diff --git a/src/core.ts b/src/core.ts index 08d2a2c..fe12765 100644 --- a/src/core.ts +++ b/src/core.ts @@ -54,6 +54,7 @@ type APIResponseProps = { response: Response; options: FinalRequestOptions; controller: AbortController; + timeout: number; }; async function defaultParseResponse(props: APIResponseProps): Promise { @@ -67,6 +68,19 @@ async function defaultParseResponse(props: APIResponseProps): Promise { return response as unknown as T; } + const timeout = setTimeout(() => props.controller.abort(), props.timeout); + try { + return await parseBody(response); + } catch (err) { + if (props.controller.signal.aborted && !props.options.signal?.aborted) + throw new APIConnectionTimeoutError(); + throw err; + } finally { + clearTimeout(timeout); + } +} + +async function parseBody(response: Response): Promise { const contentType = response.headers.get('content-type'); const mediaType = contentType?.split(';')[0]?.trim(); const isJSON = mediaType?.includes('application/json') || mediaType?.endsWith('+json'); @@ -510,7 +524,7 @@ export abstract class APIClient { throw err; } - return { response, options, controller }; + return { response, options, controller, timeout }; } requestAPIList = AbstractPage>( diff --git a/tests/index.test.ts b/tests/index.test.ts index 03142ef..3e1feab 100644 --- a/tests/index.test.ts +++ b/tests/index.test.ts @@ -1,9 +1,11 @@ // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. import Browserbase from '@browserbasehq/sdk'; -import { APIUserAbortError } from '@browserbasehq/sdk'; +import { APIConnectionTimeoutError, APIUserAbortError } from '@browserbasehq/sdk'; import { Headers } from '@browserbasehq/sdk/core'; import defaultFetch, { Response, type RequestInit, type RequestInfo } from 'node-fetch'; +import http from 'node:http'; +import { type AddressInfo } from 'node:net'; describe('instantiate client', () => { const env = process.env; @@ -505,4 +507,28 @@ describe('retries', () => { ).toEqual(JSON.stringify({ a: 1 })); expect(count).toEqual(3); }); + + test.each([ + ['native fetch', undefined], + ['node-fetch', defaultFetch], + ])('timeout covers a stalled response body with %s', async (_, fetch) => { + const server = http.createServer((req, res) => + res.writeHead(200, { 'content-type': 'application/json' }).write('{'), + ); + await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve)); + const { port } = server.address() as AddressInfo; + const client = new Browserbase({ + apiKey: 'My API Key', + baseURL: `http://127.0.0.1:${port}`, + fetch, + timeout: 50, + maxRetries: 0, + }); + try { + await expect(client.get('/foo')).rejects.toThrow(APIConnectionTimeoutError); + } finally { + server.closeAllConnections(); + server.close(); + } + }); });