@eleven-am/pondsocket 0.1.125 → 0.1.126

package/abstracts/abstractResponse.js

@@ -2,5 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PondResponse = void 0;
 class PondResponse {
+    constructor(requestId) {
+        this.requestId = requestId;
+    }
 }
 exports.PondResponse = PondResponse;

package/channel/channel.js

@@ -28,6 +28,7 @@ const eventRequest_1 = require("./eventRequest");
 const eventResponse_1 = require("./eventResponse");
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
+const uuid_1 = require("../misc/uuid");
 const presence_1 = require("../presence/presence");
 const subject_1 = require("../subjects/subject");
 class Channel {
@@ -45,16 +46,16 @@ class Channel {
         return __classPrivateFieldGet(this, _Channel_engine, "f").getUserData(userId);
     }
     broadcastMessage(event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
     }
     broadcastMessageFromUser(userId, event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(userId, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage((0, uuid_1.uuid)(), userId, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
     }
     sendToUser(userId, event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.BROADCAST, event, payload);
     }
     sendToUsers(userIds, event, payload) {
-        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, userIds, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _Channel_engine, "f").sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, userIds, enums_1.ServerActions.BROADCAST, event, payload);
     }
     evictUser(userId, reason) {
         __classPrivateFieldGet(this, _Channel_engine, "f").kickUser(userId, reason !== null && reason !== void 0 ? reason : 'You have been banned from the channel');
@@ -132,12 +133,12 @@ class ChannelEngine {
      * @param reason - The reason for kicking the user
      */
     kickUser(userId, reason) {
-        this.sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.SYSTEM, 'kicked_out', {
+        this.sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.SYSTEM, 'kicked_out', {
             message: reason,
             code: 403,
         });
         this.removeUser(userId);
-        this.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, 'kicked', {
+        this.sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, 'kicked', {
             userId,
             reason,
         });
@@ -147,7 +148,7 @@ class ChannelEngine {
      * @param reason - The reason for self-destructing the channel
      */
     destroy(reason) {
-        this.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.ERROR, 'destroyed', {
+        this.sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.ERROR, 'destroyed', {
             message: reason !== null && reason !== void 0 ? reason : 'Channel has been destroyed',
         });
         __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").destroyChannel();
@@ -195,19 +196,21 @@ class ChannelEngine {
     }
     /**
      * @desc Sends a message to a specified set of users, from a specified sender
+     * @param requestId - The id of the request
      * @param sender - The sender of the message
      * @param recipient - The users to send the message to
      * @param action - The action of the message
      * @param event - The event name
      * @param payload - The payload of the message
      */
-    sendMessage(sender, recipient, action, event, payload) {
+    sendMessage(requestId, sender, recipient, action, event, payload) {
         if (!__classPrivateFieldGet(this, _ChannelEngine_users, "f").has(sender) && sender !== enums_1.SystemSender.CHANNEL) {
             throw new pondError_1.ChannelError(`ChannelEngine: User with id ${sender} does not exist in channel ${this.name}`, 404, this.name);
         }
         const eventMessage = {
             recipients: __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getUsersFromRecipients).call(this, recipient, sender),
             channelName: this.name,
+            requestId,
             action,
             payload,
             event,
@@ -229,12 +232,13 @@ class ChannelEngine {
             payload: message.payload,
             action: enums_1.ServerActions.BROADCAST,
             channelName: this.name,
+            requestId: message.requestId,
             recipients: __classPrivateFieldGet(this, _ChannelEngine_instances, "m", _ChannelEngine_getUsersFromRecipients).call(this, message.addresses || enums_1.ChannelReceiver.ALL_USERS, userId),
         };
         const request = new eventRequest_1.EventRequest(responseEvent, this);
         const response = new eventResponse_1.EventResponse(responseEvent, this);
         __classPrivateFieldGet(this, _ChannelEngine_parentEngine, "f").execute(request, response, () => {
-            this.sendMessage(enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.ERROR, enums_1.ErrorTypes.HANDLER_NOT_FOUND, {
+            this.sendMessage(responseEvent.requestId, enums_1.SystemSender.CHANNEL, [userId], enums_1.ServerActions.ERROR, enums_1.ErrorTypes.HANDLER_NOT_FOUND, {
                 message: 'A handler did not respond to the event',
                 code: 404,
             });

package/channel/eventResponse.js

@@ -18,7 +18,7 @@ const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
 class EventResponse extends abstractResponse_1.PondResponse {
     constructor(event, engine) {
-        super();
+        super(event.requestId);
         _EventResponse_instances.add(this);
         _EventResponse_event.set(this, void 0);
         _EventResponse_engine.set(this, void 0);
@@ -39,7 +39,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      */
     accept(assigns) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, __classPrivateFieldGet(this, _EventResponse_event, "f").recipients, __classPrivateFieldGet(this, _EventResponse_event, "f").action, __classPrivateFieldGet(this, _EventResponse_event, "f").event, __classPrivateFieldGet(this, _EventResponse_event, "f").payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, __classPrivateFieldGet(this, _EventResponse_event, "f").recipients, __classPrivateFieldGet(this, _EventResponse_event, "f").action, __classPrivateFieldGet(this, _EventResponse_event, "f").event, __classPrivateFieldGet(this, _EventResponse_event, "f").payload);
         return this;
     }
     /**
@@ -51,7 +51,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
     reject(message, errorCode, assigns) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
         const text = message || 'Unauthorized request';
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.ERROR, enums_1.ErrorTypes.UNAUTHORIZED_BROADCAST, {
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.ERROR, enums_1.ErrorTypes.UNAUTHORIZED_BROADCAST, {
             message: text,
             code: errorCode || 403,
         });
@@ -65,7 +65,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      */
     send(event, payload, assigns) {
         this.accept(assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.SYSTEM, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.SYSTEM, event, payload);
     }
     /**
      * @desc Emits a direct message to the client without accepting the request
@@ -75,7 +75,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      */
     sendOnly(event, payload, assigns) {
         __classPrivateFieldGet(this, _EventResponse_instances, "m", _EventResponse_manageAssigns).call(this, assigns);
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.SYSTEM, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _EventResponse_event, "f").sender], enums_1.ServerActions.SYSTEM, event, payload);
     }
     /**
      * @desc Sends a message to all clients in the channel
@@ -83,7 +83,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      */
     broadcast(event, payload) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**
@@ -92,7 +92,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      */
     broadcastFromUser(event, payload) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**
@@ -102,7 +102,7 @@ class EventResponse extends abstractResponse_1.PondResponse {
      * @param userIds - the ids of the clients to send the message to
      */
     sendToUsers(event, payload, userIds) {
-        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _EventResponse_event, "f").sender, userIds, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _EventResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _EventResponse_event, "f").sender, userIds, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**

package/client/channel.js

@@ -10,23 +10,24 @@ 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 _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;
+var _Channel_instances, _Channel_name, _Channel_queue, _Channel_presence, _Channel_publisher, _Channel_joinParams, _Channel_presenceSub, _Channel_receiver, _Channel_clientState, _Channel_joinState, _Channel_send, _Channel_publish, _Channel_subscribeToPresence, _Channel_init, _Channel_emptyQueue, _Channel_buildJoinMessage, _Channel_onMessage;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channel = void 0;
 const enums_1 = require("../enums");
+const uuid_1 = require("../misc/uuid");
 const subject_1 = require("../subjects/subject");
 class Channel {
     constructor(publisher, clientState, name, receiver, params) {
         _Channel_instances.add(this);
         _Channel_name.set(this, void 0);
+        _Channel_queue.set(this, void 0);
+        _Channel_presence.set(this, void 0);
+        _Channel_publisher.set(this, void 0);
         _Channel_joinParams.set(this, void 0);
+        _Channel_presenceSub.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");
@@ -50,12 +51,7 @@ class Channel {
         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: __classPrivateFieldGet(this, _Channel_name, "f"),
-            event: enums_1.ClientActions.JOIN_CHANNEL,
-            payload: __classPrivateFieldGet(this, _Channel_joinParams, "f"),
-        };
+        const joinMessage = __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_buildJoinMessage).call(this);
         __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);
@@ -69,9 +65,11 @@ class Channel {
      */
     leave() {
         const leaveMessage = {
+            addresses: enums_1.ChannelReceiver.ALL_USERS,
             action: enums_1.ClientActions.LEAVE_CHANNEL,
-            channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
             event: enums_1.ClientActions.LEAVE_CHANNEL,
+            channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
+            requestId: (0, uuid_1.uuid)(),
             payload: {},
         };
         __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_publish).call(this, leaveMessage);
@@ -83,10 +81,8 @@ class Channel {
      * @param callback - The callback to call when a message is received.
      */
     onMessage(callback) {
-        return __classPrivateFieldGet(this, _Channel_receiver, "f").subscribe((data) => {
-            if (data.action !== enums_1.ServerActions.PRESENCE) {
-                return callback(data.event, data.payload);
-            }
+        return __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_onMessage).call(this, (event, message) => {
+            callback(event, message);
         });
     }
     /**
@@ -150,7 +146,8 @@ class Channel {
      * @param recipient - The clients to send the message to.
      */
     sendMessage(event, payload, recipient) {
-        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload, recipient);
+        const requestId = (0, uuid_1.uuid)();
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, requestId, payload, recipient);
     }
     /**
      * @desc Sends a message to the server and waits for a response.
@@ -159,12 +156,15 @@ class Channel {
      * @param responseEvent - The event to wait for.
      */
     sendForResponse(sentEvent, payload, responseEvent) {
+        const requestId = (0, uuid_1.uuid)();
         return new Promise((resolve) => {
-            const unsub = this.onMessageEvent(responseEvent, (message) => {
-                resolve(message);
-                unsub();
+            const unsub = __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_onMessage).call(this, (event, message, responseId) => {
+                if (event === responseEvent && requestId === responseId) {
+                    resolve(message);
+                    unsub();
+                }
             });
-            __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, sentEvent, payload);
+            __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, sentEvent, requestId, payload);
         });
     }
     /**
@@ -173,7 +173,8 @@ class Channel {
      * @param payload - The message to send.
      */
     broadcastFrom(event, payload) {
-        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER);
+        const requestId = (0, uuid_1.uuid)();
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, requestId, payload, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER);
     }
     /**
      * @desc Broadcasts a message to the channel, including yourself.
@@ -181,7 +182,8 @@ class Channel {
      * @param payload - The message to send.
      */
     broadcast(event, payload) {
-        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, payload);
+        const requestId = (0, uuid_1.uuid)();
+        __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_send).call(this, event, requestId, payload);
     }
     /**
      * @desc Gets the current presence of the channel.
@@ -223,27 +225,16 @@ class Channel {
             callback(state === enums_1.ChannelState.JOINED || state === enums_1.ChannelState.STALLED);
         });
     }
-    /**
-     * @desc Gets the first response from the channel.
-     * @param event - The event to monitor.
-     */
-    getFirstResponse(event) {
-        return new Promise((resolve) => {
-            const unsub = this.onMessageEvent(event, (message) => {
-                resolve(message);
-                unsub();
-            });
-        });
-    }
 }
 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) {
+_Channel_name = new WeakMap(), _Channel_queue = new WeakMap(), _Channel_presence = new WeakMap(), _Channel_publisher = new WeakMap(), _Channel_joinParams = new WeakMap(), _Channel_presenceSub = new WeakMap(), _Channel_receiver = new WeakMap(), _Channel_clientState = new WeakMap(), _Channel_joinState = new WeakMap(), _Channel_instances = new WeakSet(), _Channel_send = function _Channel_send(event, requestId, payload, receivers = enums_1.ChannelReceiver.ALL_USERS) {
     const message = {
         action: enums_1.ClientActions.BROADCAST,
         channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
+        addresses: receivers,
+        requestId,
         event,
         payload,
-        addresses: receivers,
     };
     __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_publish).call(this, message);
 }, _Channel_publish = function _Channel_publish(data) {
@@ -274,12 +265,7 @@ _Channel_name = new WeakMap(), _Channel_joinParams = new WeakMap(), _Channel_rec
     });
     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"),
-            };
+            const joinMessage = __classPrivateFieldGet(this, _Channel_instances, "m", _Channel_buildJoinMessage).call(this);
             __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, joinMessage);
         }
         else if (!state && __classPrivateFieldGet(this, _Channel_joinState, "f").value === enums_1.ChannelState.JOINED) {
@@ -301,4 +287,19 @@ _Channel_name = new WeakMap(), _Channel_joinParams = new WeakMap(), _Channel_rec
         __classPrivateFieldGet(this, _Channel_publisher, "f").call(this, message);
     });
     __classPrivateFieldSet(this, _Channel_queue, [], "f");
