@eleven-am/pondsocket 0.1.145 → 0.1.147

package/channel/channel.js

@@ -56,6 +56,12 @@ class ChannelEngine {
     get size() {
         return __classPrivateFieldGet(this, _ChannelEngine_users, "f").size;
     }
+    /**
+     * @desc Gets the parent engine
+     */
+    get parent() {
+        return __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f");
+    }
     /**
      * @desc Adds a user to the channel
      * @param userId - The id of the user to add

package/channel/channel.test.js

@@ -13,7 +13,6 @@ const createParentEngine = () => {
         channelName: 'channel',
         requestId: 'requestId',
         subscriptions: new Map(),
-        pendingSubscriptions: new Set(),
         socket: {
             send: jest.fn(),
         },

package/endpoint/endpoint.js

@@ -10,7 +10,7 @@ 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 _EndpointEngine_instances, _EndpointEngine_middleware, _EndpointEngine_channels, _EndpointEngine_sockets, _EndpointEngine_parentEngine, _EndpointEngine_sendMessage, _EndpointEngine_joinChannel, _EndpointEngine_execute, _EndpointEngine_retrieveChannel, _EndpointEngine_handleMessage, _EndpointEngine_readMessage, _EndpointEngine_buildError, _EndpointEngine_leaveChannel, _Endpoint_engine;
+var _EndpointEngine_instances, _EndpointEngine_middleware, _EndpointEngine_channels, _EndpointEngine_sockets, _EndpointEngine_parentEngine, _EndpointEngine_joinChannel, _EndpointEngine_execute, _EndpointEngine_retrieveChannel, _EndpointEngine_handleMessage, _EndpointEngine_readMessage, _EndpointEngine_buildError, _EndpointEngine_leaveChannel, _Endpoint_engine;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Endpoint = exports.EndpointEngine = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -30,7 +30,7 @@ class EndpointEngine {
         _EndpointEngine_parentEngine.set(this, void 0);
         __classPrivateFieldSet(this, _EndpointEngine_sockets, new Map(), "f");
         __classPrivateFieldSet(this, _EndpointEngine_middleware, new middleware_1.Middleware(), "f");
-        __classPrivateFieldSet(this, _EndpointEngine_channels, new Set(), "f");
+        __classPrivateFieldSet(this, _EndpointEngine_channels, new Map(), "f");
         __classPrivateFieldSet(this, _EndpointEngine_parentEngine, parent, "f");
     }
     get parent() {
@@ -64,7 +64,7 @@ class EndpointEngine {
             }
             next();
         });
-        __classPrivateFieldGet(this, _EndpointEngine_channels, "f").add(pondChannel);
+        __classPrivateFieldGet(this, _EndpointEngine_channels, "f").set(path, pondChannel);
         return new lobby_1.PondChannel(pondChannel);
     }
     /**
@@ -87,7 +87,7 @@ class EndpointEngine {
                 action: pondsocket_common_1.ServerActions.BROADCAST,
                 channelName: pondsocket_common_1.SystemSender.ENDPOINT,
             };
-            __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_sendMessage).call(this, socket, message);
+            this.sendMessage(socket, message);
         });
     }
     /**
@@ -114,9 +114,11 @@ class EndpointEngine {
             __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_readMessage).call(this, cache, message.data);
         });
         socket.addEventListener('close', () => {
+            __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
             cache.subscriptions.forEach((unsubscribe) => unsubscribe());
         });
         socket.addEventListener('error', () => {
+            __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
             cache.subscriptions.forEach((unsubscribe) => unsubscribe());
         });
     }
@@ -140,14 +142,9 @@ class EndpointEngine {
     subscribeTo(userId, channel) {
         const user = this.getUser(userId);
         const channelEngine = __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_retrieveChannel).call(this, channel);
-        if (!channelEngine) {
-            user.pendingSubscriptions.add(channel);
-        }
-        else {
-            user.subscriptions.set(channel, channelEngine.addUser(userId, user.assigns, (event) => {
-                user.socket.send(JSON.stringify(event));
-            }));
-        }
+        const onMessage = this.sendMessage.bind(this, user.socket);
+        const subscription = channelEngine.addUser(userId, user.assigns, onMessage);
+        user.subscriptions.set(channel, subscription);
     }
     /**
      * @desc Unsubscribes a user from a channel
@@ -160,51 +157,45 @@ class EndpointEngine {
         if (unsubscribe) {
             unsubscribe();
             user.subscriptions.delete(channel);
+            return;
         }
-        else if (user.pendingSubscriptions.has(channel)) {
-            user.pendingSubscriptions.delete(channel);
-        }
-        else {
-            throw new pondError_1.EndpointError(`GatewayEngine: User ${userId} is not subscribed to ${channel}`, 404);
-        }
+        throw new pondError_1.EndpointError(`GatewayEngine: Channel ${channel} does not exist`, 404);
     }
-    subscribePendingUsers(channel) {
-        const users = [...__classPrivateFieldGet(this, _EndpointEngine_sockets, "f").values()]
-            .filter(({ pendingSubscriptions }) => pendingSubscriptions.has(channel.name));
-        users.forEach(({ clientId, pendingSubscriptions, subscriptions, socket, assigns }) => {
-            const unsubscribe = channel.addUser(clientId, assigns, (event) => {
-                socket.send(JSON.stringify(event));
-            });
-            subscriptions.set(channel.name, unsubscribe);
-            pendingSubscriptions.delete(channel.name);
-        });
+    /**
+     * @desc Sends a message to a client
+     * @param socket - The socket to send the message to
+     * @param message - The message to send
+     */
+    sendMessage(socket, message) {
+        socket.send(JSON.stringify(message));
     }
 }
 exports.EndpointEngine = EndpointEngine;
