Make it work with Async Hooks

HISTORY.md

@@ -8,6 +8,7 @@ unreleased
     - deps: http-errors@1.7.3
   * deps: safe-buffer@5.2.0
   * deps: type-is@~1.6.18
+  * Make it work with Async Hooks
 
 1.19.0 / 2019-04-25
 ===================

lib/read.js

@@ -73,30 +73,27 @@ function read (req, res, next, parse, debug, options) {
   }
 
   // read body
-  debug('read body')
-  getBody(stream, opts, function (error, body) {
-    if (error) {
-      var _error
-
-      if (error.type === 'encoding.unsupported') {
-        // echo back charset
-        _error = createError(415, 'unsupported charset "' + encoding.toUpperCase() + '"', {
-          charset: encoding.toLowerCase(),
-          type: 'charset.unsupported'
-        })
-      } else {
-        // set status code on error
-        _error = createError(400, error)
-      }
-
-      // read off entire request
-      stream.resume()
-      onFinished(req, function onfinished () {
-        next(createError(400, _error))
+  function readErrorHandler (error) {
+    var _error
+    if (error.type === 'encoding.unsupported') {
+      // echo back charset
+      _error = createError(415, 'unsupported charset "' + encoding.toUpperCase() + '"', {
+        charset: encoding.toLowerCase(),
+        type: 'charset.unsupported'
       })
-      return
+    } else {
+      // set status code on error
+      _error = createError(400, error)
     }
 
+    // read off entire request
+    stream.resume()
+    onFinished(req, function onfinished () {
+      next(createError(400, _error))
+    })
+  }
+
+  function readSuccessHandler (body) {
     // verify
     if (verify) {
       try {
@@ -128,7 +125,21 @@ function read (req, res, next, parse, debug, options) {
     }
 
     next()
-  })
+  }
+
+  debug('read body')
+  if (typeof global.Promise === 'function') {
+    getBody(stream, opts)
+      .then(readSuccessHandler)
+      .catch(readErrorHandler)
+  } else {
+    getBody(stream, opts, function (error, body) {
+      if (error) {
+        return readErrorHandler(error)
+      }
+      readSuccessHandler(body)
+    })
+  }
 }
 
 /**

test/body-parser.js

@@ -3,6 +3,13 @@ var http = require('http')
 var methods = require('methods')
 var request = require('supertest')
 
+var testAsyncHooks = false
+try {
+  var asyncHooks = require('async_hooks')
+  testAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
+} catch (ignored) {
+}
+
 var bodyParser = require('..')
 
 describe('bodyParser()', function () {
@@ -51,6 +58,31 @@ describe('bodyParser()', function () {
       .expect(200, '{"user":"tobi"}', done)
   })
 
+  if (testAsyncHooks) {
+    it('should work with async hooks', function (done) {
+      var _bodyParser = bodyParser()
+      var asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
+
+      var server = http.createServer(function (req, res) {
+        const store = {
+          contextMaintained: true
+        }
+        asyncLocalStorage.run(store, function () {
+          _bodyParser(req, res, function (err) {
+            res.statusCode = err ? (err.status || 500) : 200
+            res.end(err ? err.message : JSON.stringify(asyncLocalStorage.getStore()))
+          })
+        })
+      })
+
+      request(server)
+        .post('/')
+        .set('Content-Type', 'application/json')
+        .send('{"user":"tobi"}')
+        .expect(200, '{"contextMaintained":true}', done)
+    })
+  }
+
   describe('http methods', function () {
     before(function () {
       var _bodyParser = bodyParser()