finish bootstrap interface

dignifiedquire · dignifiedquire · commit b9200f192554 · 2016-12-14T23:13:48.000+01:00
diff --git a/src/cli/commands/bootstrap/add.js b/src/cli/commands/bootstrap/add.js
@@ -6,22 +6,30 @@ const utils = require('../../utils')
 log.error = debug('cli:bootstrap:error')
 
 module.exports = {
-  command: 'add <peer>',
+  command: 'add [<peer>]',
 
   describe: 'Add peers to the bootstrap list',
 
-  builder: {},
+  builder: {
+    default: {
+      describe: 'Add default bootstrap nodes.',
+      type: 'boolean',
+      default: false
+    }
+  },
 
   handler (argv) {
     utils.getIPFS((err, ipfs) => {
       if (err) {
         throw err
       }
 
-      ipfs.bootstrap.add(argv.peer, (err, list) => {
+      ipfs.bootstrap.add(argv.peer, {default: argv.default}, (err, list) => {
         if (err) {
           throw err
         }
+
+        list.Peers.forEach((l) => console.log(l))
       })
     })
   }
diff --git a/src/cli/commands/bootstrap/list.js b/src/cli/commands/bootstrap/list.js
@@ -21,7 +21,8 @@ module.exports = {
         if (err) {
           throw err
         }
-        list.forEach((node) => {
+
+        list.Peers.forEach((node) => {
           console.log(node)
         })
       })
diff --git a/src/cli/commands/bootstrap/rm.js b/src/cli/commands/bootstrap/rm.js
@@ -28,6 +28,8 @@ module.exports = {
         if (err) {
           throw err
         }
+
+        list.Peers.forEach((l) => console.log(l))
       })
     })
   }
diff --git a/src/core/components/bootstrap.js b/src/core/components/bootstrap.js
@@ -1,22 +1,40 @@
 'use strict'
 
+const defaultNodes = require('../../init-files/default-config.json').Bootstrap
+
 module.exports = function bootstrap (self) {
   return {
     list: (callback) => {
       self._repo.config.get((err, config) => {
         if (err) {
           return callback(err)
         }
-        callback(null, config.Bootstrap)
+        callback(null, {Peers: config.Bootstrap})
       })
     },
-    add: (multiaddr, callback) => {
+    add: (multiaddr, args, callback) => {
+      if (typeof args === 'function') {
+        callback = args
+        args = {default: false}
+      }
       self._repo.config.get((err, config) => {
         if (err) {
           return callback(err)
         }
-        config.Bootstrap.push(multiaddr)
-        self._repo.config.set(config, callback)
+        if (args.default) {
+          config.Bootstrap = defaultNodes
+        } else {
+          config.Bootstrap.push(multiaddr)
+        }
+        self._repo.config.set(config, (err) => {
+          if (err) {
+            return callback(err)
+          }
+
+          callback(null, {
+            Peers: args.default ? defaultNodes : [multiaddr]
+          })
+        })
       })
     },
     rm: (multiaddr, args, callback) => {
@@ -34,7 +52,18 @@ module.exports = function bootstrap (self) {
           config.Bootstrap = config.Bootstrap.filter((mh) => mh !== multiaddr)
         }
 
-        self._repo.config.set(config, callback)
+        self._repo.config.set(config, (err) => {
+          if (err) {
+            return callback(err)
+          }
+
+          const res = []
+          if (!args.all && multiaddr) {
+            res.push(multiaddr)
+          }
+
+          callback(null, {Peers: res})
+        })
       })
     }
   }
diff --git a/src/http-api/resources/bootstrap.js b/src/http-api/resources/bootstrap.js
@@ -1,65 +1,105 @@
 'use strict'
 
-const boom = require('boom')
 const multiaddr = require('multiaddr')
 
 exports = module.exports
 
