@eleven-am/pondsocket 0.1.213 → 0.1.215

package/engines/channelEngine.js

@@ -30,30 +30,44 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var _ChannelEngine_instances, _ChannelEngine_endpointId, _ChannelEngine_backend, _ChannelEngine_presenceEngine, _ChannelEngine_assignsCache, _ChannelEngine_userSubscriptions, _ChannelEngine_publisher, _ChannelEngine_distributedSubscription, _ChannelEngine_name, _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_handleRemoteAssignsRemoved, _ChannelEngine_handleRemoteEvictUser, _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_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;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelEngine = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
 const presenceEngine_1 = require("./presenceEngine");
-const types_1 = require("../abstracts/types");
 const httpError_1 = require("../errors/httpError");
+const types_1 = require("../types");
+function mapToObject(map) {
+    const result = {};
+    for (const [key, value] of map) {
+        result[key] = value;
+    }
+    return result;
+}
 class ChannelEngine {
     constructor(parent, name, backend = null) {
         _ChannelEngine_instances.add(this);
         this.parent = parent;
         _ChannelEngine_endpointId.set(this, void 0);
         _ChannelEngine_backend.set(this, void 0);
+        _ChannelEngine_nodeId.set(this, void 0);
         _ChannelEngine_presenceEngine.set(this, null);
         _ChannelEngine_assignsCache.set(this, new Map());
         _ChannelEngine_userSubscriptions.set(this, new Map());
         _ChannelEngine_publisher.set(this, new pondsocket_common_1.Subject());
         _ChannelEngine_distributedSubscription.set(this, null);
+        _ChannelEngine_heartbeatSubscription.set(this, null);
+        _ChannelEngine_nodeLastSeen.set(this, new Map());
+        _ChannelEngine_nodeUsers.set(this, new Map());
+        _ChannelEngine_staleNodeTimer.set(this, null);
         _ChannelEngine_name.set(this, void 0);
         __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);
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_setupDistributedSubscription).call(this).catch(() => { });
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_setupHeartbeatTracking).call(this);
         }
     }
     get name() {
@@ -62,13 +76,6 @@ class ChannelEngine {
     get users() {
         return new Set(__classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").keys());
     }
-    /**
-     * Adds a user to the channel
-     * @param userId - The user ID
-     * @param assigns - The user's assigns
-     * @param onMessage - Callback for messages
-     * @returns Unsubscribe function
-     */
     addUser(userId, assigns, onMessage) {
         if (this.users.has(userId)) {
             const message = `ChannelEngine: User with id ${userId} already exists in channel ${this.name}`;
@@ -87,21 +94,16 @@ class ChannelEngine {
         if (isFirstUser && __classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_requestChannelState).call(this);
         }
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.USER_JOINED,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                userId,
-                presence: {},
-                assigns,
-            });
-        }
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.USER_JOINED,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            presence: {},
+            assigns,
+        });
         return () => this.removeUser(userId);
     }
-    /**
-     * Sends a message to recipients
-     */
     sendMessage(sender, recipient, action, event, payload, requestId = (0, pondsocket_common_1.uuid)()) {
         if (!this.users.has(sender) && sender !== pondsocket_common_1.SystemSender.CHANNEL) {
             const message = `ChannelEngine: User with id ${sender} does not exist in channel ${this.name}`;
@@ -117,24 +119,17 @@ class ChannelEngine {
         const recipients = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getUsersFromRecipients).call(this, recipient, sender);
         const internalEvent = Object.assign(Object.assign({}, channelEvent), { recipients });
         __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(internalEvent);
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.USER_MESSAGE,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                fromUserId: sender,
-                event,
-                payload,
-                requestId,
-                recipients,
-            });
-        }
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.USER_MESSAGE,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            fromUserId: sender,
+            event,
+            payload,
+            requestId,
+            recipientDescriptor: recipient,
+        });
     }
-    /**
-     * Broadcasts a message from a user
-     * @param userId - The ID of the user sending the message
-     * @param message - The message to broadcast
-     */
     broadcastMessage(userId, message) {
         if (!this.users.has(userId)) {
             const messageText = `ChannelEngine: User with id ${userId} does not exist in channel ${this.name}`;
@@ -148,80 +143,50 @@ class ChannelEngine {
             }, message.requestId);
         });
     }
