refactor: convert bitswap to async/await (#1149)

src/bitswap/index.js

@@ -1,13 +1,9 @@
 'use strict'
 
-const moduleConfig = require('../utils/module-config')
+const callbackify = require('callbackify')
 
-module.exports = (arg) => {
-  const send = moduleConfig(arg)
-
-  return {
-    wantlist: require('./wantlist')(send),
-    stat: require('./stat')(send),
-    unwant: require('./unwant')(send)
-  }
-}
+module.exports = (config) => ({
+  wantlist: callbackify.variadic(require('./wantlist')(config)),
+  stat: callbackify.variadic(require('./stat')(config)),
+  unwant: callbackify.variadic(require('./unwant')(config))
+})

src/bitswap/stat.js

@@ -1,10 +1,25 @@
 'use strict'
 
-const promisify = require('promisify-es6')
+const configure = require('../lib/configure')
 const Big = require('bignumber.js')
 
-const transform = function (res, callback) {
-  callback(null, {
+module.exports = configure(({ ky }) => {
+  return async (options) => {
+    options = options || {}
+
+    const res = await ky.get('bitswap/stat', {
+      timeout: options.timeout,
+      signal: options.signal,
+      headers: options.headers,
+      searchParams: options.searchParams
+    }).json()
+
+    return toCoreInterface(res)
+  }
+})
+
+function toCoreInterface (res) {
+  return {
     provideBufLen: res.ProvideBufLen,
     wantlist: res.Wantlist || [],
     peers: res.Peers || [],
@@ -14,13 +29,5 @@ const transform = function (res, callback) {
     dataSent: new Big(res.DataSent),
     dupBlksReceived: new Big(res.DupBlksReceived),
     dupDataReceived: new Big(res.DupDataReceived)
-  })
-}
-
-module.exports = (send) => {
-  return promisify((callback) => {
-    send.andTransform({
-      path: 'bitswap/stat'
-    }, transform, callback)
-  })
+  }
 }

src/bitswap/unwant.js

@@ -1,25 +1,27 @@
 'use strict'
 
-const promisify = require('promisify-es6')
 const CID = require('cids')
+const configure = require('../lib/configure')
 
-module.exports = (send) => {
-  return promisify((cid, opts, callback) => {
-    if (typeof (opts) === 'function') {
-      callback = opts
-      opts = {}
-    }
+module.exports = configure(({ ky }) => {
+  return async (cid, options) => {
+    options = options || {}
+
+    const searchParams = new URLSearchParams(options.searchParams)
 
-    try {
-      cid = new CID(cid)
-    } catch (err) {
-      return callback(err)
+    if (typeof cid === 'string') {
+      searchParams.set('arg', cid)
+    } else {
+      searchParams.set('arg', new CID(cid).toString())
     }
 
-    send({
-      path: 'bitswap/unwant',
-      args: cid.toBaseEncodedString(),
-      qs: opts
-    }, callback)
-  })
-}
+    const res = await ky.get('bitswap/unwant', {
+      timeout: options.timeout,
+      signal: options.signal,
+      headers: options.headers,
+      searchParams
+    }).json()
+
+    return res
+  }
+})

src/bitswap/wantlist.js

@@ -1,30 +1,29 @@
 'use strict'
 
-const promisify = require('promisify-es6')
 const CID = require('cids')
+const configure = require('../lib/configure')
 
-module.exports = (send) => {
-  return promisify((peerId, opts, callback) => {
-    if (typeof (peerId) === 'function') {
-      callback = peerId
-      opts = {}
-      peerId = null
-    } else if (typeof (opts) === 'function') {
-      callback = opts
-      opts = {}
-    }
+module.exports = configure(({ ky }) => {
+  return async (peerId, options) => {
+    options = options || {}
+
+    const searchParams = new URLSearchParams(options.searchParams)
 
     if (peerId) {
-      try {
-        opts.peer = new CID(peerId).toBaseEncodedString()
-      } catch (err) {
-        return callback(err)
+      if (typeof peerId === 'string') {
+        searchParams.set('peer', peerId)
+      } else {
+        searchParams.set('peer', new CID(peerId).toString())
       }
     }
 
-    send({
-      path: 'bitswap/wantlist',
-      qs: opts
-    }, callback)
-  })
-}
+    const res = await ky.get('bitswap/wantlist', {
+      timeout: options.timeout,
+      signal: options.signal,
+      headers: options.headers,
+      searchParams
+    }).json()
+
+    return res
+  }
+})

src/utils/load-commands.js

@@ -3,7 +3,8 @@
 function requireCommands (send, config) {
   const cmds = {
     ...require('../files-regular')(config),
-    getEndpointConfig: require('../get-endpoint-config')(config)
+    getEndpointConfig: require('../get-endpoint-config')(config),
+    bitswap: require('../bitswap')(config)
   }
 
   const subCmds = {
@@ -12,7 +13,6 @@ function requireCommands (send, config) {
 
     // Block
     block: require('../block'),
-    bitswap: require('../bitswap'),
 
     // Graph
     dag: require('../dag'),