@eleven-am/pondsocket 0.1.10 → 0.1.11

package/package.json

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

package/pondBase/pubSub.d.ts

@@ -4,11 +4,6 @@ export declare class Subscription {
 
 export declare class Broadcast<T, A> {
 
-    /**
-     * @desc Gets the number of subscribers
-     */
-    get subscriberCount(): number;
-
     /**
      * @desc Subscribe to the broadcast
      * @param handler - The handler to call when the broadcast is published
@@ -35,17 +30,21 @@ export declare class Subject<T, A> extends Broadcast<T, A> {
      */
     get value(): T;
 
+    /**
+     * @desc Get the list of observers
+     * @returns The list of observers
+     */
+    get observers(): Set<(data: T) => Anything<A>>;
+
     /**
      * @desc Subscribe to the subject
-     * @param handler - The handler to call when the subject is published
      */
     subscribe(handler: (data: T) => A): Subscription;
 
     /**
      * @desc Publish to the subject
-     * @param data - The data to publish
      */
-    publish(data: T): A | undefined;
+    publish(data: T): Anything<A>;
 }
 
 export declare class EventPubSub<T, A> {
@@ -55,7 +54,7 @@ export declare class EventPubSub<T, A> {
      * @param event - The event to subscribe to
      * @param handler - The handler to call when the event subject is published
      */
-    subscribe(event: string, handler: (data: T) => A): Subscription;
+    subscribe(event: string, handler: (data: T) => Anything<A>): Subscription;
 
     /**
      * @desc Publish to the event subject

package/pondBase/pubSub.js

@@ -20,12 +20,6 @@ class Broadcast {
             }
         };
     }
-    /**
-     * @desc Gets the number of subscribers
-     */
-    get subscriberCount() {
-        return this._subscribers.size;
-    }
     /**
      * @desc Publish to the broadcast
      * @param data - The data to publish
@@ -33,9 +27,14 @@ class Broadcast {
     publish(data) {
         let result;
         for (const subscriber of this._subscribers) {
-            result = subscriber(data);
-            if (result)
-                break;
+            try {
+                result = subscriber(data);
+                if (result)
+                    break;
+            }
+            catch (e) {
+                throw e;
+            }
         }
         return result;
     }
@@ -58,17 +57,22 @@ class Subject extends Broadcast {
     get value() {
         return this._value;
     }
+    /**
+     * @desc Get the list of observers
+     * @returns The list of observers
+     */
+    get observers() {
+        return this._subscribers;
+    }
     /**
      * @desc Subscribe to the subject
-     * @param handler - The handler to call when the subject is published
      */
     subscribe(handler) {
-        void handler(this._value);
+        handler(this._value);
         return super.subscribe(handler);
     }
     /**
      * @desc Publish to the subject
-     * @param data - The data to publish
      */
     publish(data) {
         if (this._value !== data) {
@@ -91,7 +95,6 @@ class EventPubSub {
         const subscriber = (eventData) => {
             if (eventData.type === event)
                 return handler(eventData.data);
-            return undefined;
         };
         this._subscribers.add(subscriber);
         return {
@@ -110,7 +113,12 @@ class EventPubSub {
      */
     publish(event, data) {
         for (const subscriber of this._subscribers) {
-            void subscriber({ type: event, data });
+            try {
+                subscriber({ type: event, data });
+            }
+            catch (e) {
+                throw e;
+            }
         }
     }
     /**

package/pondBase/pubSub.test.js

@@ -163,6 +163,15 @@ describe('Subject', () => {
         expect(subscriber3).toHaveBeenCalledWith('Hello');
         expect(subscriber2).not.toHaveBeenCalled();
     });
+    it('should provide the current list of observers', () => {
+        const subject = new pubSub_1.Subject('hi');
+        const subscriber1 = jest.fn();
+        const subscriber2 = jest.fn();
+        subject.subscribe(subscriber1);
+        subject.subscribe(subscriber2);
+        const set = new Set([subscriber1, subscriber2]);
+        expect(subject.observers).toEqual(set);
+    });
 });
 describe('EventSubject', () => {
     it('should be defined', () => {

package/pondClient/channel.d.ts

@@ -7,6 +7,11 @@ export declare class Channel {
 
     constructor(name: string, receiver: Broadcast<ServerMessage, void>, broadcaster: Broadcast<ClientMessage, void>, params?: ChannelParams);
 
+    /**
+     * @desc Gets the current presence state of the channel.
+     */
+    get presence(): PondPresence[];
+
     /**
      * @desc Connects to the channel.
      */
@@ -53,10 +58,16 @@ export declare class Channel {
     updatePresence(presence: PondPresence): void;
 
     /**
-     * @desc Monitors the presence state of the channel.
-     * @param callback - The callback to call when the presence state changes.
+     * @desc Detects when clients join the channel.
+     * @param callback - The callback to call when a client joins the channel.
+     */
+    onJoin(callback: (presence: PondPresence) => void): Subscription;
+
+    /**
+     * @desc Detects when clients leave the channel.
+     * @param callback - The callback to call when a client leaves the channel.
      */
-    onPresence(callback: (change: PondPresence | null, presence: PondPresence[]) => void): Subscription;
+    onLeave(callback: (presence: PondPresence) => void): Subscription;
 
     /**
      * @desc Monitors the connection state of the channel.

package/pondClient/channel.js

@@ -10,16 +10,17 @@ class Channel {
         this._broadcaster = broadcaster;
         this._connection = new pondBase_1.Subject(false);
         this._receiver = new pondBase_1.Broadcast();
+        this._presence = new pondBase_1.Subject({
+            action: pondBase_1.PondBaseActions.REMOVE_FROM_POND,
+            change: null,
+            presence: []
+        });
         this._subscription = receiver.subscribe(data => {
             if (data.channelName === name) {
                 this._receiver.publish(data);
                 this._connection.publish(true);
             }
         });
-        this._presence = new pondBase_1.Subject({
-            change: null,
-            presence: []
-        });
     }
     /**
      * @desc Connects to the channel.
@@ -33,7 +34,13 @@ class Channel {
         };
         this._receiver.subscribe(data => {
             if (data.action === pondSocket_1.ServerActions.PRESENCE) {
-                this._presence.publish(data.payload);
+                const event = data.event;
+                const presenceData = data.payload;
+                this._presence.publish({
+                    action: event,
+                    change: presenceData.change,
+                    presence: presenceData.presence
+                });
             }
         });
         this._broadcaster.publish(joinMessage);
@@ -118,14 +125,35 @@ class Channel {
         this._broadcaster.publish(message);
     }
     /**
-     * @desc Monitors the presence state of the channel.
-     * @param callback - The callback to call when the presence state changes.
+     * @desc Detects when clients join the channel.
+     * @param callback - The callback to call when a client joins the channel.
      */
-    onPresence(callback) {
+    onJoin(callback) {
         return this._presence.subscribe(data => {
-            callback(data.change, data.presence);
+            if (data.action === pondBase_1.PondBaseActions.ADD_TO_POND)
+                callback(data.change);
         });
     }
+    /**
+     * @desc Detects when clients leave the channel.
+     * @param callback - The callback to call when a client leaves the channel.
+     */
+    onLeave(callback) {
+        let presence = [];
+        return this._presence.subscribe(data => {
+            if (data.action === pondBase_1.PondBaseActions.REMOVE_FROM_POND) {
+                const missing = presence.filter(p => !data.presence.find(x => x.id === p.id));
+                missing.forEach(p => callback(p));
+            }
+            presence = data.presence;
+        });
+    }
+    /**
+     * @desc Gets the current presence state of the channel.
+     */
+    get presence() {
+        return this._presence.value.presence;
+    }
     /**
      * @desc Monitors the connection state of the channel.
      * @param callback - The callback to call when the connection state changes.

package/pondClient/socket.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondClient = void 0;
 const channel_1 = require("./channel");
-const pondBase_1 = require("../pondBase");
 const pondSocket_1 = require("../pondSocket");
+const pondBase_1 = require("../pondBase");
 class PondClient {
     constructor(endpoint, params) {
         let address;

package/pondSocket/channel.js

@@ -99,7 +99,7 @@ class Channel extends pondBase_1.BaseClass {
             this.removeChannel();
     }
     /**
-     * @desc Subscribes to the presence changes occuring in the channel
+     * @desc Subscribes to the presence changes occurring in the channel
      * @param callback - The callback to call when a presence change occurs
      */
     onPresenceChange(callback) {
@@ -114,7 +114,7 @@ class Channel extends pondBase_1.BaseClass {
         });
     }
     /**
-     * @desc Subscribes to the message events occuring in the channel
+     * @desc Subscribes to the message events occurring in the channel
      * @param callback - The callback to call when a message event occurs
      */
     onMessage(callback) {