Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions src/transports/sse.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,52 @@ describe("SSE transport helpers", () => {
).resolves.toEqual([message]);
});

it("ignores a leading BOM even when its bytes arrive separately", async () => {
const message: AnyMessage = { jsonrpc: "2.0", id: 1, result: { ok: true } };

await expect(
collectMessages(
streamFromChunks(chunkBytes(`\uFEFF${serializeSseEvent(message)}`, 1)),
),
).resolves.toEqual([message]);
});

it("does not treat a BOM-prefixed field later in the stream as data", async () => {
const first: AnyMessage = { jsonrpc: "2.0", id: 1, result: { ok: true } };
const second: AnyMessage = { jsonrpc: "2.0", id: 2, result: { ok: true } };

await expect(
collectMessages(
streamFromChunks([
serializeSseEvent(first),
`\uFEFF${serializeSseEvent(second)}`,
]),
),
).resolves.toEqual([first]);
});

it("does not treat a BOM-only line within an event as a blank line", async () => {
const message: AnyMessage = { jsonrpc: "2.0", id: 1, result: { ok: true } };

await expect(
collectMessages(
streamFromChunks([
'data: {"jsonrpc":"2.0",\n\uFEFF\ndata: "id":1,"result":{"ok":true}}\n\n',
]),
),
).resolves.toEqual([message]);
});

it("does not strip a BOM after an initial empty line", async () => {
const message: AnyMessage = { jsonrpc: "2.0", id: 1, result: { ok: true } };

await expect(
collectMessages(
streamFromChunks([`\n\uFEFF${serializeSseEvent(message)}`]),
),
).resolves.toEqual([]);
});

it("skips a JSON array as a malformed message", async () => {
const warn = vi.spyOn(console, "warn").mockImplementation(() => undefined);
const batch = [
Expand Down
10 changes: 7 additions & 3 deletions src/transports/sse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export async function* parseSseStream(
);
const reader = body.getReader();
let hasData = false;
let firstLine = true;
let finished = false;
let cancelReason: unknown;

Expand All @@ -50,9 +51,12 @@ export async function* parseSseStream(
};

const consumeLine = (line: Uint8Array): AnyMessage | undefined => {
// Preserve the previous decoder's per-line BOM handling.
if (line[0] === 0xef && line[1] === 0xbb && line[2] === 0xbf) {
line = line.subarray(3);
// SSE strips a single BOM at the start of the stream, not at each line.
if (firstLine) {
firstLine = false;
if (line[0] === 0xef && line[1] === 0xbb && line[2] === 0xbf) {
line = line.subarray(3);
}
}
if (line.byteLength === 0) {
return takeEvent();
Expand Down
Loading