@eleven-am/pondsocket 0.1.61 → 0.1.63

package/channel/channel.js

@@ -70,6 +70,12 @@ class ChannelEngine {
             __classPrivateFieldGet(this, _ChannelEngine_users, "f").delete(userId);
             __classPrivateFieldGet(this, _ChannelEngine_receiver, "f").unsubscribe(userId);
             (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) === null || _a === void 0 ? void 0 : _a.removePresence(userId, graceful);
+            if (__classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").leaveCallback) {
+                __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").leaveCallback({
+                    userId,
+                    assigns: user,
+                });
+            }
             if (__classPrivateFieldGet(this, _ChannelEngine_users, "f").size === 0) {
                 __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").destroyChannel();
             }

package/lobby/lobby.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 _LobbyEngine_channels, _LobbyEngine_middleware, _PondChannel_lobby;
+var _LobbyEngine_channels, _LobbyEngine_middleware, _LobbyEngine_leaveCallback, _PondChannel_lobby;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondChannel = exports.LobbyEngine = void 0;
 const middleware_1 = require("../abstracts/middleware");
@@ -20,6 +20,7 @@ class LobbyEngine {
     constructor() {
         _LobbyEngine_channels.set(this, void 0);
         _LobbyEngine_middleware.set(this, void 0);
+        _LobbyEngine_leaveCallback.set(this, void 0);
         __classPrivateFieldSet(this, _LobbyEngine_channels, new Set(), "f");
         __classPrivateFieldSet(this, _LobbyEngine_middleware, new middleware_1.Middleware(), "f");
     }
@@ -42,6 +43,13 @@ class LobbyEngine {
             next();
         });
     }
+    /**
+     * @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) {
+        __classPrivateFieldSet(this, _LobbyEngine_leaveCallback, callback, "f");
+    }
     /**
      * @desc Broadcasts a message to all users in a channel
      * @param event - The event to broadcast
@@ -127,6 +135,7 @@ class LobbyEngine {
         const parentEngine = {
             execute,
             destroyChannel,
+            leaveCallback: __classPrivateFieldGet(this, _LobbyEngine_leaveCallback, "f"),
         };
         const newChannel = new channel_1.ChannelEngine(channelName, parentEngine);
         __classPrivateFieldGet(this, _LobbyEngine_channels, "f").add(newChannel);
@@ -134,7 +143,7 @@ class LobbyEngine {
     }
 }
 exports.LobbyEngine = LobbyEngine;
-_LobbyEngine_channels = new WeakMap(), _LobbyEngine_middleware = new WeakMap();
+_LobbyEngine_channels = new WeakMap(), _LobbyEngine_middleware = new WeakMap(), _LobbyEngine_leaveCallback = new WeakMap();
 class PondChannel {
     constructor(lobby) {
         _PondChannel_lobby.set(this, void 0);
@@ -169,6 +178,13 @@ class PondChannel {
     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);
+    }
 }
 exports.PondChannel = PondChannel;
 _PondChannel_lobby = new WeakMap();

package/matcher/matcher.js

@@ -1,91 +1,72 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAddress = void 0;
-/**
- * @desc Returns the {key: value} matches of a string
- * @param path - the string to create the regex from
- * @param address - the pattern to match
- *
- * @example
- * /api/:id should match /api/123 and return { id: 123 }
- * /api/:id/:name should match /api/123/abc and return { id: 123, name: abc }
- * hello:id should match hello:123 and return { id: 123 }
- * @private
- */
-function matchPath(path, address) {
-    const pathParts = path.split('/');
-    const addressParts = address.split('/');
-    const params = {};
-    const length = Math.max(pathParts.length, addressParts.length);
-    for (let i = 0; i < length; i++) {
-        const pathPart = pathParts[i];
-        const addressPart = addressParts[i];
-        if (pathPart === undefined || addressPart === undefined) {
-            return null;
-        }
-        else if (pathPart === '*') {
-            return params;
+function pathToRegexp(path) {
+    const parts = path.split('/');
+    const regexpParts = parts.map((part) => {
+        if (part.startsWith(':')) {
+            return '([^/]+)';
         }
-        else if (pathPart.startsWith(':')) {
-            params[pathPart.slice(1)] = addressPart;
+        else if (part === '*') {
+            return '(.*)';
         }
-        else if (pathPart !== addressPart) {
-            return null;
-        }
-    }
-    return params;
+        return part;
+    });
+    return new RegExp(`^${regexpParts.join('/')}$`);
 }
-/**
- * @desc Given a Regex expression it returns an empty object if the address matches
- * @param regex - The regex to match the address against
- * @param address - The address ot match
- */
-function matchRegex(regex, address) {
-    if (address.match(regex)) {
+function getParams(path, route) {
+    const regexp = pathToRegexp(route);
+    const match = path.match(regexp);
+    if (!match) {
+        return null;
+    }
+    const cleanRoute = route.replace(/:/g, '');
+    const cleanMatch = cleanRoute.match(regexp);
+    if (!cleanMatch) {
+        return null;
+    }
+    const keys = cleanMatch.slice(1).filter((s) => s !== '');
+    const values = match.slice(1).filter((s) => s !== '');
+    if (keys.length !== values.length) {
         return {};
     }
-    return null;
+    return keys.reduce((params, key, index) => {
+        if (key === '*') {
+            params[key] = `/${values.slice(index).join('/')}`.replace(/\/+/g, '/');
+            return params;
+        }
+        params[key] = values[index];
+        return params;
+    }, {});
 }
-/**
- * @desc Creates an object from the params of a path
- * @param address - the path to create the object from
- *
- * @example
- * /api/id?name=abc should return { name: 'abc' }
- * /api/id?name=abc&age=123 should return { name: 'abc', age: '123' }
- */
-function getQuery(address) {
-    const obj = {};
-    const params = address.split('?')[1];
-    if (params) {
-        params.split('&').forEach((param) => {
-            const [key, value] = param.split('=');
-            obj[key] = value;
-        });
+function getQuery(query) {
+    if (!query) {
+        return {};
     }
-    return obj;
+    const parts = query.split('&');
+    return parts.reduce((params, part) => {
+        const [key, value] = part.split('=');
+        params[key] = value;
+        return params;
+    }, {});
 }
-/**
- * @desc Generates a pond request resolver object
- * @param path - the path to resolve
- * @param address - the address to resolve
- */
-function parseAddress(path, address) {
-    let params;
-    const [paramsPath] = address.split('?');
-    if (typeof path === 'string') {
-        params = matchPath(path, paramsPath);
-        if (params === null) {
+function parseAddress(route, address) {
+    if (route instanceof RegExp) {
+        const match = address.match(route);
+        if (!match) {
             return null;
         }
+        return {
+            params: {},
+            query: {},
+        };
     }
-    else {
-        params = matchRegex(path, paramsPath);
-        if (params === null) {
-            return null;
-        }
+    const [path, queryParams] = address.split('?');
+    const params = getParams(path, route);
+    if (!params) {
+        return null;
     }
-    const query = getQuery(address);
+    const query = getQuery(queryParams);
     return {
         params,
         query,

package/package.json

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