@highway1/cli 0.1.32 → 0.1.34

package/dist/index.js

@@ -116169,10 +116169,11 @@ async function createNode(config2) {
       bootstrapPeers = [],
       enableDHT = true,
       enableRelay = false,
+      reserveRelaySlot = false,
       enableMDNS = false,
       privateKey
     } = config2;
-    const relayListenAddrs = [];
+    const relayListenAddrs = reserveRelaySlot ? bootstrapPeers.map((peer) => `${peer}/p2p-circuit`) : [];
     const libp2pConfig = {
       addresses: {
         listen: [...listenAddresses, ...relayListenAddrs]
@@ -116222,7 +116223,10 @@ async function createNode(config2) {
     }
     if (peerDiscovery.length > 0) libp2pConfig.peerDiscovery = peerDiscovery;
     const libp2p = await createLibp2p(libp2pConfig);
-    logger2.info("Libp2p node created");
+    logger2.info("Libp2p node created", {
+      listenAddresses: libp2pConfig.addresses.listen,
+      reserveRelaySlot
+    });
     return {
       libp2p,
       start: async () => {
@@ -116230,7 +116234,8 @@ async function createNode(config2) {
         logger2.info("Node started", {
           peerId: libp2p.peerId.toString(),
           addresses: libp2p.getMultiaddrs().map((ma) => ma.toString()),
-          relay: enableRelay
+          relay: enableRelay,
+          reserveRelaySlot
         });
       },
       stop: async () => {
@@ -118287,18 +118292,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(", ")}`);