fix: throw on invalid multiaddr to constructor

- dont assume that invalid multiaddrs are valid hosts
- if multiaddrOrHost starts with a /, assume its a multiaddr
- throw if that multiaddr is invalid.

Previously, we'd try and use invalid multiaddrs as the host,
which would lead to requests like http:///dnsaddr/foobar.com:5001/api

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

Author: olizilla

src/index.js

@@ -8,13 +8,13 @@ const sendRequest = require('./utils/send-request')
 
 function ipfsClient (hostOrMultiaddr, port, opts) {
   const config = getConfig()
-
-  try {
-    const maddr = multiaddr(hostOrMultiaddr).nodeAddress()
-    config.host = maddr.address
-    config.port = maddr.port
-  } catch (e) {
-    if (typeof hostOrMultiaddr === 'string') {
+  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
+    } else {
       config.host = hostOrMultiaddr
       config.port = port && typeof port !== 'object' ? port : config.port
     }

test/constructor.spec.js

@@ -74,5 +74,13 @@ describe('ipfs-http-client constructor tests', () => {
 
       clientWorks(ipfsClient(splitted[2], splitted[4], { protocol: 'http' }), done)
     })
+
+    it('error in invalid mutliaddr', () => {
+      const splitted = apiAddr.split('/')
+
+      expect(() => ipfsClient('/dns4')).to.throw('invalid address')
+      expect(() => ipfsClient('/hello')).to.throw('no protocol with name')
+      expect(() => ipfsClient('/dns4/ipfs.io')).to.throw('multiaddr must have a valid format')
+    })
   })
 })