fix issue #84

daviddias · daviddias · commit f97c0b3df509 · 2015-10-25T12:28:44.000Z
diff --git a/src/config.js b/src/config.js
@@ -1,8 +1,10 @@
 var pkg = require('../package.json')
 
-exports = module.exports = {
-  'api-path': '/api/v0/',
-  'user-agent': '/node-' + pkg.name + '/' + pkg.version + '/',
-  'host': 'localhost',
-  'port': '5001'
+exports = module.exports = function getConfig () {
+  return {
+    'api-path': '/api/v0/',
+    'user-agent': '/node-' + pkg.name + '/' + pkg.version + '/',
+    'host': 'localhost',
+    'port': '5001'
+  }
 }
diff --git a/src/index.js b/src/index.js
@@ -1,11 +1,12 @@
 var multiaddr = require('multiaddr')
-var config = require('./config')
-var requestAPI = require('./request-api')
+var getConfig = require('./config')
+var getRequestAPI = require('./request-api')
 
 exports = module.exports = IpfsAPI
 
 function IpfsAPI (host_or_multiaddr, port) {
   var self = this
+  var config = getConfig()
 
   if (!(self instanceof IpfsAPI)) {
     return new IpfsAPI(host_or_multiaddr, port)
@@ -28,6 +29,8 @@ function IpfsAPI (host_or_multiaddr, port) {
     config.port = split[1]
   }
 
+  var requestAPI = getRequestAPI(config)
+
   // -- Internal
 
   function command (name) {
diff --git a/src/request-api.js b/src/request-api.js
@@ -1,107 +1,108 @@
 var http = require('http')
 var qs = require('querystring')
 var getFilesStream = require('./get-files-stream')
-var config = require('./config')
 
-exports = module.exports = requestAPI
+exports = module.exports = function getRequestAPI (config) {
+  return requestAPI
 
-function requestAPI (path, args, opts, files, buffer, cb) {
-  var query, stream, contentType
-  contentType = 'application/json'
+  function requestAPI (path, args, opts, files, buffer, cb) {
+    var query, stream, contentType
+    contentType = 'application/json'
 
-  if (Array.isArray(path)) path = path.join('/')
+    if (Array.isArray(path)) path = path.join('/')
 
-  opts = opts || {}
+    opts = opts || {}
 
-  if (args && !Array.isArray(args)) args = [args]
-  if (args) opts.arg = args
+    if (args && !Array.isArray(args)) args = [args]
+    if (args) opts.arg = args
 
-  if (files) {
-    stream = getFilesStream(files, opts)
-    if (!stream.boundary) {
-      throw new Error('no boundary in multipart stream')
+    if (files) {
+      stream = getFilesStream(files, opts)
+      if (!stream.boundary) {
+        throw new Error('no boundary in multipart stream')
+      }
+      contentType = 'multipart/form-data; boundary=' + stream.boundary
     }
-    contentType = 'multipart/form-data; boundary=' + stream.boundary
-  }
-
-  if (typeof buffer === 'function') {
-    cb = buffer
-    buffer = false
-  }
 
-  // this option is only used internally, not passed to daemon
-  delete opts.followSymlinks
-
-  opts['stream-channels'] = true
-  query = qs.stringify(opts)
-
-  var reqo = {
-    method: files ? 'POST' : 'GET',
-    host: config.host,
-    port: config.port,
-    path: config['api-path'] + path + '?' + query,
-    headers: {
-      'User-Agent': config['user-agent'],
-      'Content-Type': contentType
-    },
-    withCredentials: false
-  }
+    if (typeof buffer === 'function') {
+      cb = buffer
+      buffer = false
+    }
 
-  var req = http.request(reqo, function (res) {
-    var data = ''
-    var objects = []
-    var stream = !!res.headers && !!res.headers['x-stream-output']
-    var chunkedObjects = !!res.headers && !!res.headers['x-chunked-output']
+    // this option is only used internally, not passed to daemon
+    delete opts.followSymlinks
+
+    opts['stream-channels'] = true
+    query = qs.stringify(opts)
+
+    var reqo = {
+      method: files ? 'POST' : 'GET',
+      host: config.host,
+      port: config.port,
+      path: config['api-path'] + path + '?' + query,
+      headers: {
+        'User-Agent': config['user-agent'],
+        'Content-Type': contentType
+      },
+      withCredentials: false
+    }
 
-    if (stream && !buffer) return cb(null, res)
-    if (chunkedObjects && buffer) return cb(null, res)
+    var req = http.request(reqo, function (res) {
+      var data = ''
+      var objects = []
+      var stream = !!res.headers && !!res.headers['x-stream-output']
+      var chunkedObjects = !!res.headers && !!res.headers['x-chunked-output']
 
-    res.on('data', function (chunk) {
-      if (!chunkedObjects) {
-        data += chunk
-        return data
-      }
+      if (stream && !buffer) return cb(null, res)
+      if (chunkedObjects && buffer) return cb(null, res)
 
-      try {
-        var obj = JSON.parse(chunk.toString())
-        objects.push(obj)
-      } catch (e) {
-        chunkedObjects = false
-        data += chunk
-      }
-    })
-    res.on('end', function () {
-      var parsed
+      res.on('data', function (chunk) {
+        if (!chunkedObjects) {
+          data += chunk
+          return data
+        }
 
-      if (!chunkedObjects) {
         try {
-          parsed = JSON.parse(data)
-          data = parsed
-        } catch (e) {}
-      } else {
-        data = objects
-      }
-
-      if (res.statusCode >= 400 || !res.statusCode) {
-        if (!data) data = new Error()
-        return cb(data, null)
-      }
-      return cb(null, data)
+          var obj = JSON.parse(chunk.toString())
+          objects.push(obj)
+        } catch (e) {
+          chunkedObjects = false
+          data += chunk
+        }
+      })
+      res.on('end', function () {
+        var parsed
+
+        if (!chunkedObjects) {
+          try {
+            parsed = JSON.parse(data)
+            data = parsed
+          } catch (e) {}
+        } else {
+          data = objects
+        }
+
+        if (res.statusCode >= 400 || !res.statusCode) {
+          if (!data) data = new Error()
+          return cb(data, null)
+        }
+        return cb(null, data)
+      })
+      res.on('error', function (err) {
+        return cb(err, null)
+      })
     })
-    res.on('error', function (err) {
+
+    req.on('error', function (err) {
       return cb(err, null)
     })
-  })
 
-  req.on('error', function (err) {
-    return cb(err, null)
-  })
+    if (stream) {
+      stream.pipe(req)
+    } else {
+      req.end()
+    }
 
-  if (stream) {
-    stream.pipe(req)
-  } else {
-    req.end()
+    return req
   }
-
-  return req
 }
