@eleven-am/pondsocket 0.1.108 → 0.1.109

package/nest.js

@@ -37,7 +37,6 @@ const endpointClassKey = Symbol('endpoint');
 const channelsClassKey = Symbol('channels');
 const parametersKey = Symbol('generalParametersKey');
 const pondGuardsKey = Symbol('pondGuardsKey');
-const endpointGuardsKey = Symbol('endpointGuardsKey');
 function isNotEmpty(value) {
     return value !== null &&
         value !== undefined &&
@@ -612,7 +611,6 @@ exports.EndpointInstance = EndpointInstance;
 const Channel = (path = '*') => createClassDecorator(channelClassKey, path);
 exports.Channel = Channel;
 const setEndpoint = (path = '*') => createClassDecorator(endpointClassKey, path);
-const setGuards = (guards) => createClassDecorator(endpointGuardsKey, guards);
 const setChannels = (channels) => createClassDecorator(channelsClassKey, channels);
 const getChannels = (target) => {
     var _a;
@@ -628,15 +626,13 @@ const getGuards = (target) => {
     });
     return [...classGuards, ...methodGuards.flat()];
 };
-const Endpoint = (metadata) => {
-    var _a;
-    return (0, common_1.applyDecorators)(setChannels(metadata.channels), setEndpoint(metadata.path), setGuards((_a = metadata.guards) !== null && _a !== void 0 ? _a : []));
-};
+const Endpoint = (metadata) => (0, common_1.applyDecorators)(setChannels(metadata.channels), setEndpoint(metadata.path));
 exports.Endpoint = Endpoint;
 class PondSocketService {
-    constructor(moduleRef, adapterHost, endpoints) {
+    constructor(moduleRef, adapterHost, externalGuards, endpoints) {
         this.moduleRef = moduleRef;
         this.adapterHost = adapterHost;
+        this.externalGuards = externalGuards;
         this.endpoints = endpoints;
         const httpAdapter = this.adapterHost.httpAdapter;
         httpAdapter.listen = (...args) => {
@@ -653,7 +649,8 @@ class PondSocketService {
         if (!endpointMetadata) {
             return;
         }
-        const endpointGuards = (_a = manageClassData(endpointGuardsKey, endpoint).get()) !== null && _a !== void 0 ? _a : [];
+        const { get, set: setGuards } = manageClassData(pondGuardsKey, endpoint);
+        setGuards([...this.externalGuards, ...((_a = get()) !== null && _a !== void 0 ? _a : [])]);
         const instance = this.moduleRef.get(endpoint, { strict: false });
         const { set } = manageEndpointInstance(instance);
         const pondEndpoint = socket.createEndpoint(endpointMetadata, (request, response) => __awaiter(this, void 0, void 0, function* () {
@@ -668,17 +665,17 @@ class PondSocketService {
         }));
         set(pondEndpoint);
         getChannels(endpoint).forEach((channel) => {
-            this.manageChannel(channel, endpointGuards, pondEndpoint);
+            this.manageChannel(channel, pondEndpoint);
         });
     }
-    manageChannel(channel, guards, endpoint) {
+    manageChannel(channel, endpoint) {
         var _a;
         const channelMetadata = manageClassData(channelClassKey, channel).get();
         if (!channelMetadata) {
             return;
         }
         const { get, set: setGuards } = manageClassData(pondGuardsKey, channel);
-        setGuards([...guards, ...((_a = get()) !== null && _a !== void 0 ? _a : [])]);
+        setGuards([...this.externalGuards, ...((_a = get()) !== null && _a !== void 0 ? _a : [])]);
         const instance = this.moduleRef.get(channel, { strict: false });
         const channelInstance = endpoint.createChannel(channelMetadata, (request, response) => __awaiter(this, void 0, void 0, function* () {
             const { get } = manageJoinHandlers(instance);
@@ -708,15 +705,16 @@ class PondSocketService {
     }
 }
 class PondSocketModule {
-    static forRoot({ endpoints, providers = [], imports = [], exports = [], isGlobal = false, }) {
+    static forRoot({ endpoints, guards = [], providers = [], imports = [], exports = [], isGlobal = false, }) {
         const endpointsSet = new Set(endpoints);
         const channels = Array.from(endpointsSet).flatMap((endpoint) => getChannels(endpoint));
         const channelsSet = new Set(channels);
-        const guards = Array.from(new Set([...endpointsSet, ...channelsSet])).flatMap(((target) => getGuards(target)));
-        const guardsSet = new Set(guards);
+        const uniqueGuards = new Set(guards);
+        const allGuards = Array.from(new Set([...endpointsSet, ...channelsSet])).flatMap(((target) => getGuards(target)));
+        const guardsSet = new Set([...uniqueGuards, ...allGuards]);
         const pondSocketProvider = {
             provide: PondSocketService,
-            useFactory: (moduleRef, adapterHost) => new PondSocketService(moduleRef, adapterHost, endpoints),
+            useFactory: (moduleRef, adapterHost) => new PondSocketService(moduleRef, adapterHost, Array.from(uniqueGuards), endpoints),
             inject: [core_1.ModuleRef, core_1.HttpAdapterHost],
         };
         const providersSet = new Set([...providers, ...guardsSet, ...channelsSet, ...endpointsSet, pondSocketProvider]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.108",
+  "version": "0.1.109",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",

package/types.d.ts

@@ -67,6 +67,7 @@ interface UserAssigns {
 
 interface Metadata extends Omit<ModuleMetadata, 'controllers'> {
     endpoints: Constructor<NonNullable<unknown>>[];
+    guards?: Constructor<CanActivate>[];
     isGlobal?: boolean;
 }