feat(issue-1852): now supports multiple api and gateways

src/http/index.js

@@ -29,22 +29,20 @@ function hapiInfoToMultiaddr (info) {
   return toMultiaddr(uri)
 }
 
-async function serverCreator (serverAddrsArr, createServerFunc, hapiInfoToMultiaddr, ipfs) {
-  if (!serverAddrsArr.length) {
-    debug(Error('There are no addresses'))
+async function serverCreator (serverAddrs, createServer, hapiInfoToMultiaddr, ipfs) {
+  if (!serverAddrs.length) {
+    return []
   }
   // just in case the address is just string
-  let serversAddrs = [].concat(serverAddrsArr)
-  const processServer = async (serverInstance, createServerFunc, hapiInfoToMultiaddr, ipfs) => {
-    let addr = serverInstance.split('/')
-    let _Server = await createServerFunc(addr[2], addr[4], ipfs)
-    await _Server.start()
-    _Server.info.ma = hapiInfoToMultiaddr(_Server.info)
-    return _Server
+  serverAddrs = Array.isArray(serverAddrs) ? serverAddrs : [serverAddrs]
+  const processServer = async address => {
+    const addrParts = address.split('/')
+    const server = await createServer(addrParts[2], addrParts[4], ipfs)
+    await server.start()
+    server.info.ma = hapiInfoToMultiaddr(server.info)
+    return server
   }
-  return Promise.all(
-    serversAddrs.map(server => processServer(server, createServerFunc, hapiInfoToMultiaddr, ipfs))
-  ).catch(err => debug(err))
+  return Promise.all(serverAddrs.map(processServer))
 }
 
 class HttpApi {
@@ -109,24 +107,22 @@ class HttpApi {
 
     const apiAddrs = config.Addresses.API
 
-    this._apiServer = await Promise.resolve(
-      serverCreator.apply(this, [apiAddrs, this._createApiServer, hapiInfoToMultiaddr, ipfs])
-    )
+    this._apiServers = await serverCreator(apiAddrs, this._createApiServer, hapiInfoToMultiaddr, ipfs)
+
     // for the CLI to know the where abouts of the API
-    await promisify(ipfs._repo.apiAddr.set)(this._apiServer[0].info.ma)
+    await promisify(ipfs._repo.apiAddr.set)(this._apiServers[0].info.ma)
 
-    const gatewayAddr = config.Addresses.Gateway
+    const gatewayAddrs = config.Addresses.Gateway
 
-    this._gatewayServer = await Promise.resolve(
-      serverCreator.apply(this, [gatewayAddr, this._createGatewayServer, hapiInfoToMultiaddr, ipfs])
-    )
-    this._apiServer.forEach(apiServer => {
+    this._gatewayServers = await serverCreator(gatewayAddrs, this._createGatewayServer, hapiInfoToMultiaddr, ipfs)
+
+    this._apiServers.forEach(apiServer => {
       ipfs._print('API listening on %s', apiServer.info.ma)
     })
-    this._gatewayServer.forEach(gatewayServer => {
+    this._gatewayServers.forEach(gatewayServer => {
       ipfs._print('Gateway (read only) listening on %s', gatewayServer.info.ma)
     })
-    this._apiServer.forEach(apiServer => {
+    this._apiServers.forEach(apiServer => {
       ipfs._print('Web UI available at %s', toUri(apiServer.info.ma) + '/webui')
     })
     this._log('started')
@@ -198,20 +194,18 @@ class HttpApi {
   }
 
   get apiAddr () {
-    if (!this._apiServer) throw new Error('API address unavailable - server is not started')
-    return multiaddr('/ip4/127.0.0.1/tcp/' + this._apiServer[0].info.port)
+    if (!this._apiServers) throw new Error('API address unavailable - server is not started')
+    return multiaddr('/ip4/127.0.0.1/tcp/' + this._apiServers[0].info.port)
   }
 
   async stop () {
-    function stopServer (serverArr) {
-      for (let i = 0; i < serverArr.length; i++) {
-        serverArr[i].stop()
-      }
+    function stopServers (servers) {
+      return Promise.all(servers.map(server => server.stop()))
     }
     this._log('stopping')
     await Promise.all([
-      this._apiServer && stopServer(this._apiServer),
-      this._gatewayServer && stopServer(this._gatewayServer),
+      stopServers(this._apiServers),
+      stopServers(this._gatewayServers),
       this._ipfs && this._ipfs.stop()
     ])
     this._log('stopped')

test/cli/daemon.js

@@ -26,7 +26,7 @@ const checkLock = (repo, cb) => {
   cb()
 }
 
-function testSignal (ipfs, sig) {
+function testSignal (ipfs, sig, config) {
   return ipfs('init').then(() => {
     return ipfs('config', 'Addresses', JSON.stringify({
       API: '/ip4/127.0.0.1/tcp/0',
@@ -91,6 +91,33 @@ describe('daemon', () => {
     }).catch(err => done(err))
   })
 
+  skipOnWindows('should handle API Array and Gateway Array', function (done) {
+    this.timeout(100 * 1000)
+    // These tests are flaky, but retrying 3 times seems to make it work 99% of the time
+    this.retries(3)
+
+    ipfs('init').then(() => {
+      return ipfs('config', 'Addresses', JSON.stringify({
+        Swarm: ['/ip4/0.0.0.0/tcp/4002', '/ip4/127.0.0.1/tcp/4003/ws'],
+        API: ['/ip4/127.0.0.1/tcp/5002', '/ip6/::1/tcp/5002'],
+        Gateway: ['/ip4/127.0.0.1/tcp/9090', '/ip6/::1/tcp/9090']
+      }), '--json')
+    }).then(() => {
+      const res = ipfs('daemon')
+      const timeout = setTimeout(() => {
+        done(new Error('Daemon did not get ready in time'))
+      }, 1000 * 120)
+      res.stdout.on('data', (data) => {
+        const line = data.toString()
+        if (line.includes('Daemon is ready')) {
+          clearTimeout(timeout)
+          res.kill()
+          done()
+        }
+      })
+    }).catch(err => done(err))
+  })
+
   skipOnWindows('should handle SIGINT gracefully', function (done) {
     this.timeout(100 * 1000)
 

test/gateway/index.js

@@ -60,7 +60,7 @@ describe('HTTP Gateway', function () {
 
     await http.api.start()
 
-    gateway = http.api._gatewayServer[0]
+    gateway = http.api._gatewayServers[0]
 
     // QmbQD7EMEL1zeebwBsWEfA3ndgSS6F7S6iTuwuqasPgVRi
     await http.api._ipfs.add([

test/http-api/inject/bitswap.js

@@ -12,7 +12,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     before(async function () {

test/http-api/inject/block.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('/block/put', () => {

test/http-api/inject/bootstrap.js

@@ -11,7 +11,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
       return api.inject({
         method: 'GET',
         url: '/api/v0/bootstrap/add/default'

test/http-api/inject/config.js

@@ -17,7 +17,7 @@ module.exports = (http) => {
 
     before(() => {
       updatedConfig = () => JSON.parse(fs.readFileSync(configPath, 'utf8'))
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     after(() => {

test/http-api/inject/dht.js

@@ -12,7 +12,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('/findpeer', () => {

test/http-api/inject/dns.js

@@ -8,7 +8,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('resolve ipfs.io dns', async () => {

test/http-api/inject/files.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('/add', () => {

test/http-api/inject/id.js

@@ -8,7 +8,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('get the id', async () => {

test/http-api/inject/name.js

@@ -16,7 +16,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('should publish a record', async function () {

test/http-api/inject/object.js

@@ -17,7 +17,7 @@ module.exports = (http) => {
     let api
 
     before('api', () => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('/new', () => {

test/http-api/inject/pin.js

@@ -37,7 +37,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('rm', () => {

test/http-api/inject/ping.js

@@ -13,7 +13,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('returns 400 if both n and count are provided', async () => {

test/http-api/inject/pubsub.js

@@ -16,7 +16,7 @@ module.exports = (http) => {
     const topicNotSubscribed = 'somethingRandom'
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     describe('/sub', () => {

test/http-api/inject/resolve.js

@@ -12,7 +12,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('should resolve a path and return a base2 encoded CID', async () => {

test/http-api/inject/version.js

@@ -9,7 +9,7 @@ module.exports = (http) => {
     let api
 
     before(() => {
-      api = http.api._apiServer[0]
+      api = http.api._apiServers[0]
     })
 
     it('get the version', async () => {