refactor(@nestsjs) replace underlying http server (express)

Author: kamilmysliwiec

packages/common/serializer/index.ts

@@ -1,2 +1,2 @@
-export * from './class-serializer.interceptors';
+export * from './class-serializer.interceptor';
 export * from './decorators';

packages/core/adapters/express-adapter.ts

@@ -7,6 +7,7 @@ import { RouterMethodFactory } from '../helpers/router-method-factory';
 
 export class ExpressAdapter implements HttpServer {
   private readonly routerMethodFactory = new RouterMethodFactory();
+  private httpServer = null;
 
   constructor(private readonly instance) {}
 
@@ -87,7 +88,11 @@ export class ExpressAdapter implements HttpServer {
   }
 
   getHttpServer() {
-    return this.instance;
+    return this.httpServer;
+  }
+
+  setHttpServer(httpServer) {
+    this.httpServer = httpServer;
   }
 
   getInstance() {

packages/core/nest-application.ts

@@ -104,13 +104,17 @@ export class NestApplication extends NestApplicationContext
     const isExpress = this.isExpress();
 
     if (isHttpsEnabled && isExpress) {
-      return https.createServer(
+      const server = https.createServer(
         this.appOptions.httpsOptions,
-        this.httpAdapter.getHttpServer(),
+        this.httpAdapter.getInstance(),
       );
+      (this.httpAdapter as ExpressAdapter).setHttpServer(server);
+      return server;
     }
     if (isExpress) {
-      return http.createServer(this.httpAdapter.getHttpServer());
+      const server = http.createServer(this.httpAdapter.getInstance());
+      (this.httpAdapter as ExpressAdapter).setHttpServer(server);
+      return server;
     }
     return this.httpAdapter;
   }
@@ -169,7 +173,7 @@ export class NestApplication extends NestApplicationContext
   }
 
   public isMiddlewareApplied(httpAdapter: HttpServer, name: string): boolean {
-    const app = this.httpAdapter.getHttpServer();
+    const app = this.httpAdapter.getInstance();
     return (
       !!app._router &&
       !!app._router.stack &&

packages/microservices/client/index.ts

@@ -1,2 +1,7 @@
+export * from './client-grpc';
+export * from './client-mqtt';
+export * from './client-nats';
 export * from './client-proxy';
-export * from './client-proxy-factory';
+export * from './client-proxy-factory';
+export * from './client-redis';
+export * from './client-tcp';

packages/microservices/server/index.ts

@@ -1 +1,6 @@
 export * from './server';
+export * from './server-grpc';
+export * from './server-mqtt';
+export * from './server-nats';
+export * from './server-redis';
+export * from './server-tcp';

packages/websockets/adapters/io-adapter.ts

@@ -9,11 +9,11 @@ import { CONNECTION_EVENT, DISCONNECT_EVENT } from '../constants';
 import { MessageMappingProperties } from '../gateway-metadata-explorer';
 
 export class IoAdapter implements WebSocketAdapter {
-  private readonly httpServer: Server;
+  protected readonly httpServer: Server;
 
   constructor(appOrHttpServer?: INestApplicationContext | Server) {
     if (appOrHttpServer && appOrHttpServer instanceof NestApplication) {
-      this.httpServer = appOrHttpServer.getHttpServer();
+      this.httpServer = appOrHttpServer.getUnderlyingHttpServer();
     } else {
       this.httpServer = appOrHttpServer as Server;
     }
@@ -82,8 +82,9 @@ export class IoAdapter implements WebSocketAdapter {
     const lastElement = payload[payload.length - 1];
     const isAck = isFunction(lastElement);
     if (isAck) {
+      const size = payload.length - 1;
       return {
-        data: payload.slice(0, payload.length - 1),
+        data: size === 1 ? payload[0] : payload.slice(0, size),
         ack: lastElement,
       };
     }

packages/websockets/adapters/ws-adapter.ts

@@ -15,13 +15,13 @@ import { MessageMappingProperties } from '../gateway-metadata-explorer';
 let wsPackage: any = {};
 
 export class WsAdapter implements WebSocketAdapter {
-  private readonly logger = new Logger(WsAdapter.name);
-  private readonly httpServer: Server;
+  protected readonly logger = new Logger(WsAdapter.name);
+  protected readonly httpServer: Server;
 
   constructor(appOrHttpServer?: INestApplicationContext | Server) {
     wsPackage = loadPackage('ws', 'WsAdapter');
     if (appOrHttpServer && appOrHttpServer instanceof NestApplication) {
-      this.httpServer = appOrHttpServer.getHttpServer();
+      this.httpServer = appOrHttpServer.getUnderlyingHttpServer();
     } else {
       this.httpServer = appOrHttpServer as Server;
     }