fix(websockets): ensure non-shared servers call close method

nestjs · Nov 26, 2024 · bba5fde · bba5fde
1 parent 416830c
commit bba5fde
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/packages/platform-socket.io/adapters/io-adapter.ts b/packages/platform-socket.io/adapters/io-adapter.ts
@@ -82,4 +82,12 @@ export class IoAdapter extends AbstractWsAdapter {
     }
     return { data: payload };
   }
+
+  public close(server: Server) {
+    if (this.forceCloseConnections && server.httpServer === this.httpServer) {
+      return;
+    }
+
+    return super.close(server);
+  }
 }
diff --git a/packages/websockets/adapters/ws-adapter.ts b/packages/websockets/adapters/ws-adapter.ts
@@ -23,6 +23,10 @@ export abstract class AbstractWsAdapter<
     this._forceCloseConnections = value;
   }
 
+  public get forceCloseConnections(): boolean {
+    return this._forceCloseConnections;
+  }
+
   constructor(appOrHttpServer?: INestApplicationContext | any) {
     if (appOrHttpServer && appOrHttpServer instanceof NestApplication) {
       this.httpServer = appOrHttpServer.getUnderlyingHttpServer();
@@ -40,9 +44,6 @@ export abstract class AbstractWsAdapter<
   }
 
   public async close(server: TServer) {
-    if (this._forceCloseConnections) {
-      return;
-    }
     const isCallable = server && isFunction(server.close);
     isCallable && (await new Promise(resolve => server.close(resolve)));
   }