@eleven-am/pondsocket 0.1.157 → 0.1.160

package/channel/channel.js

@@ -254,7 +254,7 @@ _ChannelEngine_receiver = new WeakMap(), _ChannelEngine_presenceEngine = new Wea
     }
     unsubscribe();
     __classPrivateFieldGet(this, _ChannelEngine_users, "f").delete(userId);
-    const userPresence = (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) === null || _a === void 0 ? void 0 : _a.removePresence(userId);
+    const userPresence = (_a = __classPrivateFieldGet(this, _ChannelEngine_presenceEngine, "f")) === null || _a === void 0 ? void 0 : _a.removePresence(userId, true);
     if (__classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").leaveCallback) {
         __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").leaveCallback({
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -297,34 +297,44 @@ class Channel {
     }
     broadcast(event, payload) {
         __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(pondsocket_common_1.SystemSender.CHANNEL, pondsocket_common_1.ChannelReceiver.ALL_USERS, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+        return this;
     }
     broadcastFrom(userId, event, payload) {
         __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(userId, pondsocket_common_1.ChannelReceiver.ALL_EXCEPT_SENDER, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+        return this;
     }
     broadcastTo(userIds, event, payload) {
         const users = Array.isArray(userIds) ? userIds : [userIds];
         __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(pondsocket_common_1.SystemSender.CHANNEL, users, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
+        return this;
     }
     evictUser(userId, reason) {
         __classPrivateFieldGet(this, _Channel_engine, "f").kickUser(userId, reason !== null && reason !== void 0 ? reason : 'You have been banned from the channel');
+        return this;
     }
     trackPresence(userId, presence) {
         __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.trackPresence(userId, presence);
+        return this;
     }
     removePresence(userId) {
         __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.removePresence(userId);
+        return this;
     }
     updatePresence(userId, presence) {
         __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.updatePresence(userId, presence);
+        return this;
     }
     updateAssigns(userId, assigns) {
         __classPrivateFieldGet(this, _Channel_engine, "f").updateAssigns(userId, assigns);
+        return this;
     }
     subscribeTo(userId, channel) {
         __classPrivateFieldGet(this, _Channel_engine, "f").subscribeTo(userId, channel);
+        return this;
     }
     unsubscribeFrom(userId, channel) {
         __classPrivateFieldGet(this, _Channel_engine, "f").unsubscribeFrom(userId, channel);
+        return this;
     }
     upsertPresence(userId, presence) {
         const oldPresence = __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.getPresence()[userId];
@@ -334,6 +344,7 @@ class Channel {
         else {
             __classPrivateFieldGet(this, _Channel_engine, "f").presenceEngine.trackPresence(userId, presence);
         }
+        return this;
     }
 }
 exports.Channel = Channel;

package/endpoint/endpoint.js

@@ -121,6 +121,14 @@ class EndpointEngine {
             __classPrivateFieldGet(this, _EndpointEngine_sockets, "f").delete(cache.clientId);
             cache.subscriptions.forEach((unsubscribe) => unsubscribe());
         });
+        const event = {
+            event: pondsocket_common_1.Events.CONNECTION,
+            action: pondsocket_common_1.ServerActions.CONNECT,
+            channelName: pondsocket_common_1.SystemSender.ENDPOINT,
+            requestId: (0, pondsocket_common_1.uuid)(),
+            payload: {},
+        };
+        this.sendMessage(socket, event);
     }
     /**
      * @desc Retrieves a user from the endpoint

package/endpoint/endpoint.test.js

@@ -228,12 +228,13 @@ describe('endpoint', () => {
         }))
             .close();
     }));
-    it('should throw an error if accept, reject / send is called more than once', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('should throw an error if accept, reject is called more than once', () => __awaiter(void 0, void 0, void 0, function* () {
         socket.createEndpoint('/api/:room', (_, res) => {
             res.reply('hello', {
                 test: 'test',
             });
-            expect(() => res.accept()).toThrowError('Cannot execute response more than once');
+            res.accept();
+            expect(() => res.decline()).toThrowError('Cannot execute response more than once');
         });
         yield (0, superwstest_1.default)(server)
             .ws('/api/socket')

package/endpoint/response.js

@@ -14,6 +14,7 @@ var _ConnectionResponse_instances, _ConnectionResponse_webSocket, _ConnectionRes
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionResponse = void 0;
 const pondsocket_common_1 = require("@eleven-am/pondsocket-common");
+const ws_1 = require("ws");
 const pondError_1 = require("../errors/pondError");
 class ConnectionResponse {
     constructor(webSocket, engine, clientId) {
@@ -85,7 +86,9 @@ class ConnectionResponse {
      * @param payload - the payload to send
      */
     reply(event, payload) {
-        __classPrivateFieldGet(this, _ConnectionResponse_instances, "m", _ConnectionResponse_performChecks).call(this);
+        if (__classPrivateFieldGet(this, _ConnectionResponse_webSocket, "f").readyState !== ws_1.WebSocket.OPEN) {
+            throw new pondError_1.EndpointError('Socket is not open', 400);
+        }
         __classPrivateFieldGet(this, _ConnectionResponse_instances, "m", _ConnectionResponse_sendMessage).call(this, pondsocket_common_1.ServerActions.BROADCAST, event, payload);
         return this;
     }

package/package.json

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

package/presence/presence.js

@@ -62,8 +62,9 @@ class PresenceEngine {
     /**
      * @desc Removes a presence from the presence engine
      * @param presenceKey - The key of the presence
+     * @param safe - If true, it will not throw an error if the presence does not exist
      */
-    removePresence(presenceKey) {
+    removePresence(presenceKey, safe = false) {
         const presence = __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").get(presenceKey);
         if (presence) {
             __classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").delete(presenceKey);
@@ -72,7 +73,7 @@ class PresenceEngine {
                 presence: Array.from(__classPrivateFieldGet(this, _PresenceEngine_presenceMap, "f").values()),
             });
         }
-        else {
+        else if (!safe) {
             const code = 404;
             const message = `PresenceEngine: Presence with key ${presenceKey} does not exist`;
             throw new pondError_1.PresenceError(message, code, __classPrivateFieldGet(this, _PresenceEngine_channel, "f").name, pondsocket_common_1.PresenceEventTypes.LEAVE);

package/presence/presenceEngine.test.js

@@ -114,6 +114,9 @@ describe('PresenceEngine', () => {
         it('should throw an error if the presence does not exist', () => {
             expect(() => presenceEngine.removePresence(presenceKey)).toThrowError(`PresenceEngine: Presence with key ${presenceKey} does not exist`);
         });
+        it('should not throw an error if the safe flag is true', () => {
+            expect(() => presenceEngine.removePresence(presenceKey, true)).not.toThrow();
+        });
     });
     describe('getPresence', () => {
         it('should return the presence', () => {

package/types.d.ts

@@ -171,7 +171,7 @@ export declare class Channel<EventType extends PondEventMap = PondEventMap, Pres
      * @param {string} event - The event to send.
      * @param {PondMessage} payload - The message to send.
      */
-    broadcast<Key extends keyof EventType>(event: Key, payload: EventType[Key]): void;
+    broadcast<Key extends keyof EventType>(event: Key, payload: EventType[Key]): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Broadcasts a message to every client in the channel except the sender,
@@ -179,7 +179,7 @@ export declare class Channel<EventType extends PondEventMap = PondEventMap, Pres
      * @param {string} event - The event to send.
      * @param {PondMessage} payload - The message to send.
      */
-    broadcastFrom<Key extends keyof EventType>(userId: string, event: Key, payload: EventType[Key]): void;
+    broadcastFrom<Key extends keyof EventType>(userId: string, event: Key, payload: EventType[Key]): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Sends a message to a specific client in the channel.
@@ -187,62 +187,62 @@ export declare class Channel<EventType extends PondEventMap = PondEventMap, Pres
      * @param {string} event - The event to send.
      * @param {PondMessage} payload - The message to send.
      */
-    broadcastTo<Key extends keyof EventType>(clientIds: string | string[], event: Key, payload: EventType[Key]): void;
+    broadcastTo<Key extends keyof EventType>(clientIds: string | string[], event: Key, payload: EventType[Key]): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Bans a user from the channel.
      * @param {string} userId - The id of the user to ban.
      * @param {string} reason - The reason for the ban.
      */
-    evictUser(userId: string, reason?: string): void;
+    evictUser(userId: string, reason?: string): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc tracks a user's presence in the channel
      * @param {string} userId - the id of the user to track
      * @param {PondPresence} presence - the presence data to track
      */
-    trackPresence(userId: string, presence: PresenceType): void;
+    trackPresence(userId: string, presence: PresenceType): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc removes a user's presence from the channel
      * @param {string} userId - the id of the user to remove
      */
-    removePresence(userId: string): void;
+    removePresence(userId: string): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc updates a user's presence in the channel
      * @param {string} userId - the id of the user to update
      * @param {PondPresence} presence - the presence data to update
      */
-    updatePresence(userId: string, presence: PresenceType): void;
+    updatePresence(userId: string, presence: Partial<PresenceType>): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Updates a user's assigns in the channel
      * @param userId - the id of the user to update
      * @param assigns - the assigns data to update
      */
-    updateAssigns(userId: string, assigns: AssignType): void;
+    updateAssigns(userId: string, assigns: Partial<AssignType>): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Tracks or updates a user's presence in the channel
      * @param userId - the id of the user to upsert
      * @param presence - the presence data to upsert
      */
-    upsertPresence (userId: string, presence: PresenceType): void;
+    upsertPresence (userId: string, presence: PresenceType): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Subscribes a user to a channel.
      * @param {string} userId - The id of the user.
      * @param {string} channel - The channel to subscribe to.
      */
-    subscribeTo(userId: string, channel: string): void;
+    subscribeTo(userId: string, channel: string): Channel<EventType, PresenceType, AssignType>;
 
     /**
      * @desc Unsubscribes a user from a channel.
      * @param {string} userId - The id of the user.
      * @param {string} channel - The channel to unsubscribe from.
      */
-    unsubscribeFrom(userId: string, channel: string): void;
+    unsubscribeFrom(userId: string, channel: string): Channel<EventType, PresenceType, AssignType>;
 }
 
 export declare class AbstractRequest<Path extends string, PresenceType extends PondPresence, AssignType extends PondAssigns> {