feat: support for cbor path into file

Author: pgte

src/exporter/resolve.js

@@ -6,7 +6,8 @@ const pull = require('pull-stream')
 const resolvers = {
   directory: require('./dir-flat'),
   'hamt-sharded-directory': require('./dir-hamt-sharded'),
-  file: require('./file')
+  file: require('./file'),
+  unknown: require('./unknown')
 }
 
 module.exports = Object.assign({
@@ -15,7 +16,12 @@ module.exports = Object.assign({
 }, resolvers)
 
 function resolve (node, hash, pathRest, ipldResolver, parentNode) {
-  const type = typeOf(node)
+  let type
+  try {
+    type = typeOf(node)
+  } catch (err) {
+    type = 'unknown'
+  }
   const resolver = resolvers[type]
   if (!resolver) {
     return pull.error(new Error('Unkown node type ' + type))

src/exporter/unknown.js

@@ -0,0 +1,35 @@
+'use strict'
+
+const path = require('path')
+const CID = require('cids')
+const pull = require('pull-stream')
+const pullDefer = require('pull-defer')
+
+// Logic to export a single (possibly chunked) unixfs file.
+module.exports = (node, name, pathRest, ipldResolver, resolve) => {
+  let newNode
+  if (pathRest.length) {
+    const pathElem = pathRest.shift()
+    newNode = node[pathElem]
+    const newName = path.join(name, pathElem)
+    if (CID.isCID(newNode)) {
+      const d = pullDefer.source()
+      ipldResolver.get(sanitizeCID(newNode), (err, newNode) => {
+        if (err) {
+          d.resolve(pull.error(err))
+        } else {
+          d.resolve(resolve(newNode.value, newName, pathRest, ipldResolver, node))
+        }
+      })
+      return d
+    } else if (newNode !== undefined) {
+      return resolve(newNode, newName, pathRest, ipldResolver, node)
+    } else {
+      return pull.error('not found')
+    }
+  }
+}
+
+function sanitizeCID (cid) {
+  return new CID(cid.version, cid.codec, cid.multihash)
+}

test/test-export-subtree.js

@@ -6,7 +6,9 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const BlockService = require('ipfs-block-service')
 const IPLDResolver = require('ipld-resolver')
+const CID = require('cids')
 const loadFixture = require('aegir/fixtures')
+
 const pull = require('pull-stream')
 const Buffer = require('safe-buffer').Buffer
 
@@ -56,6 +58,28 @@ module.exports = (repo) => {
         })
       )
     })
+
+    it('exports starting from non-protobuf node', (done) => {
+      const doc = { a: { file: new CID('QmWChcSFMNcFkfeJtNd8Yru1rE6PhtCRfewi1tMwjkwKjN') } }
+      ipldResolver.put(doc, { format: 'dag-cbor' }, (err, cid) => {
+        expect(err).to.not.exist()
+        const nodeCID = cid.toBaseEncodedString()
+
+        pull(
+          exporter(nodeCID + '/a/file/level-1/200Bytes.txt', ipldResolver),
+          pull.collect((err, files) => {
+            expect(err).to.not.exist()
+            expect(files.length).to.equal(3)
+            expect(files[0].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file')
+            expect(files[0].content).to.not.exist()
+            expect(files[1].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file/level-1')
+            expect(files[1].content).to.not.exist()
+            expect(files[2].path).to.equal('zdpuAzp9okHgbLQdmusXn8cRjr9js6nAM4JrvKDeqp2XEkFzD/a/file/level-1/200Bytes.txt')
+            fileEql(files[2], smallFile, done)
+          })
+        )
+      })
+    })
   })
 }