@highway1/cli 0.1.32 → 0.1.34

package/package.json

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

package/src/commands/join.ts

@@ -66,24 +66,43 @@ export function registerJoinCommand(program: Command): void {
           }, { once: true });
         });
 
-        // Phase 2: wait for relay address to appear (up to 5s)
+        // 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 5s. Multiaddrs: ${node.getMultiaddrs().join(', ')}`);
+              info(`Relay reservation timeout after 10s. Multiaddrs: ${node.getMultiaddrs().join(', ')}`);
               resolve();
-            }, 5000);
-            const check = () => {
+            }, 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: ${node.getMultiaddrs().filter(a => a.includes('/p2p-circuit')).join(', ')}`);
+                info(`Relay address acquired via peer update`);
                 clearTimeout(timeout);
                 resolve();
               }
             };
-            node.libp2p.addEventListener('self:peer:update', check);
-            setTimeout(() => node.libp2p.removeEventListener('self:peer:update', check), 5000);
+
+            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(', ')}`);