summaryrefslogtreecommitdiff
path: root/packages/integrations/node/src/nodeMiddleware.ts
diff options
context:
space:
mode:
authorGravatar pilcrowOnPaper <80624252+pilcrowOnPaper@users.noreply.github.com> 2023-11-16 08:39:41 +0900
committerGravatar GitHub <noreply@github.com> 2023-11-16 05:09:41 +0530
commitc9487138d6d8fd39c8c8512239b6724cf2b275ff (patch)
tree5d9f7cb1dc6b134327b1dad89bd0b4dd93765c27 /packages/integrations/node/src/nodeMiddleware.ts
parenteeac2885514ecde558ad39bcee39f78f7b60109e (diff)
downloadastro-c9487138d6d8fd39c8c8512239b6724cf2b275ff.tar.gz
astro-c9487138d6d8fd39c8c8512239b6724cf2b275ff.tar.zst
astro-c9487138d6d8fd39c8c8512239b6724cf2b275ff.zip
Cancel response stream when connection closes (#9071)
* cancel stream on close * add changeset * add test * Update .changeset/modern-ways-develop.md Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca> --------- Co-authored-by: lilnasy <69170106+lilnasy@users.noreply.github.com> Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
Diffstat (limited to 'packages/integrations/node/src/nodeMiddleware.ts')
-rw-r--r--packages/integrations/node/src/nodeMiddleware.ts12
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
index ddaa95deb..7f242809e 100644
--- a/packages/integrations/node/src/nodeMiddleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -1,8 +1,6 @@
import type { NodeApp } from 'astro/app/node';
import type { ServerResponse } from 'node:http';
-import type { Readable } from 'stream';
import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js';
-import { responseIterator } from './response-iterator.js';
import type { ErrorHandlerParams, Options, RequestHandlerParams } from './types.js';
// Disable no-unused-vars to avoid breaking signature change
@@ -79,8 +77,14 @@ async function writeWebResponse(app: NodeApp, res: ServerResponse, webResponse:
res.writeHead(status, nodeHeaders);
if (webResponse.body) {
try {
- for await (const chunk of responseIterator(webResponse) as unknown as Readable) {
- res.write(chunk);
+ const reader = webResponse.body.getReader();
+ res.on("close", () => {
+ reader.cancel();
+ })
+ let result = await reader.read();
+ while (!result.done) {
+ res.write(result.value);
+ result = await reader.read();
}
} catch (err: any) {
console.error(err?.stack || err?.message || String(err));