fix #64 with state detection after callback execution

Author: jeremydaly

index.js

@@ -184,10 +184,12 @@ class API {
         if (mw[0].length > 0 && !matched) continue
 
         // Promisify middleware
-        await new Promise(r => {
-          let rtn = mw[1](request,response,() => { r() })
+        await new Promise(async r => {
+          let rtn = await mw[1](request,response,() => { r() })
           if (rtn) response.send(rtn)
+          if (response._state === 'done') r() // if state is done, resolve promise
         })
+
       } // end for
 
       // Execute the primary handler if in processing state
@@ -239,7 +241,7 @@ class API {
     if (response._state === 'processing') {
 
       // Flag error state (this will avoid infinite error loops)
-      response._state === 'error'
+      response._state = 'error'
 
       // Execute error middleware
       for (const err of this._errors) {

test/middleware.js

@@ -86,6 +86,10 @@ api2.use('/test/testing',function(req,res,next) {
   next()
 })
 
+api2.use('/test/error',function(req,res,next) {
+  res.error(401,'Not Authorized')
+})
+
 
 api3.use(['/test','/test/:param1','/test2/*'],function(req,res,next) {
   req.testMiddlewareAll = true
@@ -166,6 +170,10 @@ api2.get('/test/:param1', function(req,res) {
   res.status(200).json({ method: 'get', middleware: req.testMiddleware ? true : false, middlewareWildcard: req.testMiddlewareWildcard ? true : false, middlewareParam: req.testMiddlewareParam ? true : false, middlewarePath: req.testMiddlewarePath ? true : false })
 })
 
+api2.get('/test/error', function(req,res) {
+  res.status(200).json({ message: 'should not get here' })
+})
+
 
 api3.get('/test', function(req,res) {
   res.status(200).json({ method: 'get', middleware: req.testMiddlewareAll ? true : false })
@@ -350,4 +358,13 @@ describe('Middleware Tests:', function() {
   }) // end it
 
 
+  it('Trigger error in middleware', async function() {
+    let _event = Object.assign({},event,{ path: '/test/error' })
+    let result = await new Promise(r => api2.run(_event,{},(e,res) => { r(res) }))
+    expect(result).to.deep.equal({
+      headers: { 'content-type': 'application/json' },
+      statusCode: 401, body: '{"error":"Not Authorized"}', isBase64Encoded: false })
+  }) // end it
+
+
 }) // end MIDDLEWARE tests