Merge pull request #162 from alexmingoia/fix-port-default

Exclude port from path if `config.port` not set.

Author: daviddias

src/request-api.js

@@ -87,9 +87,11 @@ function requestAPI (config, path, args, qs, files, buffer, cb) {
   // this option is only used internally, not passed to daemon
   delete qs.followSymlinks
 
+  const port = config.port ? `:${config.port}` : ''
+
   const opts = {
     method: files ? 'POST' : 'GET',
-    uri: `${config.protocol}://${config.host}:${config.port}${config['api-path']}${path}?${Qs.stringify(qs, {arrayFormat: 'repeat'})}`,
+    uri: `${config.protocol}://${config.host}${port}${config['api-path']}${path}?${Qs.stringify(qs, {arrayFormat: 'repeat'})}`,
     headers: {}
   }
 

test/request-api.spec.js

@@ -0,0 +1,45 @@
+'use strict'
+
+const ipfsAPI = require('../src/index.js')
+const noop = () => {}
+
+describe('ipfsAPI request tests', () => {
+  describe('requestAPI', () => {
+    const apiAddrs = require('./tmp-disposable-nodes-addrs.json')
+    const apiAddr = apiAddrs.a.split('/')
+
+    it('excludes port from URL if config.port is falsy', (done) => {
+      const Wreck = require('wreck')
+      const request = Wreck.request
+
+      Wreck.request = (method, uri, opts, cb) => {
+        Wreck.request = request
+        expect(uri).to.not.contain(/:\d/)
+        done()
+      }
+
+      ipfsAPI({
+        host: apiAddr[2],
+        port: null,
+        protocol: 'http'
+      }).id(noop)
+    })
+
+    it('includes port in URL if config.port is truthy', (done) => {
+      const Wreck = require('wreck')
+      const request = Wreck.request
+
+      Wreck.request = (method, uri, opts, cb) => {
+        Wreck.request = request
+        expect(uri).to.contain(':' + apiAddr[4])
+        done()
+      }
+
+      ipfsAPI({
+        host: apiAddr[2],
+        port: apiAddr[4],
+        protocol: 'http'
+      }).id(noop)
+    })
+  })
+})