@highway1/cli 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@highway1/cli",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "CLI tool for Clawiverse network",
   "type": "module",
   "bin": {
@@ -13,7 +13,7 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@highway1/core": "0.1.18",
+    "@highway1/core": "0.1.19",
     "chalk": "^5.3.0",
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",

package/src/commands/join.ts

@@ -16,6 +16,7 @@ export function registerJoinCommand(program: Command): void {
     .command('join')
     .description('Join the Clawiverse network')
     .option('--bootstrap <peers...>', 'Bootstrap peer addresses')
+    .option('--relay', 'Run as a relay server and advertise relay capability')
     .action(async (options) => {
       try {
         printHeader('Join Clawiverse Network');
@@ -42,6 +43,7 @@ export function registerJoinCommand(program: Command): void {
           bootstrapPeers,
           enableDHT: true,
           reserveRelaySlot: true,
+          enableRelay: options.relay ?? false,
         });
 
         await node.start();
@@ -54,31 +56,50 @@ export function registerJoinCommand(program: Command): void {
 
         // Wait for bootstrap peer connection before publishing to DHT
         const connectSpin = spinner('Connecting to bootstrap peers...');
+
+        // Phase 1: wait for peer:connect (up to 10s)
         await new Promise<void>((resolve) => {
           const timeout = setTimeout(resolve, 10000);
           node.libp2p.addEventListener('peer:connect', () => {
             clearTimeout(timeout);
-            setTimeout(resolve, 500);
+            resolve();
           }, { once: true });
         });
+
+        // Phase 2: wait for relay address to appear (up to 5s)
+        const hasRelayAddr = () => node.getMultiaddrs().some(a => a.includes('/p2p-circuit'));
+        if (!hasRelayAddr()) {
+          await new Promise<void>((resolve) => {
+            const timeout = setTimeout(resolve, 5000);
+            const check = () => {
+              if (hasRelayAddr()) { clearTimeout(timeout); resolve(); }
+            };
+            node.libp2p.addEventListener('self:multiaddress:updated', check);
+            setTimeout(() => node.libp2p.removeEventListener('self:multiaddress:updated', check), 5000);
+          });
+        }
+
         connectSpin.succeed('Connected to network!');
 
         // Publish Agent Card with peerId and multiaddrs so others can dial us
         const cardSpin = spinner('Publishing Agent Card to DHT...');
 
-        // Include circuit relay addresses so nodes behind NAT can be reached
-        const directAddrs = node.getMultiaddrs();
-        const relayAddrs = bootstrapPeers.map((relayAddr) => {
-          const peerId = node.getPeerId();
-          return `${relayAddr}/p2p-circuit/p2p/${peerId}`;
-        });
-        const allAddrs = [...directAddrs, ...relayAddrs];
+        // Use relay addresses from libp2p (populated after reservation), fall back to manual construction
+        const directAddrs = node.getMultiaddrs().filter(a => !a.includes('/p2p-circuit'));
+        const relayAddrs = node.getMultiaddrs().filter(a => a.includes('/p2p-circuit'));
+        const fallbackRelayAddrs = relayAddrs.length === 0
+          ? bootstrapPeers.map(r => `${r}/p2p-circuit/p2p/${node.getPeerId()}`)
+          : [];
+        const allAddrs = [...directAddrs, ...relayAddrs, ...fallbackRelayAddrs];
+
+        const capabilities = [...(card.capabilities ?? [])];
+        if (options.relay) capabilities.push('relay');
 
         const agentCard = createAgentCard(
           identity.did,
           card.name,
           card.description,
-          card.capabilities,
+          capabilities,
           allAddrs,
           node.getPeerId()
         );