fix(middleware): Fix middleware layer to execute middleware in reverse after controller call

According to #134 middleware are called in reverse without waiting for the controller to be executed

#134

Author: thetutlage

src/Middleware/index.js

@@ -204,6 +204,6 @@ Middleware.compose = function (middleware, request, response) {
       const values = [request, response, next].concat(middleware[i].parameters)
       next = method.apply(instance, values)
     }
-    yield * next
+    return yield * next
   }
 }

src/Server/index.js

@@ -49,7 +49,7 @@ class Server {
   _respond (request, response, finalHandler) {
     try {
       const chain = helpers.makeMiddlewareChain(this.middleware, finalHandler, true)
-      this._executeChain(chain, request, response)
+      return this._executeChain(chain, request, response)
     } catch (e) {
       this._handleError(e, request, response)
     }
@@ -71,7 +71,7 @@ class Server {
     }
     const routeAction = this._makeRouteAction(resolvedRoute.handler)
     const chain = helpers.makeMiddlewareChain(this.middleware, routeAction, false, resolvedRoute)
-    this._executeChain(chain, request, response)
+    return this._executeChain(chain, request, response)
   }
 
   /**
@@ -172,7 +172,7 @@ class Server {
    */
   _executeChain (chain, request, response) {
     const middleware = this.middleware
-    co(function * () {
+    return co(function * () {
       yield middleware.compose(chain, request, response)
     }).catch((e) => {
       this._handleError(e, request, response)
@@ -239,7 +239,7 @@ class Server {
     request._params = resolvedRoute.params
 
     const finalHandler = function * () {
-      self._callRouteAction(resolvedRoute, request, response)
+      yield self._callRouteAction(resolvedRoute, request, response)
     }
 
     /**

test/acceptance/app.spec.js

@@ -93,6 +93,22 @@ describe('App Exceptations', function () {
     expect(browser.text('body').trim()).to.equal('1')
   })
 
+  it('should return the request elapsed when controller has set timeout', function * () {
+    Middleware.global(['App/Http/Middleware/Logger'])
+    const done = function () {
+      return new Promise(function (resolve) {
+        setTimeout(function () {
+          resolve()
+        }, 1000)
+      })
+    }
+    Route.get('/', function * (request, response) {
+      yield done(request)
+    })
+    yield browser.visit('/')
+    expect(parseInt(browser.text('body').trim())).to.be.above(1000)
+  })
+
   it('should redirect request to a named route', function * () {
     Route.get('/', 'HomeController.redirect')
     Route.get('/:id', 'HomeController.profile').as('profile')

test/acceptance/app/Http/Middleware/Logger.js

@@ -0,0 +1,14 @@
+'use strict'
+
+class Logger {
+
+  * handle (request, response, next) {
+    const start = new Date().getTime()
+    yield next;
+    const elapsed = new Date().getTime() - start
+    response.send(elapsed)
+  }
+
+}
+
+module.exports = Logger