helia-coord 1.5.4 → 1.5.6

package/lib/adapters/gist.js

@@ -8,7 +8,12 @@ import axios from 'axios'
 
 class Gist {
   constructor (localConfig = {}) {
+    // Encapsulate dependencies
     this.axios = axios
+
+    // Bind 'this' object to all subfunctions
+    this.getCRList = this.getCRList.bind(this)
+    this.getCRList2 = this.getCRList2.bind(this)
   }
 
   // Retrieve a JSON file from a GitHub Gist
@@ -46,6 +51,43 @@ class Gist {
       throw err
     }
   }
+
+  // Retrieve a JSON file from bootstrap.psfoundation.info
+  async getCRList2 () {
+    try {
+      // Public CRs
+      // https://gist.github.com/christroutner/048ea1a4b635a055c6bb63d48c373806
+      const gistUrl =
+        'https://bootstrap.psfoundation.info/bootstrap.json'
+
+      // Retrieve the gist from github.com.
+      const result = await this.axios.get(gistUrl)
+      console.log('result.data: ', result.data)
+
+      // Get the current content of the gist.
+      const content = result.data
+      // console.log('content: ', content)
+
+      // Parse the JSON string into an Object.
+      // const object = JSON.parse(content)
+      const object = content
+      // console.log('object: ', object)
+
+      // Keep the linter happy.
+      const nullFunc = () => {}
+      nullFunc(object)
+
+      // return object
+      return object
+      // return {
+      //   browser: [],
+      //   node: []
+      // }
+    } catch (err) {
+      console.error('Error attempting to download GitHub Gist of alternative servers.')
+      throw err
+    }
+  }
 }
 
 export default Gist

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

@@ -6,6 +6,9 @@
   - addRelay() - Add a new relay to the state.
 */
 
+// Global npm libraries
+import RetryQueue from '@chris.troutner/retry-queue'
+
 // Local libraries
 import globalConfig from '../../config/global-config.js'
 
@@ -22,6 +25,12 @@ class RelayUseCases {
     // Encapsulate dependencies
     this.config = globalConfig
 
+    this.retryQueue = new RetryQueue({
+      concurrency: 1,
+      attempts: 5,
+      retryPeriod: 1000
+    })
+
     // Initialize v1 relay list. Allows user to overwrite with local config.
     this.bootstrapRelays = []
     if (localConfig.bootstrapRelays) {
@@ -57,7 +66,8 @@ class RelayUseCases {
   // to all of the ones in the list.
   async getCRGist (thisNode) {
     try {
-      const gistCRs = await this.adapters.gist.getCRList()
+      // const gistCRs = await this.adapters.gist.getCRList2()
+      const gistCRs = await this.retryQueue.addToQueue(this.adapters.gist.getCRList2, {})
 
       let gistRelays
       if (thisNode.type === 'browser') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helia-coord",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "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/mocks/adapter-mock.js

@@ -118,8 +118,8 @@ class AdaptersMock {
     }
 
     this.gist = {
-      getCRList: async () => {
-      }
+      getCRList: async () => {},
+      getCRList2: async () => {}
     }
   }
 }

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

@@ -76,7 +76,7 @@ describe('#relay-Use-Cases', () => {
         }],
         recommendedPeers: []
       }
-      sandbox.stub(uut.adapters.gist, 'getCRList').resolves(data)
+      sandbox.stub(uut.adapters.gist, 'getCRList2').resolves(data)
       sandbox.stub(uut, 'removeDuplicates').resolves()
 
       const result = await uut.getCRGist(thisNode)
@@ -100,7 +100,7 @@ describe('#relay-Use-Cases', () => {
         node: [],
         recommendedPeers: []
       }
-      sandbox.stub(uut.adapters.gist, 'getCRList').resolves(data)
+      sandbox.stub(uut.adapters.gist, 'getCRList2').resolves(data)
       sandbox.stub(uut, 'removeDuplicates').resolves()
 
       const result = await uut.getCRGist(thisNode)
@@ -117,7 +117,7 @@ describe('#relay-Use-Cases', () => {
           ipfsId: '123'
         }]
       }
-      sandbox.stub(uut.adapters.gist, 'getCRList').resolves(data)
+      sandbox.stub(uut.adapters.gist, 'getCRList2').resolves(data)
       sandbox.stub(uut, 'removeDuplicates').resolves()
 
       const result = await uut.getCRGist(thisNode)
@@ -128,7 +128,8 @@ describe('#relay-Use-Cases', () => {
     it('should catch and throw errors', async () => {
       try {
         // Force desired code path.
-        sandbox.stub(uut.adapters.gist, 'getCRList').rejects(new Error('test error'))
+        // sandbox.stub(uut.adapters.gist, 'getCRList2').rejects(new Error('test error'))
+        sandbox.stub(uut.retryQueue, 'addToQueue').rejects(new Error('test error'))
 
         await uut.getCRGist()