@eleven-am/pondsocket 0.1.215 → 0.1.216

package/abstracts/distributor.js

@@ -19,12 +19,18 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _RedisDistributedBackend_instances, _RedisDistributedBackend_publishClient, _RedisDistributedBackend_subscribeClient, _RedisDistributedBackend_keyPrefix, _RedisDistributedBackend_heartbeatSubject, _RedisDistributedBackend_nodeId, _RedisDistributedBackend_heartbeatIntervalMs, _RedisDistributedBackend_heartbeatTimeoutMs, _RedisDistributedBackend_onError, _RedisDistributedBackend_isConnected, _RedisDistributedBackend_heartbeatTimer, _RedisDistributedBackend_attachEventHandlers, _RedisDistributedBackend_startHeartbeat, _RedisDistributedBackend_publishHeartbeat, _RedisDistributedBackend_handleHeartbeatMessage, _RedisDistributedBackend_isValidMessage, _RedisDistributedBackend_buildKey;
+var _RedisDistributedBackend_instances, _RedisDistributedBackend_publishClient, _RedisDistributedBackend_subscribeClient, _RedisDistributedBackend_keyPrefix, _RedisDistributedBackend_namespace, _RedisDistributedBackend_heartbeatSubject, _RedisDistributedBackend_nodeId, _RedisDistributedBackend_heartbeatIntervalMs, _RedisDistributedBackend_heartbeatTimeoutMs, _RedisDistributedBackend_onError, _RedisDistributedBackend_isConnected, _RedisDistributedBackend_heartbeatTimer, _RedisDistributedBackend_attachEventHandlers, _RedisDistributedBackend_startHeartbeat, _RedisDistributedBackend_publishHeartbeat, _RedisDistributedBackend_handleHeartbeatMessage, _RedisDistributedBackend_isValidMessage, _RedisDistributedBackend_buildKey, _RedisDistributedBackend_normalizeTopicPart;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisDistributedBackend = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const redis_1 = require("redis");
 const types_1 = require("../types");
+const DISTRIBUTED_PROTOCOL = 'pondsocket.distributed';
+const DISTRIBUTED_VERSION = 1;
+function distributedId() {
+    return `${Date.now().toString(36)}-${Math.random().toString(36)
+        .slice(2)}`;
+}
 class RedisDistributedBackend {
     get nodeId() {
         return __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f");
@@ -37,6 +43,7 @@ class RedisDistributedBackend {
         _RedisDistributedBackend_publishClient.set(this, void 0);
         _RedisDistributedBackend_subscribeClient.set(this, void 0);
         _RedisDistributedBackend_keyPrefix.set(this, void 0);
+        _RedisDistributedBackend_namespace.set(this, void 0);
         _RedisDistributedBackend_heartbeatSubject.set(this, void 0);
         _RedisDistributedBackend_nodeId.set(this, void 0);
         _RedisDistributedBackend_heartbeatIntervalMs.set(this, void 0);
@@ -44,8 +51,9 @@ class RedisDistributedBackend {
         _RedisDistributedBackend_onError.set(this, void 0);
         _RedisDistributedBackend_isConnected.set(this, false);
         _RedisDistributedBackend_heartbeatTimer.set(this, null);
-        const { host = 'localhost', port = 6379, password, database = 0, url, keyPrefix = 'pondsocket', heartbeatIntervalMs = 30000, heartbeatTimeoutMs = 90000, onError = null, } = options;
+        const { host = 'localhost', port = 6379, password, database = 0, url, keyPrefix = 'pondsocket', namespace = 'default', heartbeatIntervalMs = 30000, heartbeatTimeoutMs = 90000, onError = null, } = options;
         __classPrivateFieldSet(this, _RedisDistributedBackend_keyPrefix, keyPrefix, "f");
+        __classPrivateFieldSet(this, _RedisDistributedBackend_namespace, namespace, "f");
         __classPrivateFieldSet(this, _RedisDistributedBackend_heartbeatIntervalMs, heartbeatIntervalMs, "f");
         __classPrivateFieldSet(this, _RedisDistributedBackend_heartbeatTimeoutMs, heartbeatTimeoutMs, "f");
         __classPrivateFieldSet(this, _RedisDistributedBackend_onError, onError, "f");
@@ -80,7 +88,7 @@ class RedisDistributedBackend {
                     if (!__classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_isValidMessage).call(this, parsedMessage)) {
                         return;
                     }
-                    if (parsedMessage.nodeId !== __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f")) {
+                    if (parsedMessage.sourceNodeId !== __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f")) {
                         handler(parsedMessage);
                     }
                 }
@@ -99,11 +107,13 @@ class RedisDistributedBackend {
     }
     broadcast(endpointName, channelName, message) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             if (!__classPrivateFieldGet(this, _RedisDistributedBackend_isConnected, "f")) {
                 throw new Error('Redis backend is not connected');
             }
             const key = __classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_buildKey).call(this, endpointName, channelName);
-            const distributedMessage = Object.assign(Object.assign({}, message), { nodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f"), sourceNodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f") });
+            const normalizedEndpointName = __classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_normalizeTopicPart).call(this, endpointName);
+            const distributedMessage = Object.assign(Object.assign({}, message), { protocol: DISTRIBUTED_PROTOCOL, version: DISTRIBUTED_VERSION, messageId: (_a = message.messageId) !== null && _a !== void 0 ? _a : distributedId(), timestamp: (_b = message.timestamp) !== null && _b !== void 0 ? _b : Date.now(), sourceNodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f"), endpointName: normalizedEndpointName });
             const serializedMessage = JSON.stringify(distributedMessage);
             yield __classPrivateFieldGet(this, _RedisDistributedBackend_publishClient, "f").publish(key, serializedMessage);
         });
@@ -140,7 +150,7 @@ class RedisDistributedBackend {
     }
 }
 exports.RedisDistributedBackend = RedisDistributedBackend;
