Bugfix nestjs#187, update express nestjs#206

Author: kamilmysliwiec

CHANGELOG.md

@@ -1,5 +1,7 @@
+
 ## 4.1.4
 - **common**: remove deprecated `@ExceptionFilters()` decorator
+- **core**: update to latest **express* version (4.16.2)
 
 ## 4.1.3
 - **core**: forward reference bugfixes & security updates

package.json

@@ -50,7 +50,7 @@
     "@nestjs/websockets": "^4.0.0",
     "cli-color": "^1.1.0",
     "engine.io-client": "^3.1.1",
-    "express": "^4.14.0",
+    "express": "^4.16.2",
     "fast-safe-stringify": "^1.2.0",
     "iterare": "0.0.8",
     "json-socket": "^0.2.1",

src/core/nest-application.ts

@@ -1,20 +1,27 @@
-import iterate from 'iterare';
-import { MiddlewaresModule } from './middlewares/middlewares-module';
-import { SocketModule } from '@nestjs/websockets/socket-module';
-import { NestContainer } from './injector/container';
-import { ExpressAdapter } from './adapters/express-adapter';
-import { RoutesResolver } from './router/routes-resolver';
+import {
+    CanActivate,
+    ExceptionFilter,
+    NestInterceptor,
+    OnModuleDestroy,
+    PipeTransform,
+    WebSocketAdapter
+    } from '@nestjs/common';
+import { INestApplication, INestMicroservice, OnModuleInit } from '@nestjs/common';
 import { Logger } from '@nestjs/common/services/logger.service';
-import { messages } from './constants';
+import { isNil, isUndefined, validatePath } from '@nestjs/common/utils/shared.utils';
+import { MicroserviceConfiguration } from '@nestjs/microservices';
 import { MicroservicesModule } from '@nestjs/microservices/microservices-module';
-import { Resolver } from './router/interfaces/resolver.interface';
-import { INestApplication, INestMicroservice, OnModuleInit } from '@nestjs/common';
+import { SocketModule } from '@nestjs/websockets/socket-module';
+import iterate from 'iterare';
+import { ExpressAdapter } from './adapters/express-adapter';
 import { ApplicationConfig } from './application-config';
-import { validatePath, isNil, isUndefined } from '@nestjs/common/utils/shared.utils';
-import { MicroserviceConfiguration } from '@nestjs/microservices';
+import { messages } from './constants';
 import { NestMicroservice } from './index';
-import { WebSocketAdapter, OnModuleDestroy, ExceptionFilter, PipeTransform, NestInterceptor, CanActivate } from '@nestjs/common';
+import { NestContainer } from './injector/container';
 import { Module } from './injector/module';
+import { MiddlewaresModule } from './middlewares/middlewares-module';
+import { Resolver } from './router/interfaces/resolver.interface';
+import { RoutesResolver } from './router/routes-resolver';
 
 export class NestApplication implements INestApplication {
     private readonly config = new ApplicationConfig();
@@ -61,6 +68,7 @@ export class NestApplication implements INestApplication {
         const instance = new NestMicroservice(this.container, config);
         instance.setupListeners();
         instance.setIsInitialized(true);
+        instance.setIsInitHookCalled(true);
 
         this.microservices.push(instance);
         return instance;
@@ -180,4 +188,4 @@ export class NestApplication implements INestApplication {
     private hasOnModuleDestroyHook(instance): instance is OnModuleDestroy {
         return !isUndefined((instance as OnModuleDestroy).onModuleDestroy);
     }
-}
+}

src/core/nest-microservice.ts

@@ -7,7 +7,7 @@ import { Server } from '@nestjs/microservices/server/server';
 import { MicroserviceConfiguration } from '@nestjs/microservices/interfaces/microservice-configuration.interface';
 import { ServerFactory } from '@nestjs/microservices/server/server-factory';
 import { Transport } from '@nestjs/microservices/enums/transport.enum';
-import { INestMicroservice, WebSocketAdapter, CanActivate, PipeTransform, NestInterceptor, ExceptionFilter } from '@nestjs/common';
+import { INestMicroservice, WebSocketAdapter, CanActivate, PipeTransform, NestInterceptor, ExceptionFilter, OnModuleInit } from '@nestjs/common';
 import { ApplicationConfig } from './application-config';
 import { SocketModule } from '@nestjs/websockets/socket-module';
 import { CustomTransportStrategy } from '@nestjs/microservices';
@@ -22,6 +22,7 @@ export class NestMicroservice implements INestMicroservice {
     private readonly server: Server & CustomTransportStrategy;
     private isTerminated = false;
     private isInitialized = false;
+    private isInitHookCalled = false;
 
     constructor(
         private container: NestContainer,
@@ -39,9 +40,11 @@ export class NestMicroservice implements INestMicroservice {
     public setupModules() {
         SocketModule.setup(this.container, this.config);
         MicroservicesModule.setupClients(this.container);
+
         this.setupListeners();
+        this.setIsInitialized(true);
 
-        this.isInitialized = true;
+        !this.isInitHookCalled && this.callInitHook();
     }
 
     public setupListeners() {
@@ -88,12 +91,37 @@ export class NestMicroservice implements INestMicroservice {
         this.isTerminated = isTerminaed;
     }
 
+    public setIsInitHookCalled(isInitHookCalled: boolean) {
+        this.isInitHookCalled = isInitHookCalled;
+    }
+
     private closeApplication() {
         SocketModule.close();
+
         this.callDestroyHook();
         this.setIsTerminated(true);
     }
 
+    private callInitHook() {
+        const modules = this.container.getModules();
+        modules.forEach((module) => {
+            this.callModuleInitHook(module);
+        });
+        this.setIsInitHookCalled(true);
+    }
+
+    private callModuleInitHook(module: Module) {
+        const components = [...module.routes, ...module.components];
+        iterate(components).map(([key, {instance}]) => instance)
+            .filter((instance) => !isNil(instance))
+            .filter(this.hasOnModuleInitHook)
+            .forEach((instance) => (instance as OnModuleInit).onModuleInit());
+        }
+
+    private hasOnModuleInitHook(instance): instance is OnModuleInit {
+        return !isUndefined((instance as OnModuleInit).onModuleInit);
+    }
+  
     private callDestroyHook() {
         const modules = this.container.getModules();
         modules.forEach((module) => {

src/core/package.json

@@ -8,7 +8,7 @@
     "compile": "tsc -p tsconfig.json"
   },
   "dependencies": {
-    "express": "4.14.0",
+    "express": "4.16.2",
     "iterare": "0.0.8"
   },
   "peerDependencies": {