@nestjs/websockets 9.4.2 → 10.0.0

package/context/ws-context-creator.d.ts

@@ -32,6 +32,7 @@ export declare class WsContextCreator {
     constructor(wsProxy: WsProxy, exceptionFiltersContext: ExceptionFiltersContext, pipesContextCreator: PipesContextCreator, pipesConsumer: PipesConsumer, guardsContextCreator: GuardsContextCreator, guardsConsumer: GuardsConsumer, interceptorsContextCreator: InterceptorsContextCreator, interceptorsConsumer: InterceptorsConsumer);
     create<T extends ParamsMetadata = ParamsMetadata>(instance: Controller, callback: (...args: unknown[]) => void, moduleKey: string, methodName: string): (...args: any[]) => Promise<void>;
     reflectCallbackParamtypes(instance: Controller, callback: (...args: any[]) => any): any[];
+    reflectCallbackPattern(callback: (...args: any[]) => any): string;
     createGuardsFn<TContext extends string = ContextType>(guards: any[], instance: Controller, callback: (...args: unknown[]) => any, contextType?: TContext): Function | null;
     getMetadata<TMetadata, TContext extends ContextType = ContextType>(instance: Controller, methodName: string, contextType: TContext): WsHandlerMetadata;
     exchangeKeysForValues<TMetadata = any>(keys: string[], metadata: TMetadata, moduleContext: string, paramsFactory: WsParamsFactory, contextFactory: (args: unknown[]) => ExecutionContextHost): ParamProperties[];

package/context/ws-context-creator.js

@@ -45,6 +45,7 @@ class WsContextCreator {
             return callback.apply(instance, args);
         };
         return this.wsProxy.create(async (...args) => {
+            args.push(this.reflectCallbackPattern(callback));
             const initialArgs = this.contextUtils.createNullArray(argsLength);
             fnCanActivate && (await fnCanActivate(args));
             return this.interceptorsConsumer.intercept(interceptors, args, instance, callback, handler(initialArgs, args), contextType);
@@ -53,6 +54,9 @@ class WsContextCreator {
     reflectCallbackParamtypes(instance, callback) {
         return Reflect.getMetadata(constants_1.PARAMTYPES_METADATA, instance, callback.name);
     }
+    reflectCallbackPattern(callback) {
+        return Reflect.getMetadata(constants_3.MESSAGE_METADATA, callback);
+    }
     createGuardsFn(guards, instance, callback, contextType) {
         const canActivateFn = async (args) => {
             const canActivate = await this.guardsConsumer.tryActivate(guards, args, instance, callback, contextType);

package/enums/ws-paramtype.enum.js

@@ -5,4 +5,4 @@ var WsParamtype;
 (function (WsParamtype) {
     WsParamtype[WsParamtype["SOCKET"] = 0] = "SOCKET";
     WsParamtype[WsParamtype["PAYLOAD"] = 3] = "PAYLOAD";
-})(WsParamtype = exports.WsParamtype || (exports.WsParamtype = {}));
+})(WsParamtype || (exports.WsParamtype = WsParamtype = {}));

package/exceptions/base-ws-exception-filter.js

@@ -42,5 +42,5 @@ class BaseWsExceptionFilter {
         return (0, shared_utils_1.isObject)(err) && !!err.message;
     }
 }
-BaseWsExceptionFilter.logger = new common_1.Logger('WsExceptionsHandler');
 exports.BaseWsExceptionFilter = BaseWsExceptionFilter;
+BaseWsExceptionFilter.logger = new common_1.Logger('WsExceptionsHandler');

package/exceptions/ws-exceptions-handler.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WsExceptionsHandler = void 0;
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
+const select_exception_filter_metadata_util_1 = require("@nestjs/common/utils/select-exception-filter-metadata.util");
 const invalid_exception_filter_exception_1 = require("@nestjs/core/errors/exceptions/invalid-exception-filter.exception");
 const base_ws_exception_filter_1 = require("./base-ws-exception-filter");
 /**
@@ -28,11 +29,7 @@ class WsExceptionsHandler extends base_ws_exception_filter_1.BaseWsExceptionFilt
     invokeCustomFilters(exception, args) {
         if ((0, shared_utils_1.isEmpty)(this.filters))
             return false;
-        const filter = this.filters.find(({ exceptionMetatypes }) => {
-            const hasMetatype = !exceptionMetatypes.length ||
-                exceptionMetatypes.some(ExceptionMetatype => exception instanceof ExceptionMetatype);
-            return hasMetatype;
-        });
+        const filter = (0, select_exception_filter_metadata_util_1.selectExceptionFilterMetadata)(this.filters, exception);
         filter && filter.func(exception, args);
         return !!filter;
     }

package/factories/ws-params-factory.js

@@ -4,7 +4,6 @@ exports.WsParamsFactory = void 0;
 const ws_paramtype_enum_1 = require("../enums/ws-paramtype.enum");
 class WsParamsFactory {
     exchangeKeyForValue(type, data, args) {
-        var _a;
         if (!args) {
             return null;
         }
@@ -12,7 +11,7 @@ class WsParamsFactory {
             case ws_paramtype_enum_1.WsParamtype.SOCKET:
                 return args[0];
             case ws_paramtype_enum_1.WsParamtype.PAYLOAD:
-                return data ? (_a = args[1]) === null || _a === void 0 ? void 0 : _a[data] : args[1];
+                return data ? args[1]?.[data] : args[1];
             default:
                 return null;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/websockets",
-  "version": "9.4.2",
+  "version": "10.0.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@websockets)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -15,16 +15,16 @@
   "dependencies": {
     "iterare": "1.2.1",
     "object-hash": "3.0.0",
-    "tslib": "2.5.2"
+    "tslib": "2.5.3"
   },
   "devDependencies": {
-    "@nestjs/common": "9.4.2",
-    "@nestjs/core": "9.4.2"
+    "@nestjs/common": "10.0.0",
+    "@nestjs/core": "10.0.0"
   },
   "peerDependencies": {
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/core": "^9.0.0",
-    "@nestjs/platform-socket.io": "^9.0.0",
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/core": "^10.0.0",
+    "@nestjs/platform-socket.io": "^10.0.0",
     "reflect-metadata": "^0.1.12",
     "rxjs": "^7.1.0"
   },

package/socket-module.d.ts

@@ -1,9 +1,9 @@
+import { InjectionToken } from '@nestjs/common/interfaces';
 import { Injectable } from '@nestjs/common/interfaces/injectable.interface';
 import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
 import { ApplicationConfig } from '@nestjs/core/application-config';
 import { NestContainer } from '@nestjs/core/injector/container';
 import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
-import { InstanceToken } from '@nestjs/core/injector/module';
 import { GraphInspector } from '@nestjs/core/inspector/graph-inspector';
 export declare class SocketModule<THttpServer = any, TAppOptions extends NestApplicationContextOptions = NestApplicationContextOptions> {
     private readonly socketsContainer;
@@ -13,7 +13,7 @@ export declare class SocketModule<THttpServer = any, TAppOptions extends NestApp
     private httpServer;
     private appOptions;
     register(container: NestContainer, applicationConfig: ApplicationConfig, graphInspector: GraphInspector, appOptions: TAppOptions, httpServer?: THttpServer): void;
-    connectAllGateways(providers: Map<InstanceToken, InstanceWrapper<Injectable>>, moduleName: string): void;
+    connectAllGateways(providers: Map<InjectionToken, InstanceWrapper<Injectable>>, moduleName: string): void;
     connectGatewayToServer(wrapper: InstanceWrapper<Injectable>, moduleName: string): void;
     close(): Promise<any>;
     private initializeAdapter;

package/socket-module.js

@@ -58,7 +58,7 @@ class SocketModule {
         await Promise.all((0, iterare_1.iterate)(servers.values())
             .filter(({ server }) => server)
             .map(async ({ server }) => adapter.close(server)));
-        await (adapter === null || adapter === void 0 ? void 0 : adapter.dispose());
+        await adapter?.dispose();
         this.socketsContainer.clear();
     }
     initializeAdapter() {

package/socket-server-provider.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketServerProvider = void 0;
-const tslib_1 = require("tslib");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const server_and_event_streams_factory_1 = require("./factories/server-and-event-streams-factory");
 class SocketServerProvider {
@@ -23,7 +22,7 @@ class SocketServerProvider {
     }
     createSocketServer(options, port) {
         const adapter = this.applicationConfig.getIoAdapter();
-        const _a = options, { namespace, server } = _a, partialOptions = tslib_1.__rest(_a, ["namespace", "server"]);
+        const { namespace, server, ...partialOptions } = options;
         const ioServer = adapter.create(port, partialOptions);
         const serverAndEventStreamsHost = server_and_event_streams_factory_1.ServerAndEventStreamsFactory.create(ioServer);
         this.socketsContainer.addOne({ port, path: options.path }, serverAndEventStreamsHost);
@@ -40,7 +39,11 @@ class SocketServerProvider {
     }
     getServerOfNamespace(options, port, server) {
         const adapter = this.applicationConfig.getIoAdapter();
-        return adapter.create(port, Object.assign(Object.assign({}, options), { namespace: this.validateNamespace(options.namespace || ''), server }));
+        return adapter.create(port, {
+            ...options,
+            namespace: this.validateNamespace(options.namespace || ''),
+            server,
+        });
     }
     validateNamespace(namespace) {
         if (!(0, shared_utils_1.isString)(namespace)) {

package/web-sockets-controller.js

@@ -104,11 +104,10 @@ class WebSocketsController {
     }
     inspectEntrypointDefinitions(instance, port, messageHandlers, instanceWrapperId) {
         messageHandlers.forEach(handler => {
-            var _a;
             this.graphInspector.insertEntrypointDefinition({
                 type: 'websocket',
                 methodName: handler.methodName,
-                className: (_a = instance.constructor) === null || _a === void 0 ? void 0 : _a.name,
+                className: instance.constructor?.name,
                 classNodeId: instanceWrapperId,
                 metadata: {
                     port,
@@ -124,8 +123,7 @@ class WebSocketsController {
         }
     }
     printSubscriptionLogs(instance, subscribersMap) {
-        var _a;
-        const gatewayClassName = (_a = instance === null || instance === void 0 ? void 0 : instance.constructor) === null || _a === void 0 ? void 0 : _a.name;
+        const gatewayClassName = instance?.constructor?.name;
         if (!gatewayClassName) {
             return;
         }