-    /**
-     * Tracks a user's presence
-     * @param userId - The ID of the user
-     * @param presence - The presence data to track
-     */
     trackPresence(userId, presence) {
         const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
         presenceEngine.trackPresence(userId, presence);
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.PRESENCE_UPDATE,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                userId,
-                presence,
-            });
-        }
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.PRESENCE_UPDATE,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            presence,
+        });
     }
-    /**
-     * Updates a user's presence
-     * @param userId - The ID of the user
-     * @param presence - The presence data to update
-     */
     updatePresence(userId, presence) {
         const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
         presenceEngine.updatePresence(userId, presence);
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.PRESENCE_UPDATE,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                userId,
-                presence,
-            });
-        }
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.PRESENCE_UPDATE,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            presence,
+        });
     }
-    /**
-     * Removes a user's presence
-     * @param userId - The ID of the user to remove presence for
-     */
     removePresence(userId) {
         if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
             __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(userId);
-            // Broadcast presence removal to other nodes
-            if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-                __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                    type: types_1.DistributedMessageType.PRESENCE_REMOVED,
-                    endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                    channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                    userId,
-                });
-            }
-        }
-    }
-    /**
-     * Adds or updates a user's presence
-     */
-    upsertPresence(userId, presence) {
-        const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
-        presenceEngine.upsertPresence(userId, presence);
-        // Broadcast presence update to other nodes
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.PRESENCE_UPDATE,
+                type: types_1.DistributedMessageType.PRESENCE_REMOVED,
                 endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
                 channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
                 userId,
-                presence,
             });
         }
     }
-    /**
-     * Updates a user's assigns
-     */
+    upsertPresence(userId, presence) {
+        const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
+        presenceEngine.upsertPresence(userId, presence);
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.PRESENCE_UPDATE,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            presence,
+        });
+    }
     updateAssigns(userId, assigns) {
         if (!__classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").has(userId)) {
             throw new httpError_1.HttpError(404, `User with id ${userId} does not exist in channel ${this.name}`);
@@ -229,92 +194,58 @@ class ChannelEngine {
         const currentAssigns = __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").get(userId) || {};
         const newAssigns = Object.assign(Object.assign({}, currentAssigns), assigns);
         __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(userId, newAssigns);
-        // Broadcast assigns update to other nodes
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.ASSIGNS_UPDATE,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                userId,
-                assigns: newAssigns,
-            });
-        }
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.ASSIGNS_UPDATE,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            assigns: newAssigns,
+        });
     }
-    /**
-     * Kicks a user from the channel
-     */
     kickUser(userId, reason) {
         this.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, [userId], pondsocket_common_1.ServerActions.SYSTEM, 'kicked_out', {
             message: reason,
             code: 403,
         });
-        // Broadcast eviction to other nodes
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
-                type: types_1.DistributedMessageType.EVICT_USER,
-                endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
-                channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-                userId,
-                reason,
-            });
-        }
-        this.removeUser(userId);
         this.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.SYSTEM, 'kicked', {
             userId,
             reason,
         });
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
+            type: types_1.DistributedMessageType.EVICT_USER,
+            endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            userId,
+            reason,
+        });
+        this.removeUser(userId, true);
     }
