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
6 changes: 6 additions & 0 deletions .changeset/gentle-stars-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@sveltejs/kit': minor
'@sveltejs/adapter-node': minor
---

feat: add [`signal`](https://developer.mozilla.org/en-US/docs/Web/API/Request/signal) property to request
14 changes: 14 additions & 0 deletions packages/kit/src/exports/node/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,25 @@ export async function getRequest({ request, base, bodySizeLimit }) {
delete headers[':scheme'];
}

// TODO: Whenever Node >=22 is minimum supported version, we can use `request.readableAborted`
// @see https://github.com/nodejs/node/blob/5cf3c3e24c7257a0c6192ed8ef71efec8ddac22b/lib/internal/streams/readable.js#L1443-L1453
const controller = new AbortController();
let errored = false;
let end_emitted = false;
request.once('error', () => (errored = true));
request.once('end', () => (end_emitted = true));
request.once('close', () => {
if ((errored || request.destroyed) && !end_emitted) {
controller.abort();
}
});

return new Request(base + request.url, {
// @ts-expect-error
duplex: 'half',
method: request.method,
headers: Object.entries(headers),
signal: controller.signal,
body:
request.method === 'GET' || request.method === 'HEAD'
? undefined
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<script>
import { onMount } from 'svelte';
let result;
function test_abort() {
const controller = new AbortController();
fetch('/request-abort', { method: 'POST', signal: controller.signal }).then((r) => r.json());
setTimeout(() => {
controller.abort();
fetch('/request-abort', { headers: { accept: 'application/json' } }).then(
async (r) => (result = await r.json())
);
}, 100);
}
onMount(test_abort);
</script>

<pre>{JSON.stringify(result)}</pre>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { json } from '@sveltejs/kit';

let aborted = false;

/** @type {import('@sveltejs/kit').RequestHandler} */
export function GET() {
return json({ aborted });
}

/** @type {import('@sveltejs/kit').RequestHandler} */
export async function POST({ request }) {
request.signal.addEventListener('abort', () => (aborted = true));
await new Promise((r) => setTimeout(r, 1000));
return json({ ok: true });
}
10 changes: 10 additions & 0 deletions packages/kit/test/apps/dev-only/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,13 @@ test.describe('Vite', () => {
expect(manifest).toHaveProperty('optimized.e2e-test-dep-hooks');
});
});

test.describe('request abort', () => {
test.skip(({ javaScriptEnabled }) => !process.env.DEV || !javaScriptEnabled);

test('request.signal fires abort event', async ({ page }) => {
await page.goto('/request-abort');
await page.waitForTimeout(200);
expect(await page.innerText('pre')).toBe('{"aborted":true}');
});
});