bugfix(@nestjs/websockets) lifecycle hooks multi execution

Author: kamilmysliwiec

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-      - "7"
+      - "8"
+      - "10"
 addons:
      firefox: "latest"
 before_script:

CHANGELOG.md

@@ -21,7 +21,7 @@
     "publish:beta": "./node_modules/.bin/lerna publish --npm-tag=beta -m \"chore(release) publish %s\""
   },
   "engines": {
-    "node": ">=6.11.0"
+    "node": ">= 8.9.0"
   },
   "repository": {
     "type": "git",

package.json

@@ -29,6 +29,8 @@ export {
   DynamicModule,
   INestApplicationContext,
   HttpServer,
+  Provider,
+  Type,
   HttpServerFactory,
   ArgumentsHost,
   INestExpressApplication,

packages/common/index.ts

@@ -27,4 +27,6 @@ export * from './http/http-server.interface';
 export * from './http/http-server-factory.interface';
 export * from './features/arguments-host.interface';
 export * from './nest-express-application.interface';
-export * from './nest-fastify-application.interface';
+export * from './nest-fastify-application.interface';
+export * from './modules/provider.interface';
+export * from './type.interface';

packages/common/interfaces/index.ts

@@ -2,3 +2,4 @@ export * from './module-metadata.interface';
 export * from './nest-module.interface';
 export * from './on-init.interface';
 export * from './dynamic-module.interface';
+export * from './provider.interface';

packages/common/interfaces/modules/index.ts

@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "rootDir": "./",

packages/common/tsconfig.json

@@ -95,21 +95,21 @@ export class RouterExecutionContext {
       isResponseHandled,
       httpStatusCode,
     );
+    const handler = (args, req, res, next) => async () => {
+      fnApplyPipes && (await fnApplyPipes(args, req, res, next));
+      return callback.apply(instance, args);
+    };
 
     return async (req, res, next) => {
       const args = this.createNullArray(argsLength);
       fnCanActivate && (await fnCanActivate([req, res]));
 
-      const handler = async () => {
-        fnApplyPipes && (await fnApplyPipes(args, req, res, next));
-        return callback.apply(instance, args);
-      };
       const result = await this.interceptorsConsumer.intercept(
         interceptors,
         [req, res],
         instance,
         callback,
-        handler,
+        handler(args, req, res, next),
       );
       await fnHandleResponse(result, res);
     };

packages/core/router/router-execution-context.ts

@@ -8,13 +8,11 @@ export class RouterProxy {
     targetCallback: RouterProxyCallback,
     exceptionsHandler: ExceptionsHandler,
   ) {
-    return (req, res, next) => {
-      const host = new ExecutionContextHost([req, res]);
+    return async (req, res, next) => {
       try {
-        Promise.resolve(targetCallback(req, res, next)).catch(e => {
-          exceptionsHandler.next(e, host);
-        });
+        await targetCallback(req, res, next);
       } catch (e) {
+        const host = new ExecutionContextHost([req, res]);
         exceptionsHandler.next(e, host);
       }
     };
@@ -24,13 +22,11 @@ export class RouterProxy {
     targetCallback: (err, req, res, next) => void,
     exceptionsHandler: ExceptionsHandler,
   ) {
-    return (err, req, res, next) => {
-      const host = new ExecutionContextHost([req, res]);
+    return async (err, req, res, next) => {
       try {
-        Promise.resolve(targetCallback(err, req, res, next)).catch(e => {
-          exceptionsHandler.next(e, host);
-        });
+        await targetCallback(err, req, res, next);
       } catch (e) {
+        const host = new ExecutionContextHost([req, res]);
         exceptionsHandler.next(e, host);
       }
     };

packages/core/router/router-proxy.ts

@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "rootDir": "./",