@eleven-am/pondsocket 0.1.73 → 0.1.75

package/lobby/lobby.js

@@ -64,7 +64,10 @@ class LobbyEngine {
      */
     broadcast(event, payload, channelName) {
         if (channelName) {
-            const channel = this.getChannel(channelName) || this.createChannel(channelName);
+            const channel = this.getChannel(channelName);
+            if (!channel) {
+                throw new Error(`GatewayEngine: Channel ${channelName} does not exist`);
+            }
             channel.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, event, payload);
         }
         else {

package/nest.d.ts

@@ -1,5 +1,6 @@
 import  {
     OnJoinRequest,
+    ChannelInstance,
     DChannel as Channel,
     Channels, Endpoints,
     OnConnectionRequest,
@@ -17,6 +18,7 @@ import  {
 
 export {
     OnJoinRequest,
+    ChannelInstance,
     Endpoint, PondSocketModule,
     OnConnectionRequest, OnEvent,
     Channel, Channels, Endpoints,

package/nest.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PondSocketModule = exports.Endpoints = exports.Endpoint = exports.Channels = exports.Channel = exports.OnConnectionRequest = exports.OnEvent = exports.OnJoinRequest = exports.GetConnectionQuery = exports.GetConnectionHeaders = exports.GetConnectionParams = exports.GetConnectionRequestId = exports.GetConnectionResponse = exports.GetConnectionRequest = exports.GetEventRequest = exports.GetEventResponse = exports.GetEventQuery = exports.GetEventParams = exports.GetEventPayload = exports.GetUserPresence = exports.GetInternalChannel = exports.GetUserData = exports.GetJoinParams = exports.GetJoinResponse = exports.GetJoinRequest = void 0;
+exports.PondSocketModule = exports.Endpoints = exports.Endpoint = exports.Channels = exports.ChannelInstance = exports.Channel = exports.OnConnectionRequest = exports.OnEvent = exports.OnJoinRequest = exports.GetConnectionQuery = exports.GetConnectionHeaders = exports.GetConnectionParams = exports.GetConnectionRequestId = exports.GetConnectionResponse = exports.GetConnectionRequest = exports.GetEventRequest = exports.GetEventResponse = exports.GetEventQuery = exports.GetEventParams = exports.GetEventPayload = exports.GetUserPresence = exports.GetInternalChannel = exports.GetUserData = exports.GetJoinParams = exports.GetJoinResponse = exports.GetJoinRequest = void 0;
 require("reflect-metadata");
 const common_1 = require("@nestjs/common");
 const pondSocket_1 = require("./server/pondSocket");
@@ -409,6 +409,10 @@ function OnConnectionRequest() {
 exports.OnConnectionRequest = OnConnectionRequest;
 function Channel(path = '*') {
     return (constructor) => class extends constructor {
+        constructor() {
+            super(...arguments);
+            this._channel = null;
+        }
         _setEndpoint(endpoint) {
             const channel = endpoint.createChannel(path, (request, response) => __awaiter(this, void 0, void 0, function* () {
                 const { get } = manageJoinHandlers(this);
@@ -427,28 +431,40 @@ function Channel(path = '*') {
                     yield handler.value(request, response);
                 }));
             });
+            this._channel = channel;
         }
     };
 }
 exports.Channel = Channel;
+function ChannelInstance() {
+    return (target, propertyKey) => {
+        Object.defineProperty(target, propertyKey, {
+            get() {
+                if (!target._channel) {
+                    throw new Error('Channel not initialized');
+                }
+                return target._channel;
+            },
+            set() {
+                throw new Error('Channel is read-only');
+            },
+        });
+    };
+}
+exports.ChannelInstance = ChannelInstance;
 function Channels(channels) {
     return (constructor) => {
         const { set } = manageChannels(constructor.prototype);
         set(channels);
-        return class extends constructor {
-            constructor() {
-                super(...arguments);
-                this._channels = channels;
-            }
-        };
+        return constructor;
     };
 }
 exports.Channels = Channels;
 function Endpoint(path = '*') {
     return (constructor) => class extends constructor {
         _setSocket(moduleRef, socket) {
-            var _a;
             const { get } = manageConnectionHandlers(this);
+            const { get: getChannels } = manageChannels(this);
             const [handler] = get();
             const endpoint = socket.createEndpoint(path, (request, response) => __awaiter(this, void 0, void 0, function* () {
                 if (handler) {
@@ -458,8 +474,7 @@ function Endpoint(path = '*') {
                     response.accept();
                 }
             }));
-            const channels = (_a = this._channels) !== null && _a !== void 0 ? _a : [];
-            channels.forEach((channel) => {
+            getChannels().forEach((channel) => {
                 const chan = moduleRef.get(channel, {
                     strict: false,
                 });
@@ -496,9 +511,10 @@ class PondSocketModule {
         this.socket = new pondSocket_1.PondSocket(server);
         expressInstance.listen = (...args) => {
             const { get } = manageEndpoints(this);
-            get().forEach((endpoint) => {
+            get().map((endpoint) => {
                 const instance = this.moduleRef.get(endpoint, { strict: false });
                 instance._setSocket(this.moduleRef, this.socket);
+                return instance;
             });
             this.socket.listen(...args);
         };

package/package.json

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

package/types.d.ts

@@ -7,7 +7,10 @@ import { WebSocketServer } from 'ws';
 type Unsubscribe = () => void;
 
 type Constructor<T> = new (...args: any[]) => T;
-type MethodDecorator = (target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<unknown>) => TypedPropertyDescriptor<unknown> | void;
+declare type ClassDecorator = <TFunction extends Function>(target: TFunction) => TFunction | void;
+declare type MethodDecorator = <T>(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T> | void;
+declare type ParameterDecorator = (target: Object, propertyKey: string | symbol | undefined, parameterIndex: number) => void;
+
 export type default_t<T = any> = Record<string, T>;
 type IsParam<Path> = Path extends `:${infer Param}` ? Param : never;
 
@@ -622,106 +625,107 @@ declare const pondSocket: (app: Express) => PondSocketExpressApp;
  * @desc The Decorator for retrieving the JoinRequest object from the request in a handler
  * @returns {JoinRequest}
  */
-declare function GetJoinRequest(): MethodDecorator;
+declare function GetJoinRequest(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the JoinResponse object from the response in a handler
  * @returns {JoinResponse}
  */
-declare function GetJoinResponse(): MethodDecorator;
+declare function GetJoinResponse(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the JoinParams object from the request in a handler
  * @returns {JoinParams}
  */
-declare function GetJoinParams(): MethodDecorator;
+declare function GetJoinParams(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the UserData object from the request in a handler
  * @returns {UserData}
  */
-declare function GetUserData(): MethodDecorator;
+declare function GetUserData(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the Channel object from the request in a handler
  * @returns {Channel}
  */
-declare function GetInternalChannel(): MethodDecorator;
+declare function GetInternalChannel(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the UserPresence object from the request in a handler
  * @returns {PondPresence}
  */
-declare function GetUserPresence(): MethodDecorator;
+declare function GetUserPresence(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the event payload from the request in a handler
  * @returns {PondMessage}
  */
-declare function GetEventPayload(): MethodDecorator;
+declare function GetEventPayload(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the EventRequest Params object from the request in a handler
  * @returns {EventParams}
  */
-declare function GetEventParams(): MethodDecorator;
+declare function GetEventParams(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the EventRequest Query object from the request in a handler
  * @returns {EventParams}
  */
-declare function GetEventQuery(): MethodDecorator;
+declare function GetEventQuery(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the EventResponse in a handler
  * @returns {EventResponse}
  */
-declare function GetEventResponse(): MethodDecorator;
+declare function GetEventResponse(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the EventRequest in a handler
  * @returns {EventRequest}
  */
-declare function GetEventRequest(): MethodDecorator;
+declare function GetEventRequest(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionReQuest in a handler
  * @returns {IncomingConnection}
  */
-declare function GetConnectionRequest(): MethodDecorator;
+declare function GetConnectionRequest(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionResponse in a handler
  * @returns {ConnectionResponse}
  */
-declare function GetConnectionResponse(): MethodDecorator;
+declare function GetConnectionResponse(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionRequestId in a handler
  * @returns {string}
  */
-declare function GetConnectionRequestId(): MethodDecorator;
+declare function GetConnectionRequestId(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionParams in a handler
  * @returns {EventParams}
  */
-declare function GetConnectionParams(): MethodDecorator;
+declare function GetConnectionParams(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionHeaders from the request in a handler
  * @returns {EventParams}
  */
-declare function GetConnectionHeaders(): MethodDecorator;
+declare function GetConnectionHeaders(): ParameterDecorator;
 
 /**
  * @desc The Decorator for retrieving the ConnectionQuery in a handler
  * @returns {EventParams}
  */
-declare function GetConnectionQuery(): MethodDecorator;
+declare function GetConnectionQuery(): ParameterDecorator;
 
 /**
  * @desc Marks a method as a handler for JoinRequest events.
+ * @param - The path for the JoinRequest event.
  */
 declare function OnJoinRequest(): MethodDecorator;
 
@@ -740,33 +744,30 @@ declare function OnConnectionRequest(): MethodDecorator;
  * Decorator to mark a class as a channel.
  * @param path - The path for the channel (default is '*').
  */
-declare function DChannel<T extends Constructor<NonNullable<unknown>>>(
-    path?: string
-): (constructor: T) => void;
+declare function DChannel(path?: string): ClassDecorator;
+
+/**
+ * Decorator to retrieve the channel instance as a read-only property in a class.
+ */
+declare function ChannelInstance(): PropertyDecorator;
 
 /**
  * Decorator to mark a class as having multiple channels.
  * @param channels - The array of channels.
  */
-declare function Channels<T extends Constructor<NonNullable<unknown>>>(
-    channels: Constructor<NonNullable<unknown>>[]
-): (constructor: T) => void;
+declare function Channels(channels: Constructor<NonNullable<unknown>>[]): ClassDecorator;
 
 /**
  * Decorator to mark a class as an endpoint.
  * @param path - The path for the endpoint (default is '*').
  */
-declare function DEndpoint<T extends Constructor<NonNullable<unknown>>>(
-    path?: string
-): (constructor: T) => void;
+declare function DEndpoint(path?: string): ClassDecorator;
 
 /**
  * Decorator to mark a class as having multiple endpoints.
  * @param endpoints - The array of endpoints.
  */
-declare function Endpoints<T extends Constructor<NonNullable<unknown>>>(
-    endpoints: Constructor<NonNullable<unknown>>[]
-): (constructor: T) => void;
+declare function Endpoints(endpoints: Constructor<NonNullable<unknown>>[]): ClassDecorator;
 
 declare class PondSocketModule {
     /**