diff --git a/src/core.ts b/src/core.ts index 08d2a2c..8a54cbd 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 03142ef..f435785 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); + }); });