chore: update ipfs-http-client dep (#23)

* chore: update ipfs-http-client dep

* chore: update ipfs-http-client dep

* chore: update ipfs-http-client dep

* fix: specify number of providers to retrieve

Author: Alan Shaw

package.json

@@ -21,16 +21,18 @@
     "aegir": "^20.4.1",
     "chai": "^4.2.0",
     "cids": "^0.7.1",
-    "go-ipfs-dep": "~0.4.22",
+    "go-ipfs-dep": "^0.4.23",
     "ipfsd-ctl": "~0.47.4",
-    "peer-id": "~0.13.5"
+    "peer-id": "^0.13.7"
   },
   "dependencies": {
-    "it-all": "^1.0.0",
     "debug": "^4.1.1",
-    "ipfs-http-client": "^40.0.1",
+    "ipfs-http-client": "^42.0.0",
+    "it-all": "^1.0.0",
     "multiaddr": "^7.2.1",
-    "p-queue": "^6.2.1"
+    "p-defer": "^3.0.0",
+    "p-queue": "^6.2.1",
+    "peer-info": "^0.17.1"
   },
   "contributors": [
     "Alan Shaw <alan.shaw@protocol.ai>",

src/index.js

@@ -1,13 +1,14 @@
 'use strict'
 
 const debug = require('debug')
-
-const dht = require('ipfs-http-client/src/dht')
-const refs = require('ipfs-http-client/src/refs')
-const getEndpointConfig = require('ipfs-http-client/src/get-endpoint-config')
+const PeerId = require('peer-id')
+const PeerInfo = require('peer-info')
+const createFindProvs = require('ipfs-http-client/src/dht/find-provs')
+const createRefs = require('ipfs-http-client/src/refs')
 
 const { default: PQueue } = require('p-queue')
 const all = require('it-all')
+const defer = require('p-defer')
 
 const log = debug('libp2p-delegated-content-routing')
 log.error = debug('libp2p-delegated-content-routing:error')
@@ -36,9 +37,9 @@ class DelegatedContentRouting {
       throw new Error('missing self peerId')
     }
 
-    this.api = Object.assign({}, getEndpointConfig()(), DEFAULT_IPFS_API, api)
-    this.dht = dht(this.api)
-    this.refs = refs(this.api)
+    this.api = Object.assign({}, DEFAULT_IPFS_API, api)
+    this.dht = { findProvs: createFindProvs(this.api) }
+    this.refs = createRefs(this.api)
     this.peerId = peerId
 
     // limit concurrency to avoid request flood in web browser
@@ -64,18 +65,35 @@ class DelegatedContentRouting {
    * @returns {AsyncIterable<PeerInfo>}
    */
   async * findProviders (key, options = {}) {
-    const keyString = key.toBaseEncodedString()
-    log('findProviders starts: ' + keyString)
+    const keyString = `${key}`
+    log('findProviders starts:', keyString)
     options.timeout = options.timeout || DEFAULT_TIMEOUT
 
-    const results = await this._httpQueue.add(() => this.dht.findProvs(key, {
-      timeout: `${options.timeout}ms` // The api requires specification of the time unit (s/ms)
-    }))
+    const onStart = defer()
+    const onFinish = defer()
+
+    this._httpQueue.add(() => {
+      onStart.resolve()
+      return onFinish.promise
+    })
+
+    try {
+      await onStart.promise
+
+      const providers = this.dht.findProvs(key, {
+        numProviders: options.numProviders,
+        timeout: `${options.timeout}ms` // The api requires specification of the time unit (s/ms)
+      })
 
-    for (let i = 0; i < results.length; i++) {
-      yield results[i]
+      for await (const { id, addrs } of providers) {
+        const peerInfo = new PeerInfo(PeerId.createFromCID(id))
+        addrs.forEach(addr => peerInfo.multiaddrs.add(addr))
+        yield peerInfo
+      }
+    } finally {
+      onFinish.resolve()
+      log('findProviders finished:', keyString)
     }
-    log('findProviders finished: ' + keyString)
   }
 
   /**
@@ -90,12 +108,12 @@ class DelegatedContentRouting {
    * @returns {Promise<void>}
    */
   async provide (key) {
-    const keyString = key.toBaseEncodedString()
-    log('provide starts: ' + keyString)
+    const keyString = `${key}`
+    log('provide starts:', keyString)
     const results = await this._httpQueueRefs.add(() =>
       all(this.refs(keyString, { recursive: false }))
     )
-    log('provide finished: ', keyString, results)
+    log('provide finished:', keyString, results)
   }
 }
 

test/index.spec.js

@@ -75,7 +75,6 @@ describe('DelegatedContentRouting', function () {
       const router = new DelegatedContentRouting(selfId)
 
       expect(router.api).to.include({
-        'api-path': '/api/v0',
         protocol: 'https',
         port: 443,
         host: 'node0.delegate.ipfs.io'
@@ -88,7 +87,6 @@ describe('DelegatedContentRouting', function () {
       })
 
       expect(router.api).to.include({
-        'api-path': '/api/v0',
         protocol: 'https',
         port: 443,
         host: 'other.ipfs.io'
@@ -97,7 +95,6 @@ describe('DelegatedContentRouting', function () {
 
     it('should allow for overriding the api', () => {
       const api = {
-        'api-path': '/api/v1',
         protocol: 'http',
         port: 8000,
         host: 'localhost'
@@ -124,7 +121,7 @@ describe('DelegatedContentRouting', function () {
         host: opts.host
       })
 
-      const providers = await all(routing.findProviders(cid))
+      const providers = await all(routing.findProviders(cid, { numProviders: 2 }))
 
       // We should get the bootstrap node as provider
       // The delegate node is not included, because it is handling the requests
@@ -141,7 +138,7 @@ describe('DelegatedContentRouting', function () {
       })
 
       const cid = new CID('QmS4ustL54uo8FzR9455qaxZwuMiUhyvMcX9Ba8nUH4uVv')
-      const providers = await all(routing.findProviders(cid, { timeout: 5e3 }))
+      const providers = await all(routing.findProviders(cid, { numProviders: 2, timeout: 5e3 }))
 
       expect(providers.map((p) => p.id.toB58String())).to.include(bootstrapId.id, 'Did not include bootstrap node')
     })