-    /**
-     * Gets all assigns as an object
-     */
     getAssigns() {
-        return Array
-            .from(__classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").entries())
-            .reduce((acc, [id, assigns]) => {
-            acc[id] = assigns;
-            return acc;
-        }, {});
-    }
-    /**
-     * Gets all presence data as an object
-     */
+        return mapToObject(__classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f"));
+    }
     getPresence() {
         if (!__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
             return {};
         }
-        return Array
-            .from(__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").getAllPresence().entries())
-            .reduce((acc, [id, presence]) => {
-            acc[id] = presence;
-            return acc;
-        }, {});
-    }
-    /**
-     * Destroys the channel
-     */
+        return mapToObject(__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").getAllPresence());
+    }
     destroy(reason) {
         this.sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.ERROR, 'destroyed', {
             message: reason !== null && reason !== void 0 ? reason : 'Channel has been destroyed',
         });
         this.close();
     }
-    /**
-     * Removes a user from the channel
-     */
-    removeUser(userId) {
+    removeUser(userId, skipDistributedBroadcast = false) {
         try {
             const userData = this.getUserData(userId);
             const unsubscribe = __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").get(userId);
             __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(userId);
-            if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
-                __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(userId);
-            }
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_safeRemovePresence).call(this, userId);
             if (unsubscribe) {
                 unsubscribe();
                 __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").delete(userId);
             }
-            // Broadcast user left to other nodes
-            if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
+            if (!skipDistributedBroadcast) {
                 __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
                     type: types_1.DistributedMessageType.USER_LEFT,
                     endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
@@ -332,13 +263,10 @@ class ChannelEngine {
                 this.close();
             }
         }
-        catch (_a) {
-            // Ignore cleanup errors
+        catch (_) {
+            void 0;
         }
     }
-    /**
-     * Gets user data by ID
-     */
     getUserData(userId) {
         var _a;
         const assigns = __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").get(userId);
@@ -353,9 +281,6 @@ class ChannelEngine {
             id: userId,
         };
     }
-    /**
-     * Closes the channel and cleans up resources
-     */
     close() {
         __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").forEach((unsubscribe) => unsubscribe());
         __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").clear();
@@ -368,12 +293,31 @@ class ChannelEngine {
             __classPrivateFieldGet(this, _ChannelEngine_distributedSubscription, "f").call(this);
             __classPrivateFieldSet(this, _ChannelEngine_distributedSubscription, null, "f");
         }
+        if (__classPrivateFieldGet(this, _ChannelEngine_heartbeatSubscription, "f")) {
+            __classPrivateFieldGet(this, _ChannelEngine_heartbeatSubscription, "f").call(this);
+            __classPrivateFieldSet(this, _ChannelEngine_heartbeatSubscription, null, "f");
+        }
+        if (__classPrivateFieldGet(this, _ChannelEngine_staleNodeTimer, "f")) {
+            clearInterval(__classPrivateFieldGet(this, _ChannelEngine_staleNodeTimer, "f"));
+            __classPrivateFieldSet(this, _ChannelEngine_staleNodeTimer, null, "f");
+        }
+        __classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f").clear();
+        __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").clear();
         __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").close();
         this.parent.deleteChannel(this.name);
     }
 }
 exports.ChannelEngine = ChannelEngine;
-_ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(), _ChannelEngine_presenceEngine = new WeakMap(), _ChannelEngine_assignsCache = new WeakMap(), _ChannelEngine_userSubscriptions = new WeakMap(), _ChannelEngine_publisher = new WeakMap(), _ChannelEngine_distributedSubscription = new WeakMap(), _ChannelEngine_name = new WeakMap(), _ChannelEngine_instances = new WeakSet(), _ChannelEngine_buildSubscriber = function _ChannelEngine_buildSubscriber(userId, onMessage) {
+_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) {
+    if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
+        try {
+            __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(userId);
+        }
+        catch (_) {
+            void 0;
+        }
+    }
+}, _ChannelEngine_buildSubscriber = function _ChannelEngine_buildSubscriber(userId, onMessage) {
     const subscription = __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").subscribe((_a) => __awaiter(this, void 0, void 0, function* () {
         var { recipients } = _a, event = __rest(_a, ["recipients"]);
         if (recipients.includes(userId)) {
@@ -389,10 +333,9 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
     __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").set(userId, subscription);
 }, _ChannelEngine_getOrCreatePresenceEngine = function _ChannelEngine_getOrCreatePresenceEngine() {
     if (!__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
-        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, new presenceEngine_1.PresenceEngine(this.name), "f");
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").subscribe((event) => {
+        __classPrivateFieldSet(this, _ChannelEngine_presenceEngine, new presenceEngine_1.PresenceEngine(this.name, (event) => {
             __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(event);
-        });
+        }), "f");
     }
     return __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f");
 }, _ChannelEngine_getUsersFromRecipients = function _ChannelEngine_getUsersFromRecipients(recipients, sender) {
@@ -423,12 +366,14 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
     }
     return users;
 }, _ChannelEngine_setupDistributedSubscription = function _ChannelEngine_setupDistributedSubscription() {
-    if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-        return;
-    }
-    __classPrivateFieldSet(this, _ChannelEngine_distributedSubscription, __classPrivateFieldGet(this, _ChannelEngine_backend, "f").subscribe(__classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"), __classPrivateFieldGet(this, _ChannelEngine_name, "f"), (message) => {
-        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleDistributedMessage).call(this, message);
-    }), "f");
+    return __awaiter(this, void 0, void 0, function* () {
+        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) => {
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleDistributedMessage).call(this, message);
+        }), "f");
+    });
 }, _ChannelEngine_handleDistributedMessage = function _ChannelEngine_handleDistributedMessage(message) {
     switch (message.type) {
         case types_1.DistributedMessageType.STATE_REQUEST:
@@ -455,24 +400,20 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         case types_1.DistributedMessageType.ASSIGNS_UPDATE:
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleRemoteAssignsUpdate).call(this, message);
             break;
-        case types_1.DistributedMessageType.ASSIGNS_REMOVED:
-            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleRemoteAssignsRemoved).call(this, message);
-            break;
         case types_1.DistributedMessageType.EVICT_USER:
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleRemoteEvictUser).call(this, message);
             break;
