Make ipfs.files.add return wrapped path+node.

Author: hackergrrl

src/add-to-dagnode-transform.js

@@ -3,11 +3,17 @@
 const async = require('async')
 const getDagNode = require('./get-dagnode')
 
-// transform { Hash: '...' } objects into DAGNodes async
+// transform { Hash: '...' } objects into { path: 'string', node: DAGNode }
 module.exports = function (err, res, send, done) {
   if (err) return done(err)
   async.map(res, function map (entry, next) {
-    getDagNode(send, entry.Hash, next)
+    getDagNode(send, entry.Hash, function (err, node) {
+      var obj = {
+        path: entry.Name,
+        node: node
+      }
+      next(null, obj)
+    })
   }, function (err, res) {
     done(err, res)
   })

src/get-dagnode.js

@@ -1,11 +1,36 @@
 'use strict'
 
 const DAGNode = require('ipfs-merkle-dag').DAGNode
+const bl = require('bl')
+const async = require('async')
 
 module.exports = function (send, hash, cb) {
-  send('object/get', hash, null, null, function (err, result) {
-    if (err) return cb(err)
-    const node = new DAGNode(result.Data, result.Links)
-    cb(err, node)
-  })
+
+  // Retrieve the object and its data in parallel, then produce a DAGNode
+  // instance using this information.
+  async.parallel([
+    function get (done) {
+      send('object/get', hash, null, null, done)
+    },
+
+    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('object/data', hash, null, null, done)
+    }],
+
+    function done (err, res) {
+      if (err) return cb(err)
+
+      var object = res[0]
+      var stream = res[1]
+
+      stream.pipe(bl(function (err, data) {
+        if (err) return cb(err)
+
+        cb(err, new DAGNode(data, object.Links))
+      }))
+    })
+
 }