fix: ws errors should conform to jsonrpc spec (#2505)

* fix: ws errors should conform to jsonrpc spec Signed-off-by: Ted Yeh <ted.yeh@validationcloud.io> * Update packages/ws-server/src/metrics/connectionLimiter.ts Co-authored-by: Logan Nguyen <logan@quiet-node.dev> Signed-off-by: ted-yeh-vc <135632178+ted-yeh-vc@users.noreply.github.com> * Update packages/ws-server/src/metrics/connectionLimiter.ts Co-authored-by: Logan Nguyen <logan@quiet-node.dev> Signed-off-by: ted-yeh-vc <135632178+ted-yeh-vc@users.noreply.github.com> * Update packages/ws-server/src/metrics/connectionLimiter.ts Co-authored-by: Logan Nguyen <logan@quiet-node.dev> Signed-off-by: ted-yeh-vc <135632178+ted-yeh-vc@users.noreply.github.com> --------- Signed-off-by: Ted Yeh <ted.yeh@validationcloud.io> Signed-off-by: ted-yeh-vc <135632178+ted-yeh-vc@users.noreply.github.com> Co-authored-by: Logan Nguyen <logan@quiet-node.dev>
hashgraph · May 23, 2024 · c4dac63 · c4dac63
1 parent c6cfd6c
commit c4dac63
Showing 1 changed file with 24 additions and 3 deletions.
diff --git a/packages/ws-server/src/metrics/connectionLimiter.ts b/packages/ws-server/src/metrics/connectionLimiter.ts
@@ -133,7 +133,14 @@ export default class ConnectionLimiter {
       ctx.websocket.send(
         JSON.stringify({
           jsonrpc: '2.0',
-          error: `Closing current connection due to exceeded maximum connections (max_con=${MAX_CONNECTION_LIMIT})`,
+          error: {
+            code: CONNECTION_LIMIT_EXCEEDED.code,
+            message: CONNECTION_LIMIT_EXCEEDED.message,
+            data: {
+              message: CONNECTION_LIMIT_EXCEEDED.message,
+              max_connection: MAX_CONNECTION_LIMIT,
+            },
+          },
           id: '1',
         }),
       );
@@ -152,7 +159,14 @@ export default class ConnectionLimiter {
       ctx.websocket.send(
         JSON.stringify({
           jsonrpc: '2.0',
-          error: `Closing current connection due to exceeded maximum connections from a single IP: address ${ip} - ${this.clientIps[ip]} connections. (max_con=${MAX_CONNECTION_LIMIT_PER_IP})`,
+          error: {
+            code: CONNECTION_IP_LIMIT_EXCEEDED.code,
+            message: CONNECTION_IP_LIMIT_EXCEEDED.message,
+            data: {
+              message: CONNECTION_IP_LIMIT_EXCEEDED.message,
+              max_connection: MAX_CONNECTION_LIMIT_PER_IP,
+            },
+          },
           id: '1',
         }),
       );
@@ -188,7 +202,14 @@ export default class ConnectionLimiter {
           websocket.send(
             JSON.stringify({
               jsonrpc: '2.0',
-              error: `Closing current connection due to reaching TTL (${maxInactivityTTL}ms)`,
+              error: {
+                code: TTL_EXPIRED.code,
+                message: TTL_EXPIRED.message,
+                data: {
+                  message: TTL_EXPIRED.message,
+                  max_inactivity_TTL: maxInactivityTTL,
+                },
+              },
               id: '1',
             }),
           );