@eleven-am/pondsocket 0.1.183 → 0.1.185

package/abstracts/redisClient.js

@@ -304,8 +304,8 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
         const state = message.state ? JSON.stringify(message.state) : '';
         yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").eval(script, 2, cacheKey, key, messageData, message.userId, state);
     });
-}, _RedisClient_emitStateSyncEvent = function _RedisClient_emitStateSyncEvent(endpointId, channelId) {
-    return __awaiter(this, void 0, void 0, function* () {
+}, _RedisClient_emitStateSyncEvent = function _RedisClient_emitStateSyncEvent(endpointId_1, channelId_1) {
+    return __awaiter(this, arguments, void 0, function* (endpointId, channelId, initialFetch = false) {
         const script = `
             local active_instances = redis.call('SMEMBERS', 'distributed_instances')
             local presence_data = {}
@@ -333,6 +333,7 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
         const event = {
             endpointId,
             channelId,
+            initialFetch,
             presence: new Map(Object.entries(JSON.parse(presenceData))),
             assigns: new Map(Object.entries(JSON.parse(assignsData))),
         };
@@ -366,7 +367,7 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
             return callback(data);
         }
     });
-    void __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_emitStateSyncEvent).call(this, endpoint, channel);
+    void __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_emitStateSyncEvent).call(this, endpoint, channel, true);
     return () => {
         clearInterval(interval);
         subscription();

package/managers/distributedManager.js

@@ -10,13 +10,15 @@ 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 _DistributedManager_client, _DistributedManager_subscriptions;
+var _DistributedManager_instances, _DistributedManager_client, _DistributedManager_subscriptions, _DistributedManager_parseAndUpdatePresence;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DistributedManager = void 0;
+const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const manager_1 = require("./manager");
 class DistributedManager extends manager_1.Manager {
     constructor(client) {
         super(client.channelId);
+        _DistributedManager_instances.add(this);
         _DistributedManager_client.set(this, void 0);
         _DistributedManager_subscriptions.set(this, null);
         __classPrivateFieldSet(this, _DistributedManager_client, client, "f");
@@ -84,7 +86,7 @@ class DistributedManager extends manager_1.Manager {
         });
         const stateSyncSubscription = __classPrivateFieldGet(this, _DistributedManager_client, "f").subscribeToStateSync((state) => {
             this.assignsCache = new Map(state.assigns);
-            this.presenceCache = new Map(state.presence);
+            __classPrivateFieldGet(this, _DistributedManager_instances, "m", _DistributedManager_parseAndUpdatePresence).call(this, new Map(state.presence), state.initialFetch);
         });
         __classPrivateFieldSet(this, _DistributedManager_subscriptions, () => {
             leaveSubscription();
@@ -101,4 +103,63 @@ class DistributedManager extends manager_1.Manager {
     }
 }
 exports.DistributedManager = DistributedManager;
-_DistributedManager_client = new WeakMap(), _DistributedManager_subscriptions = new WeakMap();
+_DistributedManager_client = new WeakMap(), _DistributedManager_subscriptions = new WeakMap(), _DistributedManager_instances = new WeakSet(), _DistributedManager_parseAndUpdatePresence = function _DistributedManager_parseAndUpdatePresence(newCache, initialFetch) {
+    if (initialFetch) {
+        this.presenceCache = newCache;
+    }
+    const newUsers = new Set(newCache.keys());
+    const oldUsers = new Set(this.presenceCache.keys());
+    const usersToAdd = new Set([...newUsers].filter((user) => !oldUsers.has(user)));
+    const usersToRemove = new Set([...oldUsers].filter((user) => !newUsers.has(user)));
+    const noChange = new Set([...newUsers].filter((user) => oldUsers.has(user)));
+    const usersToUpdate = new Set([...noChange]
+        .filter((user) => {
+        const oldData = this.presenceCache.get(user);
+        const newData = newCache.get(user);
+        return JSON.stringify(oldData) !== JSON.stringify(newData);
+    }));
+    const upSertInfo = [
+        ...[...usersToAdd]
+            .map((user) => ({
+            userId: user,
+            state: newCache.get(user),
+            event: pondsocket_common_1.PresenceEventTypes.JOIN,
+        })),
+        ...[...usersToUpdate]
+            .map((user) => ({
+            userId: user,
+            state: newCache.get(user),
+            event: pondsocket_common_1.PresenceEventTypes.UPDATE,
+        })),
+    ];
+    const upsertMessages = upSertInfo.map(({ userId, state, event }) => {
+        this.presenceCache.set(userId, state);
+        return {
+            event,
+            requestId: (0, pondsocket_common_1.uuid)(),
+            recipients: Array.from(this.presenceCache.keys()),
+            channelName: this.channelId,
+            action: pondsocket_common_1.ServerActions.PRESENCE,
+            payload: {
+                changed: state,
+                presence: Array.from(this.presenceCache.values()),
+            },
+        };
+    });
+    const removeMessages = [...usersToRemove].map((user) => {
+        const current = this.presenceCache.get(user);
+        this.presenceCache.delete(user);
+        return {
+            event: pondsocket_common_1.PresenceEventTypes.LEAVE,
+            requestId: (0, pondsocket_common_1.uuid)(),
+            recipients: Array.from(this.presenceCache.keys()),
+            channelName: this.channelId,
+            action: pondsocket_common_1.ServerActions.PRESENCE,
+            payload: {
+                changed: current,
+                presence: Array.from(this.presenceCache.values()),
+            },
+        };
+    });
+    [...upsertMessages, ...removeMessages].forEach((message) => this.broadcast(message));
+};

package/package.json

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

package/responses/joinResponse.js

@@ -34,7 +34,7 @@ class JoinResponse {
     }
     accept() {
         __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_performChecks).call(this);
-        const onMessage = __classPrivateFieldGet(this, _JoinResponse_instances, "m", _JoinResponse_directMessage).bind(this);
+        const onMessage = __classPrivateFieldGet(this, _JoinResponse_engine, "f").parent.parent.sendMessage.bind(__classPrivateFieldGet(this, _JoinResponse_engine, "f").parent.parent, __classPrivateFieldGet(this, _JoinResponse_user, "f").socket);
         const subscription = __classPrivateFieldGet(this, _JoinResponse_engine, "f").addUser(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, __classPrivateFieldGet(this, _JoinResponse_newAssigns, "f"), onMessage);
         __classPrivateFieldGet(this, _JoinResponse_user, "f").subscriptions.add(subscription);
         __classPrivateFieldSet(this, _JoinResponse_accepted, true, "f");