Skip to content
Open
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
1 change: 1 addition & 0 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,7 @@ export class OpenAI {
return await this.fetch.call(undefined, url, fetchOptions);
} finally {
clearTimeout(timeout);
if (signal) signal.removeEventListener('abort', abort);
}
}

Expand Down
23 changes: 23 additions & 0 deletions tests/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,29 @@ describe('retries', () => {
expect(count).toEqual(3);
});

test('removes caller abort listener after successful fetch', async () => {
const testFetch = async (): Promise<Response> => {
return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
};

const client = new OpenAI({
apiKey: 'My API Key',
adminAPIKey: 'My Admin API Key',
fetch: testFetch,
});
const controller = new AbortController();
const addEventListenerSpy = jest.spyOn(controller.signal, 'addEventListener');
const removeEventListenerSpy = jest.spyOn(controller.signal, 'removeEventListener');

expect(await client.request({ path: '/foo', method: 'get', signal: controller.signal })).toEqual({
a: 1,
});

const abortListener = addEventListenerSpy.mock.calls.find(([event]) => event === 'abort')?.[1];
expect(abortListener).toEqual(expect.any(Function));
expect(removeEventListenerSpy).toHaveBeenCalledWith('abort', abortListener);
});

test('retry count header', async () => {
let count = 0;
let capturedRequest: RequestInit | undefined;
Expand Down