-_EndpointEngine_middleware = new WeakMap(), _EndpointEngine_channels = new WeakMap(), _EndpointEngine_sockets = new WeakMap(), _EndpointEngine_parentEngine = new WeakMap(), _EndpointEngine_instances = new WeakSet(), _EndpointEngine_sendMessage = function _EndpointEngine_sendMessage(socket, message) {
-    socket.send(JSON.stringify(message));
-}, _EndpointEngine_joinChannel = function _EndpointEngine_joinChannel(channel, socket, joinParams, requestId) {
+_EndpointEngine_middleware = new WeakMap(), _EndpointEngine_channels = new WeakMap(), _EndpointEngine_sockets = new WeakMap(), _EndpointEngine_parentEngine = new WeakMap(), _EndpointEngine_instances = new WeakSet(), _EndpointEngine_joinChannel = function _EndpointEngine_joinChannel(channel, socket, joinParams, requestId) {
     const cache = Object.assign(Object.assign({}, socket), { requestId, channelName: channel });
     __classPrivateFieldGet(this, _EndpointEngine_middleware, "f").run(cache, joinParams, () => {
         throw new pondError_1.EndpointError(`GatewayEngine: Channel ${channel} does not exist`, 404);
     });
 }, _EndpointEngine_execute = function _EndpointEngine_execute(channel, handler) {
-    for (const manager of __classPrivateFieldGet(this, _EndpointEngine_channels, "f")) {
-        const isPresent = manager.listChannels()
-            .includes(channel);
-        if (isPresent) {
+    for (const [path, manager] of __classPrivateFieldGet(this, _EndpointEngine_channels, "f")) {
+        const event = (0, matcher_1.parseAddress)(path, channel);
+        if (event) {
             return manager.execute(channel, handler);
         }
     }
-    throw new Error(`GatewayEngine: Channel ${channel} does not exist`);
 }, _EndpointEngine_retrieveChannel = function _EndpointEngine_retrieveChannel(channel) {
-    for (const manager of __classPrivateFieldGet(this, _EndpointEngine_channels, "f")) {
-        const isPresent = manager.listChannels()
-            .includes(channel);
-        if (isPresent) {
-            return manager.getChannel(channel);
+    let channelEngine;
+    for (const [path, manager] of __classPrivateFieldGet(this, _EndpointEngine_channels, "f")) {
+        const event = (0, matcher_1.parseAddress)(path, channel);
+        if (event) {
+            channelEngine = manager.getChannel(channel) || manager.createChannel(channel);
+            break;
         }
     }
+    if (!channelEngine) {
+        throw new Error(`GatewayEngine: Channel ${channel} does not exist`);
+    }
+    return channelEngine;
 }, _EndpointEngine_handleMessage = function _EndpointEngine_handleMessage(cache, message) {
     switch (message.action) {
         case pondsocket_common_1.ClientActions.JOIN_CHANNEL:
@@ -228,7 +219,7 @@ _EndpointEngine_middleware = new WeakMap(), _EndpointEngine_channels = new WeakM
         __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_handleMessage).call(this, cache, result);
     }
     catch (e) {
-        __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_sendMessage).call(this, cache.socket, __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_buildError).call(this, e));
+        this.sendMessage(cache.socket, __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_buildError).call(this, e));
     }
 }, _EndpointEngine_buildError = function _EndpointEngine_buildError(error) {
     const event = {
@@ -297,6 +288,7 @@ _EndpointEngine_middleware = new WeakMap(), _EndpointEngine_channels = new WeakM
         throw new pondError_1.EndpointError(`GatewayEngine: Channel ${channel} does not exist`, 404);
     }
     unsubscribe();
+    socket.subscriptions.delete(channel);
 };
 class Endpoint {
     constructor(engine) {

package/endpoint/endpoint.test.js

@@ -27,6 +27,7 @@ const createEndpointEngine = (socket) => ({
     getUser: () => socket,
     subscribeTo: jest.fn(),
     unsubscribeFrom: jest.fn(),
+    sendMessage: (socket, msg) => socket.send(JSON.stringify(msg)),
 });
 exports.createEndpointEngine = createEndpointEngine;
 describe('endpoint', () => {

package/endpoint/response.js

@@ -61,7 +61,6 @@ class ConnectionResponse {
             socket: __classPrivateFieldGet(this, _ConnectionResponse_webSocket, "f"),
             assigns: __classPrivateFieldGet(this, _ConnectionResponse_assigns, "f"),
             subscriptions: new Map(),
-            pendingSubscriptions: new Set(),
         };
         __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").manageSocket(cache);
         return this;
@@ -116,7 +115,7 @@ _ConnectionResponse_webSocket = new WeakMap(), _ConnectionResponse_engine = new
         requestId: __classPrivateFieldGet(this, _ConnectionResponse_requestId, "f"),
         channelName: pondsocket_common_1.SystemSender.ENDPOINT,
     };
-    __classPrivateFieldGet(this, _ConnectionResponse_webSocket, "f").send(JSON.stringify(message));
+    __classPrivateFieldGet(this, _ConnectionResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _ConnectionResponse_webSocket, "f"), message);
 }, _ConnectionResponse_performChecks = function _ConnectionResponse_performChecks() {
     if (__classPrivateFieldGet(this, _ConnectionResponse_executed, "f")) {
         const message = 'Cannot execute response more than once';

package/lobby/JoinRequest.test.js

@@ -11,7 +11,6 @@ const createMockSocket = () => {
         channelName: 'channel',
         requestId: 'requestId',
         subscriptions: new Map(),
-        pendingSubscriptions: new Set(),
         socket: {
             send: jest.fn(),
         },

package/lobby/joinResponse.js

@@ -10,7 +10,7 @@ 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 _JoinResponse_instances, _JoinResponse_user, _JoinResponse_engine, _JoinResponse_newAssigns, _JoinResponse_executed, _JoinResponse_accepted, _JoinResponse_performChecks, _JoinResponse_sendMessage;
+var _JoinResponse_instances, _JoinResponse_user, _JoinResponse_engine, _JoinResponse_newAssigns, _JoinResponse_executed, _JoinResponse_accepted, _JoinResponse_performChecks, _JoinResponse_sendMessage, _JoinResponse_directMessage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoinResponse = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -60,10 +60,9 @@ class JoinResponse {
             requestId: __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId,
             payload: {},
         };
-        __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(acknowledgement));
-        const unsubscribe = __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f"), (event) => {
-            __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(event));
-        });
+        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, acknowledgement);
+        const onMessage = __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).bind(this);
+        const unsubscribe = __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f"), onMessage);
         __classPrivateFieldGet(this, _JoinResponse_user, "f").subscriptions.set(__classPrivateFieldGet(this, _JoinResponse_engine, "f").name, unsubscribe);
         __classPrivateFieldSet(this, _JoinResponse_accepted, true, "f");
         return this;
