helia-coord 1.2.7 → 1.2.9

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

@@ -255,7 +255,7 @@ class ThisNodeUseCases {
       // Get connected peers
       const connectedPeers = await this.adapters.ipfs.getPeers()
       this.adapters.log.statusLog(
-        2,
+        0,
         'refreshPeerConnections() connectedPeers: ',
         connectedPeers
       )
@@ -270,15 +270,15 @@ class ThisNodeUseCases {
 
         // Check if target peer is currently conected to the node.
         const connectedPeer = connectedPeers.filter(
-          peerObj => peerObj.peer === thisPeer
+          peerObj => peerObj === thisPeer
         )
-        // console.log('connectedPeer: ', connectedPeer)
+        console.log('connectedPeer: ', connectedPeer)
 
         // If this node is already connected to the peer, then skip this peers.
         // We do not need to do anything.
         if (connectedPeer.length) {
           this.adapters.log.statusLog(
-            2,
+            0,
             `Skipping peer in refreshPeerConnections(). Already connected to peer ${thisPeer}`
           )
           continue
@@ -296,7 +296,7 @@ class ThisNodeUseCases {
           continue
         }
 
-        let connected = false
+        let connected = { success: false }
 
         // If peer advertises itself as a Circuit Relay, connect to the circuit
         // relay connection info
@@ -304,8 +304,9 @@ class ThisNodeUseCases {
           const multiaddr = `/ip4/${peerData.data.circuitRelayInfo.ip4}/tcp/${peerData.data.circuitRelayInfo.tcpPort}/p2p/${thisPeer}`
 
           connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
+          console.log('circuit relay data connected: ', connected)
 
-          if (connected) {
+          if (connected.success) {
             this.adapters.log.statusLog(2,
               `Successfully connected to Circuit Relay peer ${thisPeer} through direct connection: ${multiaddr}.`
             )
@@ -330,10 +331,11 @@ class ThisNodeUseCases {
 
           // Attempt to connect to the node through a circuit relay.
           connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
+          console.log('direct connection connected: ', connected)
 
           // If the connection was successful, break out of the relay loop.
           // Otherwise try to connect through the next relay.
-          if (connected) {
+          if (connected.success) {
             this.adapters.log.statusLog(2,
               `Successfully connected to peer ${thisPeer} through direct connection: ${multiaddr}.`
             )
@@ -348,39 +350,7 @@ class ThisNodeUseCases {
           }
         }
 
-        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) {
+        if (connected.success) {
           continue
         }
 
@@ -402,15 +372,16 @@ class ThisNodeUseCases {
 
           // Skip the relay if this node is not connected to it.
           if (thisRelay.connected) {
-            this.adapters.log.statusLog(2, `refreshPeerConnections() connecting to peer with this multiaddr: ${multiaddr}`)
+            this.adapters.log.statusLog(0, `refreshPeerConnections() connecting to peer with this multiaddr: ${multiaddr}`)
 
             // Attempt to connect to the node through a circuit relay.
             connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
+            console.log('v2 relay connected: ', connected)
 
             // If the connection was successful, break out of the relay loop.
             // Otherwise try to connect through the next relay.
-            if (connected) {
-              this.adapters.log.statusLog(2,
+            if (connected.success) {
+              this.adapters.log.statusLog(0,
                 `Successfully connected to peer ${thisPeer} through v2 circuit relay ${thisRelay.multiaddr}.`
               )
 
@@ -424,6 +395,42 @@ class ThisNodeUseCases {
             }
           }
         }
+
+        if (connected.success) {
+          continue
+        }
+
+        // If we could not connect to the node through the v2 Circuit Relays,
+        // try connecting to it through the v1 Circuit Relays.
+        //
+        // Note 11/7/23 CT: v1 Circuit Relays do not appear to be supported by libp2p:
+        // https://github.com/libp2p/js-libp2p/issues/2208
+        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(0, `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 })
+          console.log('v1 relay connected: ', connected)
+
+          if (connected.success) {
+            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
+          }
+        }
       }
 
       const now = new Date()

package/package.json

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

package/test/unit/use-cases/this-node-use-cases-unit.js

@@ -204,7 +204,8 @@ describe('#thisNode-Use-Cases', () => {
       await uut.addSubnetPeer(mockData.announceObj2)
 
       // Mock dependencies
-      sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves(mockData.swarmPeers)
+      // sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves(mockData.swarmPeers)
+      sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves(['QmbyYXKbnAmMbMGo8LRBZ58jYs58anqUzY1m4jxDmhDsjd'])
 
       // Connect to that peer.
       const result = await uut.refreshPeerConnections()
@@ -292,7 +293,7 @@ describe('#thisNode-Use-Cases', () => {
       sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves(mockData.swarmPeers)
       sandbox.stub(uut, 'isFreshPeer').returns(true)
       sandbox.stub(uut.adapters.ipfs, 'connectToPeer')
-        .onCall(0).resolves(true)
+        .onCall(0).resolves({ success: true })
       sandbox.stub(uut.utils, 'filterMultiaddrs').returns([])
 
       // Connect to that peer.
@@ -318,7 +319,7 @@ describe('#thisNode-Use-Cases', () => {
       sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves(mockData.swarmPeers)
       sandbox.stub(uut, 'isFreshPeer').returns(true)
       sandbox.stub(uut.adapters.ipfs, 'connectToPeer')
-        .onCall(0).resolves(true)
+        .onCall(0).resolves({ success: true })
       sandbox.stub(uut.utils, 'filterMultiaddrs').returns(['/ip4/123.45.6.7/p2p/ipfs-id'])
 
       // Connect to that peer.