+}, _Channel_buildJoinMessage = function _Channel_buildJoinMessage() {
+    return {
+        addresses: enums_1.ChannelReceiver.ALL_USERS,
+        action: enums_1.ClientActions.JOIN_CHANNEL,
+        event: enums_1.ClientActions.JOIN_CHANNEL,
+        payload: __classPrivateFieldGet(this, _Channel_joinParams, "f"),
+        channelName: __classPrivateFieldGet(this, _Channel_name, "f"),
+        requestId: (0, uuid_1.uuid)(),
+    };
+}, _Channel_onMessage = function _Channel_onMessage(callback) {
+    return __classPrivateFieldGet(this, _Channel_receiver, "f").subscribe((data) => {
+        if (data.action !== enums_1.ServerActions.PRESENCE) {
+            return callback(data.event, data.payload, data.requestId);
+        }
+    });
 };

package/endpoint/endpoint.js

@@ -13,6 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Endpoint_instances, _Endpoint_middleware, _Endpoint_channels, _Endpoint_sockets, _Endpoint_sendMessage, _Endpoint_joinChannel, _Endpoint_execute, _Endpoint_handleMessage, _Endpoint_readMessage, _Endpoint_isObjectEmpty;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Endpoint = void 0;
+const zod_1 = require("zod");
 const middleware_1 = require("../abstracts/middleware");
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
@@ -20,6 +21,8 @@ const joinRequest_1 = require("../lobby/joinRequest");
 const joinResponse_1 = require("../lobby/joinResponse");
 const lobby_1 = require("../lobby/lobby");
 const matcher_1 = require("../matcher/matcher");
