Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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<void>((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)) {
Expand Down
11 changes: 11 additions & 0 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
Loading