@eleven-am/pondsocket 0.1.182 → 0.1.184

package/abstracts/redisClient.js

@@ -33,7 +33,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _RedisClient_instances, _RedisClient_heartbeatInterval, _RedisClient_cleanupInterval, _RedisClient_instanceTtl, _RedisClient_redisClient, _RedisClient_pubClient, _RedisClient_subClient, _RedisClient_instanceId, _RedisClient_assignsPublisher, _RedisClient_presencePublisher, _RedisClient_userLeavesPublisher, _RedisClient_channelMessagePublisher, _RedisClient_stateSyncPublisher, _RedisClient_heartbeatTimer, _RedisClient_cleanupTimer, _RedisClient_presence_changes_channel_get, _RedisClient_assigns_changes_channel_get, _RedisClient_channel_messages_channel_get, _RedisClient_user_leaves_channel_get, _RedisClient_cleanup, _RedisClient_handleErrors, _RedisClient_getPresenceCacheChannel, _RedisClient_getAssignsCacheChannel, _RedisClient_publishPresenceChange, _RedisClient_publishAssignsChange, _RedisClient_publishChannelMessage, _RedisClient_publishUserLeave, _RedisClient_registerInstance, _RedisClient_unregisterInstance, _RedisClient_unsubscribeFromChannels, _RedisClient_subscribeToChannels, _RedisClient_startHeartbeat, _RedisClient_startPeriodicCleanup, _RedisClient_performConsistencyCheck, _RedisClient_handleRedisMessage, _RedisClient_publishCacheMessage, _RedisClient_emitStateSyncEvent, _RedisClient_subscribeToCacheChanges, _RedisClient_subscribeToChannelMessages, _RedisClient_subscribeToUserLeaves, _RedisClient_subscribeToStateSync, _RedisClient_handleExit;
+var _RedisClient_instances, _RedisClient_heartbeatInterval, _RedisClient_cleanupInterval, _RedisClient_instanceTtl, _RedisClient_redisClient, _RedisClient_pubClient, _RedisClient_subClient, _RedisClient_instanceId, _RedisClient_assignsPublisher, _RedisClient_presencePublisher, _RedisClient_userLeavesPublisher, _RedisClient_channelMessagePublisher, _RedisClient_stateSyncPublisher, _RedisClient_heartbeatTimer, _RedisClient_cleanupTimer, _RedisClient_presence_changes_channel_get, _RedisClient_assigns_changes_channel_get, _RedisClient_channel_messages_channel_get, _RedisClient_user_leaves_channel_get, _RedisClient_handleErrors, _RedisClient_getPresenceCacheChannel, _RedisClient_getAssignsCacheChannel, _RedisClient_publishPresenceChange, _RedisClient_publishAssignsChange, _RedisClient_publishChannelMessage, _RedisClient_publishUserLeave, _RedisClient_registerInstance, _RedisClient_unregisterInstance, _RedisClient_unsubscribeFromChannels, _RedisClient_subscribeToChannels, _RedisClient_startHeartbeat, _RedisClient_startPeriodicCleanup, _RedisClient_performConsistencyCheck, _RedisClient_handleRedisMessage, _RedisClient_publishCacheMessage, _RedisClient_emitStateSyncEvent, _RedisClient_subscribeToCacheChanges, _RedisClient_subscribeToChannelMessages, _RedisClient_subscribeToUserLeaves, _RedisClient_subscribeToStateSync, _RedisClient_handleExit, _RedisClient_deleteKeysByPattern;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisClient = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -97,11 +97,12 @@ class RedisClient {
     }
     shutdown() {
         return __awaiter(this, void 0, void 0, function* () {
+            const batchSize = 1000;
             clearInterval(__classPrivateFieldGet(this, _RedisClient_heartbeatTimer, "f"));
             clearInterval(__classPrivateFieldGet(this, _RedisClient_cleanupTimer, "f"));
             yield __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_unsubscribeFromChannels).call(this);
             yield __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_unregisterInstance).call(this);
-            yield __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_cleanup).call(this);
+            yield __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_deleteKeysByPattern).call(this, `*_cache:${__classPrivateFieldGet(this, _RedisClient_instanceId, "f")}:*`, batchSize);
         });
     }
 }
@@ -114,15 +115,6 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
     return 'channel_messages';
 }, _RedisClient_user_leaves_channel_get = function _RedisClient_user_leaves_channel_get() {
     return 'user_leaves';
-}, _RedisClient_cleanup = function _RedisClient_cleanup() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const pipeline = __classPrivateFieldGet(this, _RedisClient_redisClient, "f").pipeline();
-        const presenceKeys = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").keys('presence_cache:*');
-        presenceKeys.forEach((key) => pipeline.del(key));
-        const assignsKeys = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").keys('assigns_cache:*');
-        assignsKeys.forEach((key) => pipeline.del(key));
-        yield pipeline.exec();
-    });
 }, _RedisClient_handleErrors = function _RedisClient_handleErrors() {
     __classPrivateFieldGet(this, _RedisClient_redisClient, "f").on('error', (err) => console.error('Redis client error:', err));
     __classPrivateFieldGet(this, _RedisClient_pubClient, "f").on('error', (err) => console.error('Redis pub client error:', err));
@@ -312,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 = {}
@@ -341,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))),
         };
@@ -374,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();
@@ -389,4 +382,15 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
             process.exit(1);
         }
     });
+}, _RedisClient_deleteKeysByPattern = function _RedisClient_deleteKeysByPattern(pattern, batchSize) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let cursor = '0';
+        do {
+            const [newCursor, keys] = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").scan(cursor, 'MATCH', pattern, 'COUNT', batchSize);
+            cursor = newCursor;
+            if (keys.length > 0) {
+                yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").del(...keys);
+            }
+        } while (cursor !== '0');
+    });
 };

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.182",
+  "version": "0.1.184",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",