@eleven-am/pondsocket 0.1.188 → 0.1.190

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_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;
+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, _RedisClient_generateCache;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisClient = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -221,45 +221,22 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
     }), __classPrivateFieldGet(this, _RedisClient_cleanupInterval, "f")), "f");
 }, _RedisClient_performConsistencyCheck = function _RedisClient_performConsistencyCheck() {
     return __awaiter(this, void 0, void 0, function* () {
-        const consistencyCheckScript = `
-            local active_instances = redis.call('SMEMBERS', 'distributed_instances')
-            local all_keys = redis.call('KEYS', '*_cache:*')
-            local inactive_keys = {}
-            local unique_pairs = {}
-            
-            local active_set = {}
-            for _, instance in ipairs(active_instances) do
-                active_set[instance] = true
-            end
-            
-            for _, key in ipairs(all_keys) do
-                local parts = {}
-                for part in string.gmatch(key, '[^:]+') do
-                    table.insert(parts, part)
-                end
-                local instance_id, endpoint_id, channel_id = parts[2], parts[3], parts[4]
-                
-                if not active_set[instance_id] then
-                    table.insert(inactive_keys, key)
-                    local pair = endpoint_id .. ':' .. channel_id
-                    unique_pairs[pair] = true
-                end
-            end
-            
-            if #inactive_keys > 0 then
-                redis.call('DEL', unpack(inactive_keys))
-            end
-            
-            local unique_pairs_list = {}
-            for pair in pairs(unique_pairs) do
-                table.insert(unique_pairs_list, pair)
-            end
-            
-            return unique_pairs_list
-        `;
-        const [response] = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").eval(consistencyCheckScript, 0);
-        const uniquePairs = Array.isArray(response) ? response : response ? [response] : [];
-        const promises = uniquePairs.map((pair) => {
+        const activeInstances = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").smembers('distributed_instances');
+        const allKeys = yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").keys('*_cache:*');
+        const activeSet = new Set(activeInstances);
+        const inactiveKeys = [];
+        const uniquePairs = new Set();
+        for (const key of allKeys) {
+            const [, instanceId, endpointId, channelId] = key.split(':');
+            if (!activeSet.has(instanceId)) {
+                inactiveKeys.push(key);
+                uniquePairs.add(`${endpointId}:${channelId}`);
+            }
+        }
+        if (inactiveKeys.length > 0) {
+            yield __classPrivateFieldGet(this, _RedisClient_redisClient, "f").del(...inactiveKeys);
+        }
+        const promises = Array.from(uniquePairs).map((pair) => {
             const [endpointId, channelId] = pair.split(':');
             return __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_emitStateSyncEvent).call(this, endpointId, channelId);
         });
@@ -334,8 +311,8 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
             endpointId,
             channelId,
             initialFetch,
-            presence: new Map(Object.entries(JSON.parse(presenceData))),
-            assigns: new Map(Object.entries(JSON.parse(assignsData))),
+            presence: __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_generateCache).call(this, presenceData),
+            assigns: __classPrivateFieldGet(this, _RedisClient_instances, "m", _RedisClient_generateCache).call(this, assignsData),
         };
         __classPrivateFieldGet(this, _RedisClient_stateSyncPublisher, "f").publish(event);
     });
@@ -393,4 +370,8 @@ _RedisClient_heartbeatInterval = new WeakMap(), _RedisClient_cleanupInterval = n
             }
         } while (cursor !== '0');
     });
+}, _RedisClient_generateCache = function _RedisClient_generateCache(data) {
+    const first = Object.entries(JSON.parse(data));
+    const second = first.map(([key, value]) => [key, JSON.parse(String(value))]);
+    return new Map(second);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.188",
+  "version": "0.1.190",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -34,18 +34,18 @@
     "url": "git+https://github.com/Eleven-am/pondSocket.git"
   },
   "dependencies": {
-    "@eleven-am/pondsocket-common": "^0.0.25",
+    "@eleven-am/pondsocket-common": "^0.0.26",
     "ioredis": "^5.4.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin-ts": "^2.9.0",
+    "@stylistic/eslint-plugin-ts": "^2.10.1",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.8.1",
-    "@types/ws": "^8.5.12",
+    "@types/node": "^22.8.7",
+    "@types/ws": "^8.5.13",
     "@typescript-eslint/eslint-plugin": "^8.11.0",
     "@typescript-eslint/parser": "^8.11.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-file-progress": "^1.5.0",
@@ -60,7 +60,7 @@
     "ts-loader": "^9.5.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "^5.6.2"
+    "typescript": "^5.6.3"
   },
   "jest": {
     "moduleFileExtensions": [