summaryrefslogtreecommitdiff
path: root/packages/integrations/node/src
diff options
context:
space:
mode:
authorGravatar Arsh <69170106+lilnasy@users.noreply.github.com> 2023-12-29 15:47:52 +0000
committerGravatar GitHub <noreply@github.com> 2023-12-29 21:17:52 +0530
commit26ca342cb5e21d56ad19da31c78a7a309350cd03 (patch)
treed93150430fe3c62d66e8e2838a7fa08f4961484d /packages/integrations/node/src
parent1bff812549771df6b39ac5e98f3fcd3859f1ad99 (diff)
downloadastro-26ca342cb5e21d56ad19da31c78a7a309350cd03.tar.gz
astro-26ca342cb5e21d56ad19da31c78a7a309350cd03.tar.zst
astro-26ca342cb5e21d56ad19da31c78a7a309350cd03.zip
fix(node): prevent crash on stream error (#9533)
* fix(node): prevent crash on stream error * add changeset * Apply suggestions from code review
Diffstat (limited to 'packages/integrations/node/src')
-rw-r--r--packages/integrations/node/src/nodeMiddleware.ts30
1 files changed, 19 insertions, 11 deletions
diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
index 0b9381f1d..f1fe50d76 100644
--- a/packages/integrations/node/src/nodeMiddleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -2,6 +2,7 @@ import type { NodeApp } from 'astro/app/node';
import type { ServerResponse } from 'node:http';
import { createOutgoingHttpHeaders } from './createOutgoingHttpHeaders.js';
import type { ErrorHandlerParams, Options, RequestHandlerParams } from './types.js';
+import type { AstroIntegrationLogger } from 'astro';
// Disable no-unused-vars to avoid breaking signature change
export default function (app: NodeApp, mode: Options['mode']) {
@@ -29,12 +30,14 @@ export default function (app: NodeApp, mode: Options['mode']) {
}
}
+ const logger = app.getAdapterLogger();
+
try {
const routeData = app.match(req);
if (routeData) {
try {
const response = await app.render(req, { routeData, locals });
- await writeWebResponse(app, res, response);
+ await writeWebResponse(app, res, response, logger);
} catch (err: unknown) {
if (next) {
next(err);
@@ -46,10 +49,9 @@ export default function (app: NodeApp, mode: Options['mode']) {
return next();
} else {
const response = await app.render(req);
- await writeWebResponse(app, res, response);
+ await writeWebResponse(app, res, response, logger);
}
} catch (err: unknown) {
- const logger = app.getAdapterLogger();
logger.error(`Could not render ${req.url}`);
console.error(err);
if (!res.headersSent) {
@@ -60,34 +62,40 @@ export default function (app: NodeApp, mode: Options['mode']) {
};
}
-async function writeWebResponse(app: NodeApp, res: ServerResponse, webResponse: Response) {
- const { status, headers } = webResponse;
+async function writeWebResponse(app: NodeApp, res: ServerResponse, webResponse: Response, logger: AstroIntegrationLogger) {
+ const { status, headers, body } = webResponse;
if (app.setCookieHeaders) {
const setCookieHeaders: Array<string> = Array.from(app.setCookieHeaders(webResponse));
if (setCookieHeaders.length) {
for (const setCookieHeader of setCookieHeaders) {
- webResponse.headers.append('set-cookie', setCookieHeader);
+ headers.append('set-cookie', setCookieHeader);
}
}
}
const nodeHeaders = createOutgoingHttpHeaders(headers);
res.writeHead(status, nodeHeaders);
- if (webResponse.body) {
+ if (body) {
try {
- const reader = webResponse.body.getReader();
+ const reader = body.getReader();
res.on('close', () => {
- reader.cancel();
+ // Cancelling the reader may reject not just because of
+ // an error in the ReadableStream's cancel callback, but
+ // also because of an error anywhere in the stream.
+ reader.cancel().catch(err => {
+ logger.error(`There was an uncaught error in the middle of the stream while rendering ${res.req.url}.`);
+ console.error(err);
+ });
});
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));
+ // the error will be logged by the "on end" callback above
+ } catch {
res.write('Internal server error');
}
}