-_RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend_subscribeClient = new WeakMap(), _RedisDistributedBackend_keyPrefix = new WeakMap(), _RedisDistributedBackend_heartbeatSubject = new WeakMap(), _RedisDistributedBackend_nodeId = new WeakMap(), _RedisDistributedBackend_heartbeatIntervalMs = new WeakMap(), _RedisDistributedBackend_heartbeatTimeoutMs = new WeakMap(), _RedisDistributedBackend_onError = new WeakMap(), _RedisDistributedBackend_isConnected = new WeakMap(), _RedisDistributedBackend_heartbeatTimer = new WeakMap(), _RedisDistributedBackend_instances = new WeakSet(), _RedisDistributedBackend_attachEventHandlers = function _RedisDistributedBackend_attachEventHandlers(client, label) {
+_RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend_subscribeClient = new WeakMap(), _RedisDistributedBackend_keyPrefix = new WeakMap(), _RedisDistributedBackend_namespace = new WeakMap(), _RedisDistributedBackend_heartbeatSubject = new WeakMap(), _RedisDistributedBackend_nodeId = new WeakMap(), _RedisDistributedBackend_heartbeatIntervalMs = new WeakMap(), _RedisDistributedBackend_heartbeatTimeoutMs = new WeakMap(), _RedisDistributedBackend_onError = new WeakMap(), _RedisDistributedBackend_isConnected = new WeakMap(), _RedisDistributedBackend_heartbeatTimer = new WeakMap(), _RedisDistributedBackend_instances = new WeakSet(), _RedisDistributedBackend_attachEventHandlers = function _RedisDistributedBackend_attachEventHandlers(client, label) {
     client.on('error', (err) => {
         __classPrivateFieldSet(this, _RedisDistributedBackend_isConnected, false, "f");
         if (__classPrivateFieldGet(this, _RedisDistributedBackend_onError, "f")) {
@@ -165,9 +175,14 @@ _RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend
         return;
     }
     const heartbeatMessage = {
+        protocol: DISTRIBUTED_PROTOCOL,
+        version: DISTRIBUTED_VERSION,
         type: types_1.DistributedMessageType.NODE_HEARTBEAT,
+        messageId: distributedId(),
         endpointName: '__heartbeat__',
         channelName: '__heartbeat__',
+        sourceNodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f"),
+        timestamp: Date.now(),
         nodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f"),
     };
     const key = __classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_buildKey).call(this, '__heartbeat__', '__heartbeat__');
@@ -179,8 +194,8 @@ _RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend
 }, _RedisDistributedBackend_handleHeartbeatMessage = function _RedisDistributedBackend_handleHeartbeatMessage(message) {
     try {
         const parsedMessage = JSON.parse(message);
-        if (parsedMessage.type === types_1.DistributedMessageType.NODE_HEARTBEAT && parsedMessage.nodeId !== __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f")) {
-            __classPrivateFieldGet(this, _RedisDistributedBackend_heartbeatSubject, "f").publish(parsedMessage.nodeId);
+        if (__classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_isValidMessage).call(this, parsedMessage) && parsedMessage.type === types_1.DistributedMessageType.NODE_HEARTBEAT && parsedMessage.sourceNodeId && parsedMessage.sourceNodeId !== __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f")) {
+            __classPrivateFieldGet(this, _RedisDistributedBackend_heartbeatSubject, "f").publish(parsedMessage.sourceNodeId);
         }
     }
     catch (_) {
@@ -188,10 +203,20 @@ _RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend
     }
 }, _RedisDistributedBackend_isValidMessage = function _RedisDistributedBackend_isValidMessage(message) {
     return (typeof message === 'object' &&
+        message.protocol === DISTRIBUTED_PROTOCOL &&
+        message.version === DISTRIBUTED_VERSION &&
         typeof message.type === 'string' &&
         Object.values(types_1.DistributedMessageType).includes(message.type) &&
+        typeof message.messageId === 'string' &&
         typeof message.endpointName === 'string' &&
-        typeof message.channelName === 'string');
+        typeof message.channelName === 'string' &&
+        typeof message.sourceNodeId === 'string' &&
+        typeof message.timestamp === 'number');
 }, _RedisDistributedBackend_buildKey = function _RedisDistributedBackend_buildKey(endpointName, channelName) {
-    return `${__classPrivateFieldGet(this, _RedisDistributedBackend_keyPrefix, "f")}:${endpointName}:${channelName}`;
+    if (endpointName === '__heartbeat__' && channelName === '__heartbeat__') {
+        return `${__classPrivateFieldGet(this, _RedisDistributedBackend_keyPrefix, "f")}:v1:${__classPrivateFieldGet(this, _RedisDistributedBackend_namespace, "f")}:__heartbeat__`;
+    }
+    return `${__classPrivateFieldGet(this, _RedisDistributedBackend_keyPrefix, "f")}:v1:${__classPrivateFieldGet(this, _RedisDistributedBackend_namespace, "f")}:${__classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_normalizeTopicPart).call(this, endpointName)}:${channelName}`;
+}, _RedisDistributedBackend_normalizeTopicPart = function _RedisDistributedBackend_normalizeTopicPart(value) {
+    return value.replace(/^\/+/, '');
 };

package/abstracts/types.d.ts

@@ -32,6 +32,7 @@ export interface SocketCache {
     socket: WebSocket;
     assigns: PondAssigns;
     subscriptions: Set<Unsubscribe>;
+    channelSubscriptions?: Map<string, Unsubscribe>;
 }
 export interface ConnectionResponseOptions {
     engine: EndpointEngine;

package/contexts/connectionContext.js

@@ -121,6 +121,7 @@ class ConnectionContext {
             const cache = {
                 clientId: __classPrivateFieldGet(this, _ConnectionContext_clientId, "f"),
                 subscriptions: new Set(),
+                channelSubscriptions: new Map(),
                 assigns: __classPrivateFieldGet(this, _ConnectionContext_assigns, "f"),
                 socket: ws,
             };

package/contexts/joinContext.js

@@ -45,10 +45,18 @@ class JoinContext extends baseContext_1.BaseContext {
         return __classPrivateFieldGet(this, _JoinContext_executed, "f");
     }
     accept() {
+        var _a;
         __classPrivateFieldGet(this, _JoinContext_instances, "m", _JoinContext_performChecks).call(this);
         const onMessage = this.engine.parent.parent.sendMessage.bind(this.engine.parent.parent, __classPrivateFieldGet(this, _JoinContext_user, "f").socket);
         const subscription = this.engine.addUser(__classPrivateFieldGet(this, _JoinContext_user, "f").clientId, __classPrivateFieldGet(this, _JoinContext_newAssigns, "f"), onMessage);
-        __classPrivateFieldGet(this, _JoinContext_user, "f").subscriptions.add(subscription);
+        const wrappedSubscription = () => {
+            var _a;
+            subscription();
+            __classPrivateFieldGet(this, _JoinContext_user, "f").subscriptions.delete(wrappedSubscription);
+            (_a = __classPrivateFieldGet(this, _JoinContext_user, "f").channelSubscriptions) === null || _a === void 0 ? void 0 : _a.delete(this.engine.name);
+        };
+        __classPrivateFieldGet(this, _JoinContext_user, "f").subscriptions.add(wrappedSubscription);
+        (_a = __classPrivateFieldGet(this, _JoinContext_user, "f").channelSubscriptions) === null || _a === void 0 ? void 0 : _a.set(this.engine.name, wrappedSubscription);
         __classPrivateFieldSet(this, _JoinContext_accepted, true, "f");
         return this;
     }

package/engines/channelEngine.js

@@ -30,7 +30,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _ChannelEngine_instances, _ChannelEngine_endpointId, _ChannelEngine_backend, _ChannelEngine_nodeId, _ChannelEngine_presenceEngine, _ChannelEngine_assignsCache, _ChannelEngine_userSubscriptions, _ChannelEngine_publisher, _ChannelEngine_distributedSubscription, _ChannelEngine_heartbeatSubscription, _ChannelEngine_nodeLastSeen, _ChannelEngine_nodeUsers, _ChannelEngine_staleNodeTimer, _ChannelEngine_name, _ChannelEngine_safeRemovePresence, _ChannelEngine_buildSubscriber, _ChannelEngine_getOrCreatePresenceEngine, _ChannelEngine_getUsersFromRecipients, _ChannelEngine_setupDistributedSubscription, _ChannelEngine_handleDistributedMessage, _ChannelEngine_requestChannelState, _ChannelEngine_handleStateRequest, _ChannelEngine_handleStateResponse, _ChannelEngine_handleRemoteUserJoined, _ChannelEngine_handleRemoteUserLeft, _ChannelEngine_handleRemoteMessage, _ChannelEngine_handleRemotePresenceUpdate, _ChannelEngine_handleRemotePresenceRemoved, _ChannelEngine_handleRemoteAssignsUpdate, _ChannelEngine_handleRemoteEvictUser, _ChannelEngine_setupHeartbeatTracking, _ChannelEngine_cleanupStaleNodes, _ChannelEngine_trackNodeUser, _ChannelEngine_untrackNodeUser, _ChannelEngine_broadcastToNodes;
+var _ChannelEngine_instances, _ChannelEngine_endpointId, _ChannelEngine_backend, _ChannelEngine_nodeId, _ChannelEngine_presenceEngine, _ChannelEngine_assignsCache, _ChannelEngine_userSubscriptions, _ChannelEngine_publisher, _ChannelEngine_distributedSubscription, _ChannelEngine_heartbeatSubscription, _ChannelEngine_nodeLastSeen, _ChannelEngine_nodeUsers, _ChannelEngine_staleNodeTimer, _ChannelEngine_name, _ChannelEngine_closed, _ChannelEngine_distributedReady, _ChannelEngine_safeRemovePresence, _ChannelEngine_buildSubscriber, _ChannelEngine_getOrCreatePresenceEngine, _ChannelEngine_getUsersFromRecipients, _ChannelEngine_setupDistributedSubscription, _ChannelEngine_afterDistributedReady, _ChannelEngine_handleDistributedMessage, _ChannelEngine_requestChannelState, _ChannelEngine_handleStateRequest, _ChannelEngine_handleStateResponse, _ChannelEngine_handleRemoteUserJoined, _ChannelEngine_handleRemoteUserLeft, _ChannelEngine_handleRemoteMessage, _ChannelEngine_handleRemotePresenceUpdate, _ChannelEngine_handleRemotePresenceRemoved, _ChannelEngine_handleRemoteAssignsUpdate, _ChannelEngine_handleRemoteEvictUser, _ChannelEngine_setupHeartbeatTracking, _ChannelEngine_cleanupStaleNodes, _ChannelEngine_trackNodeUser, _ChannelEngine_untrackNodeUser, _ChannelEngine_broadcastToNodes;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelEngine = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -61,12 +61,14 @@ class ChannelEngine {
         _ChannelEngine_nodeUsers.set(this, new Map());
         _ChannelEngine_staleNodeTimer.set(this, null);
         _ChannelEngine_name.set(this, void 0);
+        _ChannelEngine_closed.set(this, false);
+        _ChannelEngine_distributedReady.set(this, null);
         __classPrivateFieldSet(this, _ChannelEngine_name, name, "f");
         __classPrivateFieldSet(this, _ChannelEngine_backend, backend, "f");
         __classPrivateFieldSet(this, _ChannelEngine_nodeId, (0, pondsocket_common_1.uuid)(), "f");
         __classPrivateFieldSet(this, _ChannelEngine_endpointId, parent.parent.path, "f");
         if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_setupDistributedSubscription).call(this).catch(() => { });
+            __classPrivateFieldSet(this, _ChannelEngine_distributedReady, __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_setupDistributedSubscription).call(this).catch(() => { }), "f");
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_setupHeartbeatTracking).call(this);
         }
     }
