@highway1/cli 0.1.33 → 0.1.35

package/dist/index.js

@@ -116433,7 +116433,7 @@ function capKey(cap) {
 }
 async function readDIDList(dht, key) {
   try {
-    for await (const event of dht.get(key, { signal: AbortSignal.timeout(1e4) })) {
+    for await (const event of dht.get(key, { signal: AbortSignal.timeout(3e4) })) {
       const raw = extractValue(event);
       if (raw) {
         const text = toString2(raw);
@@ -116446,11 +116446,18 @@ async function readDIDList(dht, key) {
 }
 async function writeDIDList(dht, key, dids) {
   const value2 = fromString2([...new Set(dids)].join("\n"));
-  try {
-    for await (const _ of dht.put(key, value2, { signal: AbortSignal.timeout(5e3) })) {
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    try {
+      for await (const _ of dht.put(key, value2, { signal: AbortSignal.timeout(3e4) })) {
+      }
+      return;
+    } catch (e2) {
+      if (e2?.name === "AbortError" && attempt < 3) {
+        logger4.debug(`DHT put timeout, retrying (${attempt}/3)...`);
+        continue;
+      }
+      if (e2?.name !== "AbortError") throw e2;
     }
-  } catch (e2) {
-    if (e2?.name !== "AbortError") throw e2;
   }
 }
 function createDHTOperations(libp2p) {
@@ -116462,11 +116469,19 @@ function createDHTOperations(libp2p) {
         const dht = libp2p.services?.dht;
         if (!dht) throw new DiscoveryError("DHT service not available");
         const agentKey = fromString2(`/clawiverse/agent/${card.did}`);
-        try {
-          for await (const _ of dht.put(agentKey, encodeForDHT(card), { signal: AbortSignal.timeout(5e3) })) {
+        for (let attempt = 1; attempt <= 3; attempt++) {
+          try {
+            for await (const _ of dht.put(agentKey, encodeForDHT(card), { signal: AbortSignal.timeout(3e4) })) {
+            }
+            break;
+          } catch (e2) {
+            if (e2?.name === "AbortError" && attempt < 3) {
+              logger4.debug(`DHT put agent card timeout, retrying (${attempt}/3)...`);
+              continue;
+            }
+            logger4.warn("DHT put agent card failed (non-fatal)", { error: e2.message });
+            break;
           }
-        } catch (e2) {
-          logger4.warn("DHT put agent card failed (non-fatal)", { error: e2.message });
         }
         const caps = (card.capabilities ?? []).map(
           (c2) => typeof c2 === "string" ? c2 : c2.name
@@ -118292,18 +118307,30 @@ function registerJoinCommand(program2) {
         info("Waiting for relay reservation...");
         await new Promise((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();
-          }, 5e3);
-          const check = () => {
+          }, 1e4);
+          const onReservation = () => {
+            info(`Relay reservation successful!`);
+            clearTimeout(timeout);
+            setTimeout(() => {
+              info(`Relay addresses: ${node.getMultiaddrs().filter((a2) => a2.includes("/p2p-circuit")).join(", ")}`);
+              resolve();
+            }, 500);
+          };
+          const onPeerUpdate = () => {
             if (hasRelayAddr()) {
-              info(`Relay address acquired: ${node.getMultiaddrs().filter((a2) => a2.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), 5e3);
+          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);
+          }, 1e4);
         });
       } else {
         info(`Relay address already present: ${node.getMultiaddrs().filter((a2) => a2.includes("/p2p-circuit")).join(", ")}`);