@highway1/cli 0.1.36 → 0.1.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highway1/cli",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "CLI tool for Clawiverse network",
   "type": "module",
   "bin": {

package/src/commands/join.ts

@@ -7,6 +7,8 @@ import {
   createDHTOperations,
   createMessageRouter,
   sign,
+  verify,
+  extractPublicKey,
 } from '@highway1/core';
 import { getIdentity, getAgentCard, getBootstrapPeers } from '../config.js';
 import { success, error, spinner, printHeader, info } from '../ui.js';
@@ -66,46 +68,41 @@ export function registerJoinCommand(program: Command): void {
           }, { once: true });
         });
 
-        // Phase 2: wait for relay reservation (up to 10s)
-        const hasRelayAddr = () => node.getMultiaddrs().some(a => a.includes('/p2p-circuit'));
-        if (!hasRelayAddr()) {
-          info('Waiting for relay reservation...');
-          await new Promise<void>((resolve) => {
-            const timeout = setTimeout(() => {
-              info(`Relay reservation timeout after 10s. Multiaddrs: ${node.getMultiaddrs().join(', ')}`);
-              resolve();
-            }, 10000);
-
-            // Listen for relay:reservation event (fires when reservation succeeds)
-            const onReservation = () => {
-              info(`Relay reservation successful!`);
-              clearTimeout(timeout);
-              // Wait a bit for multiaddrs to update
-              setTimeout(() => {
-                info(`Relay addresses: ${node.getMultiaddrs().filter(a => a.includes('/p2p-circuit')).join(', ')}`);
-                resolve();
-              }, 500);
-            };
-
-            // Also listen for self:peer:update as fallback
-            const onPeerUpdate = () => {
-              if (hasRelayAddr()) {
-                info(`Relay address acquired via peer update`);
-                clearTimeout(timeout);
-                resolve();
-              }
-            };
-
-            node.libp2p.addEventListener('relay:reservation', onReservation, { once: true });
-            node.libp2p.addEventListener('self:peer:update', onPeerUpdate);
-
-            setTimeout(() => {
-              node.libp2p.removeEventListener('relay:reservation', onReservation);
-              node.libp2p.removeEventListener('self:peer:update', onPeerUpdate);
-            }, 10000);
-          });
-        } else {
-          info(`Relay address already present: ${node.getMultiaddrs().filter(a => a.includes('/p2p-circuit')).join(', ')}`);
+        // Phase 2: wait for relay reservation (up to 15s after connection)
+        // Check if we already have relay addresses (might be auto-added by libp2p)
+        const countRelayAddrs = () => node.getMultiaddrs().filter(a => a.includes('/p2p-circuit')).length;
+        const initialRelayCount = countRelayAddrs();
+
+        info(`Initial relay addresses: ${initialRelayCount}`);
+        info('Waiting for relay reservation...');
+
+        let reservationSucceeded = false;
+        await new Promise<void>((resolve) => {
+          const timeout = setTimeout(() => {
+            if (!reservationSucceeded) {
+              info(`Relay reservation timeout after 15s.`);
+              info(`Connected peers: ${node.libp2p.getPeers().map(p => p.toString()).join(', ')}`);
+            }
+            resolve();
+          }, 15000);
+
+          // Listen for relay:reservation event (fires when reservation succeeds)
+          const onReservation = (evt: any) => {
+            reservationSucceeded = true;
+            info(`✓ Relay reservation successful!`);
+            clearTimeout(timeout);
+            setTimeout(resolve, 500);
+          };
+
+          node.libp2p.addEventListener('relay:reservation', onReservation, { once: true });
+
+          setTimeout(() => {
+            node.libp2p.removeEventListener('relay:reservation', onReservation);
+          }, 15000);
+        });
+
+        if (!reservationSucceeded) {
+          info('⚠ Relay reservation did not complete - using fallback relay addresses');
         }
 
         connectSpin.succeed('Connected to network!');
@@ -153,10 +150,21 @@ export function registerJoinCommand(program: Command): void {
           }
         }, 30000); // ping every 30s
 
+        const verifyFn = async (signature: Uint8Array, data: Uint8Array): Promise<boolean> => {
+          try {
+            const decoded = JSON.parse(new TextDecoder().decode(data)) as { from?: string };
+            if (!decoded.from || typeof decoded.from !== 'string') return false;
+            const senderPublicKey = extractPublicKey(decoded.from);
+            return verify(signature, data, senderPublicKey);
+          } catch {
+            return false;
+          }
+        };
+
         // Register message handlers for incoming messages
         const router = createMessageRouter(
           node.libp2p,
-          async () => true,
+          verifyFn,
           dht
         );
 

package/src/commands/send.ts

@@ -7,6 +7,8 @@ import {
   createMessageRouter,
   createDHTOperations,
   sign,
+  verify,
+  extractPublicKey,
 } from '@highway1/core';
 import { getIdentity, getBootstrapPeers } from '../config.js';
 import { success, error, spinner, printHeader, info } from '../ui.js';
@@ -70,10 +72,20 @@ export function registerSendCommand(program: Command): void {
         await identifyDone;
 
         const dht = createDHTOperations(node.libp2p);
+        const verifyFn = async (signature: Uint8Array, data: Uint8Array): Promise<boolean> => {
+          try {
+            const decoded = JSON.parse(new TextDecoder().decode(data)) as { from?: string };
+            if (!decoded.from || typeof decoded.from !== 'string') return false;
+            const senderPublicKey = extractPublicKey(decoded.from);
+            return verify(signature, data, senderPublicKey);
+          } catch {
+            return false;
+          }
+        };
 
         const router = createMessageRouter(
           node.libp2p,
-          async () => true,
+          verifyFn,
           dht,
           bootstrapPeers
         );