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
17 changes: 7 additions & 10 deletions http/server_sent_event_stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,33 @@ function assertHasNoNewline(value: string, varName: string, errPrefix: string) {
*/
function stringify(message: ServerSentEventMessage): Uint8Array {
const lines = [];
if (message.comment) {
assertHasNoNewline(
message.comment,
"`message.comment`",
"Cannot serialize message",
if (message.comment !== undefined) {
message.comment.split(NEWLINE_REGEXP).forEach((line) =>
lines.push(`:${line}`)
);
lines.push(`:${message.comment}`);
}
if (message.event) {
if (message.event !== undefined) {
assertHasNoNewline(
message.event,
"`message.event`",
"Cannot serialize message",
);
lines.push(`event:${message.event}`);
}
if (message.data) {
if (message.data !== undefined) {
message.data.split(NEWLINE_REGEXP).forEach((line) =>
lines.push(`data:${line}`)
);
}
if (message.id) {
if (message.id !== undefined) {
assertHasNoNewline(
message.id.toString(),
"`message.id`",
"Cannot serialize message",
);
lines.push(`id:${message.id}`);
}
if (message.retry) lines.push(`retry:${message.retry}`);
if (message.retry !== undefined) lines.push(`retry:${message.retry}`);
return encoder.encode(lines.join("\n") + "\n\n");
}

Expand Down
41 changes: 24 additions & 17 deletions http/server_sent_event_stream_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,26 +58,33 @@ Deno.test("ServerSentEventStream enqueues a stringified server-sent event messag
);
});

Deno.test("ServerSentEventStream throws if single-line fields contain a newline", async () => {
// Comment
await assertRejects(
async () => await createStream([{ comment: "a\n" }]).getReader().read(),
SyntaxError,
"`message.comment` cannot contain a newline",
);
Deno.test("ServerSentEventStream serializes multi-line comments", async () => {
const stream = createStream([{ comment: "line1\nline2\r\nline3" }]);
const result = await Array.fromAsync(stream);

await assertRejects(
async () => await createStream([{ comment: "a\r" }]).getReader().read(),
SyntaxError,
"`message.comment` cannot contain a newline",
);
assertEquals(result, [":line1\n:line2\n:line3\n\n"]);
});

await assertRejects(
async () => await createStream([{ comment: "a\n\r" }]).getReader().read(),
SyntaxError,
"`message.comment` cannot contain a newline",
);
Deno.test("ServerSentEventStream serializes empty string fields", async () => {
const stream = createStream([
{ comment: "" },
{ event: "" },
{ data: "" },
{ id: 0 },
{ retry: 0 },
]);
const result = await Array.fromAsync(stream);

assertEquals(result, [
":\n\n",
"event:\n\n",
"data:\n\n",
"id:0\n\n",
"retry:0\n\n",
]);
});

Deno.test("ServerSentEventStream throws if single-line fields contain a newline", async () => {
// Event
await assertRejects(
async () => await createStream([{ event: "a\n" }]).getReader().read(),
Expand Down
Loading