@eleven-am/pondsocket 0.1.50 → 0.1.52

package/client/channel.js

@@ -1,39 +1,61 @@
 "use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    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 __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _Channel_instances, _Channel_name, _Channel_joinParams, _Channel_receiver, _Channel_clientState, _Channel_joinState, _Channel_publisher, _Channel_queue, _Channel_presence, _Channel_presenceSub, _Channel_send, _Channel_publish, _Channel_subscribeToPresence, _Channel_init, _Channel_emptyQueue;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channel = void 0;
 const enums_1 = require("../enums");
-const subjectUtils_1 = require("../server/utils/subjectUtils");
+const subject_1 = require("../subjects/subject");
 class Channel {
     constructor(publisher, clientState, name, receiver, params = {}) {
-        this._name = name;
-        this._queue = [];
-        this._presence = [];
-        this._joinParams = params;
-        this._publisher = publisher;
-        this._clientState = clientState;
-        this._receiver = new subjectUtils_1.SimpleSubject();
-        this._joinState = new subjectUtils_1.SimpleBehaviorSubject(enums_1.ChannelState.IDLE);
-        this._presenceSub = this._init(receiver);
+        _Channel_instances.add(this);
+        _Channel_name.set(this, void 0);
+        _Channel_joinParams.set(this, void 0);
+        _Channel_receiver.set(this, void 0);
+        _Channel_clientState.set(this, void 0);
+        _Channel_joinState.set(this, void 0);
+        _Channel_publisher.set(this, void 0);
+        _Channel_queue.set(this, void 0);
+        _Channel_presence.set(this, void 0);
+        _Channel_presenceSub.set(this, void 0);
+        __classPrivateFieldSet(this, _Channel_name, name, "f");
+        __classPrivateFieldSet(this, _Channel_queue, [], "f");
+        __classPrivateFieldSet(this, _Channel_presence, [], "f");
+        __classPrivateFieldSet(this, _Channel_joinParams, params, "f");
+        __classPrivateFieldSet(this, _Channel_publisher, publisher, "f");
+        __classPrivateFieldSet(this, _Channel_clientState, clientState, "f");
+        __classPrivateFieldSet(this, _Channel_receiver, new subject_1.SimpleSubject(), "f");
+        __classPrivateFieldSet(this, _Channel_joinState, new subject_1.SimpleBehaviorSubject(enums_1.ChannelState.IDLE), "f");
+        __classPrivateFieldSet(this, _Channel_presenceSub, __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_init).call(this, receiver), "f");
     }
     /**
      * @desc Connects to the channel.
      */
     join() {
-        if (this._joinState.value === enums_1.ChannelState.CLOSED) {
+        if (__classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.CLOSED) {
             throw new Error('This channel has been closed');
         }
         const joinMessage = {
             action: enums_1.ClientActions.JOIN_CHANNEL,
-            channelName: this._name,
+            channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
             event: enums_1.ClientActions.JOIN_CHANNEL,
-            payload: this._joinParams,
+            payload: __classPrivateFieldGet(this, _Channel_joinParams, "f"),
         };
-        this._joinState.next(enums_1.ChannelState.JOINING);
-        if (this._clientState.value === enums_1.PondState.OPEN) {
-            this._publisher(joinMessage);
+        __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.JOINING);
+        if (__classPrivateFieldGet(this, _Channel_clientState, "f").value) {
+            __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, joinMessage);
         }
         else {
-            this._queue.push(joinMessage);
+            __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.STALLED);
         }
     }
     /**
@@ -42,20 +64,20 @@ class Channel {
     leave() {
         const leaveMessage = {
             action: enums_1.ClientActions.LEAVE_CHANNEL,
-            channelName: this._name,
+            channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
             event: enums_1.ClientActions.LEAVE_CHANNEL,
             payload: {},
         };
-        this._publish(leaveMessage);
-        this._joinState.next(enums_1.ChannelState.CLOSED);
-        this._presenceSub();
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_publish).call(this, leaveMessage);
+        __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.CLOSED);
+        __classPrivateFieldGet(this, _Channel_presenceSub, "f").call(this);
     }
     /**
      * @desc Monitors the channel for messages.
      * @param callback - The callback to call when a message is received.
      */
     onMessage(callback) {
-        return this._receiver.subscribe((data) => {
+        return __classPrivateFieldGet(this, _Channel_receiver, "f").subscribe((data) => {
             if (data.action !== enums_1.ServerActions.PRESENCE) {
                 return callback(data.event, data.payload);
             }
@@ -78,7 +100,7 @@ class Channel {
      * @param callback - The callback to call when the connection state changes.
      */
     onChannelStateChange(callback) {
-        return this._joinState.subscribe((data) => {
+        return __classPrivateFieldGet(this, _Channel_joinState, "f").subscribe((data) => {
             callback(data);
         });
     }
@@ -87,7 +109,7 @@ class Channel {
      * @param callback - The callback to call when a client joins the channel.
      */
     onJoin(callback) {
-        return this._subscribeToPresence((event, payload) => {
+        return __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_subscribeToPresence).call(this, (event, payload) => {
             if (event === enums_1.PresenceEventTypes.JOIN) {
                 return callback(payload.changed);
             }
@@ -98,7 +120,7 @@ class Channel {
      * @param callback - The callback to call when a client leaves the channel.
      */
     onLeave(callback) {
-        return this._subscribeToPresence((event, payload) => {
+        return __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_subscribeToPresence).call(this, (event, payload) => {
             if (event === enums_1.PresenceEventTypes.LEAVE) {
                 return callback(payload.changed);
             }
@@ -109,7 +131,7 @@ class Channel {
      * @param callback - The callback to call when a client changes their presence in the channel.
      */
     onPresenceChange(callback) {
-        return this._subscribeToPresence((event, payload) => {
+        return __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_subscribeToPresence).call(this, (event, payload) => {
             if (event === enums_1.PresenceEventTypes.UPDATE) {
                 return callback(payload);
             }
@@ -122,7 +144,7 @@ class Channel {
      * @param recipient - The clients to send the message to.
      */
     sendMessage(event, payload, recipient) {
-        this._send(event, payload, recipient);
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload, recipient);
     }
     /**
      * @desc Broadcasts a message to every other client in the channel except yourself.
@@ -130,7 +152,7 @@ class Channel {
      * @param payload - The message to send.
      */
     broadcastFrom(event, payload) {
-        this._send(event, payload, 'all_except_sender');
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER);
     }
     /**
      * @desc Broadcasts a message to the channel, including yourself.
@@ -138,32 +160,32 @@ class Channel {
      * @param payload - The message to send.
      */
     broadcast(event, payload) {
-        this._send(event, payload);
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload);
     }
     /**
      * @desc Gets the current connection state of the channel.
      */
     get channelState() {
-        return this._joinState.value;
+        return __classPrivateFieldGet(this, _Channel_joinState, "f").value;
     }
     /**
      * @desc Gets the current presence of the channel.
      */
     getPresence() {
-        return this._presence;
+        return __classPrivateFieldGet(this, _Channel_presence, "f");
     }
     /**
      * @desc Monitors the presence of the channel.
      * @param callback - The callback to call when the presence changes.
      */
     onUsersChange(callback) {
-        return this._subscribeToPresence((_event, payload) => callback(payload.presence));
+        return __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_subscribeToPresence).call(this, (_event, payload) => callback(payload.presence));
     }
     /**
      * @desc Gets the current connection state of the channel.
      */
     isConnected() {
-        return this._joinState.value === enums_1.ChannelState.JOINED || this._joinState.value === enums_1.ChannelState.JOINING;
+        return __classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.JOINED || __classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.STALLED;
     }
     /**
      * @desc Monitors the connection state of the channel.
@@ -171,73 +193,74 @@ class Channel {
      */
     onConnectionChange(callback) {
         return this.onChannelStateChange((state) => {
-            callback(state === enums_1.ChannelState.JOINED || state === enums_1.ChannelState.JOINING);
+            callback(state === enums_1.ChannelState.JOINED || state === enums_1.ChannelState.STALLED);
         });
     }
-    _send(event, payload, receivers = 'all_users') {
-        const message = {
-            action: enums_1.ClientActions.BROADCAST,
-            channelName: this._name,
-            event,
-            payload,
-            addresses: receivers,
-        };
-        this._publish(message);
-    }
-    _publish(data) {
-        if (this._clientState.value === enums_1.PondState.OPEN) {
-            if (this._joinState.value === enums_1.ChannelState.JOINED || this._joinState.value === enums_1.ChannelState.JOINING) {
-                this._publisher(data);
-            }
-            return;
+}
+exports.Channel = Channel;
+_Channel_name = new WeakMap(), _Channel_joinParams = new WeakMap(), _Channel_receiver = new WeakMap(), _Channel_clientState = new WeakMap(), _Channel_joinState = new WeakMap(), _Channel_publisher = new WeakMap(), _Channel_queue = new WeakMap(), _Channel_presence = new WeakMap(), _Channel_presenceSub = new WeakMap(), _Channel_instances = new WeakSet(), _Channel_send = function _Channel_send(event, payload, receivers = enums_1.ChannelReceiver.ALL_USERS) {
+    const message = {
+        action: enums_1.ClientActions.BROADCAST,
+        channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
+        event,
+        payload,
+        addresses: receivers,
+    };
+    __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_publish).call(this, message);
+}, _Channel_publish = function _Channel_publish(data) {
+    if (__classPrivateFieldGet(this, _Channel_clientState, "f").value) {
+        if (__classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.JOINED) {
+            __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, data);
         }
-        this._queue.push(data);
+        return;
     }
-    _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 !== enums_1.ChannelState.JOINED) {
-                    this._joinState.next(enums_1.ChannelState.JOINED);
-                }
-                this._receiver.next(data);
-            }
-        });
-        const unsubStateChange = this._clientState.subscribe((state) => {
-            if (state === enums_1.PondState.OPEN && this._queue.length > 0) {
-                const joinMessage = {
-                    action: enums_1.ClientActions.JOIN_CHANNEL,
-                    channelName: this._name,
-                    event: enums_1.ClientActions.JOIN_CHANNEL,
-                    payload: this._joinParams,
-                };
-                this._publisher(joinMessage);
-                this._queue
-                    .filter((message) => message.action !== enums_1.ClientActions.JOIN_CHANNEL)
-                    .forEach((message) => {
-                    this._publisher(message);
-                });
-                this._joinState.next(enums_1.ChannelState.JOINED);
-                this._queue = [];
+    __classPrivateFieldGet(this, _Channel_queue, "f").push(data);
+}, _Channel_subscribeToPresence = function _Channel_subscribeToPresence(callback) {
+    return __classPrivateFieldGet(this, _Channel_receiver, "f").subscribe((data) => {
+        if (data.action === enums_1.ServerActions.PRESENCE) {
+            return callback(data.event, data.payload);
+        }
+    });
+}, _Channel_init = function _Channel_init(receiver) {
+    const unsubMessages = receiver.subscribe((data) => {
+        if (data.channelName === __classPrivateFieldGet(this, _Channel_name, "f")) {
+            if (data.event === enums_1.Events.ACKNOWLEDGE) {
+                __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.JOINED);
+                __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_emptyQueue).call(this);
             }
-            else if (state !== enums_1.PondState.OPEN) {
-                this._joinState.next(enums_1.ChannelState.STALLED);
+            else {
+                __classPrivateFieldGet(this, _Channel_receiver, "f").publish(data);
             }
-        });
-        const unsubPresence = this._subscribeToPresence((_, payload) => {
-            this._presence = payload.presence;
-        });
-        return () => {
-            unsubMessages();
-            unsubStateChange();
-            unsubPresence();
-        };
-    }
-}
-exports.Channel = Channel;
+        }
+    });
+    const unsubStateChange = __classPrivateFieldGet(this, _Channel_clientState, "f").subscribe((state) => {
+        if (state && __classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.STALLED) {
+            const joinMessage = {
+                action: enums_1.ClientActions.JOIN_CHANNEL,
+                channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
+                event: enums_1.ClientActions.JOIN_CHANNEL,
+                payload: __classPrivateFieldGet(this, _Channel_joinParams, "f"),
+            };
+            __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, joinMessage);
+        }
+        else if (!state && __classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.JOINED) {
+            __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.STALLED);
+        }
+    });
+    const unsubPresence = __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_subscribeToPresence).call(this, (_, payload) => {
+        __classPrivateFieldSet(this, _Channel_presence, payload.presence, "f");
+    });
+    return () => {
+        unsubMessages();
+        unsubStateChange();
+        unsubPresence();
+    };
+}, _Channel_emptyQueue = function _Channel_emptyQueue() {
+    __classPrivateFieldGet(this, _Channel_queue, "f")
+        .filter((message) => message.action !== enums_1.ClientActions.JOIN_CHANNEL)
+        .forEach((message) => {
+        __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, message);
+    });
+    __classPrivateFieldGet(this, _Channel_joinState, "f").publish(enums_1.ChannelState.JOINED);
+    __classPrivateFieldSet(this, _Channel_queue, [], "f");
+};

package/client.d.ts

@@ -1,4 +1,3 @@
-// eslint-disable-next-line import/no-unresolved
-import { PondSocketClient } from './types';
+import { PondClient } from './types';
 
-export default PondSocketClient;
+export default PondClient;

package/client.js

@@ -1,10 +1,24 @@
 "use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    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 __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _PondClient_instances, _PondClient_channels, _PondClient_createPublisher;
 Object.defineProperty(exports, "__esModule", { value: true });
 const channel_1 = require("./client/channel");
 const enums_1 = require("./enums");
-const subjectUtils_1 = require("./server/utils/subjectUtils");
+const subject_1 = require("./subjects/subject");
 class PondClient {
     constructor(endpoint, params = {}) {
+        _PondClient_instances.add(this);
+        _PondClient_channels.set(this, void 0);
         let address;
         try {
             address = new URL(endpoint);
@@ -20,9 +34,9 @@ class PondClient {
             address.protocol = protocol;
         }
         this._address = address;
-        this._channels = {};
-        this._broadcaster = new subjectUtils_1.SimpleSubject();
-        this._connectionState = new subjectUtils_1.SimpleBehaviorSubject(enums_1.PondState.CLOSED);
+        __classPrivateFieldSet(this, _PondClient_channels, {}, "f");
+        this._broadcaster = new subject_1.SimpleSubject();
+        this._connectionState = new subject_1.SimpleBehaviorSubject(false);
     }
     /**
      * @desc Connects to the server and returns the socket.
@@ -30,14 +44,14 @@ class PondClient {
     connect(backoff = 1) {
         const socket = new WebSocket(this._address.toString());
         socket.onopen = () => {
-            this._connectionState.next(enums_1.PondState.OPEN);
+            this._connectionState.publish(true);
         };
         socket.onmessage = (message) => {
             const data = JSON.parse(message.data);
-            this._broadcaster.next(data);
+            this._broadcaster.publish(data);
         };
         socket.onerror = () => {
-            this._connectionState.next(enums_1.PondState.CLOSED);
+            this._connectionState.publish(false);
             setTimeout(() => {
                 this.connect(backoff * 2);
             }, backoff * 1000);
@@ -55,9 +69,9 @@ class PondClient {
      */
     disconnect() {
         var _a;
-        Object.values(this._channels).forEach((channel) => channel.leave());
+        Object.values(__classPrivateFieldGet(this, _PondClient_channels, "f")).forEach((channel) => channel.leave());
         (_a = this._socket) === null || _a === void 0 ? void 0 : _a.close();
-        this._channels = {};
+        __classPrivateFieldSet(this, _PondClient_channels, {}, "f");
     }
     /**
      * @desc Creates a channel with the given name and params.
@@ -65,12 +79,12 @@ class PondClient {
      * @param params - The params to send to the server.
      */
     createChannel(name, params) {
-        if (this._channels[name] && this._channels[name].channelState !== enums_1.ChannelState.CLOSED) {
-            return this._channels[name];
+        if (__classPrivateFieldGet(this, _PondClient_channels, "f")[name] && __classPrivateFieldGet(this, _PondClient_channels, "f")[name].channelState !== enums_1.ChannelState.CLOSED) {
+            return __classPrivateFieldGet(this, _PondClient_channels, "f")[name];
         }
-        const publisher = this._createPublisher();
+        const publisher = __classPrivateFieldGet(this, _PondClient_instances, "m", _PondClient_createPublisher).call(this);
         const channel = new channel_1.Channel(publisher, this._connectionState, name, this._broadcaster, params);
-        this._channels[name] = channel;
+        __classPrivateFieldGet(this, _PondClient_channels, "f")[name] = channel;
         return channel;
     }
     /**
@@ -80,12 +94,12 @@ class PondClient {
     onConnectionChange(callback) {
         return this._connectionState.subscribe(callback);
     }
-    _createPublisher() {
-        return (message) => {
-            if (this._connectionState.value === enums_1.PondState.OPEN) {
-                this._socket.send(JSON.stringify(message));
-            }
-        };
-    }
 }
 exports.default = PondClient;
+_PondClient_channels = new WeakMap(), _PondClient_instances = new WeakSet(), _PondClient_createPublisher = function _PondClient_createPublisher() {
+    return (message) => {
+        if (this._connectionState.value) {
+            this._socket.send(JSON.stringify(message));
+        }
+    };
+};