Add promise support

lib/layer.js

@@ -47,6 +47,33 @@ function Layer(path, options, fn) {
   }
 }
 
+/**
+ * Handle any request for the layer.
+ *
+ * @api private
+ */
+
+Layer.prototype._handle_any = function _handle_any(/* ...args, next */) {
+  var self = this
+  var next = arguments[arguments.length - 1]
+  var handle = this.handle
+  var result
+  function hasNextBeenCalled() { return next._currentLayer === self }
+
+  try {
+    result = handle.apply(undefined, arguments)
+  } catch (err) {
+    return next(err)
+  }
+
+  if (result != null && typeof result.then === 'function') {
+    result.then(
+      null,
+      function onRejected(error) { if (!hasNextBeenCalled()) { next(error || new Error('Promise rejected with falsey value')) } }
+    )
+  }
+}
+
 /**
  * Handle the error for the layer.
  *
@@ -58,18 +85,12 @@ function Layer(path, options, fn) {
  */
 
 Layer.prototype.handle_error = function handle_error(error, req, res, next) {
-  var fn = this.handle
-
-  if (fn.length !== 4) {
+  if (this.handle.length !== 4) {
     // not a standard error handler
     return next(error)
   }
 
-  try {
-    fn(error, req, res, next)
-  } catch (err) {
-    next(err)
-  }
+  this._handle_any(error, req, res, next)
 }
 
 /**
@@ -82,18 +103,12 @@ Layer.prototype.handle_error = function handle_error(error, req, res, next) {
  */
 
 Layer.prototype.handle_request = function handle(req, res, next) {
-  var fn = this.handle
-
-  if (fn.length > 3) {
+  if (this.handle.length > 3) {
     // not a standard request handler
     return next()
   }
 
-  try {
-    fn(req, res, next)
-  } catch (err) {
-    next(err)
-  }
+  this._handle_any(req, res, next)
 }
 
 /**

lib/route.js

@@ -127,6 +127,9 @@ Route.prototype.dispatch = function dispatch(req, res, done) {
       match = !layer.method || layer.method === method
     }
 
+    // set a reference to the current layer
+    next._currentLayer = layer
+
     // no match
     if (match !== true) {
       return done(err)

package.json

@@ -16,6 +16,7 @@
   },
   "devDependencies": {
     "after": "0.8.1",
+    "bluebird": "2.10.2",
     "finalhandler": "0.4.0",
     "istanbul": "0.3.17",
     "mocha": "2.2.5",

test/promise.js

@@ -0,0 +1,88 @@
+
+var Router = require('..')
+var utils = require('./support/utils')
+var Promise = require('bluebird')
+
+var assert = utils.assert
+var createHitHandle = utils.createHitHandle
+var createErrorHitHandle = utils.createErrorHitHandle
+var shouldHitHandle = utils.shouldHitHandle
+var createServer = utils.createServer
+var request = utils.request
+
+describe('Promise', function () {
+  it('rejecting will trigger error handlers', function (done) {
+    var router = Router()
+    var server = createServer(router)
+
+    router.use(function (req, res) {
+      return new Promise(function (resolve, reject) {
+        reject(new Error('Happy error'))
+      })
+    })
+
+    request(server)
+    .get('/')
+    .expect(500, done)
+  })
+
+  it('will be ignored if next is called', function (done) {
+    var router = Router()
+    var server = createServer(router)
+    var timeoutCalled = false
+
+    router.use(createHitHandle(1), function (req, res, next) {
+      return new Promise(function (resolve, reject) {
+        next()
+        setTimeout(function () {
+          timeoutCalled = true
+          resolve()
+        }, 5)
+      })
+    })
+
+    router.use(createHitHandle(2), function (req, res) {
+      assert(!timeoutCalled)
+      res.end('Awesome!')
+    })
+
+    request(server)
+    .get('/')
+    .expect(shouldHitHandle(1))
+    .expect(shouldHitHandle(2))
+    .expect(200, done)
+  })
+
+  it('can be used in error handlers', function (done) {
+    var router = Router()
+    var server = createServer(router)
+
+    router.use(createHitHandle(1), function (req, res, next) {
+      next(new Error('Happy error'))
+    })
+
+    router.use(createErrorHitHandle(2), function (error, req, res, next) {
+      return new Promise(function (resolve, reject) {
+        setTimeout(function () {
+          next(error)
+          resolve()
+        }, 5)
+      })
+    })
+
+    router.use(function () {
+      done(new Error('This should never be reached'))
+    })
+
+    router.use(createErrorHitHandle(3), function (error, req, res, next) {
+      res.end('Awesome!')
+    })
+
+    request(server)
+    .get('/')
+    .expect(shouldHitHandle(1))
+    .expect(shouldHitHandle(2))
+    .expect(shouldHitHandle(3))
+    .expect(200, done)
+  })
+})

test/strict.js

@@ -0,0 +1,41 @@
+// IMPORTANT: Do not include 'use strict' anywhere else in this file
+// @see https://github.com/pillarjs/router/pull/25#discussion_r40988513
+
+var Router = require('..')
+var utils = require('./support/utils')
+
+var createServer = utils.createServer
+var request = utils.request
+
+describe('this', function () {
+  describe('when middleware is sloppy', function () {
+    it('should have global context', function (done) {
+      var router = new Router()
+      var server = createServer(router)
+
+      router.get('/', function (req, res) {
+        res.end(String(this === global))
+      })
+
+      request(server)
+      .get('/')
+      .expect(200, 'true', done)
+    })
+  })
+
+  describe('when middleware is strict', function () {
+    it('should have null context', function (done) {
+      'use strict'
+      var router = new Router()
+      var server = createServer(router)
+
+      router.get('/', function (req, res) {
+        res.end(String(this === global))
+      })
+
+      request(server)
+      .get('/')
+      .expect(200, 'false', done)
+    })
+  })
+})

test/support/utils.js

@@ -6,6 +6,7 @@ var request = require('supertest')
 
 exports.assert = assert
 exports.createHitHandle = createHitHandle
+exports.createErrorHitHandle = createErrorHitHandle
 exports.createServer = createServer
 exports.rawrequest = rawrequest
 exports.request = request
@@ -20,6 +21,13 @@ function createHitHandle(num) {
   }
 }
 
+function createErrorHitHandle(num) {
+  var hit = createHitHandle(num)
+  return function hitError(error, req, res, next) {
+    hit(req, res, function () { next(error) })
+  }
+}
+
 function createServer(router) {
   return http.createServer(function onRequest(req, res) {
     router(req, res, finalhandler(req, res))