@eleven-am/pondsocket 0.1.204 → 0.1.207

package/abstracts/distributor.js

@@ -19,7 +19,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 _RedisDistributedBackend_instances, _RedisDistributedBackend_publishClient, _RedisDistributedBackend_subscribeClient, _RedisDistributedBackend_keyPrefix, _RedisDistributedBackend_subject, _RedisDistributedBackend_isConnected, _RedisDistributedBackend_initialize, _RedisDistributedBackend_handleRedisMessage, _RedisDistributedBackend_isValidMessage, _RedisDistributedBackend_buildKey;
+var _RedisDistributedBackend_instances, _RedisDistributedBackend_publishClient, _RedisDistributedBackend_subscribeClient, _RedisDistributedBackend_keyPrefix, _RedisDistributedBackend_subject, _RedisDistributedBackend_nodeId, _RedisDistributedBackend_isConnected, _RedisDistributedBackend_initialize, _RedisDistributedBackend_handleRedisMessage, _RedisDistributedBackend_isValidMessage, _RedisDistributedBackend_buildKey;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisDistributedBackend = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
@@ -32,9 +32,12 @@ class RedisDistributedBackend {
         _RedisDistributedBackend_subscribeClient.set(this, void 0);
         _RedisDistributedBackend_keyPrefix.set(this, void 0);
         _RedisDistributedBackend_subject.set(this, void 0);
+        _RedisDistributedBackend_nodeId.set(this, void 0);
         _RedisDistributedBackend_isConnected.set(this, false);
         const { host = 'localhost', port = 6379, password, database = 0, url, keyPrefix = 'pondsocket', } = options;
         __classPrivateFieldSet(this, _RedisDistributedBackend_keyPrefix, keyPrefix, "f");
+        __classPrivateFieldSet(this, _RedisDistributedBackend_nodeId, Math.random().toString(36)
+            .substring(2, 15), "f");
         __classPrivateFieldSet(this, _RedisDistributedBackend_subject, new pondsocket_common_1.Subject(), "f");
         // Create Redis clients
         const clientConfig = url
@@ -58,7 +61,7 @@ class RedisDistributedBackend {
      */
     subscribe(endpointName, channelName, handler) {
         return this.subject.subscribe((message) => {
-            if (message.endpointName === endpointName && message.channelName === channelName) {
+            if (message.endpointName === endpointName && message.channelName === channelName && message.nodeId !== __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f")) {
                 handler(message);
             }
         });
@@ -72,7 +75,8 @@ class RedisDistributedBackend {
                 throw new Error('Redis backend is not connected');
             }
             const key = __classPrivateFieldGet(this, _RedisDistributedBackend_instances, "m", _RedisDistributedBackend_buildKey).call(this, endpointName, channelName);
-            const serializedMessage = JSON.stringify(message);
+            const distributedMessage = Object.assign(Object.assign({}, message), { nodeId: __classPrivateFieldGet(this, _RedisDistributedBackend_nodeId, "f") });
+            const serializedMessage = JSON.stringify(distributedMessage);
             yield __classPrivateFieldGet(this, _RedisDistributedBackend_publishClient, "f").publish(key, serializedMessage);
         });
     }
@@ -93,7 +97,7 @@ class RedisDistributedBackend {
     }
 }
 exports.RedisDistributedBackend = RedisDistributedBackend;