+        case types_1.DistributedMessageType.NODE_HEARTBEAT:
+            break;
         default:
             break;
     }
 }, _ChannelEngine_requestChannelState = function _ChannelEngine_requestChannelState() {
-    if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
-        return;
-    }
     __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_broadcastToNodes).call(this, {
         type: types_1.DistributedMessageType.STATE_REQUEST,
         endpointName: __classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"),
         channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
-        fromNode: 'current-node',
+        fromNode: __classPrivateFieldGet(this, _ChannelEngine_nodeId, "f"),
     });
 }, _ChannelEngine_handleStateRequest = function _ChannelEngine_handleStateRequest(_message) {
     if (this.users.size === 0) {
@@ -499,9 +440,10 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
     message.users.forEach((user) => {
         if (!this.users.has(user.id)) {
             __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(user.id, user.assigns);
+            __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_trackNodeUser).call(this, message.sourceNodeId, user.id);
             if (user.presence && Object.keys(user.presence).length > 0) {
                 const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
-                presenceEngine.trackPresence(user.id, user.presence);
+                presenceEngine.upsertPresence(user.id, user.presence);
             }
         }
     });
@@ -510,46 +452,124 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         return;
     }
     __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, message.assigns);
+    __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_trackNodeUser).call(this, message.sourceNodeId, message.userId);
     if (message.presence && Object.keys(message.presence).length > 0) {
         const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
         presenceEngine.trackPresence(message.userId, message.presence);
     }
 }, _ChannelEngine_handleRemoteUserLeft = function _ChannelEngine_handleRemoteUserLeft(message) {
     __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(message.userId);
-    if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);
-    }
+    __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_untrackNodeUser).call(this, message.sourceNodeId, message.userId);
+    __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_safeRemovePresence).call(this, message.userId);
 }, _ChannelEngine_handleRemoteMessage = function _ChannelEngine_handleRemoteMessage(message) {
+    const localUsers = Array.from(this.users);
+    let recipients;
+    if (message.recipientDescriptor === pondsocket_common_1.ChannelReceiver.ALL_USERS) {
+        recipients = localUsers;
+    }
+    else if (message.recipientDescriptor === pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER) {
+        recipients = localUsers.filter((u) => u !== message.fromUserId);
+    }
+    else if (Array.isArray(message.recipientDescriptor)) {
+        recipients = localUsers.filter((u) => message.recipientDescriptor.includes(u));
+    }
+    else {
+        return;
+    }
+    if (recipients.length === 0) {
+        return;
+    }
     const internalEvent = {
         channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
         requestId: message.requestId,
         action: pondsocket_common_1.ServerActions.BROADCAST,
         event: message.event,
         payload: message.payload,
-        recipients: message.recipients,
+        recipients,
     };
     __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(internalEvent);
 }, _ChannelEngine_handleRemotePresenceUpdate = function _ChannelEngine_handleRemotePresenceUpdate(message) {
     const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
     presenceEngine.upsertPresence(message.userId, message.presence);
 }, _ChannelEngine_handleRemotePresenceRemoved = function _ChannelEngine_handleRemotePresenceRemoved(message) {
-    if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);
-    }
+    __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);
-}, _ChannelEngine_handleRemoteAssignsRemoved = function _ChannelEngine_handleRemoteAssignsRemoved(message) {
-    __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, {});
 }, _ChannelEngine_handleRemoteEvictUser = function _ChannelEngine_handleRemoteEvictUser(message) {
-    __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(message.userId);
-    if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
-        __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);
+    if (__classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").has(message.userId)) {
+        const kickedOutEvent = {
+            channelName: __classPrivateFieldGet(this, _ChannelEngine_name, "f"),
+            requestId: (0, pondsocket_common_1.uuid)(),
+            action: pondsocket_common_1.ServerActions.SYSTEM,
+            event: 'kicked_out',
+            payload: {
+                message: message.reason,
+                code: 403,
+            },
+            recipients: [message.userId],
+        };
+        __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(kickedOutEvent);
     }
