refactor: http-api has now clean state

Author: dignifiedquire

package.json

@@ -11,8 +11,7 @@
     "lint": "aegir-lint",
     "coverage": "aegir-coverage",
     "test": "aegir-test",
-    "test:node": "aegir-test node && npm run test:node:cli",
-    "test:node:cli": "mocha test/cli-tests/index.js",
+    "test:node": "aegir-test node",
     "test:browser": "aegir-test browser",
     "build": "aegir-build",
     "release": "aegir-release",

src/cli/commands/daemon.js

@@ -1,16 +1,19 @@
 'use strict'
 
 const Command = require('ronin').Command
-const httpAPI = require('../../http-api')
+const HttpAPI = require('../../http-api')
 const debug = require('debug')
 const log = debug('cli:daemon')
 log.error = debug('cli:daemon:error')
 
+let httpAPI
+
 module.exports = Command.extend({
   desc: 'Start a long-running daemon process',
 
   run: (name) => {
     console.log('Initializing daemon...')
+    httpAPI = new HttpAPI()
     httpAPI.start((err) => {
       if (err) {
         return log.error(err)

src/http-api/index.js

@@ -10,83 +10,92 @@ log.error = debug('api:error')
 const IPFSRepo = require('ipfs-repo')
 const fsbs = require('fs-blob-store')
 
-exports = module.exports
+exports = module.exports = function HttpApi (repo) {
+  this.ipfs = null
+  this.server = null
 
-exports.start = (repo, callback) => {
-  if (typeof repo === 'function') {
-    callback = repo
-    repo = undefined
-  }
+  this.start = (callback) => {
+    if (typeof repo === 'string') {
+      repo = new IPFSRepo(repo, {stores: fsbs})
+    }
 
-  if (typeof repo === 'string') {
-    repo = new IPFSRepo(repo, {stores: fsbs})
-  }
+    this.ipfs = new IPFS(repo)
 
-  const ipfs = exports.ipfs = new IPFS(repo)
-  console.log('Starting at %s', ipfs.repo.path())
-  ipfs.load(() => {
-    const repoPath = ipfs.repo.path()
-    const apiPath = path.join(repoPath, 'api')
-    console.log('Finished loading')
-    try {
-      fs.statSync(apiPath)
-      console.log('This repo is currently being used by another daemon')
-      process.exit(1)
-    } catch (err) {
-      fs.writeFileSync(apiPath, 'api is on by js-ipfs', {flag: 'w+'})
-    }
+    console.log('Starting at %s', this.ipfs.repo.path())
 
-    ipfs.config.show((err, config) => {
-      if (err) {
-        return callback(err)
+    this.ipfs.load(() => {
+      const repoPath = this.ipfs.repo.path()
+      const apiPath = path.join(repoPath, 'api')
+      console.log('Finished loading')
+      try {
+        fs.statSync(apiPath)
+        console.log('This repo is currently being used by another daemon')
+        process.exit(1)
+      } catch (err) {
+        fs.writeFileSync(apiPath, 'api is on by js-ipfs', {flag: 'w+'})
       }
 
-      // TODO: set up cors correctly, following config
-      var server = exports.server = new Hapi.Server({
-        connections: {
-          routes: {
-            cors: true
-          }
+      this.ipfs.config.show((err, config) => {
+        if (err) {
+          return callback(err)
         }
-      })
-      const api = config.Addresses.API.split('/')
-      const gateway = config.Addresses.Gateway.split('/')
 
-      // for the CLI to know the where abouts of the API
-      fs.writeFileSync(apiPath, config.Addresses.API)
+        // TODO: set up cors correctly, following config
+        this.server = new Hapi.Server({
+          connections: {
+            routes: {
+              cors: true
+            }
+          }
+        })
+        this.server.app.ipfs = this.ipfs
+        const api = config.Addresses.API.split('/')
+        const gateway = config.Addresses.Gateway.split('/')
 
-      // select which connection with server.select(<label>) to add routes
-      server.connection({ host: api[2], port: api[4], labels: 'API' })
-      server.connection({ host: gateway[2], port: gateway[4], labels: 'Gateway' })
+        // for the CLI to know the where abouts of the API
+        fs.writeFileSync(apiPath, config.Addresses.API)
 
-      // load routes
-      require('./routes')(server)
+        // select which connection with server.select(<label>) to add routes
+        this.server.connection({
+          host: api[2],
+          port: api[4],
+          labels: 'API'
+        })
+        this.server.connection({
+          host: gateway[2],
+          port: gateway[4],
+          labels: 'Gateway'
+        })
 
-      ipfs.libp2p.start(() => {
-        server.start((err) => {
-          if (err) {
-            return callback(err)
-          }
-          const api = server.select('API')
-          const gateway = server.select('Gateway')
-          console.log('API is listening on: %s', api.info.uri)
-          console.log('Gateway (readonly) is listening on: %s', gateway.info.uri)
-          callback()
+        // load routes
+        require('./routes')(this.server)
+
+        this.ipfs.libp2p.start(() => {
+          this.server.start((err) => {
+            if (err) {
+              return callback(err)
+            }
+            const api = this.server.select('API')
+            const gateway = this.server.select('Gateway')
+            console.log('API is listening on: %s', api.info.uri)
+            console.log('Gateway (readonly) is listening on: %s', gateway.info.uri)
+            callback()
+          })
         })
       })
     })
-  })
-}
-
-exports.stop = (callback) => {
-  const repoPath = exports.ipfs.repo.path()
+  }
 
-  fs.unlinkSync(path.join(repoPath, 'api'))
+  this.stop = (callback) => {
+    const repoPath = this.ipfs.repo.path()
+    console.log('-> stoping api at %s', repoPath)
+    fs.unlinkSync(path.join(repoPath, 'api'))
 
-  console.log('->', 'going to stop libp2p')
+    console.log('->', 'going to stop libp2p')
 
-  exports.ipfs.libp2p.stop(() => {
-    console.log('->', 'going to stop api server')
-    exports.server.stop(callback)
-  })
+    this.ipfs.libp2p.stop(() => {
+      console.log('->', 'going to stop api server')
+      this.server.stop(callback)
+    })
+  }
 }

src/http-api/resources/block.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const ipfs = require('./../index.js').ipfs
 const bs58 = require('bs58')
 const multipart = require('ipfs-multipart')
 const Block = require('ipfs-blocks').Block
@@ -37,7 +36,7 @@ exports.get = {
   handler: (request, reply) => {
     const key = request.pre.args.key
 
-    ipfs.block.get(key, (err, block) => {
+    request.server.app.ipfs.block.get(key, (err, block) => {
       if (err) {
         log.error(err)
         return reply({
@@ -84,7 +83,7 @@ exports.put = {
 
     const block = new Block(data)
 
-    ipfs.block.put(block, (err) => {
+    request.server.app.ipfs.block.put(block, (err) => {
       if (err) {
         log.error(err)
         return reply({
@@ -109,7 +108,7 @@ exports.del = {
   handler: (request, reply) => {
     const key = request.pre.args.key
 
-    ipfs.block.del(key, (err, block) => {
+    request.server.app.ipfs.block.del(key, (err, block) => {
       if (err) {
         log.error(err)
         return reply({
@@ -131,7 +130,7 @@ exports.stat = {
   handler: (request, reply) => {
     const key = request.pre.args.key
 
-    ipfs.block.stat(key, (err, block) => {
+    request.server.app.ipfs.block.stat(key, (err, block) => {
       if (err) {
         log.error(err)
         return reply({

src/http-api/resources/bootstrap.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const ipfs = require('./../index.js').ipfs
 const boom = require('boom')
 
 exports = module.exports
 
 exports.list = (request, reply) => {
-  ipfs.bootstrap.list((err, list) => {
+  request.server.app.ipfs.bootstrap.list((err, list) => {
     if (err) {
       return reply(boom.badRequest(err))
     }
@@ -15,14 +14,14 @@ exports.list = (request, reply) => {
 }
 
 exports.add = (request, reply) => {
-//  ipfs.id((err, id) => {
+//  request.server.app.ipfs.id((err, id) => {
 //    if (err) { return reply(boom.badRequest(err)) }
 //    return reply(id)
 //   })
 }
 
 exports.rm = (request, reply) => {
-//  ipfs.id((err, id) => {
+//  request.server.app.ipfs.id((err, id) => {
 //    if (err) { return reply(boom.badRequest(err)) }
 //    return reply(id)
 //   })

src/http-api/resources/config.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const ipfs = require('./../index.js').ipfs
 const debug = require('debug')
 const get = require('lodash.get')
 const set = require('lodash.set')
@@ -61,7 +60,7 @@ exports.getOrSet = {
 
     if (value === undefined) {
       // Get the value of a given key
-      return ipfs.config.show((err, config) => {
+      return request.server.app.ipfs.config.show((err, config) => {
         if (err) {
           log.error(err)
           return reply({
@@ -85,7 +84,7 @@ exports.getOrSet = {
       })
     } else {
       // Set the new value of a given key
-      ipfs.config.show((err, originalConfig) => {
+      request.server.app.ipfs.config.show((err, originalConfig) => {
         if (err) {
           log.error(err)
           return reply({
@@ -95,7 +94,7 @@ exports.getOrSet = {
         }
 
         const updatedConfig = set(originalConfig, key, value)
-        ipfs.config.replace(updatedConfig, (err) => {
+        request.server.app.ipfs.config.replace(updatedConfig, (err) => {
           if (err) {
             log.error(err)
             return reply({
@@ -115,7 +114,7 @@ exports.getOrSet = {
 }
 
 exports.show = (request, reply) => {
-  return ipfs.config.show((err, config) => {
+  return request.server.app.ipfs.config.show((err, config) => {
     if (err) {
       log.error(err)
       return reply({
@@ -172,7 +171,7 @@ exports.replace = {
 
   // main route handler which is called after the above `parseArgs`, but only if the args were valid
   handler: (request, reply) => {
-    return ipfs.config.replace(request.pre.args.config, (err) => {
+    return request.server.app.ipfs.config.replace(request.pre.args.config, (err) => {
       if (err) {
         log.error(err)
         return reply({

src/http-api/resources/id.js

@@ -1,12 +1,11 @@
 'use strict'
 
-const ipfs = require('./../index.js').ipfs
 const boom = require('boom')
 
 exports = module.exports
 
 exports.get = (request, reply) => {
-  ipfs.id((err, id) => {
+  request.server.app.ipfs.id((err, id) => {
     if (err) { return reply(boom.badRequest(err)) }
     return reply(id)
   })