@eleven-am/pondsocket 0.1.134 → 0.1.135

package/endpoint/endpoint.js

@@ -124,6 +124,73 @@ class Endpoint {
                 .forEach((manager) => manager.removeUser(cache.clientId, true));
         });
     }
+    /**
+     * @desc Builds an error message
+     * @param error - The error to build
+     * @private
+     */
+    buildError(error) {
+        const event = {
+            event: pondsocket_common_1.ErrorTypes.INVALID_MESSAGE,
+            action: pondsocket_common_1.ServerActions.ERROR,
+            channelName: pondsocket_common_1.SystemSender.ENDPOINT,
+            requestId: (0, pondsocket_common_1.uuid)(),
+            payload: {},
+        };
+        if (error instanceof SyntaxError) {
+            event.payload = {
+                message: 'Invalid JSON',
+            };
+        }
+        else if (error instanceof Error) {
+            event.event = pondsocket_common_1.ErrorTypes.INTERNAL_SERVER_ERROR;
+            event.payload = {
+                message: error.message,
+            };
+        }
+        else if (error instanceof pondError_1.PresenceError) {
+            event.event = pondsocket_common_1.ErrorTypes.PRESENCE_ERROR;
+            event.channelName = error.channel;
+            event.payload = {
+                message: error.message,
+                code: error.code,
+                action: error.event,
+            };
+        }
+        else if (error instanceof pondError_1.ChannelError) {
+            event.event = pondsocket_common_1.ErrorTypes.CHANNEL_ERROR;
+            event.channelName = error.channel;
+            event.payload = {
+                message: error.message,
+                code: error.code,
+            };
+        }
+        else if (error instanceof pondError_1.EndpointError) {
+            event.event = pondsocket_common_1.ErrorTypes.ENDPOINT_ERROR;
+            event.payload = {
+                message: error.message,
+                code: error.code,
+            };
+        }
+        else if (error instanceof zod_1.ZodError) {
+            const message = error.errors.map((error) => {
+                if ('expected' in error && 'received' in error) {
+                    return `Expected ${error.path.join('.')} to be ${error.expected}, but received ${error.received}`;
+                }
+                return `${error.path.join('.')} ${error.message}`;
+            }).join(', ');
+            event.payload = {
+                message,
+                code: 400,
+            };
+        }
+        else {
+            event.payload = {
+                message: 'Unknown error',
+            };
+        }
+        return event;
+    }
 }
 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) {
@@ -161,65 +228,12 @@ _Endpoint_middleware = new WeakMap(), _Endpoint_channels = new WeakMap(), _Endpo
             throw new Error(`GatewayEngine: Action ${message.action} does not exist`);
     }
 }, _Endpoint_readMessage = function _Endpoint_readMessage(cache, message) {
-    const errorMessage = {
-        event: pondsocket_common_1.ErrorTypes.INVALID_MESSAGE,
-        action: pondsocket_common_1.ServerActions.ERROR,
-        channelName: pondsocket_common_1.SystemSender.ENDPOINT,
-        requestId: (0, pondsocket_common_1.uuid)(),
-        payload: {},
-    };
     try {
         const data = JSON.parse(message);
         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: e.message,
-                code: 400,
-            };
-        }
-        else if (e instanceof SyntaxError) {
-            errorMessage.payload = {
-                message: 'Invalid JSON',
-            };
-        }
-        else if (e instanceof Error) {
-            errorMessage.event = pondsocket_common_1.ErrorTypes.INTERNAL_SERVER_ERROR;
-            errorMessage.payload = {
-                message: e.message,
-            };
-        }
-        else if (e instanceof pondError_1.PresenceError) {
-            errorMessage.event = pondsocket_common_1.ErrorTypes.PRESENCE_ERROR;
-            errorMessage.channelName = e.channel;
-            errorMessage.payload = {
-                message: e.message,
-                code: e.code,
-                action: e.event,
-            };
-        }
-        else if (e instanceof pondError_1.ChannelError) {
-            errorMessage.event = pondsocket_common_1.ErrorTypes.CHANNEL_ERROR;
-            errorMessage.channelName = e.channel;
-            errorMessage.payload = {
-                message: e.message,
-                code: e.code,
-            };
-        }
-        else if (e instanceof pondError_1.EndpointError) {
-            errorMessage.event = pondsocket_common_1.ErrorTypes.ENDPOINT_ERROR;
-            errorMessage.payload = {
-                message: e.message,
-                code: e.code,
-            };
-        }
-        else {
-            errorMessage.payload = {
-                message: 'Unknown error',
-            };
-        }
-        __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_sendMessage).call(this, cache.socket, errorMessage);
+        __classPrivateFieldGet(this, _Endpoint_instances, "m", _Endpoint_sendMessage).call(this, cache.socket, this.buildError(e));
     }
 };

package/package.json

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