getting close to passing and no more wreck

Author: dignifiedquire

.travis.yml

@@ -18,7 +18,7 @@ before_install:
 
 script:
   - npm run lint
-  - npm run test:node
+  - npm run test
   - npm run coverage
 
 before_script:

README.md

@@ -99,6 +99,8 @@ If are using this module in a browser with something like browserify, then you w
 
 ```bash
 $ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin "[\"http://example.com\"]"
+$ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Credentials "\"true\""
+$ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods "[\"PUT\", \"POST\", \"GET\"]"
 ```
 
 ## Usage

package.json

@@ -5,9 +5,7 @@
   "main": "src/index.js",
   "browser": {
     "glob": false,
-    "fs": false,
-    "http": "stream-http",
-    "https": "https-browserify"
+    "fs": false
   },
   "scripts": {
     "test": "gulp test",
@@ -23,27 +21,25 @@
   },
   "dependencies": {
     "async": "^2.1.2",
-    "bl": "^1.1.2",
     "bs58": "^3.0.0",
+    "concat-stream": "^1.5.2",
     "detect-node": "^2.0.3",
     "flatmap": "0.0.3",
     "glob": "^7.1.1",
-    "https-browserify": "0.0.1",
     "ipfs-block": "^0.5.0",
     "ipld-dag-pb": "^0.8.0",
     "is-ipfs": "^0.2.1",
     "isstream": "^0.1.2",
     "multiaddr": "^2.0.3",
     "multipart-stream": "^2.0.1",
     "ndjson": "^1.4.3",
+    "once": "^1.4.0",
     "peer-id": "^0.8.0",
     "peer-info": "^0.8.0",
     "promisify-es6": "^1.0.2",
     "qs": "^6.3.0",
-    "stream-http": "^2.4.1",
     "streamifier": "^0.1.1",
-    "tar-stream": "^1.5.2",
-    "wreck": "^10.0.0"
+    "tar-stream": "^1.5.2"
   },
   "engines": {
     "node": ">=4.0.0"

src/api/block.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const promisify = require('promisify-es6')
-const bl = require('bl')
+const concat = require('concat-stream')
+const once = require('once')
 const Block = require('ipfs-block')
 const multihash = require('multihashes')
 const CID = require('cids')
@@ -17,6 +18,7 @@ module.exports = (send) => {
         callback = opts
         opts = {}
       }
+      callback = once(callback)
 
       return send({
         path: 'block/get',
@@ -29,12 +31,9 @@ module.exports = (send) => {
         if (Buffer.isBuffer(res)) {
           callback(null, new Block(res))
         } else {
-          res.pipe(bl((err, data) => {
-            if (err) {
-              return callback(err)
-            }
-            callback(null, new Block(data))
-          }))
+          res
+            .once('error', callback)
+            .pipe(concat((data) => callback(null, new Block(data))))
         }
       })
     }),

src/api/object.js

@@ -5,7 +5,8 @@ const DAGNode = dagPB.DAGNode
 const DAGLink = dagPB.DAGLink
 const promisify = require('promisify-es6')
 const bs58 = require('bs58')
