@eleven-am/pondsocket 0.1.172 → 0.1.174

package/engines/endpointEngine.js

@@ -106,8 +106,13 @@ class EndpointEngine {
 }
 exports.EndpointEngine = EndpointEngine;
 _EndpointEngine_clientFactory = new WeakMap(), _EndpointEngine_sockets = new WeakMap(), _EndpointEngine_middleware = new WeakMap(), _EndpointEngine_lobbyEngines = new WeakMap(), _EndpointEngine_instances = new WeakSet(), _EndpointEngine_handleSocketClose = function _EndpointEngine_handleSocketClose(cache) {
-    __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
-    cache.subscriptions.forEach((unsubscribe) => unsubscribe());
+    try {
+        __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
+        cache.subscriptions.forEach((unsubscribe) => unsubscribe());
+    }
+    catch (e) {
+        // no-op
+    }
 }, _EndpointEngine_handleMessage = function _EndpointEngine_handleMessage(cache, message) {
     switch (message.action) {
         case pondsocket_common_1.ClientActions.JOIN_CHANNEL:

package/managers/distributedManager.js

@@ -46,12 +46,12 @@ class DistributedManager extends manager_1.Manager {
         return this.broadcast(message);
     }
     setAssigns(userId, data) {
-        this.processAssignsData(manager_1.ActionTypes.CREATE, userId, data);
-        __classPrivateFieldGet(this, _DistributedManager_client, "f").publishAssignsChange(userId, data);
+        const assigns = this.processAssignsData(manager_1.ActionTypes.CREATE, userId, data);
+        __classPrivateFieldGet(this, _DistributedManager_client, "f").publishAssignsChange(userId, assigns);
     }
     updateAssigns(userId, data) {
-        this.processAssignsData(manager_1.ActionTypes.UPDATE, userId, data);
-        __classPrivateFieldGet(this, _DistributedManager_client, "f").publishAssignsChange(userId, data);
+        const assigns = this.processAssignsData(manager_1.ActionTypes.UPDATE, userId, data);
+        __classPrivateFieldGet(this, _DistributedManager_client, "f").publishAssignsChange(userId, assigns);
     }
     removeAssigns(userId) {
         this.processAssignsData(manager_1.ActionTypes.DELETE, userId, null);

package/managers/manager.js

@@ -50,32 +50,16 @@ class Manager {
     get userIds() {
         return new Set(this.assignsCache.keys());
     }
-    /**
-     * @desc Initializes the data manager
-     * @param unsubscribe - The callback to call when the manager is closed
-     */
     initialize(unsubscribe) {
         __classPrivateFieldSet(this, _Manager_onClose, unsubscribe, "f");
         return Promise.resolve();
     }
-    /**
-     * @desc Returns the presence of a user
-     * @param userId - The id of the user
-     */
     getPresence(userId) {
         return this.presenceCache.get(userId) || null;
     }
-    /**
-     * @desc Returns all the presence
-     */
     getAllPresence() {
         return new Map(this.presenceCache);
     }
-    /**
-     * @desc Creates or updates the presence of a user
-     * @param userId - The id of the user
-     * @param data - The presence data
-     */
     upsertPresence(userId, data) {
         if (this.presenceCache.has(userId)) {
             this.updatePresence(userId, data);
@@ -84,22 +68,12 @@ class Manager {
             this.trackPresence(userId, data);
         }
     }
-    /**
-     * @desc Returns the assigns of a user
-     * @param userId - The id of the user
-     */
     getAssigns(userId) {
         return this.assignsCache.get(userId) || null;
     }
-    /**
-     * @desc Returns all the assigns
-     */
     getAllAssigns() {
         return new Map(this.assignsCache);
     }
-    /**
-     * @desc Closes the data manager
-     */
     close() {
         var _a;
         this.publisher.close();
@@ -109,12 +83,6 @@ class Manager {
         this.userSubscriptions.clear();
         (_a = __classPrivateFieldGet(this, _Manager_onClose, "f")) === null || _a === void 0 ? void 0 : _a.call(this);
     }
-    /**
-     * @desc Subscribes to incoming messages
-     * @param userId - The id of the user
-     * @param assigns - The assigns of the user
-     * @param onMessage - The callback to call when a message is received
-     */
     addUser(userId, assigns, onMessage) {
         this.setAssigns(userId, assigns);
         const subscription = this.publisher.subscribe((_a) => {
@@ -125,10 +93,6 @@ class Manager {
         });
         this.userSubscriptions.set(userId, subscription);
     }
-    /**
-     * @desc Unsubscribes from incoming messages
-     * @param userId - The id of the user
-     */
     removeUser(userId) {
         var _a;
         const userData = this.getUserData(userId);
@@ -141,10 +105,6 @@ class Manager {
         }
         return userData;
     }
-    /**
-     * @desc Returns the data of a user
-     * @param userId - The id of the user
-     */
     getUserData(userId) {
         const presence = this.getPresence(userId);
         const assigns = this.getAssigns(userId);
@@ -159,15 +119,8 @@ class Manager {
             id: userId,
         };
     }
-    /**
-     * @desc Processes presence data
-     * @param action - The action to perform
-     * @param userId - The id of the user
-     * @param data - The presence data
-     */
     processPresenceData(action, userId, data) {
-        const current = data ? data : this.presenceCache.get(userId);
-        __classPrivateFieldGet(this, _Manager_instances, "m", _Manager_processData).call(this, this.presenceCache, DataTypes.PRESENCE, action, userId, data);
+        const current = __classPrivateFieldGet(this, _Manager_instances, "m", _Manager_processData).call(this, this.presenceCache, DataTypes.PRESENCE, action, userId, data);
         const total = Array.from(this.presenceCache.values());
         const userIds = Array.from(this.presenceCache.keys());
         const event = action === ActionTypes.CREATE ? pondsocket_common_1.PresenceEventTypes.JOIN : action === ActionTypes.UPDATE ? pondsocket_common_1.PresenceEventTypes.UPDATE : pondsocket_common_1.PresenceEventTypes.LEAVE;
@@ -183,14 +136,8 @@ class Manager {
             },
         };
     }
-    /**
-     * @desc Processes assigns data
-     * @param action - The action to perform
-     * @param userId - The id of the user
-     * @param data - The assigns data
-     */
     processAssignsData(action, userId, data) {
-        __classPrivateFieldGet(this, _Manager_instances, "m", _Manager_processData).call(this, this.assignsCache, DataTypes.ASSIGNS, action, userId, data);
+        return __classPrivateFieldGet(this, _Manager_instances, "m", _Manager_processData).call(this, this.assignsCache, DataTypes.ASSIGNS, action, userId, data);
     }
 }
 exports.Manager = Manager;
@@ -210,10 +157,12 @@ _Manager_onClose = new WeakMap(), _Manager_instances = new WeakSet(), _Manager_p
         const code = 400;
         throw new httpError_1.HttpError(code, message);
     }
+    const current = cache.get(userId);
     if (data) {
-        cache.set(userId, data);
-    }
-    else {
-        cache.delete(userId);
+        const updated = Object.assign(Object.assign({}, current), data);
+        cache.set(userId, updated);
+        return updated;
     }
+    cache.delete(userId);
+    return current || {};
 };

package/package.json

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