@highway1/core 0.1.10 → 0.1.13

package/dist/index.js

@@ -212,9 +212,10 @@ async function createNode(config) {
       enableRelay = false,
       privateKey
     } = config;
+    const relayListenAddrs = bootstrapPeers.map((peer) => `${peer}/p2p-circuit`);
     const libp2pConfig = {
       addresses: {
-        listen: listenAddresses
+        listen: [...listenAddresses, ...relayListenAddrs]
       },
       ...privateKey ? { privateKey } : {},
       transports: [
@@ -1307,29 +1308,33 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
           multiaddrs: targetMultiaddrs
         });
         let stream;
-        try {
-          stream = await libp2p.dialProtocol(targetPeerId, PROTOCOL_PREFIX);
-        } catch (directError) {
-          logger5.warn("Direct dial failed, attempting relay fallback", {
-            peerId: targetPeerIdStr,
-            error: directError.message
-          });
-          let lastError = directError;
-          for (const relayAddr of relayPeers ?? []) {
-            const relayPeerId = parseRelayPeerId(relayAddr);
-            if (!relayPeerId) continue;
+        const relayMultiaddrs = targetMultiaddrs.filter((a) => a.includes("/p2p-circuit/"));
+        const directMultiaddrs = targetMultiaddrs.filter((a) => !a.includes("/p2p-circuit/"));
+        for (const addr of directMultiaddrs) {
+          try {
+            stream = await libp2p.dialProtocol(multiaddr(addr), PROTOCOL_PREFIX);
+            logger5.info("Direct dial succeeded", { addr });
+            break;
+          } catch {
+          }
+        }
+        if (!stream) {
+          const allRelayAddrs = [
+            ...relayMultiaddrs,
+            ...(relayPeers ?? []).map((r) => buildCircuitRelayAddr(r, targetPeerIdStr))
+          ];
+          let lastError;
+          for (const addr of allRelayAddrs) {
             try {
-              const circuitAddr = buildCircuitRelayAddr(relayAddr, targetPeerIdStr);
-              await libp2p.peerStore.merge(targetPeerId, { multiaddrs: [multiaddr(circuitAddr)] });
-              stream = await libp2p.dialProtocol(targetPeerId, PROTOCOL_PREFIX);
-              logger5.info("Relay fallback succeeded", { relayAddr, targetPeerId: targetPeerIdStr });
+              stream = await libp2p.dialProtocol(multiaddr(addr), PROTOCOL_PREFIX);
+              logger5.info("Relay dial succeeded", { addr });
               break;
             } catch (relayErr) {
-              logger5.warn("Relay fallback failed", { relayAddr, error: relayErr.message });
+              logger5.warn("Relay dial failed", { addr, error: relayErr.message });
               lastError = relayErr;
             }
           }
-          if (!stream) throw lastError;
+          if (!stream) throw lastError ?? new MessagingError("All dial attempts failed");
         }
         const encoded = encodeMessage(envelope);
         await stream.sink(
@@ -1409,10 +1414,6 @@ function createMessageRouter(libp2p, verifyFn, dht, relayPeers) {
     }
   };
 }
-function parseRelayPeerId(addr) {
-  const parts = addr.split("/p2p/");
-  return parts.length >= 2 ? parts[parts.length - 1].trim() : void 0;
-}
 function buildCircuitRelayAddr(relayAddr, targetPeerId) {
   return `${relayAddr}/p2p-circuit/p2p/${targetPeerId}`;
 }