@highway1/core 0.1.51 → 0.1.54

package/dist/index.d.ts

@@ -274,6 +274,7 @@ interface CardMessage {
 }
 interface GoodbyeMessage {
     type: 'GOODBYE';
+    reconnectAfter?: number;
 }
 interface PresenceProof {
     did: string;

package/dist/index.js

@@ -1,8 +1,8 @@
 import * as ed25519 from '@noble/ed25519';
 import { base58btc } from 'multiformats/bases/base58';
 import { WebSocket } from 'ws';
-import Ajv from 'ajv';
 import { encode, decode } from 'cbor-x';
+import Ajv from 'ajv';
 import lunr from 'lunr';
 import Fuse from 'fuse.js';
 import { Level } from 'level';
@@ -207,6 +207,7 @@ function createRelayClient(config) {
     reconnectAttempt: 0,
     reconnectTimer: null,
     stableTimer: null,
+    pingTimer: null,
     peerCount: 0
   }));
   let deliveryHandler = null;
@@ -227,8 +228,8 @@ function createRelayClient(config) {
           logger.info("WebSocket connected", { url: conn.url });
           try {
             const timestamp = Date.now();
-            const helloData = JSON.stringify({ did, card, timestamp });
-            const signature = await sign(new TextEncoder().encode(helloData), keyPair.privateKey);
+            const helloData = encode({ did, card, timestamp });
+            const signature = await sign(helloData, keyPair.privateKey);
             const hello = {
               type: "HELLO",
               protocolVersion: 1,
@@ -237,7 +238,7 @@ function createRelayClient(config) {
               timestamp,
               signature
             };
-            ws.send(JSON.stringify(hello));
+            ws.send(encode(hello));
             resolve();
           } catch (err) {
             reject(err);
@@ -250,7 +251,7 @@ function createRelayClient(config) {
       });
       ws.on("message", async (data) => {
         try {
-          const msg = JSON.parse(data.toString());
+          const msg = decode(data);
           await handleRelayMessage(conn, msg);
         } catch (err) {
           logger.warn("Failed to parse relay message", { error: err.message });
@@ -264,6 +265,10 @@ function createRelayClient(config) {
           clearTimeout(conn.stableTimer);
           conn.stableTimer = null;
         }
+        if (conn.pingTimer) {
+          clearInterval(conn.pingTimer);
+          conn.pingTimer = null;
+        }
         if (!stopped) {
           scheduleReconnect(conn);
         }
@@ -306,6 +311,13 @@ function createRelayClient(config) {
           conn.reconnectAttempt = 0;
           logger.debug("Connection stable", { url: conn.url });
         }, reconnectConfig.stableAfterMs);
+        if (conn.pingTimer) clearInterval(conn.pingTimer);
+        conn.pingTimer = setInterval(() => {
+          if (conn.ws && conn.connected) {
+            conn.ws.send(encode({ type: "PING" }));
+            logger.debug("Sent PING", { url: conn.url });
+          }
+        }, 3e4);
         break;
       }
       case "DELIVER": {
@@ -314,6 +326,10 @@ function createRelayClient(config) {
         if (deliveryHandler) {
           await deliveryHandler(deliver);
         }
+        if (conn.ws && conn.connected) {
+          conn.ws.send(encode({ type: "ACK", messageId: deliver.messageId }));
+          logger.debug("Sent ACK", { messageId: deliver.messageId });
+        }
         break;
       }
       case "DELIVERY_REPORT": {
@@ -329,6 +345,20 @@ function createRelayClient(config) {
         logger.debug("Received PONG", { peers: msg.peers });
         break;
       }
+      case "GOODBYE": {
+        const goodbye = msg;
+        const reconnectAfter = goodbye.reconnectAfter || 5e3;
+        logger.info("Received GOODBYE", { url: conn.url, reconnectAfter });
+        if (conn.ws) {
+          conn.ws.close();
+        }
+        setTimeout(() => {
+          if (!stopped) {
+            connectToRelay(conn);
+          }
+        }, reconnectAfter);
+        break;
+      }
       default:
         logger.debug("Received relay message", { type: msg.type });
     }
@@ -341,7 +371,7 @@ function createRelayClient(config) {
     if (!conn || !conn.ws) {
       throw new TransportError("No connected relay");
     }
-    conn.ws.send(JSON.stringify(msg));
+    conn.ws.send(encode(msg));
   }
   return {
     async start() {
@@ -376,6 +406,10 @@ function createRelayClient(config) {
           clearTimeout(conn.stableTimer);
           conn.stableTimer = null;
         }
+        if (conn.pingTimer) {
+          clearInterval(conn.pingTimer);
+          conn.pingTimer = null;
+        }
         if (conn.ws) {
           conn.ws.close();
           conn.ws = null;
@@ -405,7 +439,7 @@ function createRelayClient(config) {
         }, 1e4);
         const handler = (data) => {
           try {
-            const msg = JSON.parse(data.toString());
+            const msg = decode(data);
             if (msg.type === "DISCOVERED") {
               clearTimeout(timeout);
               ws.off("message", handler);
@@ -415,7 +449,7 @@ function createRelayClient(config) {
           }
         };
         ws.on("message", handler);
-        ws.send(JSON.stringify({ type: "DISCOVER", query, minTrust, limit }));
+        ws.send(encode({ type: "DISCOVER", query, minTrust, limit }));
       });
     },
     async fetchCard(did2) {
@@ -430,7 +464,7 @@ function createRelayClient(config) {
         }, 5e3);
         const handler = (data) => {
           try {
-            const msg = JSON.parse(data.toString());
+            const msg = decode(data);
             if (msg.type === "CARD" && msg.did === did2) {
               clearTimeout(timeout);
               ws.off("message", handler);
@@ -440,7 +474,7 @@ function createRelayClient(config) {
           }
         };
         ws.on("message", handler);
-        ws.send(JSON.stringify({ type: "FETCH_CARD", did: did2 }));
+        ws.send(encode({ type: "FETCH_CARD", did: did2 }));
       });
     },
     onDeliver(handler) {