@@ -92,7 +94,7 @@ class ChannelEngine {
         __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(userId, assigns);
         __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_buildSubscriber).call(this, userId, onMessage);
         if (isFirstUser && __classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_requestChannelState).call(this);
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_afterDistributedReady).call(this, () => __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_requestChannelState).call(this));
         }
         __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
             type: types_1.DistributedMessageType.USER_JOINED,
@@ -282,6 +284,7 @@ class ChannelEngine {
         };
     }
     close() {
+        __classPrivateFieldSet(this, _ChannelEngine_closed, true, "f");
         __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").forEach((unsubscribe) => unsubscribe());
         __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").clear();
         __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").clear();
@@ -308,7 +311,7 @@ class ChannelEngine {
     }
 }
 exports.ChannelEngine = ChannelEngine;
-_ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(), _ChannelEngine_nodeId = new WeakMap(), _ChannelEngine_presenceEngine = new WeakMap(), _ChannelEngine_assignsCache = new WeakMap(), _ChannelEngine_userSubscriptions = new WeakMap(), _ChannelEngine_publisher = new WeakMap(), _ChannelEngine_distributedSubscription = new WeakMap(), _ChannelEngine_heartbeatSubscription = new WeakMap(), _ChannelEngine_nodeLastSeen = new WeakMap(), _ChannelEngine_nodeUsers = new WeakMap(), _ChannelEngine_staleNodeTimer = new WeakMap(), _ChannelEngine_name = new WeakMap(), _ChannelEngine_instances = new WeakSet(), _ChannelEngine_safeRemovePresence = function _ChannelEngine_safeRemovePresence(userId) {
+_ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(), _ChannelEngine_nodeId = new WeakMap(), _ChannelEngine_presenceEngine = new WeakMap(), _ChannelEngine_assignsCache = new WeakMap(), _ChannelEngine_userSubscriptions = new WeakMap(), _ChannelEngine_publisher = new WeakMap(), _ChannelEngine_distributedSubscription = new WeakMap(), _ChannelEngine_heartbeatSubscription = new WeakMap(), _ChannelEngine_nodeLastSeen = new WeakMap(), _ChannelEngine_nodeUsers = new WeakMap(), _ChannelEngine_staleNodeTimer = new WeakMap(), _ChannelEngine_name = new WeakMap(), _ChannelEngine_closed = new WeakMap(), _ChannelEngine_distributedReady = new WeakMap(), _ChannelEngine_instances = new WeakSet(), _ChannelEngine_safeRemovePresence = function _ChannelEngine_safeRemovePresence(userId) {
     if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
         try {
             __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(userId);
@@ -370,10 +373,25 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
             return;
         }
-        __classPrivateFieldSet(this, _ChannelEngine_distributedSubscription, yield __classPrivateFieldGet(this, _ChannelEngine_backend, "f").subscribeToChannel(__classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"), __classPrivateFieldGet(this, _ChannelEngine_name, "f"), (message) => {
+        const unsubscribe = yield __classPrivateFieldGet(this, _ChannelEngine_backend, "f").subscribeToChannel(__classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"), __classPrivateFieldGet(this, _ChannelEngine_name, "f"), (message) => {
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleDistributedMessage).call(this, message);
-        }), "f");
+        });
+        if (__classPrivateFieldGet(this, _ChannelEngine_closed, "f")) {
+            unsubscribe();
+            return;
+        }
+        __classPrivateFieldSet(this, _ChannelEngine_distributedSubscription, unsubscribe, "f");
     });
