helia-coord 1.2.5 → 1.2.7

package/lib/use-cases/this-node-use-cases.js

@@ -33,12 +33,11 @@ class ThisNodeUseCases {
     this.circuitRelayInfo = localConfig.circuitRelayInfo
 
     // Initialize v1 relay list. Allows user to overwrite with local config.
-    this.v1Relays = []
     if (localConfig.v1Relays) {
       this.v1Relays = localConfig.v1Relays
       // console.log('v1Relays: ', this.v1Relays)
     }
-    // console.log('this-node-use-cases.js v1Relays: ', this.v1Relays)
+    console.log('this-node-use-cases.js v1Relays: ', this.v1Relays)
 
     // Bind 'this' object to all subfunctions
     this.updateUseCases = this.updateUseCases.bind(this)
@@ -242,8 +241,8 @@ class ThisNodeUseCases {
   // - If peer is advertised as a circuit relay, try to connect directly through
   //   the advertised Circuit Relay IP address and port.
   // - Attempt to connect to peer directly through its advertised multiaddrs.
-  // - Connect to peer through v2 Circuit Relays (built into ipfs-service-provider)
   // - Connect to peer through v1 Circuit Relays (standalone v1 Circuit Relay)
+  // - Connect to peer through v2 Circuit Relays (built into ipfs-service-provider)
   async refreshPeerConnections () {
     try {
       // console.log('this.thisNode: ', this.thisNode)
@@ -324,7 +323,7 @@ class ThisNodeUseCases {
         // Try a direct connection with the peer by going through
         // the multiaddrs in the announcement object.
         const filteredMultiaddrs = this.utils.filterMultiaddrs(peerData.data.ipfsMultiaddrs)
-        console.log('filteredMultiaddrs: ', filteredMultiaddrs)
+        // console.log('filteredMultiaddrs: ', filteredMultiaddrs)
 
         for (let j = 0; j < filteredMultiaddrs.length; j++) {
           const multiaddr = filteredMultiaddrs[j]
@@ -348,6 +347,39 @@ class ThisNodeUseCases {
             break
           }
         }
+
+        if (connected) {
+          continue
+        }
+
+        // If we could not connect to the node through the v2 Circuit Relays,
+        // try connecting to it through the v1 Circuit Relays.
+        for (let j = 0; j < this.v1Relays.length; j++) {
+          const thisV1Relay = this.v1Relays[j]
+
+          // Generate a multiaddr for connecting to the peer through a circuit relay.
+          const multiaddr = `${thisV1Relay}/p2p-circuit/p2p/${thisPeer}`
+
+          console.log(`refreshPeerConnections() connecting to peer through V1 Circuit Relay with this multiaddr: ${multiaddr}`)
+          this.adapters.log.statusLog(2, `refreshPeerConnections() connecting to peer through V1 Circuit Relay with this multiaddr: ${multiaddr}`)
+
+          // Attempt to connect to the node through a circuit relay.
+          connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
+
+          if (connected) {
+            this.adapters.log.statusLog(2,
+              `Successfully connected to peer ${thisPeer} through v1 circuit relay ${thisV1Relay}.`
+            )
+
+            // Add the connection multiaddr to the peer, so that we can see
+            // exactly how we're connected to the peer.
+            const thisPeerData = this.thisNode.peerData.filter(x => x.from === thisPeer)
+            thisPeerData[0].data.connectionAddr = multiaddr
+
+            break
+          }
+        }
+
         if (connected) {
           continue
         }
@@ -392,36 +424,6 @@ class ThisNodeUseCases {
             }
           }
         }
-
-        // If we could not connect to the node through the v2 Circuit Relays,
-        // try connecting to it through the v1 Circuit Relays.
-        if (!connected) {
-          for (let j = 0; j < this.v1Relays.length; j++) {
-            const thisV1Relay = this.v1Relays[j]
-
-            // Generate a multiaddr for connecting to the peer through a circuit relay.
-            const multiaddr = `${thisV1Relay.multiaddr}/p2p-circuit/p2p/${thisPeer}`
-
-            console.log(`refreshPeerConnections() connecting to peer through V1 Circuit Relay with this multiaddr: ${multiaddr}`)
-            this.adapters.log.statusLog(2, `refreshPeerConnections() connecting to peer through V1 Circuit Relay with this multiaddr: ${multiaddr}`)
-
-            // Attempt to connect to the node through a circuit relay.
-            connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
-
-            if (connected) {
-              this.adapters.log.statusLog(2,
-                `Successfully connected to peer ${thisPeer} through v1 circuit relay ${thisV1Relay.multiaddr}.`
-              )
-
-              // Add the connection multiaddr to the peer, so that we can see
-              // exactly how we're connected to the peer.
-              const thisPeerData = this.thisNode.peerData.filter(x => x.from === thisPeer)
-              thisPeerData[0].data.connectionAddr = multiaddr
-
-              break
-            }
-          }
-        }
       }
 
       const now = new Date()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia-coord",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "A JS library for helping IPFS peers coordinate, find a common interest, and stay connected around that interest.",
   "main": "./index.js",
   "type": "module",