@statewalker/webrun-http-browser 0.12.2 → 0.12.3

package/dist/sw-worker.js

@@ -1312,7 +1312,10 @@
 			}
 			const onAbort = () => void release();
 			signal?.addEventListener("abort", onAbort, { once: true });
-			drain(output).finally(() => signal?.removeEventListener("abort", onAbort));
+			options.keepAlive;
+			drain(output).finally(() => {
+				signal?.removeEventListener("abort", onAbort);
+			});
 		};
 		let decoded;
 		try {
@@ -1675,7 +1678,8 @@
 		}
 		const { envelope, body: respBody, release, finish } = await httpFetch(call, env, body, {
 			...options,
-			signal: request.signal ?? void 0
+			signal: request.signal ?? void 0,
+			keepAlive: request
 		});
 		const responseInit = {
 			status: envelope.status,
@@ -1687,7 +1691,7 @@
 			else await release?.();
 			return new Response(null, responseInit);
 		}
-		return new Response(responseBody(respBody, request.signal, release), responseInit);
+		return new Response(responseBody(respBody, request, release), responseInit);
 	}
 	/**
 	* Wrap a `(Request) => Promise<Response>` handler as a `Duplex` so it can be
@@ -1840,7 +1844,9 @@
 	* A cancel abandons the call too — unless the read in flight comes back with the
 	* body's end, which finishes it instead (see `cancel`).
 	*/
