@eleven-am/pondsocket 0.1.31 → 0.1.33

package/client/channel.js

@@ -7,14 +7,14 @@ class Channel {
     constructor(publisher, clientState, name, receiver, params = {}) {
         this._name = name;
         this._queue = [];
+        this._presence = [];
         this._finished = false;
         this._joinParams = params;
-        this._receiver = receiver;
         this._publisher = publisher;
         this._clientState = clientState;
+        this._receiver = new subjectUtils_1.SimpleSubject();
         this._joinState = new subjectUtils_1.SimpleBehaviorSubject(false);
-        this._presence = new subjectUtils_1.SimpleBehaviorSubject([]);
-        this._presenceSub = this._init();
+        this._presenceSub = this._init(receiver);
     }
     /**
      * @desc Connects to the channel.
@@ -47,25 +47,24 @@ class Channel {
     }
     /**
      * @desc Monitors the channel for messages.
-     * @param event - The event to monitor.
      * @param callback - The callback to call when a message is received.
      */
-    onMessageEvent(event, callback) {
+    onMessage(callback) {
         return this._receiver.subscribe((data) => {
-            if (data.action === enums_1.ServerActions.BROADCAST && data.event === event && data.channelName === this._name) {
-                return callback(data.payload);
+            if (data.action !== enums_1.ServerActions.PRESENCE) {
+                return callback(data.event, data.payload);
             }
         });
     }
     /**
      * @desc Monitors the channel for messages.
+     * @param event - The event to monitor.
      * @param callback - The callback to call when a message is received.
      */
-    onMessage(callback) {
-        return this._receiver.subscribe((data) => {
-            console.log(data.channelName, this._name, 2);
-            if (data.action === enums_1.ServerActions.BROADCAST && data.channelName === this._name) {
-                return callback(data.event, data.payload);
+    onMessageEvent(event, callback) {
+        return this.onMessage((eventReceived, message) => {
+            if (eventReceived === event) {
+                return callback(message);
             }
         });
     }
@@ -83,9 +82,9 @@ class Channel {
      * @param callback - The callback to call when a client joins the channel.
      */
     onJoin(callback) {
-        return this._receiver.subscribe((data) => {
-            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.JOIN && data.channelName === this._name) {
-                return callback(data.payload.changed);
+        return this._subscribeToPresence((event, payload) => {
+            if (event === enums_1.PresenceEventTypes.JOIN) {
+                return callback(payload.changed);
             }
         });
     }
@@ -94,9 +93,9 @@ class Channel {
      * @param callback - The callback to call when a client leaves the channel.
      */
     onLeave(callback) {
-        return this._receiver.subscribe((data) => {
-            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.LEAVE && data.channelName === this._name) {
-                return callback(data.payload.changed);
+        return this._subscribeToPresence((event, payload) => {
+            if (event === enums_1.PresenceEventTypes.LEAVE) {
+                return callback(payload.changed);
             }
         });
     }
@@ -105,9 +104,9 @@ class Channel {
      * @param callback - The callback to call when a client changes their presence in the channel.
      */
     onPresenceChange(callback) {
-        return this._receiver.subscribe((data) => {
-            if (data.action === enums_1.ServerActions.PRESENCE && data.event === enums_1.PresenceEventTypes.UPDATE && data.channelName === this._name) {
-                return callback(data.payload);
+        return this._subscribeToPresence((event, payload) => {
+            if (event === enums_1.PresenceEventTypes.UPDATE) {
+                return callback(payload);
             }
         });
     }
@@ -152,16 +151,14 @@ class Channel {
      * @desc Gets the current presence of the channel.
      */
     getPresence() {
-        return this._presence.value;
+        return this._presence;
     }
     /**
      * @desc Monitors the presence of the channel.
      * @param callback - The callback to call when the presence changes.
      */
     onUsersChange(callback) {
-        return this._presence.subscribe((data) => {
-            callback(data);
-        });
+        return this._subscribeToPresence((event, payload) => callback(payload.presence));
     }
     _send(event, payload, receivers = 'all_users') {
         const message = {
@@ -174,15 +171,30 @@ class Channel {
         this._publish(message);
     }
     _publish(data) {
-        if (!this._joinState.value || this._clientState.value !== 'OPEN') {
-            this._queue.push(data);
+        if (this._joinState.value && this._clientState.value !== 'OPEN') {
+            this._publisher(data);
             return;
         }
-        this._publisher(data);
+        this._queue.push(data);
     }
-    _init() {
+    _subscribeToPresence(callback) {
+        return this._receiver.subscribe((data) => {
+            if (data.action === enums_1.ServerActions.PRESENCE) {
+                return callback(data.event, data.payload);
+            }
+        });
+    }
+    _init(receiver) {
+        const unsubMessages = receiver.subscribe((data) => {
+            if (data.channelName === this._name) {
+                if (!this._joinState.value) {
+                    this._joinState.publish(true);
+                }
+                this._receiver.publish(data);
+            }
+        });
         const unsubStateChange = this._clientState.subscribe((state) => {
-            if (state === 'OPEN') {
+            if (state === 'OPEN' && this._queue.length > 0) {
                 const joinMessage = {
                     action: enums_1.ClientActions.JOIN_CHANNEL,
                     channelName: this._name,
@@ -193,15 +205,18 @@ class Channel {
                 this._queue.forEach((message) => {
                     this._publisher(message);
                 });
+                this._joinState.publish(true);
                 this._queue = [];
             }
-        });
-        const unsubPresence = this._receiver.subscribe((data) => {
-            if (data.action === enums_1.ServerActions.PRESENCE && data.channelName === this._name) {
-                this._presence.publish(data.payload.presence);
+            else if (state !== 'OPEN') {
+                this._joinState.publish(false);
             }
         });
+        const unsubPresence = this._subscribeToPresence((_, payload) => {
+            this._presence = payload.presence;
+        });
         return () => {
+            unsubMessages();
             unsubStateChange();
             unsubPresence();
         };

package/package.json

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