+    __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(message.userId);
+    __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_safeRemovePresence).call(this, message.userId);
     const unsubscribe = __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").get(message.userId);
     if (unsubscribe) {
         unsubscribe();
         __classPrivateFieldGet(this, _ChannelEngine_userSubscriptions, "f").delete(message.userId);
     }
+}, _ChannelEngine_setupHeartbeatTracking = function _ChannelEngine_setupHeartbeatTracking() {
+    if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
+        return;
+    }
+    __classPrivateFieldSet(this, _ChannelEngine_heartbeatSubscription, __classPrivateFieldGet(this, _ChannelEngine_backend, "f").subscribeToHeartbeats((nodeId) => {
+        __classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f").set(nodeId, Date.now());
+    }), "f");
+    __classPrivateFieldSet(this, _ChannelEngine_staleNodeTimer, setInterval(() => {
+        __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_cleanupStaleNodes).call(this);
+    }, __classPrivateFieldGet(this, _ChannelEngine_backend, "f").heartbeatTimeoutMs), "f");
+}, _ChannelEngine_cleanupStaleNodes = function _ChannelEngine_cleanupStaleNodes() {
+    if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
+        return;
+    }
+    const now = Date.now();
+    const timeout = __classPrivateFieldGet(this, _ChannelEngine_backend, "f").heartbeatTimeoutMs;
+    for (const [nodeId, lastSeen] of __classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f")) {
+        if (now - lastSeen >= timeout) {
+            const users = __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").get(nodeId);
+            if (users) {
+                for (const userId of users) {
+                    __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(userId);
+                    __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_safeRemovePresence).call(this, userId);
+                }
+                __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").delete(nodeId);
+            }
+            __classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f").delete(nodeId);
+        }
+    }
+}, _ChannelEngine_trackNodeUser = function _ChannelEngine_trackNodeUser(sourceNodeId, userId) {
+    if (!sourceNodeId) {
+        return;
+    }
+    let users = __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").get(sourceNodeId);
+    if (!users) {
+        users = new Set();
+        __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").set(sourceNodeId, users);
+    }
+    users.add(userId);
+    if (!__classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f").has(sourceNodeId)) {
+        __classPrivateFieldGet(this, _ChannelEngine_nodeLastSeen, "f").set(sourceNodeId, Date.now());
+    }
+}, _ChannelEngine_untrackNodeUser = function _ChannelEngine_untrackNodeUser(sourceNodeId, userId) {
+    if (!sourceNodeId) {
+        return;
+    }
+    const users = __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").get(sourceNodeId);
+    if (users) {
+        users.delete(userId);
+        if (users.size === 0) {
+            __classPrivateFieldGet(this, _ChannelEngine_nodeUsers, "f").delete(sourceNodeId);
+        }
+    }
 }, _ChannelEngine_broadcastToNodes = function _ChannelEngine_broadcastToNodes(message) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!__classPrivateFieldGet(this, _ChannelEngine_backend, "f")) {
@@ -558,8 +578,8 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         try {
             yield __classPrivateFieldGet(this, _ChannelEngine_backend, "f").broadcast(__classPrivateFieldGet(this, _ChannelEngine_endpointId, "f"), __classPrivateFieldGet(this, _ChannelEngine_name, "f"), message);
         }
-        catch (_a) {
-            // Silently ignore broadcast errors to prevent cascading failures
+        catch (_) {
+            void 0;
         }
     });
 };