From deeb1793b6bbb63f42341f126084d2da6901b3b1 Mon Sep 17 00:00:00 2001 From: William Schmitt Date: Mon, 16 Nov 2026 13:34:58 -0800 Subject: [PATCH] fix(client): let the caller's signal interrupt the retry wait retryRequest() awaited sleep(timeoutMillis) without looking at the caller's signal, which was only checked when makeRequest() started the next attempt. An abort during a Retry-After wait (up to whatever the server asks for) stayed pending for the full delay. sleep() now takes an optional signal and resolves early on abort, removing its listener and timer either way. makeRequest() then sees the aborted signal and throws APIUserAbortError as before. Measured: new test with a 429 and Retry-After: 60 aborted after 10 ms. On main it hits the 5 s jest timeout; with this change it rejects with APIUserAbortError in ~14 ms. src/core.ts is generated; this edit is sealed. Co-Authored-By: Claude Opus 5.5 --- src/core.ts | 13 +++++++++++-- tests/index.test.ts | 11 +++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/core.ts b/src/core.ts index 08d2a2c6..8a54cbd1 100644 --- a/src/core.ts +++ b/src/core.ts @@ -630,7 +630,7 @@ export abstract class APIClient { const maxRetries = options.maxRetries ?? this.maxRetries; timeoutMillis = this.calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries); } - await sleep(timeoutMillis); + await sleep(timeoutMillis, options.signal); return this.makeRequest(options, retriesRemaining - 1); } @@ -1022,7 +1022,16 @@ const isAbsoluteURL = (url: string): boolean => { return startsWithSchemeRegexp.test(url); }; -export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)); +export const sleep = (ms: number, signal?: AbortSignal | null) => + new Promise((resolve) => { + const done = () => { + clearTimeout(timeout); + signal?.removeEventListener('abort', done); + resolve(); + }; + const timeout = setTimeout(done, ms); + signal?.addEventListener('abort', done); + }); const validatePositiveInteger = (name: string, n: unknown): number => { if (typeof n !== 'number' || !Number.isInteger(n)) { diff --git a/tests/index.test.ts b/tests/index.test.ts index 03142eff..f4357856 100644 --- a/tests/index.test.ts +++ b/tests/index.test.ts @@ -505,4 +505,15 @@ describe('retries', () => { ).toEqual(JSON.stringify({ a: 1 })); expect(count).toEqual(3); }); + + test('signal aborts the retry wait', async () => { + const client = new Browserbase({ + apiKey: 'My API Key', + fetch: async () => new Response(undefined, { status: 429, headers: { 'Retry-After': '60' } }), + }); + const controller = new AbortController(); + setTimeout(() => controller.abort(), 10); + + await expect(client.get('/foo', { signal: controller.signal })).rejects.toThrow(APIUserAbortError); + }); });