-_RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend_subscribeClient = new WeakMap(), _RedisDistributedBackend_keyPrefix = new WeakMap(), _RedisDistributedBackend_subject = new WeakMap(), _RedisDistributedBackend_isConnected = new WeakMap(), _RedisDistributedBackend_instances = new WeakSet(), _RedisDistributedBackend_initialize = function _RedisDistributedBackend_initialize() {
+_RedisDistributedBackend_publishClient = new WeakMap(), _RedisDistributedBackend_subscribeClient = new WeakMap(), _RedisDistributedBackend_keyPrefix = new WeakMap(), _RedisDistributedBackend_subject = new WeakMap(), _RedisDistributedBackend_nodeId = new WeakMap(), _RedisDistributedBackend_isConnected = new WeakMap(), _RedisDistributedBackend_instances = new WeakSet(), _RedisDistributedBackend_initialize = function _RedisDistributedBackend_initialize() {
     return __awaiter(this, void 0, void 0, function* () {
         yield Promise.all([
             __classPrivateFieldGet(this, _RedisDistributedBackend_publishClient, "f").connect(),

package/engines/channelEngine.js

@@ -112,10 +112,8 @@ class ChannelEngine {
         };
         const recipients = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getUsersFromRecipients).call(this, recipient, sender);
         const internalEvent = Object.assign(Object.assign({}, channelEvent), { recipients });
-        // Publish locally
         __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(internalEvent);
-        // If distributed and this is a user message, broadcast to other nodes
-        if (__classPrivateFieldGet(this, _ChannelEngine_backend, "f") && action === pondsocket_common_1.ServerActions.BROADCAST && sender !== pondsocket_common_1.SystemSender.CHANNEL) {
+        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"),
@@ -154,7 +152,6 @@ class ChannelEngine {
     trackPresence(userId, presence) {
         const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
         presenceEngine.trackPresence(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,
@@ -173,7 +170,6 @@ class ChannelEngine {
     updatePresence(userId, presence) {
         const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
         presenceEngine.updatePresence(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,
@@ -430,6 +426,7 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleDistributedMessage).call(this, message);
     }), "f");
 }, _ChannelEngine_handleDistributedMessage = function _ChannelEngine_handleDistributedMessage(message) {
+    console.log(message);
     switch (message.type) {
         case types_1.DistributedMessageType.STATE_REQUEST:
             __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_handleStateRequest).call(this, message);
@@ -520,46 +517,27 @@ _ChannelEngine_endpointId = new WeakMap(), _ChannelEngine_backend = new WeakMap(
         __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);
     }
 }, _ChannelEngine_handleRemoteMessage = function _ChannelEngine_handleRemoteMessage(message) {
-    const localRecipients = message.recipients.filter((userId) => this.users.has(userId));
-    if (localRecipients.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: localRecipients,
+        recipients: message.recipients,
     };
     __classPrivateFieldGet(this, _ChannelEngine_publisher, "f").publish(internalEvent);
 }, _ChannelEngine_handleRemotePresenceUpdate = function _ChannelEngine_handleRemotePresenceUpdate(message) {
-    if (!this.users.has(message.userId)) {
-        return;
-    }
     const presenceEngine = __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getOrCreatePresenceEngine).call(this);
     presenceEngine.upsertPresence(message.userId, message.presence);
 }, _ChannelEngine_handleRemotePresenceRemoved = function _ChannelEngine_handleRemotePresenceRemoved(message) {
-    if (!this.users.has(message.userId)) {
-        return;
-    }
     if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
         __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);
     }
 }, _ChannelEngine_handleRemoteAssignsUpdate = function _ChannelEngine_handleRemoteAssignsUpdate(message) {
-    if (!this.users.has(message.userId)) {
-        return;
-    }
     __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, message.assigns);
 }, _ChannelEngine_handleRemoteAssignsRemoved = function _ChannelEngine_handleRemoteAssignsRemoved(message) {
-    if (!this.users.has(message.userId)) {
-        return;
-    }
     __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").set(message.userId, {});
 }, _ChannelEngine_handleRemoteEvictUser = function _ChannelEngine_handleRemoteEvictUser(message) {
-    if (!this.users.has(message.userId)) {
-        return;
-    }
     __classPrivateFieldGet(this, _ChannelEngine_assignsCache, "f").delete(message.userId);
     if (__classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) {
         __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f").removePresence(message.userId);

package/package.json

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