@statewalker/webrun-http-browser 0.12.1 → 0.12.3

package/dist/index.js

@@ -1747,7 +1747,7 @@ const LAST_CHUNK = /* @__PURE__ */ new Uint8Array([
 	13,
 	10
 ]);
-const encoder = /* @__PURE__ */ new TextEncoder();
+const encoder$2 = /* @__PURE__ */ new TextEncoder();
 /**
 * Chunk sizes are written in HEXADECIMAL — a 21-byte chunk is `15`. Writing
 * them in decimal is the defect note 15 found in @libp2p/http, and it is the
@@ -1760,7 +1760,7 @@ const encoder = /* @__PURE__ */ new TextEncoder();
 async function* encodeChunked(body) {
 	for await (const chunk of body) {
 		if (chunk.byteLength === 0) continue;
-		yield encoder.encode(`${chunk.byteLength.toString(16)}\r\n`);
+		yield encoder$2.encode(`${chunk.byteLength.toString(16)}\r\n`);
 		yield chunk;
 		yield CRLF;
 	}
@@ -2230,7 +2230,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 {
@@ -2626,7 +2629,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,
@@ -2638,7 +2642,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
@@ -2791,7 +2795,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;
@@ -2799,6 +2805,7 @@ function responseBody(body, signal, release) {
 	const end = () => {
 		ended = true;
 		signal?.removeEventListener("abort", onAbort);
+		keep.request = void 0;
 	};
 	const onAbort = () => {
 		if (ended) return;
@@ -3331,7 +3338,7 @@ const STREAM_ABORT = "webrun-rpc:stream-abort";
 * request, sent only on a port where both ends agreed `pipeline`. The window's
 * credit is its confirmation.
 */
-const CHUNK = "webrun-rpc:chunk";
+const CHUNK$1 = "webrun-rpc:chunk";
 /**
 * What a pipelined chunk counts beyond its bytes, against the window, on the
 * receiving side. Both codecs' windows count more for the chunk's envelope
@@ -3662,7 +3669,7 @@ function receiveChunks(port, channelName, controller, touch, notice) {
 	const watcher = (event) => {
 		const data = event.data;
 		if (data?.channelName !== channelName) return;
-		const chunk = data.type === CHUNK ? data.chunk : data.type === "request" ? data.params : void 0;
+		const chunk = data.type === CHUNK$1 ? data.chunk : data.type === "request" ? data.params : void 0;
 		if (!chunk) return;
 		if (!watchPeerEnd()) {
 			port.removeEventListener("message", watcher);
@@ -3697,7 +3704,7 @@ function receiveChunks(port, channelName, controller, touch, notice) {
 	}, { channelName });
 	const onChunk = (event) => {
 		const data = event.data;
-		if (data?.type !== CHUNK || data.channelName !== channelName || !data.chunk) return;
+		if (data?.type !== CHUNK$1 || data.channelName !== channelName || !data.chunk) return;
 		if (poison) return;
 		const agreement = portAgreement(port);
 		if (!agreement?.caps.has("pipeline")) {
@@ -3789,12 +3796,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;
@@ -3810,13 +3811,13 @@ async function sendChunks(port, channelName, output, { maxMessageSize, log }, si
 			});
 			if (mayPipeline(port)) {
 				port.postMessage({
-					type: CHUNK,
+					type: CHUNK$1,
 					channelName,
 					chunk
 				});
 				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, {
@@ -3832,10 +3833,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
@@ -4833,7 +4849,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
@@ -4852,56 +4873,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) {
@@ -5104,20 +5131,24 @@ function postFrame(port, frame) {
 function messageSize(data) {
 	return typeof data === "string" ? utf8Length(data) : data.byteLength;
 }
-/** The UTF-8 length of `text`, without encoding it. */
+const encoder = new TextEncoder();
+/** Characters encoded per `encodeInto` call: at most 3 bytes each, so the scratch stays at 96 KiB. */
+const CHUNK = 32768;
+const scratch = new Uint8Array(CHUNK * 3);
+/**
+* The UTF-8 length of `text`, as `TextEncoder` would encode it (a lone surrogate counts as the 3
+* bytes of U+FFFD). Every message is measured on both ends (`bufferedAmount` and the byte acks), so
+* this runs natively: `encodeInto` a reused buffer, a chunk at a time, never splitting a surrogate
+* pair across two chunks. A loop over the characters in JavaScript took about 30 times as long.
+*/
 function utf8Length(text) {
 	let length = 0;
-	for (let i = 0; i < text.length; i++) {
-		const code = text.charCodeAt(i);
-		if (code < 128) length += 1;
-		else if (code < 2048) length += 2;
-		else if (code >= 55296 && code <= 56319 && i + 1 < text.length) {
-			const next = text.charCodeAt(i + 1);
-			if (next >= 56320 && next <= 57343) {
-				length += 4;
-				i++;
-			} else length += 3;
-		} else length += 3;
+	for (let start = 0; start < text.length;) {
+		let end = Math.min(start + CHUNK, text.length);
+		const last = text.charCodeAt(end - 1);
+		if (end < text.length && last >= 55296 && last <= 56319) end--;
+		length += encoder.encodeInto(text.slice(start, end), scratch).written;
+		start = end;
 	}
 	return length;
 }
@@ -8073,7 +8104,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/link/http-link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-link.d.ts","sourceRoot":"","sources":["../../src/link/http-link.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAKD,iEAAiE;AACjE,MAAM,WAAW,QAAQ;IACvB,0EAA0E;IAC1E,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,2CAA2C;IAC3C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAO,SAAuD,EAGzE;CACF;AASD,qEAAqE;AACrE,wBAAsB,eAAe,CACnC,IAAI,EAAE,WAAW,EACjB,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAiC,EAAE,GAAE,eAAoB,GACnF,OAAO,CAAC,QAAQ,CAAC,CAcnB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAC3D,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAE,eAAoB,GAC/D,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAClC,QAAQ,CAwEV"}
+{"version":3,"file":"http-link.d.ts","sourceRoot":"","sources":["../../src/link/http-link.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAKD,iEAAiE;AACjE,MAAM,WAAW,QAAQ;IACvB,0EAA0E;IAC1E,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,2CAA2C;IAC3C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B;;;OAGG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAO,SAAuD,EAGzE;CACF;AASD,qEAAqE;AACrE,wBAAsB,eAAe,CACnC,IAAI,EAAE,WAAW,EACjB,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAiC,EAAE,GAAE,eAAoB,GACnF,OAAO,CAAC,QAAQ,CAAC,CAcnB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,EAC3D,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAE,eAAoB,GAC/D,OAAO,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAiB9B;AAED;;;GAGG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GAClC,QAAQ,CA4EV"}

package/dist/relay-sw.js

@@ -1138,7 +1138,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 {
@@ -1388,7 +1391,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,
@@ -1400,7 +1404,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);
 	}
 	/**
 	* How long a cancelled body waits for the read in flight before it abandons the call anyway.
@@ -1423,7 +1427,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;
@@ -1431,6 +1437,7 @@
 		const end = () => {
 			ended = true;
 			signal?.removeEventListener("abort", onAbort);
+			keep.request = void 0;
 		};
 		const onAbort = () => {
 			if (ended) return;
@@ -2394,12 +2401,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;
@@ -2421,7 +2422,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, {
@@ -2437,10 +2438,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
@@ -3366,7 +3382,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
@@ -3385,56 +3406,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) {