-const bl = require('bl')
+const concat = require('concat-stream')
+const once = require('once')
 const cleanMultihash = require('../clean-multihash')
 
 module.exports = (send) => {
@@ -136,6 +137,8 @@ module.exports = (send) => {
         options = {}
       }
 
+      callback = once(callback)
+
       try {
         multihash = cleanMultihash(multihash, options)
       } catch (err) {
@@ -151,7 +154,9 @@ module.exports = (send) => {
         }
 
         if (typeof result.pipe === 'function') {
-          result.pipe(bl(callback))
+          result
+            .once('error', callback)
+            .pipe(concat((data) => callback(null, data)))
         } else {
           callback(null, result)
         }

src/api/util/url-add.js

@@ -1,9 +1,10 @@
 'use strict'
 
-const Wreck = require('wreck')
+const hyperquest = require('hyperquest')
 const addToDagNodesTransform = require('./../../add-to-dagnode-transform')
 
 const promisify = require('promisify-es6')
+const once = require('once')
 
 module.exports = (send) => {
   return promisify((url, opts, callback) => {
@@ -27,17 +28,16 @@ module.exports = (send) => {
     }
 
     const sendWithTransform = send.withTransform(addToDagNodesTransform)
-
-    Wreck.request('GET', url, null, (err, res) => {
-      if (err) {
-        return callback(err)
-      }
-
-      sendWithTransform({
-        path: 'add',
-        qs: opts,
-        files: res
-      }, callback)
-    })
+    callback = once(callback)
+
+    hyperquest.get(url)
+      .once('error', callback)
+      .once('response', (res) => {
+        sendWithTransform({
+          path: 'add',
+          qs: opts,
+          files: res
+        }, callback)
+      })
   })
 }

src/get-dagnode.js

@@ -1,48 +1,38 @@
 'use strict'
 
 const DAGNode = require('ipld-dag-pb').DAGNode
-const bl = require('bl')
+const concat = require('concat-stream')
+const once = require('once')
 const parallel = require('async/parallel')
 
 module.exports = function (send, hash, callback) {
+  callback = once(callback)
+
   // Retrieve the object and its data in parallel, then produce a DAGNode
   // instance using this information.
   parallel([
-    function get (done) {
-      send({
-        path: 'object/get',
-        args: hash
-      }, done)
-    },
+    (cb) => send({path: 'object/get', args: hash}, cb),
 
-    function data (done) {
       // WORKAROUND: request the object's data separately, since raw bits in JSON
       // are interpreted as UTF-8 and corrupt the data.
       // See https://github.com/ipfs/go-ipfs/issues/1582 for more details.
-      send({
-        path: 'object/data',
-        args: hash
-      }, done)
-    }],
-
-    function done (err, res) {
-      if (err) {
-        return callback(err)
-      }
-
-      var object = res[0]
-      var stream = res[1]
+    (cb) => send({path: 'object/data', args: hash}, cb)
+  ], (err, res) => {
+    if (err) {
+      return callback(err)
+    }
 
-      if (Buffer.isBuffer(stream)) {
-        callback(err, new DAGNode(stream, object.Links))
-      } else {
-        stream.pipe(bl(function (err, data) {
-          if (err) {
-            return callback(err)
-          }
+    const object = res[0]
+    const stream = res[1]
 
-          callback(err, new DAGNode(data, object.Links))
+    if (Buffer.isBuffer(stream)) {
+      callback(err, new DAGNode(stream, object.Links))
+    } else {
+      stream
+        .once('error', callback)
+        .pipe(concat((data) => {
+          callback(null, new DAGNode(data, object.Links))
         }))
-      }
-    })
+    }
+  })
 }

src/request-api.js

@@ -1,32 +1,54 @@
 'use strict'
 
-const Wreck = require('wreck')
+const hyperquest = require('hyperquest')
 const Qs = require('qs')
 const ndjson = require('ndjson')
-const getFilesStream = require('./get-files-stream')
-
 const isNode = require('detect-node')
+const once = require('once')
+const concat = require('concat-stream')
+
+const getFilesStream = require('./get-files-stream')
 
 // -- Internal
 
 function parseChunkedJson (res, cb) {
-  const parsed = []
   res
     .pipe(ndjson.parse())
-    .on('data', (obj) => {
-      parsed.push(obj)
-    })
-    .on('end', () => {
-      cb(null, parsed)
-    })
+    .once('error', cb)
+    .pipe(concat((data) => cb(null, data)))
 }
 
-function onRes (buffer, cb, uri) {
-  return (err, res) => {
-    if (err) {
-      return cb(err)
-    }
+function parseRaw (res, cb) {
+  res
+    .once('error', cb)
+    .pipe(concat((data) => cb(null, data)))
+}
+
+function parseJson (res, cb) {
+  res
+    .once('error', cb)
+    .pipe(concat((data) => {
+      if (!data || data.length === 0) {
+        return cb()
+      }
+
+      if (Buffer.isBuffer(data)) {
+        data = data.toString()
+      }
+
+      let res
+      try {
+        res = JSON.parse(data)
+      } catch (err) {
+        return cb(err)
+      }
 
+      cb(null, res)
+    }))
+}
+
+function onRes (buffer, cb) {
+  return (res) => {
     const stream = Boolean(res.headers['x-stream-output'])
     const chunkedObjects = Boolean(res.headers['x-chunked-output'])
     const isJson = res.headers['content-type'] &&
@@ -35,7 +57,7 @@ function onRes (buffer, cb, uri) {
     if (res.statusCode >= 400 || !res.statusCode) {
       const error = new Error(`Server responded with ${res.statusCode}`)
 
-      return Wreck.read(res, {json: true}, (err, payload) => {
+      parseJson(res, (err, payload) => {
         if (err) {
           return cb(err)
         }
@@ -56,15 +78,16 @@ function onRes (buffer, cb, uri) {
         return parseChunkedJson(res, cb)
       }
 
-      return Wreck.read(res, null, cb)
+      return parseRaw(res, cb)
     }
 
-    Wreck.read(res, {json: isJson}, cb)
+    parseJson(res, cb)
   }
 }
 
 function requestAPI (config, options, callback) {
   options.qs = options.qs || {}
+  callback = once(callback)
 
   if (Array.isArray(options.files)) {
     options.qs.recursive = true
@@ -100,28 +123,37 @@ function requestAPI (config, options, callback) {
   delete options.qs.followSymlinks
 
   const port = config.port ? `:${config.port}` : ''
-
-  const opts = {
-    method: 'POST',
-    uri: `${config.protocol}://${config.host}${port}${config['api-path']}${options.path}?${Qs.stringify(options.qs, {arrayFormat: 'repeat'})}`,
-    headers: {}
-  }
+  const uri = `${config.protocol}://${config.host}${port}${config['api-path']}${options.path}?${Qs.stringify(options.qs, {arrayFormat: 'repeat'})}`
+  const method = 'POST'
+  const headers = {}
 
   if (isNode) {
     // Browsers do not allow you to modify the user agent
-    opts.headers['User-Agent'] = config['user-agent']
+    headers['User-Agent'] = config['user-agent']
   }
 
   if (options.files) {
     if (!stream.boundary) {
       return callback(new Error('No boundary in multipart stream'))
     }
 
-    opts.headers['Content-Type'] = `multipart/form-data; boundary=${stream.boundary}`
-    opts.payload = stream
+    headers['Content-Type'] = `multipart/form-data; boundary=${stream.boundary}`
+  }
+
+  const req = hyperquest(uri, {
+    method: method,
+    headers: headers
+  })
+  .on('error', callback)
+  .on('response', onRes(options.buffer, callback))
+
+  if (options.files) {
+    stream.pipe(req)
+  } else {
+    req.end()
   }
 
-  return Wreck.request(opts.method, opts.uri, opts, onRes(options.buffer, callback, opts.uri))
+  return req
 }
 
 //