Switch to superagent instead of raw http.request

Author: dignifiedquire

.eslintrc

@@ -1,3 +1,4 @@
 {
+  "parser": "babel-eslint",
   "extends": "standard"
 }

package.json

@@ -10,7 +10,8 @@
     "multipart-stream": "^2.0.0",
     "vinyl": "^0.5.1",
     "vinyl-fs-browser": "^2.1.1-1",
-    "vinyl-multipart-stream": "^1.2.6"
+    "vinyl-multipart-stream": "^1.2.6",
+    "superagent": "github:visionmedia/superagent"
   },
   "browserify": {
     "transform": [
@@ -25,6 +26,7 @@
     "url": "https://github.com/ipfs/js-ipfs-api"
   },
   "devDependencies": {
+    "babel-eslint": "^4.1.3",
     "brfs": "^1.4.1",
     "browserify": "^11.0.0",
     "concurrently": "^0.1.1",

src/json-parser.js

@@ -0,0 +1,46 @@
+module.exports = function safeJSONParser (buffer, res, done) {
+  var headers = !!res.headers
+  var stream = headers && !!res.headers['x-stream-output']
+  var chunkedObjects = headers && !!res.headers['x-chunked-output']
+
+  // No need to parse
+  if (stream && !buffer) return done()
+  if (chunkedObjects && buffer) return done()
+
+  var objects = []
+  var data = ''
+  res.text = ''
+  res.setEncoding('utf8')
+
+  res.on('data', function (chunk) {
+    res.text += chunk
+
+    if (!chunkedObjects) {
+      data += chunk
+      return
+    }
+
+    try {
+      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
+    }
+
+    return done(null, data)
+  })
+}

src/request-api.js

@@ -1,108 +1,63 @@
-var http = require('http')
-var qs = require('querystring')
-var getFilesStream = require('./get-files-stream')
-
-exports = module.exports = function getRequestAPI (config) {
-  return requestAPI
-
-  function requestAPI (path, args, opts, files, buffer, cb) {
-    var query, stream, contentType
-    contentType = 'application/json'
+var request = require('superagent')
 
-    if (Array.isArray(path)) path = path.join('/')
+var safeJSONParser = require('./json-parser')
+var getFilesStream = require('./get-files-stream')
 
-    opts = opts || {}
+var isNode = !global.window
 
-    if (args && !Array.isArray(args)) args = [args]
-    if (args) opts.arg = args
+function requestAPI (config, path, args, opts, files, buffer, cb) {
+  opts = opts || {}
+  if (Array.isArray(path)) path = path.join('/')
+  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')
-      }
-      contentType = 'multipart/form-data; boundary=' + stream.boundary
-    }
-
-    if (typeof buffer === 'function') {
-      cb = buffer
-      buffer = false
-    }
+  if (typeof buffer === 'function') {
+    cb = buffer
+    buffer = false
+  }
 
-    // this option is only used internally, not passed to daemon
-    delete opts.followSymlinks
+  // this option is only used internally, not passed to daemon
+  delete opts.followSymlinks
 
-    opts['stream-channels'] = true
-    query = qs.stringify(opts)
+  var method = files ? 'POST' : 'GET'
+  var url = `${config.host}:${config.port}${config['api-path']}${path}`
 
-    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
-    }
+  var req = request(method, url)
+    .set('User-Agent', config['user-agent'])
+    .query(opts)
+    .query('stream-channels')
+    .parse(safeJSONParser.bind(null, buffer))
+    .on('error', cb)
+    .on('response', res => {
+      if (res.error) return cb(res.error)
 
-    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']
+      var headers = !!res.headers
+      var stream = headers && !!res.headers['x-stream-output']
+      var chunkedObjects = headers && !!res.headers['x-chunked-output']
 
       if (stream && !buffer) return cb(null, res)
       if (chunkedObjects && buffer) return cb(null, res)
 
-      res.on('data', function (chunk) {
-        if (!chunkedObjects) {
-          data += chunk
-          return data
-        }
-
-        try {
-          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)
-      })
+      return cb(null, res.body)
     })
 
-    req.on('error', function (err) {
-      return cb(err, null)
-    })
+  // Superagent does not support buffering on the client side
+  if (isNode) {
+    req.buffer(buffer)
+  }
 
-    if (stream) {
-      stream.pipe(req)
-    } else {
-      req.end()
+  if (files) {
+    var stream = getFilesStream(files, opts)
+    if (!stream.boundary) {
+      return cb(new Error('no boundary in multipart stream'))
     }
-
-    return req
+    req.set('Content-Type', 'multipart/form-data; boundary=' + stream.boundary)
+    stream.pipe(req)
+  } else {
+    req.end()
   }
 }
+
+module.exports = function getRequestAPI (config) {
+  return requestAPI.bind(null, config)
+}

tasks/test.js

@@ -34,6 +34,11 @@ gulp.task('test:browser', function (done) {
 gulp.task('mocha', function () {
   return gulp.src('test/tests.js')
     .pipe($.mocha())
+    .once('error', err => {
+      console.error(err.stack)
+      process.exit(1)
+    })
+    .once('end', () => process.exit())
 })
 
 gulp.task('karma', function (done) {