@eleven-am/pondsocket 0.1.141 → 0.1.143

package/lobby/lobby.js

@@ -10,20 +10,31 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _LobbyEngine_channels, _LobbyEngine_middleware, _LobbyEngine_leaveCallback, _PondChannel_lobby;
+var _LobbyEngine_channels, _LobbyEngine_middleware, _LobbyEngine_leaveCallback, _LobbyEngine_parentEngine, _PondChannel_lobby;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondChannel = exports.LobbyEngine = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const middleware_1 = require("../abstracts/middleware");
 const channel_1 = require("../channel/channel");
 class LobbyEngine {
-    constructor() {
+    constructor(endpointEngine) {
         _LobbyEngine_channels.set(this, void 0);
         _LobbyEngine_middleware.set(this, void 0);
         _LobbyEngine_leaveCallback.set(this, void 0);
+        _LobbyEngine_parentEngine.set(this, void 0);
+        __classPrivateFieldSet(this, _LobbyEngine_parentEngine, endpointEngine, "f");
         __classPrivateFieldSet(this, _LobbyEngine_channels, new Set(), "f");
         __classPrivateFieldSet(this, _LobbyEngine_middleware, new middleware_1.Middleware(), "f");
     }
+    get parent() {
+        return __classPrivateFieldGet(this, _LobbyEngine_parentEngine, "f");
+    }
+    get leaveCallback() {
+        return __classPrivateFieldGet(this, _LobbyEngine_leaveCallback, "f");
+    }
+    get middleware() {
+        return __classPrivateFieldGet(this, _LobbyEngine_middleware, "f");
+    }
     /**
      * @desc Handles an event request made by a user
      * @param event - The event to listen for
@@ -68,23 +79,14 @@ class LobbyEngine {
             if (!channel) {
                 throw new Error(`GatewayEngine: Channel ${channelName} does not exist`);
             }
-            channel.sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, event, payload);
+            channel.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, event, payload);
         }
         else {
             __classPrivateFieldGet(this, _LobbyEngine_channels, "f").forEach((channel) => {
-                channel.sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, event, payload);
+                channel.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, event, payload);
             });
         }
     }
-    /**
-     * @desc Removes a user from all channels
-     * @param clientId - The client id of the user to remove
-     */
-    removeUser(clientId) {
-        __classPrivateFieldGet(this, _LobbyEngine_channels, "f").forEach((channel) => {
-            channel.removeUser(clientId, true);
-        });
-    }
     /**
      * @desc Executes a function on a channel
      * @param channelName - The name of the channel to execute the function on
@@ -132,65 +134,28 @@ class LobbyEngine {
      * @private
      */
     createChannel(channelName) {
-        const destroyChannel = this.destroyChannel.bind(this, channelName);
-        const execute = __classPrivateFieldGet(this, _LobbyEngine_middleware, "f").run.bind(__classPrivateFieldGet(this, _LobbyEngine_middleware, "f"));
-        const parentEngine = {
-            execute,
-            destroyChannel,
-            leaveCallback: __classPrivateFieldGet(this, _LobbyEngine_leaveCallback, "f"),
-        };
-        const newChannel = new channel_1.ChannelEngine(channelName, parentEngine);
+        const newChannel = new channel_1.ChannelEngine(channelName, this);
+        __classPrivateFieldGet(this, _LobbyEngine_parentEngine, "f").subscribePendingUsers(newChannel);
         __classPrivateFieldGet(this, _LobbyEngine_channels, "f").add(newChannel);
         return newChannel;
     }
 }
 exports.LobbyEngine = LobbyEngine;
-_LobbyEngine_channels = new WeakMap(), _LobbyEngine_middleware = new WeakMap(), _LobbyEngine_leaveCallback = new WeakMap();
+_LobbyEngine_channels = new WeakMap(), _LobbyEngine_middleware = new WeakMap(), _LobbyEngine_leaveCallback = new WeakMap(), _LobbyEngine_parentEngine = new WeakMap();
 class PondChannel {
     constructor(lobby) {
         _PondChannel_lobby.set(this, void 0);
         __classPrivateFieldSet(this, _PondChannel_lobby, lobby, "f");
     }
-    /**
-     * @desc Handles an event request made by a user
-     * @param event - The event to listen for
-     * @param handler - The handler to execute when the event is received
-     * @example
-     * pond.onEvent('echo', (request, response) => {
-     *     response.send('echo', {
-     *         message: request.event.payload,
-     *     });
-     * });
-     */
     onEvent(event, handler) {
         __classPrivateFieldGet(this, _PondChannel_lobby, "f").onEvent(event, handler);
     }
-    /**
-     * @desc Broadcasts a message to all users in a channel
-     * @param event - The event to broadcast
-     * @param payload - The payload to send
-     * @param channelName - The channel to broadcast to (if not specified, broadcast to all channels)
-     * @example
-     * pond.broadcast('echo', {
-     *    message: 'Hello World',
-     *    timestamp: Date.now(),
-     *    channel: 'my_channel',
-     *});
-     */
     broadcast(event, payload, channelName) {
         __classPrivateFieldGet(this, _PondChannel_lobby, "f").broadcast(event, payload, channelName);
     }
-    /**
-     * @desc Handles the leave event for a user, can occur when a user disconnects or leaves a channel, use this to clean up any resources
-     * @param callback - The callback to execute when a user leaves
-     */
     onLeave(callback) {
         __classPrivateFieldGet(this, _PondChannel_lobby, "f").onLeave(callback);
     }
-    /**
-     * @desc Gets a channel by name
-     * @param channelName - The name of the channel to get
-     */
     getChannel(channelName) {
         const channel = __classPrivateFieldGet(this, _PondChannel_lobby, "f").getChannel(channelName);
         if (channel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.141",
+  "version": "0.1.143",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -16,7 +16,7 @@
     "access": "public"
   },
   "scripts": {
-    "test": "jest --coverage --verbose",
+    "test": "jest --coverage --verbose --forceExit --detectOpenHandles --runInBand --bail",
     "build": "rimraf dist && tsc && npm run remove",
     "lint": "eslint --ext .ts src",
     "lint:fix": "eslint --fix --ext .ts src",
@@ -34,22 +34,22 @@
     "url": "git+https://github.com/Eleven-am/pondSocket.git"
   },
   "dependencies": {
-    "@eleven-am/pondsocket-common": "^0.0.10",
+    "@eleven-am/pondsocket-common": "^0.0.11",
     "ws": "^8.16.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.5",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.11.20",
     "@types/websocket": "^1.0.10",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "eslint": "^8.56.0",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "eslint": "^8.57.0",
     "eslint-plugin-file-progress": "^1.3.0",
     "eslint-plugin-import": "^2.29.1",
     "jest": "^29.7.0",
     "superwstest": "^2.0.3",
-    "ts-jest": "^29.1.1",
+    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
   },

package/presence/presence.js

@@ -107,5 +107,5 @@ _PresenceEngine_presenceMap = new WeakMap(), _PresenceEngine_channel = new WeakM
     if (recipients.length === 0) {
         return;
     }
-    __classPrivateFieldGet(this, _PresenceEngine_channel, "f").sendMessage((0, pondsocket_common_1.uuid)(), pondsocket_common_1.SystemSender.CHANNEL, recipients, pondsocket_common_1.ServerActions.PRESENCE, event, payload);
+    __classPrivateFieldGet(this, _PresenceEngine_channel, "f").sendMessage(pondsocket_common_1.SystemSender.CHANNEL, recipients, pondsocket_common_1.ServerActions.PRESENCE, event, payload);
 };

package/presence/presenceEngine.test.js

@@ -9,7 +9,7 @@ describe('PresenceEngine', () => {
     let presenceKey;
     let channel;
     beforeEach(() => {
-        channel = (0, eventResponse_test_1.createChannelEngine)();
+        channel = (0, eventResponse_test_1.createChannelEngine)().channelEngine;
         channel.addUser('presenceKey', { assign: 'assign' }, () => {
             // do nothing
         });
@@ -33,7 +33,6 @@ describe('PresenceEngine', () => {
             // remove the first element as it contains the request id which is random
             params.shift();
             expect(params).toEqual([
-                pondsocket_common_1.SystemSender.CHANNEL,
                 ['presenceKey'],
                 pondsocket_common_1.ServerActions.PRESENCE,
                 pondsocket_common_1.PresenceEventTypes.JOIN,
@@ -65,7 +64,6 @@ describe('PresenceEngine', () => {
             // remove the first element as it contains the request id which is random
             params.shift();
             expect(params).toEqual([
-                pondsocket_common_1.SystemSender.CHANNEL,
                 ['presenceKey'],
                 pondsocket_common_1.ServerActions.PRESENCE,
                 pondsocket_common_1.PresenceEventTypes.UPDATE,
@@ -98,7 +96,6 @@ describe('PresenceEngine', () => {
             // remove the first element as it contains the request id which is random
             params.shift();
             expect(params).toEqual([
-                pondsocket_common_1.SystemSender.CHANNEL,
                 ['presenceKey2'],
                 pondsocket_common_1.ServerActions.PRESENCE,
                 pondsocket_common_1.PresenceEventTypes.LEAVE,

package/schema.js

@@ -9,5 +9,4 @@ exports.clientMessageSchema = zod_1.z.object({
     channelName: zod_1.z.string(),
     payload: zod_1.z.record(zod_1.z.any()),
     action: zod_1.z.nativeEnum(pondsocket_common_1.ClientActions),
-    addresses: zod_1.z.union([zod_1.z.nativeEnum(pondsocket_common_1.ChannelReceiver), zod_1.z.array(zod_1.z.string())]).optional(),
 });

package/server/pondSocket.js

@@ -62,7 +62,7 @@ class PondSocket {
      * })
      */
     createEndpoint(path, handler) {
-        const endpoint = new endpoint_1.Endpoint();
+        const endpoint = new endpoint_1.EndpointEngine(this);
         __classPrivateFieldGet(this, _PondSocket_middleware, "f").use((req, socket, next) => {
             const event = (0, matcher_1.parseAddress)(path, req.address);
             if (event) {
@@ -72,7 +72,7 @@ class PondSocket {
             }
             return next();
         });
-        return endpoint;
+        return new endpoint_1.Endpoint(endpoint);
     }
 }
 exports.PondSocket = PondSocket;
@@ -82,7 +82,7 @@ _PondSocket_server = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _P
             socket.isAlive = true;
         });
     });
-    const interval = setInterval(() => {
+    return setInterval(() => {
         __classPrivateFieldGet(this, _PondSocket_socketServer, "f").clients.forEach((socket) => {
             if (socket.isAlive === false) {
                 return socket.terminate();
@@ -91,12 +91,15 @@ _PondSocket_server = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _P
             socket.ping();
         });
     }, 30000);
-    __classPrivateFieldGet(this, _PondSocket_socketServer, "f").on('close', () => clearInterval(interval));
 }, _PondSocket_init = function _PondSocket_init() {
-    __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_manageHeartbeat).call(this);
+    const timeout = __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_manageHeartbeat).call(this);
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('error', (error) => {
+        clearInterval(timeout);
         throw new Error(error.message);
     });
+    __classPrivateFieldGet(this, _PondSocket_server, "f").on('close', () => {
+        clearInterval(timeout);
+    });
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('upgrade', (req, socket, head) => {
         const clientId = req.headers['sec-websocket-key'];
         const request = {