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.

Sign up for GitHub

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

Jump to bottom

fix(server): error in pre handler triggers after event #1500

Merged
merged 2 commits into from Sep 19, 2017
Merged

fix(server): error in pre handler triggers after event #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2254ff9
fix(server): error in pre handler triggers after event
Sep 19, 2017
c6a37c2
impl feedback
Sep 19, 2017
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
13 changes: 5 additions & 8 deletions lib/server.js
View file
Open in desktop
Expand Up @@ -753,17 +753,14 @@ Server.prototype._handle = function _handle(req, res) {
// run pre() handlers first before routing and running
if (self.before.length > 0) {
self._run(req, res, null, self.before, function (err) {
// check for return false here - like with the regular handlers,
// if false is returned we already sent a response and should stop
// processing.
if (err === false) {
self._finishReqResCycle(req, res);
// Like with regular handlers, if we are provided an error, we
// should abort the middleware chain and fire after events.
if (err === false || err instanceof Error) {
self._finishReqResCycle(req, res, null, err);
return;
}

if (!err) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come this got dropped? I think if you remove this there is the edge case where the "err" object is not false or a function?

routeAndRun();
}
routeAndRun();
});
} else {
routeAndRun();
Expand Down
19 changes: 18 additions & 1 deletion test/server.test.js
View file
Open in desktop
Expand Up @@ -630,7 +630,6 @@ test('GH-64 prerouting chain with error', function (t) {
});
});


test('GH-67 extend access-control headers', function (t) {
SERVER.get('/hello/:name', function tester(req, res, next) {
res.header('Access-Control-Allow-Headers',
Expand Down Expand Up @@ -2337,6 +2336,24 @@ test('calling next(false) should early exit from pre handlers', function (t) {

});

test('calling next(err) from pre should still emit after event', function (t) {
setTimeout(function () {
t.fail('Timed out');
t.end();
}, 2000);
var error = new Error();
SERVER.pre(function (req, res, next) {
next(error);
});
SERVER.get('/', function (req, res, next) {
t.fail('should have aborted stack before routing');
});
SERVER.on('after', function (req, res, route, err) {
t.equal(err, error);
t.end();
});
CLIENT.get('/', function () {});
});

test('GH-1078: server name should default to restify', function (t) {

Expand Down