@eleven-am/pondsocket 0.1.54 → 0.1.56

package/channel/channel.js

@@ -52,7 +52,7 @@ class ChannelEngine {
         const oldUser = __classPrivateFieldGet(this, _ChannelEngine_users, "f").get(userId);
         if (oldUser) {
             const message = `ChannelEngine: User with id ${userId} already exists in channel ${this.name}`;
-            const code = 404;
+            const code = 400;
             throw new pondError_1.ChannelError(message, code, this.name);
         }
         __classPrivateFieldGet(this, _ChannelEngine_users, "f").set(userId, assigns);
@@ -123,11 +123,12 @@ class ChannelEngine {
      * @param userId - The id of the user to get
      */
     getUserData(userId) {
+        const assigns = __classPrivateFieldGet(this, _ChannelEngine_users, "f").get(userId);
         const presence = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f") ? __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").getUserPresence(userId) : {};
-        if (__classPrivateFieldGet(this, _ChannelEngine_users, "f").has(userId)) {
+        if (assigns) {
             return {
+                assigns,
                 id: userId,
-                assigns: __classPrivateFieldGet(this, _ChannelEngine_users, "f").get(userId),
                 presence: presence || {},
             };
         }
@@ -201,11 +202,8 @@ class ChannelEngine {
         if (!__classPrivateFieldGet(this, _ChannelEngine_users, "f").has(userId)) {
             throw new pondError_1.ChannelError(`ChannelEngine: User with id ${userId} does not exist in channel ${this.name}`, 404, this.name);
         }
-        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) !== null && _a !== void 0 ? _a : new presence_1.PresenceEngine(this.name), "f");
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").trackPresence(userId, presence, (change) => {
-            const { type } = change, rest = __rest(change, ["type"]);
-            this.sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.PRESENCE, type, rest);
-        });
+        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) !== null && _a !== void 0 ? _a : new presence_1.PresenceEngine(this), "f");
+        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").trackPresence(userId, presence);
     }
     /**
      * @desc Gets the presence engine for the channel

package/lobby/joinResponse.js

@@ -33,7 +33,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      */
     accept(assigns) {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_performChecks).call(this);
-        assigns = Object.assign(Object.assign({}, assigns), __classPrivateFieldGet(this, _JoinResponse_user, "f").assigns);
+        const newAssigns = Object.assign(Object.assign({}, assigns || {}), __classPrivateFieldGet(this, _JoinResponse_user, "f").assigns);
         const acknowledgement = {
             action: enums_1.ServerActions.SYSTEM,
             channelName: __classPrivateFieldGet(this, _JoinResponse_engine, "f").name,
@@ -41,7 +41,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
             payload: {},
         };
         __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(acknowledgement));
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, assigns, (event) => {
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, newAssigns, (event) => {
             __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(event));
         });
         return this;

package/package.json

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

package/presence/presence.js

