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: 5 additions & 0 deletions .changeset/clear-vans-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: avoid hanging when `error()` is used while streaming promises from a server `load` function
3 changes: 1 addition & 2 deletions packages/kit/src/runtime/server/page/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ export async function render_response({
paths.reset();
}

// eslint-disable-next-line
const { head, html, css } = options.async ? await rendered : rendered;

return { head, html, css };
Expand Down Expand Up @@ -654,7 +653,7 @@ export async function render_response({
async start(controller) {
controller.enqueue(text_encoder.encode(transformed + '\n'));
for await (const chunk of chunks) {
controller.enqueue(text_encoder.encode(chunk));
if (chunk.length) controller.enqueue(text_encoder.encode(chunk));
}
controller.close();
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export function load() {
return {
promise: Promise.resolve(42)
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { error } from '@sveltejs/kit';

export function load() {
error(404);
}
15 changes: 15 additions & 0 deletions packages/kit/test/apps/basics/test/server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1408,3 +1408,18 @@ test.describe('asset preload', () => {
});
}
});

test.describe('Streaming', () => {
test("Discarded promises from server load functions don't hang SSR request", async ({
request
}) => {
let error;
try {
await request.get('/streaming/discarded-promise');
} catch (e) {
error = e;
}

expect(error).toBeUndefined();
});
});
Loading