Skip to content
Merged
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
5 changes: 3 additions & 2 deletions src/lib/browser-routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,11 @@ async function routeRequest(

const headers = new Headers(request.headers);
headers.delete('authorization');
return innerFetch(target.toString(), buildRoutedInit(request, init, headers));
return innerFetch(target.toString(), buildRoutedInit(input, request, init, headers));
}

function buildRoutedInit(
input: RequestInfo,
request: Request,
originalInit: RequestInit | undefined,
headers: Headers,
Expand All @@ -276,7 +277,7 @@ function buildRoutedInit(
method,
headers,
redirect: request.redirect,
signal: request.signal,
signal: originalInit?.signal ?? (input instanceof Request ? input.signal : undefined),
} as RequestInit & Record<string, unknown>;

delete routedInit['body'];
Expand Down
36 changes: 36 additions & 0 deletions tests/lib/browser-routing.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,42 @@ describe('browser routing', () => {
});
});

test('preserves the caller abort signal for routed requests', async () => {
const controller = new AbortController();
const cache = new BrowserRouteCache();
cache.set({
sessionId: 'sess-1',
baseURL: 'http://browser-session.test/browser/kernel',
jwt: 'token-abc',
});

let routedSignal: AbortSignal | null | undefined;
const wrappedFetch = createRoutingFetch(
async (_input, init) => {
routedSignal = init?.signal;
return new Response(null, { status: 204 });
},
{
apiBaseURL: 'https://api.example/',
subresources: ['telemetry/stream'],
cache,
},
);

await wrappedFetch('https://api.example/browsers/sess-1/telemetry/stream', {
signal: controller.signal,
});

expect(routedSignal === controller.signal).toBe(true);

const request = new Request('https://api.example/browsers/sess-1/telemetry/stream', {
signal: controller.signal,
});
await wrappedFetch(request);

expect(routedSignal === request.signal).toBe(true);
});

test('ignores browser responses that do not include a usable jwt', async () => {
await withBrowserRoutingEnv('process', async () => {
const kernel = new Kernel({
Expand Down
Loading