@@ -10,19 +10,17 @@ 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 _PresenceEngine_engine, _PresenceEngine_presenceMap, _PresenceEngine_channel;
+var _PresenceEngine_instances, _PresenceEngine_presenceMap, _PresenceEngine_channel, _PresenceEngine_publish;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresenceEngine = void 0;
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
-const subject_1 = require("../subjects/subject");
 class PresenceEngine {
     constructor(channel) {
-        _PresenceEngine_engine.set(this, void 0);
+        _PresenceEngine_instances.add(this);
         _PresenceEngine_presenceMap.set(this, void 0);
         _PresenceEngine_channel.set(this, void 0);
         __classPrivateFieldSet(this, _PresenceEngine_channel, channel, "f");
-        __classPrivateFieldSet(this, _PresenceEngine_engine, new subject_1.BehaviorSubject(), "f");
         __classPrivateFieldSet(this, _PresenceEngine_presenceMap, new Map(), "f");
     }
     /**
@@ -46,23 +44,20 @@ class PresenceEngine {
      * @desc Tracks a presence
      * @param presenceKey - The key of the presence
      * @param presence - The presence
-     * @param onPresenceChange - The callback to be called when the presence changes
      */
-    trackPresence(presenceKey, presence, onPresenceChange) {
+    trackPresence(presenceKey, presence) {
         if (!__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").has(presenceKey)) {
             __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").set(presenceKey, presence);
-            __classPrivateFieldGet(this, _PresenceEngine_engine, "f").publish({
-                type: enums_1.PresenceEventTypes.JOIN,
+            __classPrivateFieldGet(this, _PresenceEngine_instances, "m", _PresenceEngine_publish).call(this, enums_1.PresenceEventTypes.JOIN, {
                 changed: presence,
                 presence: Array.from(__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").values()),
             });
         }
         else {
-            const code = 404;
+            const code = 400;
             const message = `PresenceEngine: Presence with key ${presenceKey} already exists`;
-            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f"), enums_1.PresenceEventTypes.JOIN);
+            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f").name, enums_1.PresenceEventTypes.JOIN);
         }
-        return __classPrivateFieldGet(this, _PresenceEngine_engine, "f").subscribeWith(presenceKey, onPresenceChange);
     }
     /**
      * @desc Removes a presence from the presence engine
@@ -72,10 +67,8 @@ class PresenceEngine {
     removePresence(presenceKey, graceful = false) {
         const presence = __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").get(presenceKey);
         if (presence) {
-            __classPrivateFieldGet(this, _PresenceEngine_engine, "f").unsubscribe(presenceKey);
             __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").delete(presenceKey);
-            __classPrivateFieldGet(this, _PresenceEngine_engine, "f").publish({
-                type: enums_1.PresenceEventTypes.LEAVE,
+            __classPrivateFieldGet(this, _PresenceEngine_instances, "m", _PresenceEngine_publish).call(this, enums_1.PresenceEventTypes.LEAVE, {
                 changed: presence,
                 presence: Array.from(__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").values()),
             });
@@ -83,7 +76,7 @@ class PresenceEngine {
         else if (!graceful) {
             const code = 404;
             const message = `PresenceEngine: Presence with key ${presenceKey} does not exist`;
-            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f"), enums_1.PresenceEventTypes.LEAVE);
+            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f").name, enums_1.PresenceEventTypes.LEAVE);
         }
     }
     /**
@@ -96,8 +89,7 @@ class PresenceEngine {
         if (oldPresence) {
             const newPresence = Object.assign(Object.assign({}, oldPresence), presence);
             __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").set(presenceKey, newPresence);
-            __classPrivateFieldGet(this, _PresenceEngine_engine, "f").publish({
-                type: enums_1.PresenceEventTypes.UPDATE,
+            __classPrivateFieldGet(this, _PresenceEngine_instances, "m", _PresenceEngine_publish).call(this, enums_1.PresenceEventTypes.UPDATE, {
                 changed: newPresence,
                 presence: Array.from(__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").values()),
             });
@@ -105,9 +97,15 @@ class PresenceEngine {
         else {
             const code = 404;
             const message = `PresenceEngine: Presence with key ${presenceKey} does not exist`;
-            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f"), enums_1.PresenceEventTypes.UPDATE);
+            throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f").name, enums_1.PresenceEventTypes.UPDATE);
         }
     }
 }
 exports.PresenceEngine = PresenceEngine;
-_PresenceEngine_engine = new WeakMap(), _PresenceEngine_presenceMap = new WeakMap(), _PresenceEngine_channel = new WeakMap();
+_PresenceEngine_presenceMap = new WeakMap(), _PresenceEngine_channel = new WeakMap(), _PresenceEngine_instances = new WeakSet(), _PresenceEngine_publish = function _PresenceEngine_publish(event, payload) {
+    const recipients = Array.from(__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").keys());
+    if (recipients.length === 0) {
+        return;
+    }
+    __classPrivateFieldGet(this, _PresenceEngine_channel, "f").sendMessage(enums_1.SystemSender.CHANNEL, recipients, enums_1.ServerActions.PRESENCE, event, payload);
+};

package/server/pondSocket.js

@@ -88,7 +88,7 @@ _PondSocket_server = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _P
                 return socket.terminate();
             }
             socket.isAlive = false;
-            socket.ping(() => { });
+            socket.ping();
         });
     }, 30000);
     __classPrivateFieldGet(this, _PondSocket_socketServer, "f").on('close', () => clearInterval(interval));

package/subjects/subject.js

@@ -18,13 +18,24 @@ class SimpleSubject {
         _SimpleSubject_observers.set(this, void 0);
         __classPrivateFieldSet(this, _SimpleSubject_observers, new Set(), "f");
     }
+    /**
+     * @desc Subscribes to a subject
+     * @param observer - The observer to subscribe
+     */
     subscribe(observer) {
         __classPrivateFieldGet(this, _SimpleSubject_observers, "f").add(observer);
         return () => __classPrivateFieldGet(this, _SimpleSubject_observers, "f").delete(observer);
     }
+    /**
+     * @desc Publishes a message to all subscribers
+     * @param message - The message to publish
+     */
     publish(message) {
         __classPrivateFieldGet(this, _SimpleSubject_observers, "f").forEach((observer) => observer(message));
     }
+    /**
+     * @desc Returns the number of subscribers
+     */
     get size() {
         return __classPrivateFieldGet(this, _SimpleSubject_observers, "f").size;
     }
@@ -37,13 +48,24 @@ class SimpleBehaviorSubject extends SimpleSubject {
         _SimpleBehaviorSubject_lastMessage.set(this, void 0);
         __classPrivateFieldSet(this, _SimpleBehaviorSubject_lastMessage, initialValue, "f");
     }
+    /**
+     * @desc Returns the last message published
+     */
     get value() {
         return __classPrivateFieldGet(this, _SimpleBehaviorSubject_lastMessage, "f");
     }
+    /**
+     * @desc Publishes a message to all subscribers
+     * @param message - The message to publish
+     */
     publish(message) {
         __classPrivateFieldSet(this, _SimpleBehaviorSubject_lastMessage, message, "f");
         super.publish(message);
     }
+    /**
+     * @desc Subscribes to a subject
+     * @param observer - The observer to subscribe
+     */
     subscribe(observer) {
         if (__classPrivateFieldGet(this, _SimpleBehaviorSubject_lastMessage, "f")) {
             observer(__classPrivateFieldGet(this, _SimpleBehaviorSubject_lastMessage, "f"));
@@ -58,14 +80,27 @@ class Subject extends SimpleSubject {
         super(...arguments);
         _Subject_subscriptions.set(this, {});
     }
+    /**
+     * @desc Subscribes to a subject
+     * @param identifier - The identifier of the subscription
+     * @param observer - The observer to subscribe
+     */
     subscribeWith(identifier, observer) {
         __classPrivateFieldGet(this, _Subject_subscriptions, "f")[identifier] = super.subscribe(observer);
     }
+    /**
+     * @desc Unsubscribes from a subject
+     * @param identifier - The identifier of the subscription
+     */
     unsubscribe(identifier) {
         var _a, _b;
         (_b = (_a = __classPrivateFieldGet(this, _Subject_subscriptions, "f"))[identifier]) === null || _b === void 0 ? void 0 : _b.call(_a);
         delete __classPrivateFieldGet(this, _Subject_subscriptions, "f")[identifier];
     }
+    /**
+     * @desc Checks if a subscription exists
+     * @param identifier - The identifier of the subscription
+     */
     has(identifier) {
         return Boolean(__classPrivateFieldGet(this, _Subject_subscriptions, "f")[identifier]);
     }
@@ -78,12 +113,21 @@ class BehaviorSubject extends Subject {
         _BehaviorSubject_lastMessage.set(this, void 0);
         __classPrivateFieldSet(this, _BehaviorSubject_lastMessage, initialValue, "f");
     }
+    /**
+     * @desc Subscribes to a subject
+     * @param identifier - The identifier of the subscription
+     * @param observer - The observer to subscribe
+     */
     subscribeWith(identifier, observer) {
         if (__classPrivateFieldGet(this, _BehaviorSubject_lastMessage, "f")) {
             observer(__classPrivateFieldGet(this, _BehaviorSubject_lastMessage, "f"));
         }
         super.subscribeWith(identifier, observer);
     }
+    /**
+     * @desc Publishes a message to all subscribers
+     * @param message - The message to publish
+     */
     publish(message) {
         __classPrivateFieldSet(this, _BehaviorSubject_lastMessage, message, "f");
         super.publish(message);