+}, _ChannelEngine_afterDistributedReady = function _ChannelEngine_afterDistributedReady(callback) {
+    if (!__classPrivateFieldGet(this, _ChannelEngine_distributedReady, "f")) {
+        callback();
+        return;
+    }
+    __classPrivateFieldGet(this, _ChannelEngine_distributedReady, "f").then(() => {
+        if (!__classPrivateFieldGet(this, _ChannelEngine_closed, "f")) {
+            return callback();
+        }
+    }).catch(() => { });
 }, _ChannelEngine_handleDistributedMessage = function _ChannelEngine_handleDistributedMessage(message) {
     switch (message.type) {
         case types_1.DistributedMessageType.STATE_REQUEST:
@@ -494,7 +512,17 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
 }, _ChannelEngine_handleRemotePresenceRemoved = function _ChannelEngine_handleRemotePresenceRemoved(message) {
     __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_safeRemovePresence).call(this, message.userId);
 }, _ChannelEngine_handleRemoteAssignsUpdate = function _ChannelEngine_handleRemoteAssignsUpdate(message) {
-    __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, message.assigns);
+    const current = __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").get(message.userId);
+    if (!current) {
+        return;
+    }
+    if (message.assigns) {
+        __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, message.assigns);
+        return;
+    }
+    if (message.key) {
+        __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, Object.assign(Object.assign({}, current), { [message.key]: message.value }));
+    }
 }, _ChannelEngine_handleRemoteEvictUser = function _ChannelEngine_handleRemoteEvictUser(message) {
     if (__classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").has(message.userId)) {
         const kickedOutEvent = {
@@ -576,6 +604,9 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
             return;
         }
         try {
+            if (__classPrivateFieldGet(this, _ChannelEngine_closed, "f")) {
+                return;
+            }
             yield __classPrivateFieldGet(this, _ChannelEngine_backend, "f").broadcast(__classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"), __classPrivateFieldGet(this, _ChannelEngine_name, "f"), message);
         }
         catch (_) {

package/engines/endpointEngine.js

@@ -115,11 +115,13 @@ class EndpointEngine {
 }
 exports.EndpointEngine = EndpointEngine;
 _EndpointEngine_sockets = new WeakMap(), _EndpointEngine_backend = new WeakMap(), _EndpointEngine_middleware = new WeakMap(), _EndpointEngine_lobbyEngines = new WeakMap(), _EndpointEngine_maxMessageSize = new WeakMap(), _EndpointEngine_instances = new WeakSet(), _EndpointEngine_handleSocketClose = function _EndpointEngine_handleSocketClose(cache) {
+    var _a;
     try {
         __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
         cache.subscriptions.forEach((unsubscribe) => unsubscribe());
+        (_a = cache.channelSubscriptions) === null || _a === void 0 ? void 0 : _a.clear();
     }
-    catch (_a) {
+    catch (_b) {
         void 0;
     }
 }, _EndpointEngine_handleMessage = function _EndpointEngine_handleMessage(cache, message) {
@@ -143,6 +145,12 @@ _EndpointEngine_sockets = new WeakMap(), _EndpointEngine_backend = new WeakMap()
         throw error;
     });
 }, _EndpointEngine_leaveChannel = function _EndpointEngine_leaveChannel(channel, socket) {
+    var _a;
+    const subscription = (_a = socket.channelSubscriptions) === null || _a === void 0 ? void 0 : _a.get(channel);
+    if (subscription) {
+        subscription();
+        return;
+    }
     const engine = __classPrivateFieldGet(this, _EndpointEngine_instances, "m", _EndpointEngine_retrieveChannel).call(this, channel);
     engine.removeUser(socket.clientId);
 }, _EndpointEngine_retrieveChannel = function _EndpointEngine_retrieveChannel(channel) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eleven-am/pondsocket",
-  "version": "0.1.215",
+  "version": "0.1.216",
   "description": "PondSocket is a fast simple socket server",
   "keywords": [
     "socket",
@@ -43,21 +43,21 @@
     "url": "git+https://github.com/Eleven-am/pondSocket.git"
   },
   "dependencies": {
-    "@eleven-am/pondsocket-common": "^0.0.37",
-    "redis": "^5.11.0",
-    "ws": "^8.19.0"
+    "@eleven-am/pondsocket-common": "^0.0.38",
+    "redis": "^5.12.1",
+    "ws": "^8.20.1"
   },
   "devDependencies": {
     "@eslint/compat": "^1.4.0",
     "@eslint/eslintrc": "^3.3.4",
-    "@eslint/js": "^9.38.0",
+    "@eslint/js": "^9.39.4",
     "@stylistic/eslint-plugin-ts": "^4.4.1",
     "@types/jest": "^30.0.0",
     "@types/node": "^25.3.3",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.56.1",
-    "@typescript-eslint/parser": "^8.56.1",
-    "eslint": "^9.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.59.4",
+    "@typescript-eslint/parser": "^8.59.4",
+    "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-file-progress": "^3.0.2",
@@ -65,11 +65,11 @@
     "eslint-plugin-prettier": "^5.5.5",
     "globals": "^16.4.0",
     "jest": "^30.2.0",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.3",
     "source-map-support": "^0.5.21",
     "supertest": "^7.2.2",
-    "ts-jest": "^29.4.6",
-    "ts-loader": "^9.5.4",
+    "ts-jest": "^29.4.11",
+    "ts-loader": "^9.5.7",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.9.3"

package/server/server.js

@@ -10,7 +10,7 @@ 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 _PondSocket_instances, _PondSocket_server, _PondSocket_exclusiveServer, _PondSocket_socketServer, _PondSocket_backend, _PondSocket_middleware, _PondSocket_maxMessageSize, _PondSocket_heartbeatMs, _PondSocket_heartbeatTimer, _PondSocket_handleUpgrade, _PondSocket_manageHeartbeat, _PondSocket_init, _PondSocket_getCookies;
+var _PondSocket_instances, _PondSocket_server, _PondSocket_exclusiveServer, _PondSocket_socketServer, _PondSocket_backend, _PondSocket_middleware, _PondSocket_maxMessageSize, _PondSocket_heartbeatMs, _PondSocket_heartbeatTimer, _PondSocket_backendReady, _PondSocket_handleUpgrade, _PondSocket_manageHeartbeat, _PondSocket_init, _PondSocket_getCookies;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondSocket = void 0;
 const http_1 = require("http");
@@ -32,6 +32,7 @@ class PondSocket {
         _PondSocket_maxMessageSize.set(this, void 0);
         _PondSocket_heartbeatMs.set(this, void 0);
         _PondSocket_heartbeatTimer.set(this, null);
+        _PondSocket_backendReady.set(this, null);
         __classPrivateFieldSet(this, _PondSocket_middleware, new middleware_1.Middleware(), "f");
         __classPrivateFieldSet(this, _PondSocket_exclusiveServer, exclusiveServer, "f");
         __classPrivateFieldSet(this, _PondSocket_server, server !== null && server !== void 0 ? server : new http_1.Server(), "f");
@@ -51,6 +52,7 @@ class PondSocket {
      * Close the server
      */
     close(callback, timeout = 5000) {
+        var _a, _b;
         if (__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f")) {
             clearInterval(__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f"));
             __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, null, "f");
@@ -71,6 +73,7 @@ class PondSocket {
         __classPrivateFieldGet(this, _PondSocket_socketServer, "f").close(() => {
             clearTimeout(forceClose);
         });
+        __classPrivateFieldSet(this, _PondSocket_backendReady, (_b = (_a = __classPrivateFieldGet(this, _PondSocket_backendReady, "f")) === null || _a === void 0 ? void 0 : _a.catch(() => { }).then(() => { var _a; return (_a = __classPrivateFieldGet(this, _PondSocket_backend, "f")) === null || _a === void 0 ? void 0 : _a.cleanup(); }).catch(() => { })) !== null && _b !== void 0 ? _b : null, "f");
         return __classPrivateFieldGet(this, _PondSocket_server, "f").close(callback);
     }
     /**
@@ -96,7 +99,7 @@ class PondSocket {
     }
 }
 exports.PondSocket = PondSocket;
-_PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _PondSocket_backend = new WeakMap(), _PondSocket_middleware = new WeakMap(), _PondSocket_maxMessageSize = new WeakMap(), _PondSocket_heartbeatMs = new WeakMap(), _PondSocket_heartbeatTimer = new WeakMap(), _PondSocket_instances = new WeakSet(), _PondSocket_handleUpgrade = function _PondSocket_handleUpgrade(req, socket, head) {
+_PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(), _PondSocket_socketServer = new WeakMap(), _PondSocket_backend = new WeakMap(), _PondSocket_middleware = new WeakMap(), _PondSocket_maxMessageSize = new WeakMap(), _PondSocket_heartbeatMs = new WeakMap(), _PondSocket_heartbeatTimer = new WeakMap(), _PondSocket_backendReady = new WeakMap(), _PondSocket_instances = new WeakSet(), _PondSocket_handleUpgrade = function _PondSocket_handleUpgrade(req, socket, head) {
     const clientId = (0, pondsocket_common_1.uuid)();
     const request = {
         id: clientId,
@@ -137,7 +140,11 @@ _PondSocket_server = new WeakMap(), _PondSocket_exclusiveServer = new WeakMap(),
         });
     }, __classPrivateFieldGet(this, _PondSocket_heartbeatMs, "f"));
 }, _PondSocket_init = function _PondSocket_init() {
+    var _a, _b;
     __classPrivateFieldSet(this, _PondSocket_heartbeatTimer, __classPrivateFieldGet(this, _PondSocket_instances, "m", _PondSocket_manageHeartbeat).call(this), "f");
+    __classPrivateFieldSet(this, _PondSocket_backendReady, (_b = (_a = __classPrivateFieldGet(this, _PondSocket_backend, "f")) === null || _a === void 0 ? void 0 : _a.initialize().catch((error) => {
+        __classPrivateFieldGet(this, _PondSocket_server, "f").emit('error', error);
+    })) !== null && _b !== void 0 ? _b : null, "f");
     __classPrivateFieldGet(this, _PondSocket_server, "f").on('error', (error) => {
         if (__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f")) {
             clearInterval(__classPrivateFieldGet(this, _PondSocket_heartbeatTimer, "f"));

package/types.d.ts

@@ -8,6 +8,7 @@ export interface RedisDistributedBackendOptions {
     database?: number;
     url?: string;
     keyPrefix?: string;
+    namespace?: string;
     heartbeatIntervalMs?: number;
     heartbeatTimeoutMs?: number;
     onError?: (error: Error) => void;
@@ -30,10 +31,16 @@ export declare enum DistributedMessageType {
     PRESENCE_REMOVED = "PRESENCE_REMOVED",
     ASSIGNS_UPDATE = "ASSIGNS_UPDATE",
     EVICT_USER = "EVICT_USER",
+    USER_REMOVE = "USER_REMOVE",
+    USER_GET_REQUEST = "USER_GET_REQUEST",
+    USER_GET_RESPONSE = "USER_GET_RESPONSE",
     NODE_HEARTBEAT = "NODE_HEARTBEAT"
 }
 export interface DistributedMessage {
+    protocol?: 'pondsocket.distributed';
+    version?: 1;
     type: DistributedMessageType;
+    messageId?: string;
     endpointName: string;
     channelName: string;
     timestamp?: number;
@@ -81,19 +88,38 @@ export interface PresenceRemoved extends DistributedMessage {
 export interface AssignsUpdate extends DistributedMessage {
     type: DistributedMessageType.ASSIGNS_UPDATE;
     userId: string;
-    assigns: PondAssigns;
+    assigns?: PondAssigns;
+    key?: string;
+    value?: unknown;
 }
 export interface EvictUser extends DistributedMessage {
     type: DistributedMessageType.EVICT_USER;
     userId: string;
     reason: string;
-    fromNode?: string;
+}
+export interface UserRemove extends DistributedMessage {
+    type: DistributedMessageType.USER_REMOVE;
+    userId: string;
+    reason: string;
+}
+export interface UserGetRequest extends DistributedMessage {
+    type: DistributedMessageType.USER_GET_REQUEST;
+    userId: string;
+    lookupRequestId: string;
+}
+export interface UserGetResponse extends DistributedMessage {
+    type: DistributedMessageType.USER_GET_RESPONSE;
+    lookupRequestId: string;
+    userId: string;
+    found: boolean;
+    assigns?: PondAssigns;
+    presence?: PondPresence;
 }
 export interface NodeHeartbeat extends DistributedMessage {
     type: DistributedMessageType.NODE_HEARTBEAT;
     nodeId: string;
 }
-export type DistributedChannelMessage = StateRequest | StateResponse | UserJoined | UserLeft | UserMessage | PresenceUpdate | PresenceRemoved | AssignsUpdate | EvictUser | NodeHeartbeat;
+export type DistributedChannelMessage = StateRequest | StateResponse | UserJoined | UserLeft | UserMessage | PresenceUpdate | PresenceRemoved | AssignsUpdate | EvictUser | UserRemove | UserGetRequest | UserGetResponse | NodeHeartbeat;
 export interface IDistributedBackend {
     readonly nodeId: string;
     readonly heartbeatTimeoutMs: number;

package/types.js

@@ -12,5 +12,8 @@ var DistributedMessageType;
     DistributedMessageType["PRESENCE_REMOVED"] = "PRESENCE_REMOVED";
     DistributedMessageType["ASSIGNS_UPDATE"] = "ASSIGNS_UPDATE";
     DistributedMessageType["EVICT_USER"] = "EVICT_USER";
+    DistributedMessageType["USER_REMOVE"] = "USER_REMOVE";
+    DistributedMessageType["USER_GET_REQUEST"] = "USER_GET_REQUEST";
+    DistributedMessageType["USER_GET_RESPONSE"] = "USER_GET_RESPONSE";
     DistributedMessageType["NODE_HEARTBEAT"] = "NODE_HEARTBEAT";
 })(DistributedMessageType || (exports.DistributedMessageType = DistributedMessageType = {}));