@nestjs/platform-ws 11.1.16 → 12.0.0-alpha.0

package/adapters/index.d.ts

@@ -1 +1 @@
-export * from './ws-adapter';
+export * from './ws-adapter.js';

package/adapters/index.js

@@ -1,4 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./ws-adapter"), exports);
+export * from './ws-adapter.js';

package/adapters/ws-adapter.d.ts

@@ -1,8 +1,8 @@
-import { INestApplicationContext, Logger } from '@nestjs/common';
+import { type INestApplicationContext, Logger } from '@nestjs/common';
 import { AbstractWsAdapter } from '@nestjs/websockets';
-import { MessageMappingProperties } from '@nestjs/websockets/gateway-metadata-explorer';
 import * as http from 'http';
 import { Observable } from 'rxjs';
+import type { MessageMappingProperties } from '@nestjs/websockets';
 type WsServerRegistryEntry = any[];
 type WsData = string | Buffer | ArrayBuffer | Buffer[];
 type WsMessageParser = (data: WsData) => {

package/adapters/ws-adapter.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WsAdapter = void 0;
-const common_1 = require("@nestjs/common");
-const load_package_util_1 = require("@nestjs/common/utils/load-package.util");
-const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
-const websockets_1 = require("@nestjs/websockets");
-const constants_1 = require("@nestjs/websockets/constants");
-const http = require("http");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
+import { Logger } from '@nestjs/common';
+import { AbstractWsAdapter } from '@nestjs/websockets';
+import * as http from 'http';
+import { createRequire } from 'module';
+import { EMPTY, fromEvent } from 'rxjs';
+import { filter, first, mergeMap, share, takeUntil } from 'rxjs/operators';
+import { loadPackageSync, isNil, normalizePath } from '@nestjs/common/internal';
+import { CLOSE_EVENT, CONNECTION_EVENT, ERROR_EVENT, } from '@nestjs/websockets/internal';
 let wsPackage = {};
 var READY_STATE;
 (function (READY_STATE) {
@@ -21,16 +18,21 @@ const UNDERLYING_HTTP_SERVER_PORT = 0;
 /**
  * @publicApi
  */
-class WsAdapter extends websockets_1.AbstractWsAdapter {
+export class WsAdapter extends AbstractWsAdapter {
+    logger = new Logger(WsAdapter.name);
+    httpServersRegistry = new Map();
+    wsServersRegistry = new Map();
+    messageParser = (data) => {
+        return JSON.parse(data.toString());
+    };
     constructor(appOrHttpServer, options) {
         super(appOrHttpServer);
-        this.logger = new common_1.Logger(WsAdapter.name);
-        this.httpServersRegistry = new Map();
-        this.wsServersRegistry = new Map();
-        this.messageParser = (data) => {
-            return JSON.parse(data.toString());
-        };
-        wsPackage = (0, load_package_util_1.loadPackage)('ws', 'WsAdapter', () => require('ws'));
+        wsPackage = loadPackageSync('ws', 'WsAdapter', () => createRequire(import.meta.url)('ws'));
+        // Normalize CJS/ESM: In CJS, require('ws') returns WebSocket with .Server.
+        // We need .Server for creating WebSocketServer instances.
+        if (!wsPackage.Server) {
+            wsPackage = { ...wsPackage, Server: wsPackage.WebSocketServer };
+        }
         if (options?.messageParser) {
             this.messageParser = options.messageParser;
         }
@@ -77,8 +79,8 @@ class WsAdapter extends websockets_1.AbstractWsAdapter {
     bindMessageHandlers(client, handlers, transform) {
         const handlersMap = new Map();
         handlers.forEach(handler => handlersMap.set(handler.message, handler));
-        const close$ = (0, rxjs_1.fromEvent)(client, constants_1.CLOSE_EVENT).pipe((0, operators_1.share)(), (0, operators_1.first)());
-        const source$ = (0, rxjs_1.fromEvent)(client, 'message').pipe((0, operators_1.mergeMap)(data => this.bindMessageHandler(data, handlersMap, transform).pipe((0, operators_1.filter)(result => !(0, shared_utils_1.isNil)(result)))), (0, operators_1.takeUntil)(close$));
+        const close$ = fromEvent(client, CLOSE_EVENT).pipe(share(), first());
+        const source$ = fromEvent(client, 'message').pipe(mergeMap(data => this.bindMessageHandler(data, handlersMap, transform).pipe(filter(result => !isNil(result)))), takeUntil(close$));
         const onMessage = (response) => {
             if (client.readyState !== READY_STATE.OPEN_STATE) {
                 return;
@@ -91,28 +93,30 @@ class WsAdapter extends websockets_1.AbstractWsAdapter {
         try {
             const message = this.messageParser(buffer.data);
             if (!message) {
-                return rxjs_1.EMPTY;
+                return EMPTY;
             }
             const messageHandler = handlersMap.get(message.event);
             const { callback } = messageHandler;
             return transform(callback(message.data, message.event));
         }
         catch {
-            return rxjs_1.EMPTY;
+            return EMPTY;
         }
     }
     bindErrorHandler(server) {
-        server.on(constants_1.CONNECTION_EVENT, (ws) => ws.on(constants_1.ERROR_EVENT, (err) => this.logger.error(err)));
-        server.on(constants_1.ERROR_EVENT, (err) => this.logger.error(err));
+        server.on(CONNECTION_EVENT, (ws) => ws.on(ERROR_EVENT, (err) => this.logger.error(err)));
+        server.on(ERROR_EVENT, (err) => this.logger.error(err));
         return server;
     }
     bindClientDisconnect(client, callback) {
-        client.on(constants_1.CLOSE_EVENT, callback);
+        client.on(CLOSE_EVENT, callback);
     }
     async close(server) {
         const closeEventSignal = new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve(undefined))));
-        for (const ws of server.clients) {
-            ws.terminate();
+        if (server.clients) {
+            for (const ws of server.clients) {
+                ws.terminate();
+            }
         }
         await closeEventSignal;
     }
@@ -152,7 +156,7 @@ class WsAdapter extends websockets_1.AbstractWsAdapter {
                 }
             }
             catch (err) {
-                socket.end('HTTP/1.1 400\r\n' + err.message);
+                socket.end(`HTTP/1.1 400\r\n${err.message}`);
             }
         });
         return httpServer;
@@ -160,8 +164,7 @@ class WsAdapter extends websockets_1.AbstractWsAdapter {
     addWsServerToRegistry(wsServer, port, path) {
         const entries = this.wsServersRegistry.get(port) ?? [];
         entries.push(wsServer);
-        wsServer.path = (0, shared_utils_1.normalizePath)(path);
+        wsServer.path = normalizePath(path);
         this.wsServersRegistry.set(port, entries);
     }
 }
-exports.WsAdapter = WsAdapter;

package/index.d.ts

@@ -1 +1 @@
-export * from './adapters';
+export * from './adapters/index.js';

package/index.js

@@ -1,10 +1,7 @@
-"use strict";
 /*
  * Nest @platform-ws
  * Copyright(c) 2017 - 2025 Kamil Mysliwiec
  * https://nestjs.com
  * MIT Licensed
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./adapters"), exports);
+export * from './adapters/index.js';

package/package.json

@@ -1,9 +1,17 @@
 {
   "name": "@nestjs/platform-ws",
-  "version": "11.1.16",
+  "version": "12.0.0-alpha.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-ws)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
+  "type": "module",
+  "main": "./index.js",
+  "exports": {
+    ".": "./index.js",
+    "./*.js": "./*.js",
+    "./*": "./*.js",
+    "./adapters": "./adapters/index.js"
+  },
   "homepage": "https://nestjs.com",
   "funding": {
     "type": "opencollective",
@@ -26,5 +34,5 @@
     "@nestjs/websockets": "^11.0.0",
     "rxjs": "^7.1.0"
   },
-  "gitHead": "315e698096208868b43dda25f2db9ac9d7c1d822"
+  "gitHead": "7035ecc828a2a9f752aad188871b1171663a20c2"
 }

package/tsconfig.build.json

@@ -2,13 +2,7 @@
   "extends": "../tsconfig.build.json",
   "compilerOptions": {
     "outDir": ".",
-    "rootDir": ".",
-    "paths": {
-      "@nestjs/common": ["../common"],
-      "@nestjs/common/*": ["../common/*"],
-      "@nestjs/websockets": ["../websockets"],
-      "@nestjs/websockets/*": ["../websockets/*"]
-    }
+    "rootDir": "."
   },
   "exclude": ["node_modules", "dist", "test/**/*", "*.spec.ts"],
   "references": [