+const uuid_1 = require("../misc/uuid");
+const schema_1 = require("../schema");
 class Endpoint {
     constructor() {
         _Endpoint_instances.add(this);
@@ -83,6 +86,7 @@ class Endpoint {
             const message = {
                 event,
                 payload,
+                requestId: (0, uuid_1.uuid)(),
                 action: enums_1.ServerActions.BROADCAST,
                 channelName: enums_1.SystemSender.ENDPOINT,
             };
@@ -125,8 +129,8 @@ class Endpoint {
 exports.Endpoint = Endpoint;
 _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpoint_sockets = new WeakMap(), _Endpoint_instances = new WeakSet(), _Endpoint_sendMessage = function _Endpoint_sendMessage(socket, message) {
     socket.send(JSON.stringify(message));
-}, _Endpoint_joinChannel = function _Endpoint_joinChannel(channel, socket, joinParams) {
-    const cache = Object.assign(Object.assign({}, socket), { channelName: channel });
+}, _Endpoint_joinChannel = function _Endpoint_joinChannel(channel, socket, joinParams, requestId) {
+    const cache = Object.assign(Object.assign({}, socket), { requestId, channelName: channel });
     __classPrivateFieldGet(this, _Endpoint_middleware, "f").run(cache, joinParams, () => {
         throw new pondError_1.EndpointError(`GatewayEngine: Channel ${channel} does not exist`, 404);
     });
@@ -142,7 +146,7 @@ _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpo
 }, _Endpoint_handleMessage = function _Endpoint_handleMessage(cache, message) {
     switch (message.action) {
         case enums_1.ClientActions.JOIN_CHANNEL:
-            __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_joinChannel).call(this, message.channelName, cache, message.payload);
+            __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_joinChannel).call(this, message.channelName, cache, message.payload, message.requestId);
             break;
         case enums_1.ClientActions.LEAVE_CHANNEL:
             __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_execute).call(this, message.channelName, (channel) => {
@@ -162,34 +166,22 @@ _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpo
         event: enums_1.ErrorTypes.INVALID_MESSAGE,
         action: enums_1.ServerActions.ERROR,
         channelName: enums_1.SystemSender.ENDPOINT,
+        requestId: (0, uuid_1.uuid)(),
         payload: {},
     };
     try {
         const data = JSON.parse(message);
-        if (!data.action) {
-            errorMessage.payload = {
-                message: 'No action provided',
-            };
-        }
-        else if (!data.channelName) {
-            errorMessage.payload = {
-                message: 'No channel name provided',
-            };
-        }
-        else if (!data.payload) {
+        const result = schema_1.clientMessageSchema.parse(data);
+        __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_handleMessage).call(this, cache, result);
+    }
+    catch (e) {
+        if (e instanceof zod_1.ZodError) {
             errorMessage.payload = {
-                message: 'No payload provided',
+                message: e.message,
+                code: 400,
             };
         }
-        if (!__classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_isObjectEmpty).call(this, errorMessage.payload)) {
-            __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_sendMessage).call(this, cache.socket, errorMessage);
-        }
-        else {
-            __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_handleMessage).call(this, cache, data);
-        }
-    }
-    catch (e) {
-        if (e instanceof SyntaxError) {
+        else if (e instanceof SyntaxError) {
             errorMessage.payload = {
                 message: 'Invalid JSON',
             };
@@ -224,6 +216,11 @@ _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpo
                 code: e.code,
             };
         }
+        else {
+            errorMessage.payload = {
+                message: 'Unknown error',
+            };
+        }
         __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_sendMessage).call(this, cache.socket, errorMessage);
     }
 }, _Endpoint_isObjectEmpty = function _Endpoint_isObjectEmpty(obj) {

package/endpoint/response.js

@@ -16,9 +16,10 @@ exports.ConnectionResponse = void 0;
 const abstractResponse_1 = require("../abstracts/abstractResponse");
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
+const uuid_1 = require("../misc/uuid");
 class ConnectionResponse extends abstractResponse_1.PondResponse {
     constructor(webSocket, engine, clientId) {
-        super();
+        super((0, uuid_1.uuid)());
         _ConnectionResponse_instances.add(this);
         _ConnectionResponse_webSocket.set(this, void 0);
         _ConnectionResponse_engine.set(this, void 0);
@@ -76,9 +77,10 @@ class ConnectionResponse extends abstractResponse_1.PondResponse {
 exports.ConnectionResponse = ConnectionResponse;
 _ConnectionResponse_webSocket = new WeakMap(), _ConnectionResponse_engine = new WeakMap(), _ConnectionResponse_clientId = new WeakMap(), _ConnectionResponse_executed = new WeakMap(), _ConnectionResponse_instances = new WeakSet(), _ConnectionResponse_sendMessage = function _ConnectionResponse_sendMessage(action, event, payload) {
     const message = {
-        action,
         event,
+        action,
         payload,
+        requestId: this.requestId,
         channelName: enums_1.SystemSender.ENDPOINT,
     };
     __classPrivateFieldGet(this, _ConnectionResponse_webSocket, "f").send(JSON.stringify(message));

package/lobby/joinResponse.js

@@ -18,7 +18,7 @@ const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
 class JoinResponse extends abstractResponse_1.PondResponse {
     constructor(user, engine) {
-        super();
+        super(user.requestId);
         _JoinResponse_instances.add(this);
         _JoinResponse_user.set(this, void 0);
         _JoinResponse_engine.set(this, void 0);
@@ -44,6 +44,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
             action: enums_1.ServerActions.SYSTEM,
             channelName: __classPrivateFieldGet(this, _JoinResponse_engine, "f").name,
             event: enums_1.Events.ACKNOWLEDGE,
+            requestId: this.requestId,
             payload: {},
         };
         __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(acknowledgement));
@@ -67,6 +68,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
             },
             channelName: __classPrivateFieldGet(this, _JoinResponse_engine, "f").name,
             action: enums_1.ServerActions.ERROR,
+            requestId: this.requestId,
         };
         __classPrivateFieldGet(this, _JoinResponse_user, "f").socket.send(JSON.stringify(errorMessage));
         return this;
@@ -79,7 +81,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      */
     send(event, payload, assigns) {
         this.accept(assigns);
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId], enums_1.ServerActions.SYSTEM, event, payload);
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(this.requestId, enums_1.SystemSender.CHANNEL, [__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId], enums_1.ServerActions.SYSTEM, event, payload);
         return this;
     }
     /**
@@ -88,7 +90,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      */
     broadcast(event, payload) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**
@@ -97,7 +99,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      * @param payload - the payload to send
      */
     broadcastFromUser(event, payload) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, enums_1.ChannelReceiver.ALL_EXCEPT_SENDER, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**
@@ -107,7 +109,7 @@ class JoinResponse extends abstractResponse_1.PondResponse {
      * @param userIds - the ids of the clients to send the message to
      */
     sendToUsers(event, payload, userIds) {
-        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(__classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, userIds, enums_1.ServerActions.BROADCAST, event, payload);
+        __classPrivateFieldGet(this, _JoinResponse_engine, "f").sendMessage(this.requestId, __classPrivateFieldGet(this, _JoinResponse_user, "f").clientId, userIds, enums_1.ServerActions.BROADCAST, event, payload);
         return this;
     }
     /**

package/lobby/lobby.js

@@ -16,6 +16,7 @@ exports.PondChannel = exports.LobbyEngine = void 0;
 const middleware_1 = require("../abstracts/middleware");
 const channel_1 = require("../channel/channel");
 const enums_1 = require("../enums");
+const uuid_1 = require("../misc/uuid");
 class LobbyEngine {
     constructor() {
         _LobbyEngine_channels.set(this, void 0);
@@ -68,11 +69,11 @@ class LobbyEngine {
             if (!channel) {
                 throw new Error(`GatewayEngine: Channel ${channelName} does not exist`);
             }
-            channel.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, event, payload);
+            channel.sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, event, payload);
         }
         else {
             __classPrivateFieldGet(this, _LobbyEngine_channels, "f").forEach((channel) => {
-                channel.sendMessage(enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, event, payload);
+                channel.sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, enums_1.ChannelReceiver.ALL_USERS, enums_1.ServerActions.SYSTEM, event, payload);
             });
         }
     }

package/misc/uuid.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uuid = void 0;
+function uuid() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'
+        .replace(/[xy]/g, (c) => {
+        const r = Math.random() * 16 | 0;
+        const v = c === 'x' ? r : (r & 0x3 | 0x8);
+        return v.toString(16);
+    });
+}
+exports.uuid = uuid;

package/package.json

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

package/presence/presence.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PresenceEngine = void 0;
 const enums_1 = require("../enums");
 const pondError_1 = require("../errors/pondError");
+const uuid_1 = require("../misc/uuid");
 class PresenceEngine {
     constructor(channel) {
         _PresenceEngine_instances.add(this);
@@ -107,5 +108,5 @@ _PresenceEngine_presenceMap = new WeakMap(), _PresenceEngine_channel = new WeakM
     if (recipients.length === 0) {
         return;
     }
-    __classPrivateFieldGet(this, _PresenceEngine_channel, "f").sendMessage(enums_1.SystemSender.CHANNEL, recipients, enums_1.ServerActions.PRESENCE, event, payload);
+    __classPrivateFieldGet(this, _PresenceEngine_channel, "f").sendMessage((0, uuid_1.uuid)(), enums_1.SystemSender.CHANNEL, recipients, enums_1.ServerActions.PRESENCE, event, payload);
 };

package/schema.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clientMessageSchema = void 0;
+const zod_1 = require("zod");
+const enums_1 = require("./enums");
+exports.clientMessageSchema = zod_1.z.object({
+    event: zod_1.z.string(),
+    requestId: zod_1.z.string(),
+    channelName: zod_1.z.string(),
+    payload: zod_1.z.record(zod_1.z.any()),
+    action: zod_1.z.nativeEnum(enums_1.ClientActions),
+    addresses: zod_1.z.union([zod_1.z.nativeEnum(enums_1.ChannelReceiver), zod_1.z.array(zod_1.z.string())]).optional(),
+});