Skip to content

Commit 8c41a31

Browse files
committed
fix(acp): preserve metadata for final protocol messages
1 parent 8db9e05 commit 8c41a31

1 file changed

Lines changed: 11 additions & 21 deletions

File tree

‎packages/effect-acp/src/protocol.ts‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ const makeStrictNdJsonRpcParser = () => {
178178
const codec = RpcSerialization.jsonRpc().makeUnsafe();
179179
const decoder = new TextDecoder();
180180
let buffer = "";
181+
const decodeLine = (line: string): ReadonlyArray<AcpDecodedWireMessage> =>
182+
codec.decode(line).map((message) => ({
183+
message: normalizeAcpJsonRpcError(
184+
message as RpcMessage.FromClientEncoded | RpcMessage.FromServerEncoded,
185+
),
186+
lineLength: line.length,
187+
}));
181188
return {
182189
// Every message in a batch line is charged the whole line.
183190
decode: (bytes: Uint8Array | string): ReadonlyArray<AcpDecodedWireMessage> => {
@@ -190,21 +197,14 @@ const makeStrictNdJsonRpcParser = () => {
190197
}
191198
const lines = (buffer + chunk.slice(0, lastNewline)).split("\n");
192199
buffer = chunk.slice(lastNewline + 1);
193-
return lines.flatMap((line) =>
194-
codec.decode(line).map((message) => ({
195-
message: normalizeAcpJsonRpcError(
196-
message as RpcMessage.FromClientEncoded | RpcMessage.FromServerEncoded,
197-
),
198-
lineLength: line.length,
199-
})),
200-
);
200+
return lines.flatMap(decodeLine);
201201
},
202202
// A truncated final line is left to the exit status, which explains a crash better.
203-
end: (): ReadonlyArray<unknown> => {
203+
end: (): ReadonlyArray<AcpDecodedWireMessage> => {
204204
const line = buffer + decoder.decode();
205205
buffer = "";
206206
try {
207-
return line.trim() === "" ? [] : codec.decode(line);
207+
return line.trim() === "" ? [] : decodeLine(line);
208208
} catch {
209209
return [];
210210
}
@@ -807,17 +807,7 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
807807
),
808808
),
809809
Effect.andThen(
810-
Effect.suspend(() =>
811-
Effect.forEach(
812-
(
813-
parser.end() as ReadonlyArray<
814-
RpcMessage.FromClientEncoded | RpcMessage.FromServerEncoded
815-
>
816-
).map(normalizeAcpJsonRpcError),
817-
routeDecodedMessage,
818-
{ discard: true },
819-
),
820-
),
810+
Effect.suspend(() => Effect.forEach(parser.end(), routeDecodedMessage, { discard: true })),
821811
),
822812
// Anything that ends the reader, including a defect in a callback it runs,
823813
// terminates the connection so pending requests fail instead of hanging.

0 commit comments

Comments
 (0)