fix: close eventSource on stream end (#76)

trpc · Oct 20, 2023 · 2cdfc8c · 2cdfc8c
1 parent 697be72
commit 2cdfc8c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/async/createTsonAsync.ts b/src/async/createTsonAsync.ts
@@ -2,9 +2,11 @@ import { TsonAsyncOptions } from "./asyncTypes.js";
 import {
 	createTsonParseAsync,
 	createTsonParseEventSource,
+	createTsonParseJsonStreamResponse,
 } from "./deserializeAsync.js";
 import {
 	createTsonSSEResponse,
+	createTsonSerializeJsonStreamResponse,
 	createTsonStreamAsync,
 } from "./serializeAsync.js";
 
@@ -13,8 +15,10 @@ import {
  * @internal
  */
 export const createTsonAsync = (opts: TsonAsyncOptions) => ({
-	createEventSourceParser: createTsonParseEventSource(opts),
+	createEventSource: createTsonParseEventSource(opts),
+	fromJsonStreamResponse: createTsonParseJsonStreamResponse(opts),
 	parseJsonStream: createTsonParseAsync(opts),
 	stringifyJsonStream: createTsonStreamAsync(opts),
+	toJsonStreamResponse: createTsonSerializeJsonStreamResponse,
 	toSSEResponse: createTsonSSEResponse(opts),
 });
diff --git a/src/async/deserializeAsync.ts b/src/async/deserializeAsync.ts
@@ -285,17 +285,14 @@ export function createTsonParseEventSource(opts: TsonAsyncOptions) {
 
 		signal?.addEventListener("abort", onAbort);
 
-		// eventSource.addEventListener("head", (e) => {
-		// 	controller.enqueue(JSON.parse(e.data));
-		// });
-
 		eventSource.onmessage = (msg) => {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			controller.enqueue(JSON.parse(msg.data));
 		};
 
 		eventSource.addEventListener("close", () => {
 			controller.close();
+			eventSource.close();
 		});
 
 		const iterable = readableStreamToAsyncIterable(stream);

diff --git a/src/async/sse.test.ts b/src/async/sse.test.ts
@@ -86,7 +86,7 @@ test("SSE response test", async () => {
 	{
 		// e2e
 		const ac = new AbortController();
-		const shape = await tson.createEventSourceParser<MockObj>(server.url, {
+		const shape = await tson.createEventSource<MockObj>(server.url, {
 			signal: ac.signal,
 		});