fix: refactor constructor arg parsing

- explicitly handle all the cases we expect to be passed
- convert each param into an object so we can merge them
- presedence is right to left as with Object.assign

License: MIT
Signed-off-by: Oli Evans <oli@tableflip.io>

Author: olizilla

src/index.js

@@ -7,35 +7,36 @@ const getConfig = require('./utils/default-config')
 const sendRequest = require('./utils/send-request')
 
 function ipfsClient (hostOrMultiaddr, port, opts) {
-  const config = getConfig()
-  if (typeof hostOrMultiaddr === 'string') {
+  // convert all three params to objects that we can merge.
+  let hostAndPort = {}
+
+  if (hostOrMultiaddr.host) {
+    hostAndPort = hostOrMultiaddr
+
+  } else if (multiaddr.isMultiaddr(hostOrMultiaddr)) {
+    hostAndPort = toHostAndPort(hostOrMultiaddr)
+
+  } else if (typeof hostOrMultiaddr === 'string') {
     if (hostOrMultiaddr[0] === '/') {
       // throws if multiaddr is malformed or can't be converted to a nodeAddress
-      const maddr = multiaddr(hostOrMultiaddr).nodeAddress()
-      config.host = maddr.address
-      config.port = maddr.port
+      hostAndPort = toHostAndPort(multiaddr(hostOrMultiaddr))
     } else {
-      config.host = hostOrMultiaddr
-      config.port = port && typeof port !== 'object' ? port : config.port
+      // hostAndPort is domain or ip address as a string
+      hostAndPort = hostOrMultiaddr
     }
-  }
 
-  let lastIndex = arguments.length
-  while (!opts && lastIndex-- > 0) {
-    opts = arguments[lastIndex]
-    if (opts) break
+  // autoconfigure host and port in browser
+  } else if (!hostOrMultiaddr && typeof self !== 'undefined') {
+    const split = self.location.host.split(':')
+    hostAndPort.host = split[0]
+    hostAndPort.port = split[1]
   }
 
-  Object.assign(config, opts)
-
-  // autoconfigure in browser
-  if (!config.host &&
-    typeof self !== 'undefined') {
-    const split = self.location.host.split(':')
-    config.host = split[0]
-    config.port = split[1]
+  if (port && typeof port !== 'object') {
+    port = { port: port }
   }
 
+  const config = Object.assign(getConfig(), hostAndPort, port, opts)
   const requestAPI = sendRequest(config)
   const cmds = loadCommands(requestAPI, config)
   cmds.send = requestAPI
@@ -44,4 +45,13 @@ function ipfsClient (hostOrMultiaddr, port, opts) {
   return cmds
 }
 
+// throws if multiaddr can't be converted to a nodeAddress
+function toHostAndPort (multiaddr) {
+  const nodeAddr = multiaddr.nodeAddress()
+  return {
+    host: nodeAddr.address,
+    port: nodeAddr.port
+  }
+}
+
 module.exports = ipfsClient