refactor: convert bootstrap API to async/await

Author: Alan Shaw

src/core/components/bootstrap.js

@@ -0,0 +1,34 @@
+'use strict'
+
+const defaultConfig = require('../runtime/config-nodejs.js')
+const isMultiaddr = require('mafmt').IPFS.matches
+
+function isValidMultiaddr (ma) {
+  try {
+    return isMultiaddr(ma)
+  } catch (err) {
+    return false
+  }
+}
+
+module.exports = ({ repo }) => {
+  return async function add (multiaddr, options) {
+    options = options || {}
+
+    if (multiaddr && !isValidMultiaddr(multiaddr)) {
+      throw new Error(`${multiaddr} is not a valid Multiaddr`)
+    }
+
+    const config = await repo.config.get()
+    if (options.default) {
+      config.Bootstrap = defaultConfig().Bootstrap
+    } else if (multiaddr && config.Bootstrap.indexOf(multiaddr) === -1) {
+      config.Bootstrap.push(multiaddr)
+    }
+    await repo.config.set(config)
+
+    return {
+      Peers: options.default ? defaultConfig().Bootstrap : [multiaddr]
+    }
+  }
+}

src/core/components/bootstrap/add.js

@@ -0,0 +1,8 @@
+'use strict'
+
+module.exports = ({ repo }) => {
+  return async function list () {
+    const config = await repo.config.get()
+    return { Peers: config.Bootstrap || [] }
+  }
+}

src/core/components/bootstrap/list.js

@@ -0,0 +1,39 @@
+'use strict'
+
+const isMultiaddr = require('mafmt').IPFS.matches
+
+function isValidMultiaddr (ma) {
+  try {
+    return isMultiaddr(ma)
+  } catch (err) {
+    return false
+  }
+}
+
+module.exports = ({ repo }) => {
+  return async function rm (multiaddr, options) {
+    options = options || {}
+
+    if (multiaddr && !isValidMultiaddr(multiaddr)) {
+      throw new Error(`${multiaddr} is not a valid Multiaddr`)
+    }
+
+    let res = []
+    const config = await repo.config.get()
+
+    if (options.all) {
+      res = config.Bootstrap || []
+      config.Bootstrap = []
+    } else {
+      config.Bootstrap = (config.Bootstrap || []).filter(ma => ma !== multiaddr)
+    }
+
+    await repo.config.set(config)
+
+    if (!options.all && multiaddr) {
+      res.push(multiaddr)
+    }
+
+    return { Peers: res }
+  }
+}

src/core/components/bootstrap/rm.js

@@ -6,6 +6,11 @@ exports.bitswap = {
   unwant: require('./bitswap/unwant'),
   wantlist: require('./bitswap/wantlist')
 }
+exports.bootstrap = {
+  add: require('./bootstrap/add'),
+  list: require('./bootstrap/list'),
+  rm: require('./bootstrap/rm')
+}
 exports.config = require('./config')
 exports.id = require('./id')
 exports.init = require('./init')

src/core/components/index.js

@@ -314,6 +314,11 @@ function createApi ({
 
   const api = {
     add,
+    bootstrap: {
+      add: Commands.bootstrap.add({ repo }),
+      list: Commands.bootstrap.list({ repo }),
+      rm: Commands.bootstrap.rm({ repo })
+    },
     config: Commands.config({ repo }),
     id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },

src/core/components/init.js

@@ -150,6 +150,11 @@ function createApi ({
       unwant: Commands.bitswap.unwant({ bitswap }),
       wantlist: Commands.bitswap.wantlist({ bitswap })
     },
+    bootstrap: {
+      add: Commands.bootstrap.add({ repo }),
+      list: Commands.bootstrap.list({ repo }),
+      rm: Commands.bootstrap.rm({ repo })
+    },
     config: Commands.config({ repo }),
     id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },

src/core/components/start.js

@@ -112,6 +112,11 @@ function createApi ({
 
   const api = {
     add,
+    bootstrap: {
+      add: Commands.bootstrap.add({ repo }),
+      list: Commands.bootstrap.list({ repo }),
+      rm: Commands.bootstrap.rm({ repo })
+    },
     config: Commands.config({ repo }),
     id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },