Merge branch 'koa-middleware-error-handling-fix'

Author: jotamorais

src/driver/koa/KoaDriver.ts

@@ -255,11 +255,7 @@ export class KoaDriver extends BaseDriver {
             options.response.body = Buffer.from(result as any);
         }
         else { // send regular result
-            if (result instanceof Object) {
-                options.response.body = result;
-            } else {
-                options.response.body = result;
-            }
+            options.response.body = result;
         }
 
         // set http status code
@@ -329,24 +325,11 @@ export class KoaDriver extends BaseDriver {
         const middlewareFunctions: Function[] = [];
         uses.forEach(use => {
             if (use.middleware.prototype && use.middleware.prototype.use) { // if this is function instance of MiddlewareInterface
-                middlewareFunctions.push((context: any, next: (err?: any) => Promise<any>) => {
+                middlewareFunctions.push(async (context: any, next: (err?: any) => Promise<any>) => {
                     try {
-                        const useResult = (getFromContainer(use.middleware, { context } as Action) as KoaMiddlewareInterface).use(context, next);
-                        if (isPromiseLike(useResult)) {
-                            useResult.catch((error: any) => {
-                                this.handleError(error, undefined, {
-                                    request: context.req,
-                                    response: context.res,
-                                    context,
-                                    next
-                                });
-                                return error;
-                            });
-                        }
-
-                        return useResult;
+                        return await (getFromContainer(use.middleware) as KoaMiddlewareInterface).use(context, next);
                     } catch (error) {
-                        this.handleError(error, undefined, {
+                        return await this.handleError(error, undefined, {
                             request: context.request,
                             response: context.response,
                             context,
@@ -424,4 +407,4 @@ export class KoaDriver extends BaseDriver {
 
         return await next();
     }
-}
+}

test/functional/koa-middlewares.spec.ts

@@ -68,12 +68,19 @@ describe("koa middlewares", () => {
 
         class TestCustomMiddlewareWhichThrows implements KoaMiddlewareInterface {
 
-            use(request: any, response: any, next?: Function): any {
+            use(context: any, next?: Function): any {
                 throw new NotAcceptableError("TestCustomMiddlewareWhichThrows");
             }
 
         }
 
+        class TestCustomAsyncMiddlewareWhichThrows implements KoaMiddlewareInterface {
+
+            async use(context: any, next?: Function): Promise<any> {
+                throw new NotAcceptableError("TestCustomAsyncMiddlewareWhichThrows");
+            }
+
+        }
         @Controller()
         class KoaMiddlewareController {
 
@@ -127,9 +134,15 @@ describe("koa middlewares", () => {
                 return "1234";
             }
 
-            @Get("/customMiddlewareWichThrows")
+            @Get("/customMiddlewareWhichThrows")
             @UseBefore(TestCustomMiddlewareWhichThrows)
-            customMiddlewareWichThrows() {
+            customMiddlewareWhichThrows() {
+                return "1234";
+            }
+
+            @Get("/customAsyncMiddlewareWhichThrows")
+            @UseBefore(TestCustomAsyncMiddlewareWhichThrows)
+            TestCustomAsyncMiddlewareWhichThrows() {
                 return "1234";
             }
 
@@ -193,10 +206,17 @@ describe("koa middlewares", () => {
 
     it("should handle errors in custom middlewares", () => {
         return chakram
-            .get("http://127.0.0.1:3001/customMiddlewareWichThrows")
+            .get("http://127.0.0.1:3001/customMiddlewareWhichThrows")
             .then((response: any) => {
                 expect(response).to.have.status(406);
             });
     });
 
-});
+    it("should handle errors in custom async middlewares", () => {
+        return chakram
+            .get("http://127.0.0.1:3001/customAsyncMiddlewareWhichThrows")
+            .then((response: any) => {
+                expect(response).to.have.status(406);
+            });
+    });
+});