-	function responseBody(body, signal, release) {
+	function responseBody(body, request, release) {
+		const keep = { request };
+		const signal = request.signal ?? void 0;
 		const it = body[Symbol.asyncIterator]();
 		let controller;
 		let ended = false;
@@ -1848,6 +1854,7 @@
 		const end = () => {
 			ended = true;
 			signal?.removeEventListener("abort", onAbort);
+			keep.request = void 0;
 		};
 		const onAbort = () => {
 			if (ended) return;
@@ -2879,12 +2886,6 @@
 		const producer = output;
 		const returnProducer = () => void Promise.resolve(producer.return?.()).catch(() => {});
 		if (framed !== output) signal.addEventListener("abort", returnProducer, { once: true });
-		let onAborted = () => {};
-		const aborted = new Promise((resolve) => {
-			onAborted = () => resolve();
-		});
-		if (signal.aborted) onAborted();
-		else signal.addEventListener("abort", onAborted, { once: true });
 		try {
 			await sendIterator(async ({ done, value, error }) => {
 				if (signal.aborted) return;
@@ -2906,7 +2907,7 @@
 					});
 					touch();
 					if (done && !error) onSent();
-					if (portBufferedAmount(port) > 0) await Promise.race([whenPortReady(port), aborted]);
+					if (portBufferedAmount(port) > 0) await whenReadyOrAborted(port, signal);
 					return;
 				}
 				await callPort(port, chunk, {
@@ -2922,10 +2923,25 @@
 			throw err;
 		} finally {
 			signal.removeEventListener("abort", returnProducer);
-			signal.removeEventListener("abort", onAborted);
 		}
 	}
 	/**
+	* A pipelined sender waits only for room in the window, or for the abort. The
+	* abort listener lives for this one wait: a promise held for the whole stream
+	* would keep one reaction per wait until the stream ends.
+	*/
+	function whenReadyOrAborted(port, signal) {
+		if (signal.aborted) return Promise.resolve();
+		return new Promise((resolve) => {
+			const settle = () => {
+				signal.removeEventListener("abort", settle);
+				resolve();
+			};
+			signal.addEventListener("abort", settle, { once: true });
+			whenPortReady(port).then(settle, settle);
+		});
+	}
+	/**
 	* One virtual port.
 	*
 	* `deliver` and `markClosed` are deliberately not on `port`: the consumer holds
@@ -3923,7 +3939,12 @@
 					finish();
 					return response;
 				}
-				return new Response(guardBody(response.body, lost, () => lostReason, finish, request.signal), {
+				failers.delete(fail);
+				const body = guardBody(response.body, finish, request);
+				fail = body.fail;
+				if (closed) fail(lostReason);
+				else if (!finished) failers.add(fail);
+				return new Response(body.stream, {
 					status: response.status,
 					statusText: response.statusText,
 					headers: response.headers
@@ -3942,56 +3963,62 @@
 		return asyncDisposable(link, () => link.close());
 	}
 	/**
-	* A response body that reports its end (done, cancelled, failed or aborted) and
-	* fails with the link's reason when the link is lost mid-stream. An abort of the
-	* request's signal ends it at once, read or not: the exchange is over (the layer
-	* below has given its port back), so the request leaves `inflight` then.
+	* A response body that reports its end (done, cancelled, failed or aborted).
+	* `fail(error)` ends it with `error` at once — the link calls it when it is lost
+	* mid-stream. An abort of the request's signal does the same with the signal's
+	* reason, read or not: the exchange is over (the layer below has given its port
+	* back), so the request leaves `inflight` then. A read waits on the reader
+	* alone, so nothing outlives the chunk it brings.
 	*/
-	function guardBody(body, lost, reason, finish, signal) {
+	function guardBody(body, finish, request) {
+		const keep = { request };
+		const signal = request.signal ?? void 0;
 		const reader = body.getReader();
 		let controller;
 		let ended = false;
 		const end = () => {
 			ended = true;
 			signal?.removeEventListener("abort", onAbort);
+			keep.request = void 0;
 			finish();
 		};
-		const onAbort = () => {
+		const fail = (error) => {
 			if (ended) return;
 			end();
 			reader.cancel().catch(() => {});
 			try {
-				controller.error(abortError(signal));
+				controller.error(error);
 			} catch {}
 		};
-		return new ReadableStream({
-			start(c) {
-				controller = c;
-				if (signal?.aborted) onAbort();
-				else signal?.addEventListener("abort", onAbort, { once: true });
-			},
-			async pull(controller) {
-				try {
-					const { done, value } = await Promise.race([reader.read(), lost]);
-					if (ended) return;
-					if (done) {
-						end();
-						controller.close();
-						return;
+		const onAbort = () => fail(abortError(signal));
+		return {
+			stream: new ReadableStream({
+				start(c) {
+					controller = c;
+					if (signal?.aborted) onAbort();
+					else signal?.addEventListener("abort", onAbort, { once: true });
+				},
+				async pull(controller) {
+					try {
+						const { done, value } = await reader.read();
+						if (ended) return;
+						if (done) {
+							end();
+							controller.close();
+							return;
+						}
+						controller.enqueue(value);
+					} catch (error) {
+						fail(error);
 					}
-					controller.enqueue(value);
-				} catch (error) {
-					if (ended) return;
+				},
+				cancel(why) {
 					end();
-					reader.cancel().catch(() => {});
-					controller.error(reason() ?? error);
+					setTimeout(() => void reader.cancel(why).catch(() => {}), 0);
 				}
-			},
-			async cancel(why) {
-				end();
-				await reader.cancel(why).catch(() => {});
-			}
-		});
+			}),
+			fail
+		};
 	}
 	/** The signal's reason as an `Error` (`AbortError` when it gave none). */
 	function abortError(signal) {

package/dist/sw.js

@@ -1183,7 +1183,10 @@ async function httpFetch(call, env, body, options = {}) {
 		}
 		const onAbort = () => void release();
 		signal?.addEventListener("abort", onAbort, { once: true });
-		drain(output).finally(() => signal?.removeEventListener("abort", onAbort));
+		options.keepAlive;
+		drain(output).finally(() => {
+			signal?.removeEventListener("abort", onAbort);
+		});
 	};
 	let decoded;
 	try {
@@ -1546,7 +1549,8 @@ async function fetchOverDuplex(call, request, options = {}) {
 	}
 	const { envelope, body: respBody, release, finish } = await httpFetch(call, env, body, {
 		...options,
-		signal: request.signal ?? void 0
+		signal: request.signal ?? void 0,
+		keepAlive: request
 	});
 	const responseInit = {
 		status: envelope.status,
@@ -1558,7 +1562,7 @@ async function fetchOverDuplex(call, request, options = {}) {
 		else await release?.();
 		return new Response(null, responseInit);
 	}
-	return new Response(responseBody(respBody, request.signal, release), responseInit);
+	return new Response(responseBody(respBody, request, release), responseInit);
 }
 /**
 * Wrap a `(Request) => Promise<Response>` handler as a `Duplex` so it can be
@@ -1711,7 +1715,9 @@ const CANCEL_GRACE_MS = 1e3;
 * A cancel abandons the call too — unless the read in flight comes back with the
 * body's end, which finishes it instead (see `cancel`).
 */
-function responseBody(body, signal, release) {
+function responseBody(body, request, release) {
+	const keep = { request };
+	const signal = request.signal ?? void 0;
 	const it = body[Symbol.asyncIterator]();
 	let controller;
 	let ended = false;
@@ -1719,6 +1725,7 @@ function responseBody(body, signal, release) {
 	const end = () => {
 		ended = true;
 		signal?.removeEventListener("abort", onAbort);
+		keep.request = void 0;
 	};
 	const onAbort = () => {
 		if (ended) return;
@@ -2547,12 +2554,6 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 	const producer = output;
 	const returnProducer = () => void Promise.resolve(producer.return?.()).catch(() => {});
 	if (framed !== output) signal.addEventListener("abort", returnProducer, { once: true });
-	let onAborted = () => {};
-	const aborted = new Promise((resolve) => {
-		onAborted = () => resolve();
-	});
-	if (signal.aborted) onAborted();
-	else signal.addEventListener("abort", onAborted, { once: true });
 	try {
 		await sendIterator(async ({ done, value, error }) => {
 			if (signal.aborted) return;
@@ -2574,7 +2575,7 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 				});
 				touch();
 				if (done && !error) onSent();
-				if (portBufferedAmount(port) > 0) await Promise.race([whenPortReady(port), aborted]);
+				if (portBufferedAmount(port) > 0) await whenReadyOrAborted(port, signal);
 				return;
 			}
 			await callPort(port, chunk, {
@@ -2590,10 +2591,25 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 		throw err;
 	} finally {
 		signal.removeEventListener("abort", returnProducer);
-		signal.removeEventListener("abort", onAborted);
 	}
 }
 /**
+* A pipelined sender waits only for room in the window, or for the abort. The
+* abort listener lives for this one wait: a promise held for the whole stream
+* would keep one reaction per wait until the stream ends.
+*/
+function whenReadyOrAborted(port, signal) {
+	if (signal.aborted) return Promise.resolve();
+	return new Promise((resolve) => {
+		const settle = () => {
+			signal.removeEventListener("abort", settle);
+			resolve();
+		};
+		signal.addEventListener("abort", settle, { once: true });
+		whenPortReady(port).then(settle, settle);
+	});
+}
+/**
 * One virtual port.
 *
 * `deliver` and `markClosed` are deliberately not on `port`: the consumer holds
@@ -3591,7 +3607,12 @@ function trackedLink(send, release) {
 				finish();
 				return response;
 			}
-			return new Response(guardBody(response.body, lost, () => lostReason, finish, request.signal), {
+			failers.delete(fail);
+			const body = guardBody(response.body, finish, request);
+			fail = body.fail;
+			if (closed) fail(lostReason);
+			else if (!finished) failers.add(fail);
+			return new Response(body.stream, {
 				status: response.status,
 				statusText: response.statusText,
 				headers: response.headers
@@ -3610,56 +3631,62 @@ function trackedLink(send, release) {
 	return asyncDisposable(link, () => link.close());
 }
 /**
-* A response body that reports its end (done, cancelled, failed or aborted) and
-* fails with the link's reason when the link is lost mid-stream. An abort of the
-* request's signal ends it at once, read or not: the exchange is over (the layer
-* below has given its port back), so the request leaves `inflight` then.
+* A response body that reports its end (done, cancelled, failed or aborted).
+* `fail(error)` ends it with `error` at once — the link calls it when it is lost
+* mid-stream. An abort of the request's signal does the same with the signal's
+* reason, read or not: the exchange is over (the layer below has given its port
+* back), so the request leaves `inflight` then. A read waits on the reader
+* alone, so nothing outlives the chunk it brings.
 */
-function guardBody(body, lost, reason, finish, signal) {
+function guardBody(body, finish, request) {
+	const keep = { request };
+	const signal = request.signal ?? void 0;
 	const reader = body.getReader();
 	let controller;
 	let ended = false;
 	const end = () => {
 		ended = true;
 		signal?.removeEventListener("abort", onAbort);
+		keep.request = void 0;
 		finish();
 	};
-	const onAbort = () => {
+	const fail = (error) => {
 		if (ended) return;
 		end();
 		reader.cancel().catch(() => {});
 		try {
-			controller.error(abortError(signal));
+			controller.error(error);
 		} catch {}
 	};
-	return new ReadableStream({
-		start(c) {
-			controller = c;
-			if (signal?.aborted) onAbort();
-			else signal?.addEventListener("abort", onAbort, { once: true });
-		},
-		async pull(controller) {
-			try {
-				const { done, value } = await Promise.race([reader.read(), lost]);
-				if (ended) return;
-				if (done) {
-					end();
-					controller.close();
-					return;
+	const onAbort = () => fail(abortError(signal));
+	return {
+		stream: new ReadableStream({
+			start(c) {
+				controller = c;
+				if (signal?.aborted) onAbort();
+				else signal?.addEventListener("abort", onAbort, { once: true });
+			},
+			async pull(controller) {
+				try {
+					const { done, value } = await reader.read();
+					if (ended) return;
+					if (done) {
+						end();
+						controller.close();
+						return;
+					}
+					controller.enqueue(value);
+				} catch (error) {
+					fail(error);
 				}
-				controller.enqueue(value);
-			} catch (error) {
-				if (ended) return;
+			},
+			cancel(why) {
 				end();
-				reader.cancel().catch(() => {});
-				controller.error(reason() ?? error);
+				setTimeout(() => void reader.cancel(why).catch(() => {}), 0);
 			}
-		},
-		async cancel(why) {
-			end();
-			await reader.cancel(why).catch(() => {});
-		}
-	});
+		}),
+		fail
+	};
 }
 /** The signal's reason as an `Error` (`AbortError` when it gave none). */
 function abortError(signal) {
@@ -6928,7 +6955,10 @@ function serveHttpInWorker(handler, options = {}) {
 	let WebSocketClass;
 	return {
 		fetch(input, init) {
-			const request = input instanceof Request && init === void 0 ? input : new Request(input instanceof Request ? input : new URL(`${input}`, baseUrl()), init);
+			const request = input instanceof Request && init === void 0 ? input : new Request(input instanceof Request ? input : new URL(`${input}`, baseUrl()), {
+				...init,
+				signal: init && "signal" in init ? init.signal : input instanceof Request ? input.signal : void 0
+			});
 			return endpoint.fetch(request);
 		},
 		connectWebSocket,

package/dist/worker.js

@@ -1124,7 +1124,10 @@ async function httpFetch(call, env, body, options = {}) {
 		}
 		const onAbort = () => void release();
 		signal?.addEventListener("abort", onAbort, { once: true });
-		drain(output).finally(() => signal?.removeEventListener("abort", onAbort));
+		options.keepAlive;
+		drain(output).finally(() => {
+			signal?.removeEventListener("abort", onAbort);
+		});
 	};
 	let decoded;
 	try {
@@ -1432,7 +1435,8 @@ async function fetchOverDuplex(call, request, options = {}) {
 	}
 	const { envelope, body: respBody, release, finish } = await httpFetch(call, env, body, {
 		...options,
-		signal: request.signal ?? void 0
+		signal: request.signal ?? void 0,
+		keepAlive: request
 	});
 	const responseInit = {
 		status: envelope.status,
@@ -1444,7 +1448,7 @@ async function fetchOverDuplex(call, request, options = {}) {
 		else await release?.();
 		return new Response(null, responseInit);
 	}
-	return new Response(responseBody(respBody, request.signal, release), responseInit);
+	return new Response(responseBody(respBody, request, release), responseInit);
 }
 /**
 * Wrap a `(Request) => Promise<Response>` handler as a `Duplex` so it can be
@@ -1597,7 +1601,9 @@ const CANCEL_GRACE_MS = 1e3;
 * A cancel abandons the call too — unless the read in flight comes back with the
 * body's end, which finishes it instead (see `cancel`).
 */
-function responseBody(body, signal, release) {
+function responseBody(body, request, release) {
+	const keep = { request };
+	const signal = request.signal ?? void 0;
 	const it = body[Symbol.asyncIterator]();
 	let controller;
 	let ended = false;
@@ -1605,6 +1611,7 @@ function responseBody(body, signal, release) {
 	const end = () => {
 		ended = true;
 		signal?.removeEventListener("abort", onAbort);
+		keep.request = void 0;
 	};
 	const onAbort = () => {
 		if (ended) return;
@@ -2433,12 +2440,6 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 	const producer = output;
 	const returnProducer = () => void Promise.resolve(producer.return?.()).catch(() => {});
 	if (framed !== output) signal.addEventListener("abort", returnProducer, { once: true });
-	let onAborted = () => {};
-	const aborted = new Promise((resolve) => {
-		onAborted = () => resolve();
-	});
-	if (signal.aborted) onAborted();
-	else signal.addEventListener("abort", onAborted, { once: true });
 	try {
 		await sendIterator(async ({ done, value, error }) => {
 			if (signal.aborted) return;
@@ -2460,7 +2461,7 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 				});
 				touch();
 				if (done && !error) onSent();
-				if (portBufferedAmount(port) > 0) await Promise.race([whenPortReady(port), aborted]);
+				if (portBufferedAmount(port) > 0) await whenReadyOrAborted(port, signal);
 				return;
 			}
 			await callPort(port, chunk, {
@@ -2476,10 +2477,25 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 		throw err;
 	} finally {
 		signal.removeEventListener("abort", returnProducer);
-		signal.removeEventListener("abort", onAborted);
 	}
 }
 /**
+* A pipelined sender waits only for room in the window, or for the abort. The
+* abort listener lives for this one wait: a promise held for the whole stream
+* would keep one reaction per wait until the stream ends.
+*/
+function whenReadyOrAborted(port, signal) {
+	if (signal.aborted) return Promise.resolve();
+	return new Promise((resolve) => {
+		const settle = () => {
+			signal.removeEventListener("abort", settle);
+			resolve();
+		};
+		signal.addEventListener("abort", settle, { once: true });
+		whenPortReady(port).then(settle, settle);
+	});
+}
+/**
 * One virtual port.
 *
 * `deliver` and `markClosed` are deliberately not on `port`: the consumer holds
@@ -3477,7 +3493,12 @@ function trackedLink(send, release) {
 				finish();
 				return response;
 			}
-			return new Response(guardBody(response.body, lost, () => lostReason, finish, request.signal), {
+			failers.delete(fail);
+			const body = guardBody(response.body, finish, request);
+			fail = body.fail;
+			if (closed) fail(lostReason);
+			else if (!finished) failers.add(fail);
+			return new Response(body.stream, {
 				status: response.status,
 				statusText: response.statusText,
 				headers: response.headers
@@ -3496,56 +3517,62 @@ function trackedLink(send, release) {
 	return asyncDisposable(link, () => link.close());
 }
 /**
-* A response body that reports its end (done, cancelled, failed or aborted) and
-* fails with the link's reason when the link is lost mid-stream. An abort of the
-* request's signal ends it at once, read or not: the exchange is over (the layer
-* below has given its port back), so the request leaves `inflight` then.
+* A response body that reports its end (done, cancelled, failed or aborted).
+* `fail(error)` ends it with `error` at once — the link calls it when it is lost
+* mid-stream. An abort of the request's signal does the same with the signal's
+* reason, read or not: the exchange is over (the layer below has given its port
+* back), so the request leaves `inflight` then. A read waits on the reader
+* alone, so nothing outlives the chunk it brings.
 */
-function guardBody(body, lost, reason, finish, signal) {
+function guardBody(body, finish, request) {
+	const keep = { request };
+	const signal = request.signal ?? void 0;
 	const reader = body.getReader();
 	let controller;
 	let ended = false;
 	const end = () => {
 		ended = true;
 		signal?.removeEventListener("abort", onAbort);
+		keep.request = void 0;
 		finish();
 	};
-	const onAbort = () => {
+	const fail = (error) => {
 		if (ended) return;
 		end();
 		reader.cancel().catch(() => {});
 		try {
-			controller.error(abortError(signal));
+			controller.error(error);
 		} catch {}
 	};
-	return new ReadableStream({
-		start(c) {
-			controller = c;
-			if (signal?.aborted) onAbort();
-			else signal?.addEventListener("abort", onAbort, { once: true });
-		},
-		async pull(controller) {
-			try {
-				const { done, value } = await Promise.race([reader.read(), lost]);
-				if (ended) return;
-				if (done) {
-					end();
-					controller.close();
-					return;
+	const onAbort = () => fail(abortError(signal));
+	return {
+		stream: new ReadableStream({
+			start(c) {
+				controller = c;
+				if (signal?.aborted) onAbort();
+				else signal?.addEventListener("abort", onAbort, { once: true });
+			},
+			async pull(controller) {
+				try {
+					const { done, value } = await reader.read();
+					if (ended) return;
+					if (done) {
+						end();
+						controller.close();
+						return;
+					}
+					controller.enqueue(value);
+				} catch (error) {
+					fail(error);
 				}
-				controller.enqueue(value);
-			} catch (error) {
-				if (ended) return;
+			},
+			cancel(why) {
 				end();
-				reader.cancel().catch(() => {});
-				controller.error(reason() ?? error);
+				setTimeout(() => void reader.cancel(why).catch(() => {}), 0);
 			}
-		},
-		async cancel(why) {
-			end();
-			await reader.cancel(why).catch(() => {});
-		}
-	});
+		}),
+		fail
+	};
 }
 /** The signal's reason as an `Error` (`AbortError` when it gave none). */
 function abortError(signal) {
@@ -4879,7 +4906,10 @@ function serveHttpInWorker(handler, options = {}) {
 	let WebSocketClass;
 	return {
 		fetch(input, init) {
-			const request = input instanceof Request && init === void 0 ? input : new Request(input instanceof Request ? input : new URL(`${input}`, baseUrl()), init);
+			const request = input instanceof Request && init === void 0 ? input : new Request(input instanceof Request ? input : new URL(`${input}`, baseUrl()), {
+				...init,
+				signal: init && "signal" in init ? init.signal : input instanceof Request ? input.signal : void 0
+			});
 			return endpoint.fetch(request);
 		},
 		connectWebSocket,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@statewalker/webrun-http-browser",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "private": false,
   "type": "module",
   "description": "ServiceWorker-based HTTP and WebSocket server for browsers: handlers in pages and Dedicated Workers, same-origin and relay modes, streams with backpressure",
@@ -58,8 +58,8 @@
   ],
   "dependencies": {
     "idb-keyval": "^6.3.0",
-    "@statewalker/webrun-http-streams": "^0.4.0",
-    "@statewalker/webrun-rpc": "^0.10.0",
+    "@statewalker/webrun-http-streams": "^0.4.1",
+    "@statewalker/webrun-rpc": "^0.10.1",
     "@statewalker/webrun-streams": "^0.2.3"
   },
   "devDependencies": {