diff --git a/src/adapters/browser-transfer/presigned/http-common.ts b/src/adapters/browser-transfer/presigned/http-common.ts index 8cbe3841..1db83099 100644 --- a/src/adapters/browser-transfer/presigned/http-common.ts +++ b/src/adapters/browser-transfer/presigned/http-common.ts @@ -42,7 +42,7 @@ export function createAbortScope( external: AbortSignal, timeoutMs: number, timers: AbortTimerSnapshot, - additionalSignals: readonly AbortSignal[] = [], + consumer?: AbortSignal, ) { const operation = createAbortableOperation({ signal: external, @@ -50,23 +50,19 @@ export function createAbortScope( setTimer: timers.setTimer, clearTimer: timers.clearTimer, }); - const releases: (() => void)[] = []; - for (const extra of additionalSignals) { - if (!extra) continue; - if (extra.aborted) { - operation.close(); - continue; - } + let release = () => {}; + if (consumer?.aborted) operation.close(); + else if (consumer) { const onAbort = () => operation.close(); try { - extra.addEventListener("abort", onAbort, { once: true }); - releases.push(() => { + consumer.addEventListener("abort", onAbort, { once: true }); + release = () => { try { - extra.removeEventListener("abort", onAbort); + consumer.removeEventListener("abort", onAbort); } catch { // A hostile signal facade cannot block the rest of cleanup. } - }); + }; } catch { // A signal that refuses a listener cannot bound this operation, so the // operation closes rather than running unbounded. @@ -75,7 +71,7 @@ export function createAbortScope( } const end = () => { operation.close(); - for (const release of releases.splice(0)) release(); + release(); }; return Object.freeze({ signal: operation.signal, @@ -100,29 +96,18 @@ export function createAbortScope( }); } -export function readWithSignal( +export async function readWithSignal( reader: ReadableStreamDefaultReader, signal: AbortSignal, ): Promise> { - if (signal.aborted) { - return Promise.reject(new DOMException("Aborted", "AbortError")); - } - return new Promise((resolve, reject) => { - const onAbort = () => { - reject(new DOMException("Aborted", "AbortError")); - }; - signal.addEventListener("abort", onAbort, { once: true }); - reader.read().then( - (result) => { - signal.removeEventListener("abort", onAbort); - resolve(result); - }, - (error: unknown) => { - signal.removeEventListener("abort", onAbort); - reject(error); - }, - ); - }); + if (signal.aborted) throw new DOMException("Aborted", "AbortError"); + const operation = createAbortableOperation({ signal }); + const outcome = await operation.race(reader.read()); + operation.close(); + if (outcome.kind === "VALUE") return outcome.value; + throw outcome.kind === "REJECTED" + ? outcome.reason + : new DOMException("Aborted", "AbortError"); } /** diff --git a/src/adapters/browser-transfer/presigned/presigned-transfer-executor.ts b/src/adapters/browser-transfer/presigned/presigned-transfer-executor.ts index 7002cc8d..4bcfdb1f 100644 --- a/src/adapters/browser-transfer/presigned/presigned-transfer-executor.ts +++ b/src/adapters/browser-transfer/presigned/presigned-transfer-executor.ts @@ -199,7 +199,7 @@ export function createPresignedTransferExecutor( signal, timeoutMs, timers, - consumerSignal ? [consumerSignal] : [], + consumerSignal, ), recheckExpiry: () => validateExpiry(capability, minimumRemainingLifetimeMs, now()), diff --git a/tests/unit/presigned-transfer-download.test.ts b/tests/unit/presigned-transfer-download.test.ts index c4fe0f72..8b076541 100644 --- a/tests/unit/presigned-transfer-download.test.ts +++ b/tests/unit/presigned-transfer-download.test.ts @@ -445,6 +445,51 @@ describe("presigned download stream lifecycle", () => { ]); }); + it("ends a pending read when only the stream consumer signal aborts", async () => { + // R3-2 characterization: the consumer signal is composed into the read + // scope separately from the owner signal, which stays live here. + const bytes = new Uint8Array([1]); + const payload = downloadCapabilityPayload(bytes); + let cancelled = false; + const fetcher = vi.fn(async (input: RequestInfo | URL) => + String(input) === CONTROL_ENDPOINT + ? jsonResponse(payload) + : downloadResponse( + new ReadableStream({ + pull() {}, + cancel() { + cancelled = true; + }, + }), + payload, + ), + ) as unknown as typeof fetch; + const harness = createHarness({ fetcher }); + const owner = new AbortController(); + const issued = await harness.provider.issueDownload({ + resourceId: "resource-1", + signal: owner.signal, + }); + expect(issued.ok).toBe(true); + if (!issued.ok) return; + const opened = await harness.executor.downloadSources.open({ + resourceId: "resource-1", + capability: issued.value, + signal: owner.signal, + }); + expect(opened.ok).toBe(true); + if (!opened.ok) return; + const consumer = new AbortController(); + const pending = collect(opened.value, consumer.signal); + await new Promise((resolve) => setTimeout(resolve, 0)); + consumer.abort("consumer"); + expect(await pending).toMatchObject([ + { ok: false, error: { code: "ABORTED" } }, + ]); + expect(owner.signal.aborted).toBe(false); + expect(cancelled).toBe(true); + }); + it("rejects an expired capability before data-plane fetch", async () => { const bytes = new Uint8Array([1]); const payload = downloadCapabilityPayload(bytes);