fix: Ref -> ref

Author: dirkmc

src/files-regular/refs-local-pull-stream.js

@@ -18,7 +18,10 @@ module.exports = (send) => {
     send({ path: 'refs/local', qs: opts }, (err, stream) => {
       if (err) { return p.resolve(pull.error(err)) }
 
-      p.resolve(toPull.source(stream))
+      p.resolve(pull(
+        toPull.source(stream),
+        pull.map(r => ({ ref: r.Ref, err: r.Err }))
+      ))
     })
 
     return p

src/files-regular/refs-local-readable-stream.js

@@ -4,6 +4,7 @@ const cleanCID = require('../utils/clean-cid')
 const v = require('is-ipfs')
 const Stream = require('readable-stream')
 const pump = require('pump')
+const through = require('through2')
 
 module.exports = (send) => {
   return (opts) => {
@@ -14,7 +15,9 @@ module.exports = (send) => {
     send({ path: 'refs/local', qs: opts }, (err, stream) => {
       if (err) { return pt.destroy(err) }
 
-      pump(stream, pt)
+      pump(stream, through.obj(function (r, enc, cb) {
+        cb(null, { ref: r.Ref, err: r.Err })
+      }), pt)
     })
 
     return pt

src/files-regular/refs-local.js

@@ -2,7 +2,7 @@
 
 const IsIpfs = require('is-ipfs')
 const promisify = require('promisify-es6')
-const streamToValue = require('../utils/stream-to-value')
+const streamToValueWithTransformer = require('../utils/stream-to-value-with-transformer')
 const moduleConfig = require('../utils/module-config')
 const cleanCID = require('../utils/clean-cid')
 
@@ -15,11 +15,20 @@ module.exports = (arg) => {
       opts = {}
     }
 
+    const transform = (res, cb) => {
+      cb(null, res.map(r => ({ ref: r.Ref, err: r.Err })))
+    }
+
     const request = {
       path: 'refs/local',
       qs: opts
     }
+    send(request, (err, result) => {
+      if (err) {
+        return callback(err)
+      }
 
-    send.andTransform(request, streamToValue, callback)
+      streamToValueWithTransformer(result, transform, callback)
+    })
   })
 }

src/files-regular/refs-pull-stream.js

@@ -26,7 +26,10 @@ module.exports = (send) => {
     send({ path: 'refs', args: hash, qs: opts }, (err, stream) => {
       if (err) { return p.resolve(pull.error(err)) }
 
-      p.resolve(toPull.source(stream))
+      p.resolve(pull(
+        toPull.source(stream),
+        pull.map(r => ({ ref: r.Ref, err: r.Err }))
+      ))
     })
 
     return p

src/files-regular/refs-readable-stream.js

@@ -4,6 +4,7 @@ const cleanCID = require('../utils/clean-cid')
 const v = require('is-ipfs')
 const Stream = require('readable-stream')
 const pump = require('pump')
+const through = require('through2')
 
 module.exports = (send) => {
   return (hash, opts) => {
@@ -22,7 +23,9 @@ module.exports = (send) => {
     send({ path: 'refs', args: hash, qs: opts }, (err, stream) => {
       if (err) { return pt.destroy(err) }
 
-      pump(stream, pt)
+      pump(stream, through.obj(function (r, enc, cb) {
+        cb(null, { ref: r.Ref, err: r.Err })
+      }), pt)
     })
 
     return pt

src/files-regular/refs.js

@@ -2,18 +2,10 @@
 
 const IsIpfs = require('is-ipfs')
 const promisify = require('promisify-es6')
-const streamToValue = require('../utils/stream-to-value')
+const streamToValueWithTransformer = require('../utils/stream-to-value-with-transformer')
 const moduleConfig = require('../utils/module-config')
 const cleanCID = require('../utils/clean-cid')
 
-function valueOrStreamToValue (response, callback) {
-  if (typeof response.pipe === 'function') {
-    streamToValue(response, callback)
-  } else {
-    callback(null, response)
-  }
-}
-
 module.exports = (arg) => {
   const send = moduleConfig(arg)
 
@@ -31,13 +23,22 @@ module.exports = (arg) => {
       }
     }
 
+    const transform = (res, cb) => {
+      cb(null, res.map(r => ({ ref: r.Ref, err: r.Err })))
+    }
+
     const request = {
       path: 'refs',
       args: args,
       qs: opts
     }
+    send(request, (err, result) => {
+      if (err) {
+        return callback(err)
+      }
 
-    send.andTransform(request, valueOrStreamToValue, callback)
+      streamToValueWithTransformer(result, transform, callback)
+    })
   })
 
   refs.local = require('./refs-local')(arg)