@lovrozagar/flare 0.9.4 → 0.9.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lovrozagar/flare",
-	"version": "0.9.4",
+	"version": "0.9.6",
 	"description": "Solid meta-framework. Server-driven, NDJSON streaming, renderToStream.",
 	"keywords": [
 		"flare",

package/src/plugins/dev-server.ts

@@ -12,8 +12,11 @@ interface NodeReq {
 }
 
 interface NodeRes {
+	destroy: () => void;
 	end: (data?: unknown) => void;
+	headersSent?: boolean;
 	on: (event: string, fn: () => void) => void;
+	socket?: { off: (event: string, fn: () => void) => void; on: (event: string, fn: () => void) => void } | null;
 	writableEnded?: boolean;
 	write: (chunk: unknown) => void;
 	writeHead: (status: number, headers: Record<string, string | string[]>) => void;
@@ -71,7 +74,7 @@ function nodeToWebRequest(req: NodeReq, url: URL): Request {
 	} as RequestInit);
 }
 
-async function streamResponse(response: Response, res: NodeRes): Promise<void> {
+export async function streamResponse(response: Response, res: NodeRes): Promise<void> {
 	const responseHeaders: Record<string, string | string[]> = {};
 	/* Set-Cookie must be sent as separate headers — Node.js writeHead
 	 * accepts string[] for multi-value headers like Set-Cookie */
@@ -88,28 +91,42 @@ async function streamResponse(response: Response, res: NodeRes): Promise<void> {
 	}
 	res.writeHead(response.status, responseHeaders);
 
-	if (response.body) {
-		const reader = response.body.getReader();
-		const pump = async (): Promise<void> => {
+	if (!response.body) {
+		res.end();
+		return;
+	}
+	const reader = response.body.getReader();
+	/* A client that leaves mid-stream (closed tab, aborted navigation): cancel the body so
+	   rendering stops, and never write to the closed response. Node and Bun 1.4 close `res`;
+	   Bun 1.3 only closes the socket, so listen to both. */
+	let left = false;
+	const leave = () => {
+		if (left || res.writableEnded) return;
+		left = true;
+		reader.cancel().catch(() => {});
+	};
+	const socket = res.socket;
+	res.on("close", leave);
+	socket?.on("close", leave);
+	try {
+		while (true) {
 			const { done, value } = await reader.read();
-			if (done) {
-				res.end();
-				return;
-			}
+			if (done || left) break;
 			res.write(value);
-			return pump();
-		};
-		try {
-			await pump();
-		} finally {
-			reader.cancel().catch(() => {});
-			if (!res.writableEnded) res.end();
 		}
-	} else {
-		res.end();
+	} finally {
+		/* Keep-alive sockets outlive this response. */
+		socket?.off("close", leave);
+		if (!left && !res.writableEnded) res.end();
 	}
 }
 
+/* Once the status line is out, an error can't become a 500: drop the connection instead. */
+function failResponse(res: NodeRes, next: (err?: unknown) => void, error: unknown): void {
+	if (res.headersSent) res.destroy();
+	else next(error);
+}
+
 const INLINE_PLACEHOLDER = (i: number) => `<!--flare-inline-${i}-->`;
 const INLINE_PLACEHOLDER_RE = /<!--flare-inline-(\d+)-->/g;
 
@@ -238,7 +255,7 @@ export function createDevServerPlugin(entries: ResolvedEntries, _assetsBase: str
 						if (e instanceof Error) {
 							vite.ssrFixStacktrace(e);
 						}
-						next(e);
+						failResponse(res, next, e);
 					}
 				});
 			};
@@ -325,7 +342,7 @@ export function createPreviewServerPlugin(assetsBase: string = "/assets"): ViteP
 						const response = await handler.fetch(webReq);
 						await streamResponse(response, res);
 					} catch (e: unknown) {
-						next(e);
+						failResponse(res, next, e);
 					}
 				});
 			};