Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve HTTP stream error messages

Browse Source
This commit is contained in:
Joachim Van Herwegen 2022-07-13 15:43:47 +02:00
parent 085d0accad
commit 93a141dd61
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/http/output/BasicResponseWriter.ts
View File

@ -36,7 +36,8 @@ export class BasicResponseWriter extends ResponseWriter {
if (input.result.data) { if (input.result.data) {
const pipe = pipeSafely(input.result.data, input.response); const pipe = pipeSafely(input.result.data, input.response);
pipe.on('error', (error): void => { pipe.on('error', (error): void => {
this.logger.error(`Writing to HttpResponse failed with message ${error.message}`); this.logger.error(`Aborting streaming response because of server error; headers already sent.`);
this.logger.error(`Response error: ${error.message}`);
}); });
} else { } else {
// If there is input data the response will end once the input stream ends // If there is input data the response will end once the input stream ends

6
src/server/BaseHttpServerFactory.ts
View File

@ -64,7 +64,11 @@ export class BaseHttpServerFactory implements HttpServerFactory {
async(request: IncomingMessage, response: ServerResponse): Promise<void> => { async(request: IncomingMessage, response: ServerResponse): Promise<void> => {
try { try {
this.logger.info(`Received ${request.method} request for ${request.url}`); this.logger.info(`Received ${request.method} request for ${request.url}`);
await this.handler.handleSafe({ request: guardStream(request), response }); const guardedRequest = guardStream(request);
guardedRequest.on('error', (error): void => {
this.logger.error(`Request error: ${error.message}`);
});
await this.handler.handleSafe({ request: guardedRequest, response });
} catch (error: unknown) { } catch (error: unknown) {
let errMsg: string; let errMsg: string;
if (!isError(error)) { if (!isError(error)) {

9
test/unit/server/BaseHttpServerFactory.test.ts
View File

@ -90,6 +90,15 @@ describe('A BaseHttpServerFactory', (): void => {
const res = await request(server).get('/').expect(500); const res = await request(server).get('/').expect(500);
expect(res.text).toContain('Unknown error: apple.'); expect(res.text).toContain('Unknown error: apple.');
}); });
it('can handle errors on the HttpResponse.', async(): Promise<void> => {
// This just makes sure the logging line is covered.
// Actually destroying the request to trigger an error causes issues for supertest
handler.handleSafe.mockImplementationOnce(async(input): Promise<void> => {
input.request.emit('error', new Error('bad request'));
});
await request(server).get('/').expect(404);
});
}); });
describe('with showStackTrace enabled', (): void => { describe('with showStackTrace enabled', (): void => {