helia-coord 1.2.8 → 1.2.9

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

@@ -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,7 +350,7 @@ class ThisNodeUseCases {
           }
         }
 
-        if (connected) {
+        if (connected.success) {
           continue
         }
 
@@ -374,10 +376,11 @@ class ThisNodeUseCases {
 
             // 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) {
+            if (connected.success) {
               this.adapters.log.statusLog(0,
                 `Successfully connected to peer ${thisPeer} through v2 circuit relay ${thisRelay.multiaddr}.`
               )
@@ -393,7 +396,7 @@ class ThisNodeUseCases {
           }
         }
 
-        if (connected) {
+        if (connected.success) {
           continue
         }
 
@@ -413,8 +416,9 @@ class ThisNodeUseCases {
 
           // 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) {
+          if (connected.success) {
             this.adapters.log.statusLog(2,
               `Successfully connected to peer ${thisPeer} through v1 circuit relay ${thisV1Relay}.`
             )

package/package.json

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

@@ -293,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.
@@ -319,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.