@@ -85,7 +84,7 @@ class JoinResponse {
             action: pondsocket_common_1.ServerActions.ERROR,
             requestId: __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId,
         };
-        __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(errorMessage));
+        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, errorMessage);
         return this;
     }
     /**
@@ -101,7 +100,7 @@ class JoinResponse {
             payload,
             event,
         };
-        __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(message));
+        __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).call(this, message);
         return this;
     }
     /**
@@ -168,4 +167,6 @@ _JoinResponse_user = new WeakMap(), _JoinResponse_engine = new WeakMap(), _JoinR
     __classPrivateFieldSet(this, _JoinResponse_executed, true, "f");
 }, _JoinResponse_sendMessage = function _JoinResponse_sendMessage(recipient, event, payload) {
     __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, recipient, pondsocket_common_1.ServerActions.BROADCAST, event, payload, __classPrivateFieldGet(this, _JoinResponse_user, "f").requestId);
+}, _JoinResponse_directMessage = function _JoinResponse_directMessage(event) {
+    __classPrivateFieldGet(this, _JoinResponse_engine, "f").parent.parent.sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").socket, event);
 };

package/lobby/lobby.js

@@ -26,12 +26,21 @@ class LobbyEngine {
         __classPrivateFieldSet(this, _LobbyEngine_channels, new Set(), "f");
         __classPrivateFieldSet(this, _LobbyEngine_middleware, new middleware_1.Middleware(), "f");
     }
+    /**
+     * @desc The parent engine
+     */
     get parent() {
         return __classPrivateFieldGet(this, _LobbyEngine_parentEngine, "f");
     }
