Make ipfs.files.add return DAGNodes.

Author: hackergrrl

package.json

@@ -71,6 +71,7 @@
     "ipfs-multipart": "^0.1.0",
     "ipfs-repo": "^0.8.0",
     "ipfs-unixfs-engine": "^0.8.0",
+    "isstream": "^0.1.2",
     "joi": "^8.0.5",
     "libp2p-ipfs": "^0.6.0",
     "libp2p-ipfs-browser": "^0.5.0",
@@ -89,7 +90,8 @@
     "run-parallel-limit": "^1.0.3",
     "run-series": "^1.1.4",
     "run-waterfall": "^1.1.3",
-    "temp": "^0.8.3"
+    "temp": "^0.8.3",
+    "through2": "^2.0.1"
   },
   "aegir": {
     "webpack": {
@@ -122,4 +124,4 @@
     "kumavis <[email protected]>",
     "nginnever <[email protected]>"
   ]
-}
+}

src/core/ipfs/files.js

@@ -3,38 +3,68 @@
 const Importer = require('ipfs-unixfs-engine').importer
 const Exporter = require('ipfs-unixfs-engine').exporter
 const UnixFS = require('ipfs-unixfs')
+const bs58 = require('bs58')
+const through = require('through2')
+const isStream = require('isstream')
+const promisify = require('promisify-es6')
 
 module.exports = function files (self) {
   return {
-    add: (arr, callback) => {
-      if (typeof arr === 'function') {
-        callback = arr
-        arr = undefined
+    createAddStream: promisify((callback) => {
+      // TODO: wip
+      if (data === undefined) {
+        return new Importer(self._dagS)
       }
-      if (callback === undefined) {
-        callback = function noop () {}
+    }),
+
+    add: promisify((data, callback) => {
+      // Buffer input
+      if (Buffer.isBuffer(data)) {
+        data = [{
+          path: '',
+          content: data
+        }]
       }
-      if (arr === undefined) {
-        return new Importer(self._dagS)
+      // Readable stream input
+      if (isStream.isReadable(data)) {
+        data = [{
+          path: '',
+          content: data
+        }]
+      }
+      if (!callback || typeof callback !== 'function') {
+        callback = function oop () {}
+      }
+      if (!Array.isArray(data)) {
+        return callback(new Error('"data" must be an array of { path: string, content: Buffer|Readable } or Buffer or Readable'))
       }
 
       const i = new Importer(self._dagS)
       const res = []
 
-      i.on('data', (info) => {
-        res.push(info)
-      })
-
-      i.once('end', () => {
+      // Transform file info tuples to DAGNodes
+      i.pipe(through.obj(function transform (info, enc, next) {
+        const mh = bs58.encode(info.multihash).toString()
+        self._dagS.get(mh, (err, node) => {
+          if (err) return callback(err)
+          var obj = {
+            path: info.path || mh,
+            node: node
+          }
+          res.push(obj)
+          next()
+        })
+      }, function end (done) {
         callback(null, res)
-      })
+      }))
 
-      arr.forEach((tuple) => {
+      data.forEach((tuple) => {
         i.write(tuple)
       })
 
       i.end()
-    },
+    }),
+
     cat: (hash, callback) => {
       self._dagS.get(hash, (err, fetchedNode) => {
         if (err) {

test/core-tests/test-files.js

@@ -1,64 +1,19 @@
 /* eslint-env mocha */
 'use strict'
 
-const bl = require('bl')
-const expect = require('chai').expect
-const Readable = require('stream').Readable
-const bs58 = require('bs58')
-
+const test = require('/home/noffle/forks/interface-ipfs-core')
 const IPFS = require('../../src/core')
 
-describe('files', () => {
-  let ipfs
-
-  before((done) => {
-    ipfs = new IPFS(require('./repo-path'))
-    ipfs.load(done)
-  })
-
-  it('add', (done) => {
-    const buffered = new Buffer('some data')
-    const rs = new Readable()
-    rs.push(buffered)
-    rs.push(null)
-    const arr = []
-    const filePair = {path: 'data.txt', stream: rs}
-    arr.push(filePair)
-    ipfs.files.add(arr, (err, res) => {
-      expect(err).to.not.exist
-      expect(res[0].path).to.equal('data.txt')
-      expect(res[0].size).to.equal(17)
-      expect(bs58.encode(res[0].multihash).toString()).to.equal('QmVv4Wz46JaZJeH5PMV4LGbRiiMKEmszPYY3g6fjGnVXBS')
-      done()
+const common = {
+  setup: function (cb) {
+    const ipfs = new IPFS(require('./repo-path'))
+    ipfs.load(() => {
+      cb(null, ipfs)
     })
-  })
+  },
+  teardown: function (cb) {
+    cb()
+  }
+}
 
-  it('cat', (done) => {
-    const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
-    ipfs.files.cat(hash, (err, res) => {
-      expect(err).to.not.exist
-      res.on('data', (data) => {
-        data.stream.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.equal('hello world\n')
-          done()
-        }))
-      })
-    })
-  })
-
-  it('get', (done) => {
-    // TODO create non-trival get test
-    const hash = 'QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o'
-    ipfs.files.get(hash, (err, res) => {
-      expect(err).to.not.exist
-      res.on('data', (data) => {
-        data.stream.pipe(bl((err, bldata) => {
-          expect(err).to.not.exist
-          expect(bldata.toString()).to.equal('hello world\n')
-          done()
-        }))
-      })
-    })
-  })
-})
+test.files(common)