+function applyError (reply, err) {
+  reply({
+    Message: err.message,
+    Code: 0
+  }).code(500).takeover()
+}
+
 // common pre request handler that parses the args and returns `key` which is assigned to `request.pre.args`
 exports.parseKey = (request, reply) => {
   if (!request.query.arg) {
-    return reply("Argument 'multiaddr' is required").code(400).takeover()
+    return applyError(reply, new Error("Argument 'multiaddr' is required"))
   }
 
   try {
     return reply({
       addr: multiaddr(request.query.arg)
     })
   } catch (err) {
-    return reply({
-      Message: 'Not a valid multiaddr',
-      Code: 0
-    }).code(500).takeover()
+    return applyError(reply, new Error('Not a valid multiaddr'))
   }
 }
 
 exports.list = (request, reply) => {
   const ipfs = request.server.app.ipfs
+
   ipfs.bootstrap.list((err, list) => {
     if (err) {
-      return reply(boom.badRequest(err))
+      return applyError(reply, err)
     }
+
     return reply(list)
   })
 }
 
 exports.add = {
-  parseArgs: exports.parseKey,
+  parseArgs (request, reply) {
+    const q = request.query
+    const def = q.default === 'true'
+
+    if (q.arg != null) {
+      try {
+        return reply({
+          addr: multiaddr(q.arg),
+          default: def
+        })
+      } catch (err) {
+        return applyError(reply, new Error('Not a valid multiaddr'))
+      }
+    } else {
+      reply({default: def})
+    }
+  },
   handler (request, reply) {
     const ipfs = request.server.app.ipfs
     const addr = request.pre.args.addr
-    console.log('Handler is called', addr.toString())
+    const def = request.pre.args.default
 
-    ipfs.bootstrap.add(addr.toString(), (err, list) => {
+    ipfs.bootstrap.add(addr && addr.toString(), {default: def}, (err, list) => {
       if (err) {
-        return reply(boom.badRequest(err))
+        return applyError(reply, err)
       }
-      return reply()
+
+      return reply(list)
     })
   }
 }
 
 exports.rm = {
-  parseArgs: exports.parseKey,
+  parseArgs (request, reply) {
+    const q = request.query
+    const all = q.all === 'true'
+
+    if (q.arg != null) {
+      try {
+        return reply({
+          addr: multiaddr(q.arg),
+          all: all
+        })
+      } catch (err) {
+        return applyError(reply, new Error('Not a valid multiaddr'))
+      }
+    } else {
+      reply({all: all})
+    }
+  },
   handler (request, reply) {
     const ipfs = request.server.app.ipfs
     const addr = request.pre.args.addr
+    const all = request.pre.args.all
 
-    ipfs.bootstrap.rm(addr.toString(), (err, list) => {
+    ipfs.bootstrap.rm(addr && addr.toString(), {all: all}, (err, list) => {
       if (err) {
-        return reply(boom.badRequest(err))
+        return applyError(reply, err)
       }
-      return reply()
+
+      return reply(list)
     })
   }
 }
diff --git a/src/http-api/routes/bootstrap.js b/src/http-api/routes/bootstrap.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const Joi = require('joi')
 const resources = require('./../resources')
 
 module.exports = (server) => {
@@ -21,14 +20,7 @@ module.exports = (server) => {
       pre: [
         { method: resources.bootstrap.add.parseArgs, assign: 'args' }
       ],
-      handler: resources.bootstrap.add.handler,
-      validate: {
-        query: {
-          arg: Joi.string().required(),
-          default: Joi.boolean(),
-          'stream-channels': Joi.boolean()
-        }
-      }
+      handler: resources.bootstrap.add.handler
     }
   })
 
@@ -47,14 +39,7 @@ module.exports = (server) => {
       pre: [
         { method: resources.bootstrap.rm.parseArgs, assign: 'args' }
       ],
-      handler: resources.bootstrap.rm.handler,
-      validate: {
-        query: {
-          arg: Joi.string().required(),
-          default: Joi.boolean(),
-          'stream-channels': Joi.boolean()
-        }
-      }
+      handler: resources.bootstrap.rm.handler
     }
   })
 }
