bugfix(@nestjs/websockets) lifecycle hooks multi execution

digikare · May 2, 2018 · 382d999 · 382d999
1 parent 154b865
commit 382d999
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 489 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-      - "7"
+      - "8"
+      - "10"
 addons:
      firefox: "latest"
 before_script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/package.json b/package.json
@@ -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",

diff --git a/packages/common/index.ts b/packages/common/index.ts
@@ -29,6 +29,8 @@ export {
   DynamicModule,
   INestApplicationContext,
   HttpServer,
+  Provider,
+  Type,
   HttpServerFactory,
   ArgumentsHost,
   INestExpressApplication,

diff --git a/packages/common/interfaces/index.ts b/packages/common/interfaces/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';
diff --git a/packages/common/interfaces/modules/index.ts b/packages/common/interfaces/modules/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';
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "rootDir": "./",

diff --git a/packages/core/router/router-execution-context.ts b/packages/core/router/router-execution-context.ts
@@ -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);
     };

diff --git a/packages/core/router/router-proxy.ts b/packages/core/router/router-proxy.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);
       }
     };

diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "rootDir": "./",

diff --git a/packages/microservices/tsconfig.json b/packages/microservices/tsconfig.json
@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "baseUrl": "./../../",

diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json
@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "baseUrl": "./../../",

diff --git a/packages/websockets/observable-socket.ts b/packages/websockets/observable-socket.ts
@@ -3,8 +3,11 @@ import { ObservableSocketServer } from './interfaces/observable-socket-server.in
 
 export class ObservableSocket {
   public static create(server): ObservableSocketServer {
+    const init = new ReplaySubject();
+    init.next(server);
+
     return {
-      init: new ReplaySubject(),
+      init,
       connection: new Subject(),
       disconnect: new Subject(),
       server,

diff --git a/packages/websockets/test/web-sockets-controller.spec.ts b/packages/websockets/test/web-sockets-controller.spec.ts
@@ -145,10 +145,6 @@ describe('WebSocketsController', () => {
       (instance as any).subscribeDisconnectEvent = subscribeDisconnectEvent;
     });
 
-    it('should call "next" method of server object with expected argument', () => {
-      instance.subscribeEvents(gateway, handlers, server as any);
-      expect(nextSpy.calledWith(server.server)).to.be.true;
-    });
     it('should call "subscribeConnectionEvent" with expected arguments', () => {
       instance.subscribeEvents(gateway, handlers, server as any);
       expect(subscribeConnectionEvent.calledWith(gateway, server.connection)).to
@@ -242,7 +238,7 @@ describe('WebSocketsController', () => {
 
     beforeEach(() => {
       subscribe = sinon.spy();
-      event = { subscribe };
+      event = { subscribe, pipe: sinon.stub().returnsThis() };
     });
     it('should not call subscribe method when "afterInit" method not exists', () => {
       instance.subscribeInitEvent(gateway, event);
@@ -260,7 +256,7 @@ describe('WebSocketsController', () => {
 
     beforeEach(() => {
       subscribe = sinon.spy();
-      event = { subscribe };
+      event = { subscribe, pipe: sinon.stub().returnsThis() };
     });
     it('should not call subscribe method when "handleConnection" method not exists', () => {
       instance.subscribeConnectionEvent(gateway, event);
@@ -278,7 +274,7 @@ describe('WebSocketsController', () => {
 
     beforeEach(() => {
       subscribe = sinon.spy();
-      event = { subscribe };
+      event = { subscribe, pipe: sinon.stub().returnsThis() };
     });
     it('should not call subscribe method when "handleDisconnect" method not exists', () => {
       instance.subscribeDisconnectEvent(gateway, event);

diff --git a/packages/websockets/tsconfig.json b/packages/websockets/tsconfig.json
@@ -8,7 +8,7 @@
     "noLib": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es6",
+    "target": "es2017",
     "sourceMap": false,
     "allowJs": false,
     "baseUrl": "./../../",

diff --git a/packages/websockets/web-sockets-controller.ts b/packages/websockets/web-sockets-controller.ts
@@ -17,7 +17,7 @@ import { MiddlewareInjector } from './middleware-injector';
 import { ApplicationConfig } from '@nestjs/core/application-config';
 import { WsContextCreator } from './context/ws-context-creator';
 import { isFunction } from '@nestjs/common/utils/shared.utils';
-import { mergeMap } from 'rxjs/operators';
+import { mergeMap, distinctUntilChanged } from 'rxjs/operators';
 
 export class WebSocketsController {
   private readonly metadataExplorer = new GatewayMetadataExplorer(
@@ -85,7 +85,6 @@ export class WebSocketsController {
     this.subscribeInitEvent(instance, init);
     this.subscribeConnectionEvent(instance, connection);
     this.subscribeDisconnectEvent(instance, disconnect);
-    init.next(server);
 
     const handler = this.getConnectionHandler(
       this,
@@ -123,13 +122,17 @@ export class WebSocketsController {
 
   public subscribeConnectionEvent(instance: NestGateway, event: Subject<any>) {
     if (instance.handleConnection) {
-      event.subscribe(instance.handleConnection.bind(instance));
+      event
+        .pipe(distinctUntilChanged())
+        .subscribe(instance.handleConnection.bind(instance));
     }
   }
 
   public subscribeDisconnectEvent(instance: NestGateway, event: Subject<any>) {
     if (instance.handleDisconnect) {
-      event.subscribe(instance.handleDisconnect.bind(instance));
+      event
+        .pipe(distinctUntilChanged())
+        .subscribe(instance.handleDisconnect.bind(instance));
     }
   }
 

diff --git a/sample/01-cats-app/src/common/interceptors/exception.interceptor.ts b/sample/01-cats-app/src/common/interceptors/exception.interceptor.ts
@@ -5,9 +5,8 @@ import {
   HttpStatus,
 } from '@nestjs/common';
 import { HttpException } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { _throw } from 'rxjs/observable/throw';
 
 @Injectable()
 export class ErrorsInterceptor implements NestInterceptor {
@@ -17,7 +16,7 @@ export class ErrorsInterceptor implements NestInterceptor {
   ): Observable<any> {
     return call$.pipe(
       catchError(err =>
-        _throw(new HttpException('Message', HttpStatus.BAD_GATEWAY)),
+        throwError(new HttpException('Message', HttpStatus.BAD_GATEWAY)),
       ),
     );
   }

diff --git a/sample/01-cats-app/src/common/interceptors/logging.interceptor.ts b/sample/01-cats-app/src/common/interceptors/logging.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
 @Injectable()

diff --git a/sample/01-cats-app/src/common/interceptors/timeout.interceptor.ts b/sample/01-cats-app/src/common/interceptors/timeout.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { timeout } from 'rxjs/operators';
 
 @Injectable()

diff --git a/sample/01-cats-app/src/common/interceptors/transform.interceptor.ts b/sample/01-cats-app/src/common/interceptors/transform.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 export interface Response<T> {

diff --git a/sample/02-gateways/src/events/events.gateway.ts b/sample/02-gateways/src/events/events.gateway.ts
@@ -5,8 +5,7 @@ import {
   WebSocketServer,
   WsException,
 } from '@nestjs/websockets';
-import { Observable } from 'rxjs/Observable';
-import { from } from 'rxjs/observable/from';
+import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 @WebSocketGateway()

diff --git a/sample/03-microservices/src/common/filters/rpc-exception.filter.ts b/sample/03-microservices/src/common/filters/rpc-exception.filter.ts
@@ -1,11 +1,10 @@
 import { Catch, RpcExceptionFilter } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable, throwError } from 'rxjs';
 import { RpcException } from '@nestjs/microservices';
-import { _throw } from 'rxjs/observable/throw';
 
 @Catch(RpcException)
 export class ExceptionFilter implements RpcExceptionFilter {
   catch(exception: RpcException): Observable<any> {
-    return _throw(exception.getError());
+    return throwError(exception.getError());
   }
 }
diff --git a/sample/03-microservices/src/common/interceptors/logging.interceptor.ts b/sample/03-microservices/src/common/interceptors/logging.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
 @Injectable()

diff --git a/sample/03-microservices/src/math/math.controller.ts b/sample/03-microservices/src/math/math.controller.ts
@@ -5,7 +5,7 @@ import {
   Transport,
   MessagePattern,
 } from '@nestjs/microservices';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 @Controller()
 export class MathController {

diff --git a/sample/04-grpc/src/hero/hero.controller.ts b/sample/04-grpc/src/hero/hero.controller.ts
@@ -6,7 +6,7 @@ import {
   GrpcRoute,
   ClientGrpc,
 } from '@nestjs/microservices';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { grpcClientOptions } from './../grpc-client.options';
 import { HeroById } from './interfaces/hero-by-id.interface';
 import { Hero } from './interfaces/hero.interface';

diff --git a/sample/10-fastify/src/common/interceptors/exception.interceptor.ts b/sample/10-fastify/src/common/interceptors/exception.interceptor.ts
@@ -5,9 +5,8 @@ import {
   HttpStatus,
 } from '@nestjs/common';
 import { HttpException } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable, throwError } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { _throw } from 'rxjs/observable/throw';
 
 @Injectable()
 export class ExceptionInterceptor implements NestInterceptor {
@@ -17,7 +16,7 @@ export class ExceptionInterceptor implements NestInterceptor {
   ): Observable<any> {
     return call$.pipe(
       catchError(err =>
-        _throw(
+        throwError(
           new HttpException(
             'Exception interceptor message',
             HttpStatus.BAD_GATEWAY,

diff --git a/sample/10-fastify/src/common/interceptors/logging.interceptor.ts b/sample/10-fastify/src/common/interceptors/logging.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
 @Injectable()

diff --git a/sample/10-fastify/src/common/interceptors/transform.interceptor.ts b/sample/10-fastify/src/common/interceptors/transform.interceptor.ts
@@ -1,5 +1,5 @@
 import { Injectable, NestInterceptor, ExecutionContext } from '@nestjs/common';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 @Injectable()

diff --git a/sample/16-gateways-ws/src/events/events.gateway.ts b/sample/16-gateways-ws/src/events/events.gateway.ts
@@ -5,8 +5,7 @@ import {
   WebSocketServer,
   WsException,
 } from '@nestjs/websockets';
-import { Observable } from 'rxjs/Observable';
-import { from } from 'rxjs/observable/from';
+import { Observable, from } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 @WebSocketGateway(8080)

diff --git a/sample/19-auth/package.json b/sample/19-auth/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@nestjs/common": "^5.0.0",
     "@nestjs/core": "^5.0.0",
-    "@nestjs/passport": "^1.0.2",
+    "@nestjs/passport": "^1.0.5",
     "passport": "^0.4.0",
     "passport-http-bearer": "^1.0.1",
     "passport-jwt": "^4.0.0",

diff --git a/sample/19-auth/src/auth/auth.controller.ts b/sample/19-auth/src/auth/auth.controller.ts
@@ -13,7 +13,7 @@ export class AuthController {
 
   @Get('data')
   @UseGuards(AuthGuard('jwt'))
-  getSensitiveData() {
+  findAll() {
     // this route is restricted
   }
 }