+    /**
+     * @desc The leave callback
+     */
     get leaveCallback() {
         return __classPrivateFieldGet(this, _LobbyEngine_leaveCallback, "f");
     }
+    /**
+     * @desc The middleware to use
+     */
     get middleware() {
         return __classPrivateFieldGet(this, _LobbyEngine_middleware, "f");
     }
@@ -120,14 +129,6 @@ class LobbyEngine {
             __classPrivateFieldGet(this, _LobbyEngine_channels, "f").delete(newChannel);
         }
     }
-    /**
-     * @desc Lists all channels
-     * @private
-     */
-    listChannels() {
-        return Array.from(__classPrivateFieldGet(this, _LobbyEngine_channels, "f"))
-            .map((channel) => channel.name);
-    }
     /**
      * @desc Creates a new channel
      * @param channelName - The name of the channel to create
@@ -135,7 +136,6 @@ class LobbyEngine {
      */
     createChannel(channelName) {
         const newChannel = new channel_1.ChannelEngine(channelName, this);
-        __classPrivateFieldGet(this, _LobbyEngine_parentEngine, "f").subscribePendingUsers(newChannel);
         __classPrivateFieldGet(this, _LobbyEngine_channels, "f").add(newChannel);
         return newChannel;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.145",
+  "version": "0.1.147",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -42,7 +42,7 @@
     "@types/node": "^20.11.20",
     "@types/websocket": "^1.0.10",
     "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
     "eslint": "^8.57.0",
     "eslint-plugin-file-progress": "^1.3.0",
     "eslint-plugin-import": "^2.29.1",