Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Koa.js handling of node.js set error codes #1460

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/context.js
Expand Up @@ -143,16 +143,18 @@ const proto = module.exports = {
// force text/plain
this.type = 'text';

let statusCode = err.status || err.statusCode;
vijaykrishnavanshi marked this conversation as resolved.
Show resolved Hide resolved

// ENOENT support
if ('ENOENT' === err.code) err.status = 404;
if ('ENOENT' === err.code) statusCode = 404;

// default to 500
if ('number' !== typeof err.status || !statuses[err.status]) err.status = 500;
if ('number' !== typeof statusCode || !statuses[statusCode]) statusCode = 500;

// respond
const code = statuses[err.status];
const code = statuses[statusCode];
const msg = err.expose ? err.message : code;
this.status = err.status;
this.status = err.status = statusCode;
this.length = Buffer.byteLength(msg);
res.end(msg);
},
Expand Down
42 changes: 42 additions & 0 deletions test/context/onerror.js
Expand Up @@ -100,6 +100,48 @@ describe('ctx.onerror(err)', () => {
.expect(200, () => {});
});

it('should set status specified in the error using statusCode', () => {
const app = new Koa();

app.use((ctx, next) => {
ctx.body = 'something else';
const err = new Error('Not found');
err.statusCode = 404;
throw err;
});

const server = app.listen();

return request(server)
.get('/')
.expect(404)
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Not Found');
});

describe('when invalid err.statusCode', () => {
describe('not number', () => {
it('should respond 500', () => {
const app = new Koa();

app.use((ctx, next) => {
ctx.body = 'something else';
const err = new Error('some error');
err.statusCode = 'notnumber';
throw err;
});

const server = app.listen();

return request(server)
.get('/')
.expect(500)
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Internal Server Error');
});
});
});

describe('when invalid err.status', () => {
describe('not number', () => {
it('should respond 500', () => {
Expand Down