helia-coord 1.2.6 → 1.2.8

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)
@@ -256,7 +255,7 @@ class ThisNodeUseCases {
       // Get connected peers
       const connectedPeers = await this.adapters.ipfs.getPeers()
       this.adapters.log.statusLog(
-        2,
+        0,
         'refreshPeerConnections() connectedPeers: ',
         connectedPeers
       )
@@ -271,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
@@ -348,6 +347,7 @@ class ThisNodeUseCases {
             break
           }
         }
+
         if (connected) {
           continue
         }
@@ -370,7 +370,7 @@ 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 })
@@ -378,7 +378,7 @@ class ThisNodeUseCases {
             // 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,
+              this.adapters.log.statusLog(0,
                 `Successfully connected to peer ${thisPeer} through v2 circuit relay ${thisRelay.multiaddr}.`
               )
 
@@ -393,33 +393,38 @@ 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.
-        if (!connected) {
-          for (let j = 0; j < this.v1Relays.length; j++) {
-            const thisV1Relay = this.v1Relays[j]
+        //
+        // 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.multiaddr}/p2p-circuit/p2p/${thisPeer}`
+          // 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}`)
+          // 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 })
+          // 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}.`
-              )
+          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
+            // 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
-            }
+            break
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia-coord",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "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()