diff --git a/test/cli/test-bootstrap.js b/test/cli/test-bootstrap.js
@@ -7,7 +7,7 @@ const repoPath = require('./index').repoPath
 const ipfs = require('../utils/ipfs-exec')(repoPath)
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
-describe.only('bootstrap', () => {
+describe('bootstrap', () => {
   describeOnlineAndOffline(repoPath, () => {
     const defaultList = [
       '/ip4/104.131.131.82/tcp/4001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ',
@@ -34,16 +34,21 @@ describe.only('bootstrap', () => {
       '/ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD'
     ]
 
+    it('add default', () => {
+      return ipfs('bootstrap add --default').then((out) => {
+        expect(out).to.be.eql(defaultList.join('\n'))
+      })
+    })
+
     it('list the bootstrap nodes', () => {
       return ipfs('bootstrap list').then((out) => {
         expect(out).to.eql(defaultList.join('\n'))
       })
     })
 
-    // TODO need https://github.com/ipfs/interface-ipfs-core/issues/97
-    // to happen, otherwise it is a cat an mouse game
-    it.skip('add another bootstrap node', () => {
+    it('add another bootstrap node', () => {
       return ipfs('bootstrap add /ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD').then((out) => {
+        expect(out).to.be.eql('/ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD')
         return ipfs('bootstrap list')
       }).then((out) => {
         expect(out).to.be.eql(updatedList.join('\n'))
@@ -52,6 +57,7 @@ describe.only('bootstrap', () => {
 
     it('rm a bootstrap node', () => {
       return ipfs('bootstrap rm /ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD').then((out) => {
+        expect(out).to.be.eql('/ip4/111.111.111.111/tcp/1001/ipfs/QmcyFFKfLDGJKwufn2GeitxvhricsBQyNKTkrD14psikoD')
         return ipfs('bootstrap list')
       }).then((out) => {
         expect(out).to.deep.equal(defaultList.join('\n'))
@@ -60,6 +66,7 @@ describe.only('bootstrap', () => {
 
     it('rm all bootstrap nodes', () => {
       return ipfs('bootstrap rm --all').then((out) => {
+        expect(out).to.be.eql('')
         return ipfs('bootstrap list')
       }).then((out) => {
         expect(out).to.deep.equal('')
diff --git a/test/core/both/test-bootstrap.js b/test/core/both/test-bootstrap.js
@@ -41,28 +41,30 @@ describe('bootstrap', () => {
   it('get bootstrap list', (done) => {
     ipfs.bootstrap.list((err, list) => {
       expect(err).to.not.exist
-      expect(list).to.deep.equal(defaultList)
+      expect(list.Peers).to.deep.equal(defaultList)
       done()
     })
   })
 
   it('add a peer to the bootstrap list', (done) => {
-    ipfs.bootstrap.add('/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT', (err) => {
+    ipfs.bootstrap.add('/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT', (err, res) => {
       expect(err).to.not.exist
+      expect(res).to.be.eql({Peers: ['/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT']})
       ipfs.bootstrap.list((err, list) => {
         expect(err).to.not.exist
-        expect(list).to.deep.equal(updatedList)
+        expect(list.Peers).to.deep.equal(updatedList)
         done()
       })
     })
   })
 
   it('remove a peer from the bootstrap list', (done) => {
-    ipfs.bootstrap.rm('/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT', (err) => {
+    ipfs.bootstrap.rm('/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT', (err, res) => {
       expect(err).to.not.exist
+      expect(res).to.be.eql({Peers: ['/ip4/111.111.111.111/tcp/1001/ipfs/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLUVIT']})
       ipfs.bootstrap.list((err, list) => {
         expect(err).to.not.exist
-        expect(list).to.deep.equal(defaultList)
+        expect(list.Peers).to.deep.equal(defaultList)
         done()
       })
     })
diff --git a/test/http-api/custom-ipfs-api/test-bootstrap.js b/test/http-api/custom-ipfs-api/test-bootstrap.js

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ module.exports = {`
`28`	`28`	`if (err) {`
`29`	`29`	`throw err`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ list.Peers.forEach((l) => console.log(l))`
`31`	`33`	`})`
`32`	`34`	`})`
`33`	`35`	`}`