Fix layerStack timing issue

index.js

@@ -164,6 +164,7 @@ Router.prototype.handle = function handle(req, res, callback) {
   var self = this
   var slashAdded = false
   var paramcalled = {}
+  var matchedLayer = false
 
   // middleware and routes
   var stack = this.stack
@@ -286,6 +287,14 @@ Router.prototype.handle = function handle(req, res, callback) {
       : layer.params
     var layerPath = layer.path
 
+    if (!matchedLayer) {
+      matchedLayer = true
+      req.layerStack = req.layerStack || []
+    } else {
+      req.layerStack.pop()
+    }
+    req.layerStack.push(layer)
+
     // this should be done for the layer
     self.process_params(layer, paramcalled, req, res, function (err) {
       if (err) {

lib/layer.js

@@ -78,9 +78,6 @@ Layer.prototype.handle_error = function handle_error(error, req, res, next) {
     return next(error)
   }
 
-  req.layerStack = req.layerStack || []
-  req.layerStack.push(this)
-
   if (onHandleError && onHandleError.shouldPublish()) {
     onHandleError.publish({
       error: error,
@@ -92,9 +89,7 @@ Layer.prototype.handle_error = function handle_error(error, req, res, next) {
 
   try {
     fn(error, req, res, next)
-    req.layerStack.pop()
   } catch (err) {
-    req.layerStack.pop()
     next(err)
   }
 }
@@ -116,9 +111,6 @@ Layer.prototype.handle_request = function handle(req, res, next) {
     return next()
   }
 
-  req.layerStack = req.layerStack || []
-  req.layerStack.push(this)
-
   if (onHandleRequest && onHandleRequest.shouldPublish()) {
     onHandleRequest.publish({
       request: req,
@@ -129,9 +121,7 @@ Layer.prototype.handle_request = function handle(req, res, next) {
 
   try {
     fn(req, res, next)
-    req.layerStack.pop()
   } catch (err) {
-    req.layerStack.pop()
     next(err)
   }
 }

lib/route.js

@@ -93,6 +93,7 @@ Route.prototype._methods = function _methods() {
  */
 
 Route.prototype.dispatch = function dispatch(req, res, done) {
+  var matchedLayer = false
   var idx = 0
   var stack = this.stack
   if (stack.length === 0) {
@@ -138,6 +139,14 @@ Route.prototype.dispatch = function dispatch(req, res, done) {
       return done(err)
     }
 
+    if (!matchedLayer) {
+      matchedLayer = true
+      req.layerStack = req.layerStack || []
+    } else {
+      req.layerStack.pop()
+    }
+    req.layerStack.push(layer)
+
     if (err) {
       layer.handle_error(err, req, res, next)
     } else {

test/diagnostics-channel.js

@@ -71,7 +71,9 @@ describe('diagnostics_channel', function () {
       res.end();
     });
 
-    outer.use('/hello', inner);
+    outer.use('/hello', (req, res, next) => {
+      next();
+    }, inner);
 
     function end() {
       assert.strictEqual(joinLayerStack(handleRequest.request.layerStack), '/hello/:name/');