mirror of
https://github.com/withastro/astro.git
synced 2024-12-16 21:46:22 -05:00
Catch errors that occur within the stream in the Node adapter (#6935)
* Catch errors that occur within the stream in the Node adapter * Adding a changeset * Better error message on completely uncaught errors within the stream * Update test
This commit is contained in:
parent
649d70934e
commit
c405cef647
6 changed files with 76 additions and 2 deletions
5
.changeset/silent-years-burn.md
Normal file
5
.changeset/silent-years-burn.md
Normal file
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
'@astrojs/node': patch
|
||||
---
|
||||
|
||||
Catch errors that occur within the stream in the Node adapter
|
|
@ -51,8 +51,13 @@ async function writeWebResponse(app: NodeApp, res: ServerResponse, webResponse:
|
|||
|
||||
res.writeHead(status, Object.fromEntries(headers.entries()));
|
||||
if (webResponse.body) {
|
||||
for await (const chunk of responseIterator(webResponse) as unknown as Readable) {
|
||||
res.write(chunk);
|
||||
try {
|
||||
for await (const chunk of responseIterator(webResponse) as unknown as Readable) {
|
||||
res.write(chunk);
|
||||
}
|
||||
} catch(err: any) {
|
||||
console.error(err?.stack || err?.message || String(err))
|
||||
res.write('Internal server error');
|
||||
}
|
||||
}
|
||||
res.end();
|
||||
|
|
33
packages/integrations/node/test/errors.test.js
Normal file
33
packages/integrations/node/test/errors.test.js
Normal file
|
@ -0,0 +1,33 @@
|
|||
import nodejs from '../dist/index.js';
|
||||
import { loadFixture } from './test-utils.js';
|
||||
import { expect } from 'chai';
|
||||
import * as cheerio from 'cheerio';
|
||||
|
||||
describe('Errors', () => {
|
||||
let fixture;
|
||||
before(async () => {
|
||||
fixture = await loadFixture({
|
||||
root: './fixtures/errors/',
|
||||
output: 'server',
|
||||
adapter: nodejs({ mode: 'standalone' }),
|
||||
});
|
||||
await fixture.build();
|
||||
});
|
||||
describe('Within the stream', async () => {
|
||||
let devPreview;
|
||||
|
||||
before(async () => {
|
||||
devPreview = await fixture.preview();
|
||||
});
|
||||
after(async () => {
|
||||
await devPreview.stop();
|
||||
});
|
||||
it('when mode is standalone', async () => {
|
||||
const res = await fixture.fetch('/in-stream');
|
||||
const html = await res.text();
|
||||
const $ = cheerio.load(html);
|
||||
|
||||
expect($('p').text().trim()).to.equal('Internal server error');
|
||||
});
|
||||
});
|
||||
});
|
9
packages/integrations/node/test/fixtures/errors/package.json
vendored
Normal file
9
packages/integrations/node/test/fixtures/errors/package.json
vendored
Normal file
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"name": "@test/nodejs-errors",
|
||||
"version": "0.0.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"astro": "workspace:*",
|
||||
"@astrojs/node": "workspace:*"
|
||||
}
|
||||
}
|
13
packages/integrations/node/test/fixtures/errors/src/pages/in-stream.astro
vendored
Normal file
13
packages/integrations/node/test/fixtures/errors/src/pages/in-stream.astro
vendored
Normal file
|
@ -0,0 +1,13 @@
|
|||
---
|
||||
---
|
||||
<html>
|
||||
<head>
|
||||
<title>One</title>
|
||||
</head>
|
||||
<body>
|
||||
<h1>One</h1>
|
||||
<p>
|
||||
{Promise.reject('Error in the stream')}
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
|
@ -4321,6 +4321,15 @@ importers:
|
|||
specifier: workspace:*
|
||||
version: link:../../../../../astro
|
||||
|
||||
packages/integrations/node/test/fixtures/errors:
|
||||
dependencies:
|
||||
'@astrojs/node':
|
||||
specifier: workspace:*
|
||||
version: link:../../..
|
||||
astro:
|
||||
specifier: workspace:*
|
||||
version: link:../../../../../astro
|
||||
|
||||
packages/integrations/node/test/fixtures/node-middleware:
|
||||
dependencies:
|
||||
'@astrojs/node':
|
||||
|
|
Loading…
Reference in a new issue