Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-31 23:31:30 -05:00
Code Issues Activity

Fix an issue where ReadableStream wasn't canceled in dev mode (#9971)

Browse source 
* Fix an issue where ReadableStream wasn't canceled in dev mode

* Add changeset

* add test

---------

Co-authored-by: lilnasy <69170106+lilnasy@users.noreply.github.com>
This commit is contained in:
Ming-jun Lu 2024-02-13 19:28:14 +08:00 • committed by GitHub
parent bedb3b0930
commit d9266c4467
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 52 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/thin-kangaroos-exist.md Normal file
View file

@ -0,0 +1,5 @@
---
"astro": patch
---
Fixes an issue where ReadableStream wasn't canceled in dev mode

6
packages/astro/src/vite-plugin-astro-server/response.ts
View file

@ -82,6 +82,12 @@ export async function writeWebResponse(res: http.ServerResponse, webResponse: Re
res.write(body);
} else {
const reader = body.getReader();
res.on('close', () => {
reader.cancel().catch((error: unknown) => {
// eslint-disable-next-line no-console
console.error('An unexpected error occurred in the middle of the stream.', error);
});
});
while (true) {
const { done, value } = await reader.read();
if (done) break;

41
packages/astro/test/units/vite-plugin-astro-server/response.test.js
View file

@ -21,6 +21,28 @@ const fileSystem = {
headers.append('Set-Cookie', 'world');
return new Response(null, { headers });
}`,
'/src/pages/streaming.js': `export const GET = ({ locals }) => {
let sentChunks = 0;
const readableStream = new ReadableStream({
async pull(controller) {
if (sentChunks === 3) return controller.close();
else sentChunks++;
await new Promise(resolve => setTimeout(resolve, 1000));
controller.enqueue(new TextEncoder().encode('hello'));
},
cancel() {
locals.cancelledByTheServer = true;
}
});
return new Response(readableStream, {
headers: {
"Content-Type": "text/event-stream"
}
})
}`,
};
describe('endpoints', () => {
@ -60,4 +82,23 @@ describe('endpoints', () => {
'set-cookie': ['hello', 'world'],
});
});
it('Headers with multisple values (set-cookie special case)', async () => {
const { req, res, done } = createRequestAndResponse({
method: 'GET',
url: '/streaming',
});
const locals = { cancelledByTheServer: false }
req[Symbol.for("astro.locals")] = locals
container.handle(req, res);
await new Promise(resolve => setTimeout(resolve, 500));
res.emit('close');
await done;
expect(locals).to.deep.equal({ cancelledByTheServer: true });
});
});