add opts to constructor

Author: ckeenan

src/config.js

@@ -7,6 +7,7 @@ exports = module.exports = () => {
     'api-path': '/api/v0/',
     'user-agent': `/node-$pkg.name}/${pkg.version}/`,
     'host': 'localhost',
-    'port': '5001'
+    'port': '5001',
+    'protocol': 'http'
   }
 }

src/index.js

@@ -7,21 +7,36 @@ const Wreck = require('wreck')
 
 exports = module.exports = IpfsAPI
 
-function IpfsAPI (host_or_multiaddr, port) {
+function IpfsAPI (host_or_multiaddr, port, opts) {
   const self = this
   const config = getConfig()
 
   if (!(self instanceof IpfsAPI)) {
-    return new IpfsAPI(host_or_multiaddr, port)
+    return new IpfsAPI(host_or_multiaddr, port, opts)
   }
 
   try {
     const maddr = multiaddr(host_or_multiaddr).nodeAddress()
     config.host = maddr.address
     config.port = maddr.port
   } catch (e) {
-    config.host = host_or_multiaddr
-    config.port = port || config.port
+    if (typeof host_or_multiaddr === 'string') {
+      config.host = host_or_multiaddr
+      config.port = port && typeof port !== 'object' ? port : config.port
+    }
+  }
+
+  let lastIndex = arguments.length
+  while (!opts && lastIndex-- > 0) {
+    opts = arguments[lastIndex]
+    if (opts) break
+  }
+
+  if (typeof opts === 'object') {
+    for (let key in opts)
+      if (config[key]) {
+        config[key] = opts[key]
+      }
   }
 
   // autoconfigure in browser

src/request-api.js

@@ -87,7 +87,7 @@ function requestAPI (config, path, args, qs, files, buffer, cb) {
 
   const opts = {
     method: files ? 'POST' : 'GET',
-    uri: `http://${config.host}:${config.port}${config['api-path']}${path}?${Qs.stringify(qs, {arrayFormat: 'repeat'})}`,
+    uri: `${config.protocol}://${config.host}:${config.port}${config['api-path']}${path}?${Qs.stringify(qs, {arrayFormat: 'repeat'})}`,
     headers: {}
   }
 

test/tests.js

@@ -766,4 +766,49 @@ describe('IPFS Node.js API wrapper tests', () => {
       })
     })
   })
+
+  describe('constructor parameters', () => {
+    const apiAddr = apiAddrs.a.split('/')
+
+    function clientWorks (client, done) {
+      client.id((err, res) => {
+        if (err) throw err
+        const id = res
+        assert(id.ID)
+        assert(id.PublicKey)
+        done()
+      })
+    }
+
+    it('opts', (done) => {
+      clientWorks(ipfsAPI({
+        host: apiAddr[2],
+        port: apiAddr[4],
+        protocol: 'http'
+      }), done)
+    })
+
+    it('mutliaddr, opts', (done) => {
+      clientWorks(ipfsAPI(
+        apiAddrs.a,
+        {protocol: 'http'}
+      ), done)
+    })
+
+    it('host, port', (done) => {
+      clientWorks(ipfsAPI(
+        apiAddr[2],
+        apiAddr[4]
+      ), done)
+    })
+
+    it('host, port, opts', (done) => {
+      clientWorks(ipfsAPI(
+        apiAddr[2],
+        apiAddr[4],
+        {protocol: 'http'}
+      ), done)
+    })
+  })
 })
+