helia-coord 1.2.19 → 1.2.21

package/config/bootstrap-circuit-relays.js

@@ -23,20 +23,20 @@ const BOOTSTRAP_BROWSER_CRs = [
 ]
 
 const BOOTSTRAP_NODE_CRs = [
-  {
-    name: 'psf1.tokentiger.com',
-    multiaddr: '/ip4/137.184.93.145/tcp/8001/p2p/12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g',
-    connected: false,
-    ipfsId: '12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g',
-    isBootstrap: true
-  },
-  {
-    name: 'cr1.psfoundatoin.info',
-    multiaddr: '/ip4/78.46.129.7/tcp/4001/p2p/12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL',
-    connected: false,
-    ipfsId: '12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL',
-    isBootstrap: true
-  }
+  // {
+  //   name: 'psf1.tokentiger.com',
+  //   multiaddr: '/ip4/137.184.93.145/tcp/8001/p2p/12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g',
+  //   connected: false,
+  //   ipfsId: '12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g',
+  //   isBootstrap: true
+  // },
+  // {
+  //   name: 'cr1.psfoundatoin.info',
+  //   multiaddr: '/ip4/78.46.129.7/tcp/4001/p2p/12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL',
+  //   connected: false,
+  //   ipfsId: '12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL',
+  //   isBootstrap: true
+  // }
 ]
 
 const bootstrapCircuitRelays = {

package/lib/adapters/gist.js

@@ -36,10 +36,11 @@ class Gist {
       nullFunc(object)
 
       // return object
-      return {
-        browser: [],
-        node: []
-      }
+      return object
+      // return {
+      //   browser: [],
+      //   node: []
+      // }
     } catch (err) {
       console.error('Error attempting to download GitHub Gist of alternative servers.')
       throw err

package/lib/use-cases/relay-use-cases.js

@@ -19,6 +19,9 @@ class RelayUseCases {
       )
     }
 
+    // Encapsulate dependencies
+    this.bootstrapCircuitRelays = bootstrapCircuitRelays
+
     // Initialize v1 relay list. Allows user to overwrite with local config.
     this.bootstrapRelays = []
     if (localConfig.bootstrapRelays) {
@@ -43,9 +46,9 @@ class RelayUseCases {
       // Set the initial CR bootstrap nodes based on the type of IPFS node.
       let bootstrapRelays = []
       if (thisNode.type === 'browser') {
-        bootstrapRelays = bootstrapCircuitRelays.browser
+        bootstrapRelays = this.bootstrapCircuitRelays.browser
       } else {
-        bootstrapRelays = bootstrapCircuitRelays.node
+        bootstrapRelays = this.bootstrapCircuitRelays.node
       }
 
       // Loop through each bootstrap Relay.

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

@@ -6,6 +6,7 @@
 import ThisNodeEntity from '../entities/this-node-entity.js'
 import Schema from './schema.js'
 import Util from '../util/utils.js'
+import { publicIpv4 } from 'public-ip'
 
 class ThisNodeUseCases {
   constructor (localConfig = {}) {
@@ -19,9 +20,11 @@ class ThisNodeUseCases {
 
     // Encapsulate dependencies
     this.utils = new Util()
+    this.publicIp = publicIpv4
 
     // Optional JSON-LD used for announcements. If present, will override
     // default announcement object in Schema library.
+    this.tcpPort = localConfig.tcpPort
     this.announceJsonLd = localConfig.announceJsonLd
 
     // If consuming app wants to configure itself as a Circuit Relay, it can
@@ -70,6 +73,15 @@ class ThisNodeUseCases {
     selfData.ipfsId = this.adapters.ipfs.ipfsPeerId
     selfData.ipfsMultiaddrs = this.adapters.ipfs.ipfsMultiaddrs
 
+    // Try to auto-detect the public multiaddr and add it.
+    if (this.tcpPort) {
+      const ip4 = await this.publicIp()
+      console.log(`helia-coord using this IP address: ${ip4}, and this TCP port: ${this.tcpPort}`)
+      const detectedMultiaddr = `/ip4/${ip4}/tcp/${this.tcpPort}/p2p/${selfData.ipfsId}`
+      // detectedMultiaddr = this.multiaddr(detectedMultiaddr)
+      selfData.ipfsMultiaddrs.push(detectedMultiaddr)
+    }
+
     // Aggregate data from the BCH adapter.
     const bchData = await this.adapters.bch.generateBchId()
     selfData.bchAddr = bchData.cashAddress
@@ -256,7 +268,7 @@ class ThisNodeUseCases {
       // Get connected peers
       const connectedPeers = await this.adapters.ipfs.getPeers()
       this.adapters.log.statusLog(
-        2,
+        0,
         'refreshPeerConnections() connectedPeers: ',
         connectedPeers
       )
@@ -279,7 +291,7 @@ class ThisNodeUseCases {
         // 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
@@ -293,7 +305,7 @@ class ThisNodeUseCases {
         // If broadcastedAt value is older than 10 minutes, skip connecting
         // to the peer. It may be stale information.
         if (!this.isFreshPeer(peerData)) {
-          this.adapters.log.statusLog(2, `Peer ${peerData.from} is stale. Skipping.`)
+          this.adapters.log.statusLog(0, `Peer ${peerData.from} is stale. Skipping.`)
           continue
         }
 
@@ -331,10 +343,13 @@ 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]
+          this.adapters.log.statusLog(0,
+            `Trying a direct connecto to peer ${thisPeer} with this multiaddr: ${multiaddr}.`
+          )
 
           // Attempt to connect to the node through a circuit relay.
           connected = await this.adapters.ipfs.connectToPeer({ multiaddr })
@@ -356,7 +371,7 @@ class ThisNodeUseCases {
             // Break out of the loop once we've made a successful connection.
             break
           } else {
-            this.adapters.log.statusLog(2,
+            this.adapters.log.statusLog(0,
               `Failed to connect to peer ${thisPeer} through direct connection: ${multiaddr}. Reason: ${connected.details}`
             )
           }

package/lib/util/utils.js

@@ -11,6 +11,7 @@ class Util {
   // This function takes an array of multiaddrs as input, and returns an array
   // filtered to remove any local network IP addresses.
   filterMultiaddrs (multiaddrs) {
+    console.log('filterMultiaddrs() input: ', multiaddrs)
     try {
       const filteredMultiaddrs = multiaddrs.filter((x) => {
         if (x.includes('127.0.0.1')) return false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia-coord",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "description": "A JS library for helping IPFS peers coordinate, find a common interest, and stay connected around that interest.",
   "main": "./index.js",
   "type": "module",
@@ -34,6 +34,7 @@
     "@chris.troutner/retry-queue": "1.0.8",
     "@multiformats/multiaddr": "12.1.8",
     "bch-encrypt-lib": "2.1.1",
+    "public-ip": "6.0.1",
     "uuid": "9.0.0"
   },
   "peerDependencies": {

package/test/unit/use-cases/relay-use-cases-unit.js

@@ -80,6 +80,12 @@ describe('#relay-Use-Cases', () => {
           .stub(uut.adapters.ipfs, 'connectToPeer')
           .rejects(new Error('test error'))
 
+        uut.bootstrapCircuitRelays = {
+          node: [{
+            multiaddr: 'fake-multiaddr'
+          }]
+        }
+
         await uut.initializeRelays(thisNode)
 
         assert.fail('Unexpected code path')