@helia/car 4.1.3 → 4.2.0-1f0e7f7d

package/dist/src/car.d.ts

@@ -1,4 +1,3 @@
-import { CarWriter } from '@ipld/car';
 import type { CarComponents, Car as CarInterface, ExportCarOptions } from './index.js';
 import type { PutManyBlocksProgressEvents } from '@helia/interface/blocks';
 import type { CarReader } from '@ipld/car';
@@ -11,7 +10,7 @@ export declare class Car implements CarInterface {
     private readonly log;
     constructor(components: CarComponents, init: any);
     import(reader: Pick<CarReader, 'blocks'>, options?: AbortOptions & ProgressOptions<PutManyBlocksProgressEvents>): Promise<void>;
-    export(root: CID | CID[], writer: Pick<CarWriter, 'put' | 'close'>, options?: ExportCarOptions): Promise<void>;
-    stream(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>;
+    export(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>;
+    private _export;
 }
 //# sourceMappingURL=car.d.ts.map

package/dist/src/car.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"car.d.ts","sourceRoot":"","sources":["../../src/car.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AASrC,OAAO,KAAK,EAAE,aAAa,EAAE,GAAG,IAAI,YAAY,EAAE,gBAAgB,EAAqC,MAAM,YAAY,CAAA;AACzH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AA2BtD,qBAAa,GAAI,YAAW,YAAY;;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG;IAK3C,MAAM,CAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAOhI,MAAM,CAAE,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoF7G,MAAM,CAAE,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC;CA4E5G"}
+{"version":3,"file":"car.d.ts","sourceRoot":"","sources":["../../src/car.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,GAAG,IAAI,YAAY,EAAE,gBAAgB,EAAqC,MAAM,YAAY,CAAA;AACzH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,mBAAmB,CAAA;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AA2BtD,qBAAa,GAAI,YAAW,YAAY;;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEf,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG;IAK3C,MAAM,CAAE,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9H,MAAM,CAAE,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC;YAkC7F,OAAO;CAiJtB"}

package/dist/src/car.js

@@ -1,9 +1,10 @@
 import { CarWriter } from '@ipld/car';
+import { Queue } from '@libp2p/utils';
 import drain from 'it-drain';
 import map from 'it-map';
+import toBuffer from 'it-to-buffer';
 import { createUnsafe } from 'multiformats/block';
-import defer from 'p-defer';
-import PQueue from 'p-queue';
+import { raceSignal } from 'race-signal';
 import { DAG_WALK_QUEUE_CONCURRENCY } from './constants.js';
 import { SubgraphExporter } from './export-strategies/subgraph-exporter.js';
 import { GraphSearch } from './traversal-strategies/graph-search.js';
@@ -15,10 +16,38 @@ export class Car {
         this.log = components.logger.forComponent('helia:car');
     }
     async import(reader, options) {
-        await drain(this.components.blockstore.putMany(map(reader.blocks(), ({ cid, bytes }) => ({ cid, block: bytes })), options));
+        await drain(this.components.blockstore.putMany(map(reader.blocks(), ({ cid, bytes }) => ({ cid, bytes })), options));
     }
-    async export(root, writer, options) {
-        const deferred = defer();
+    async *export(root, options) {
+        const { writer, out } = CarWriter.create(root);
+        const iter = out[Symbol.asyncIterator]();
+        const controller = new AbortController();
+        // has to be done async so we write to `writer` and read from `out` at the
+        // same time
+        this._export(root, writer, options)
+            .catch((err) => {
+            this.log.error('error during streaming export - %e', err);
+            controller.abort(err);
+        });
+        while (true) {
+            const { done, value } = await raceSignal(iter.next(), controller.signal);
+            // the writer's `out` iterable can yield results synchronously, in which
+            // case the controller may have been aborted but the event may not have
+            // fired yet so check the signal status manually before processing the
+            // next iterable result
+            if (controller.signal.aborted) {
+                throw controller.signal.reason;
+            }
+            if (value != null) {
+                yield value;
+            }
+            if (done === true) {
+                break;
+            }
+        }
+    }
+    async _export(root, writer, options) {
+        const deferred = Promise.withResolvers();
         const roots = Array.isArray(root) ? root : [root];
         // Create traversal-specific context
         const traversalContext = {
@@ -29,11 +58,11 @@ export class Car {
         const exportStrategy = options?.exporter ?? new SubgraphExporter();
         // use a queue to walk the DAG instead of recursion so we can traverse very
         // large DAGs
-        const queue = new PQueue({
+        const queue = new Queue({
             concurrency: DAG_WALK_QUEUE_CONCURRENCY
         });
         let startedExport = false;
-        queue.on('idle', () => {
+        queue.addEventListener('idle', () => {
             if (startedExport) {
                 // idle event was called, and started exporting, so we are done.
                 deferred.resolve();
@@ -48,7 +77,7 @@ export class Car {
                     const targetCid = path[targetIndex];
                     // Process all verification blocks in the path except the target
                     path.slice(0, -1).forEach(cid => {
-                        void queue.add(async () => {
+                        queue.add(async () => {
                             await this.#exportDagNode({ cid, queue, writer, strategy: exportStrategy, options, recursive: false });
                         })
                             .catch((err) => {
@@ -56,7 +85,7 @@ export class Car {
                         });
                     });
                     // Process the target block (which will recursively export its DAG)
-                    void queue.add(async () => {
+                    queue.add(async () => {
                         await this.#exportDagNode({ cid: targetCid, queue, writer, strategy: exportStrategy, options });
                     })
                         .catch((err) => {
@@ -73,9 +102,9 @@ export class Car {
                 deferred.reject(new Error('Could not traverse to target CID(s)'));
             }
         });
-        queue.on('error', (err) => {
+        queue.addEventListener('failure', (evt) => {
             queue.clear();
-            deferred.reject(err);
+            deferred.reject(evt.detail.error);
         });
         for (const root of roots) {
             void queue.add(async () => {
@@ -94,18 +123,6 @@ export class Car {
             await writer.close();
         }
     }
-    async *stream(root, options) {
-        const { writer, out } = CarWriter.create(root);
-        // has to be done async so we write to `writer` and read from `out` at the
-        // same time
-        this.export(root, writer, options)
-            .catch((err) => {
-            this.log.error('error during streaming export - %e', err);
-        });
-        for await (const buf of out) {
-            yield buf;
-        }
-    }
     /**
      * Traverse a DAG and stop when we reach the target node
      */
@@ -119,7 +136,7 @@ export class Car {
             return;
         }
         const codec = await this.components.getCodec(cid.code);
-        const bytes = await this.components.blockstore.get(cid, options);
+        const bytes = await toBuffer(this.components.blockstore.get(cid, options));
         // we are recursively traversing the dag
         const decodedBlock = createUnsafe({ bytes, cid, codec });
         for await (const nextCid of strategy.traverse(cid, decodedBlock)) {
@@ -139,7 +156,7 @@ export class Car {
             return;
         }
         const codec = await this.components.getCodec(cid.code);
-        const bytes = await this.components.blockstore.get(cid, options);
+        const bytes = await toBuffer(this.components.blockstore.get(cid, options));
         // Mark as processed
         options?.blockFilter?.add(cid.multihash.bytes);
         // Write to CAR

package/dist/src/car.js.map

@@ -1 +1 @@
-{"version":3,"file":"car.js","sourceRoot":"","sources":["../../src/car.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"car.js","sourceRoot":"","sources":["../../src/car.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -23,7 +23,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid)) {
+ * for await (const buf of c.export(cid)) {
  *   out.write(buf)
  * }
  *
@@ -44,7 +44,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid, {
+ * for await (const buf of c.export(cid, {
  *   traversal: new UnixFSPath('/foo/bar/baz.txt')
  * })) {
  *   out.write(buf)
@@ -76,10 +76,10 @@
  * ```
  */
 import type { CodecLoader } from '@helia/interface';
-import type { PutManyBlocksProgressEvents, GetBlockProgressEvents } from '@helia/interface/blocks';
-import type { CarWriter, CarReader } from '@ipld/car';
+import type { PutManyBlocksProgressEvents, GetBlockProgressEvents, ProviderOptions } from '@helia/interface/blocks';
+import type { CarReader } from '@ipld/car';
 import type { AbortOptions, ComponentLogger } from '@libp2p/interface';
-import type { Filter } from '@libp2p/utils/filters';
+import type { Filter } from '@libp2p/utils';
 import type { Blockstore } from 'interface-blockstore';
 import type { BlockView } from 'multiformats/block/interface';
 import type { CID } from 'multiformats/cid';
@@ -119,7 +119,7 @@ export interface ExportStrategy {
 }
 export * from './export-strategies/index.js';
 export * from './traversal-strategies/index.js';
-export interface ExportCarOptions extends AbortOptions, ProgressOptions<GetBlockProgressEvents> {
+export interface ExportCarOptions extends AbortOptions, ProgressOptions<GetBlockProgressEvents>, ProviderOptions {
     /**
      * If true, the blockstore will not do any network requests.
      *
@@ -168,37 +168,6 @@ export interface Car {
      * ```
      */
     import(reader: Pick<CarReader, 'blocks'>, options?: AbortOptions & ProgressOptions<PutManyBlocksProgressEvents>): Promise<void>;
-    /**
-     * Store all blocks that make up one or more DAGs in a car file.
-     *
-     * @example
-     *
-     * ```typescript
-     * import fs from 'node:fs'
-     * import { Readable } from 'node:stream'
-     * import { car } from '@helia/car'
-     * import { CarWriter } from '@ipld/car'
-     * import { createHelia } from 'helia'
-     * import { CID } from 'multiformats/cid'
-     * import { pEvent } from 'p-event'
-     *
-     * const helia = await createHelia()
-     * const cid = CID.parse('QmFoo...')
-     *
-     * const c = car(helia)
-     * const { writer, out } = CarWriter.create(cid)
-     * const output = fs.createWriteStream('example.car')
-     * const stream = Readable.from(out).pipe(output)
-     *
-     * await Promise.all([
-     *   c.export(cid, writer),
-     *   pEvent(stream, 'close')
-     * ])
-     * ```
-     *
-     * @deprecated Use `stream` instead. In a future release `stream` will be renamed `export`.
-     */
-    export(root: CID | CID[], writer: Pick<CarWriter, 'put' | 'close'>, options?: ExportCarOptions): Promise<void>;
     /**
      * Returns an AsyncGenerator that yields CAR file bytes.
      *
@@ -214,12 +183,12 @@ export interface Car {
      *
      * const c = car(helia)
      *
-     * for (const buf of c.stream(cid)) {
+     * for (const buf of c.export(cid)) {
      *   // store or send `buf` somewhere
      * }
      * ```
      */
-    stream(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>;
+    export(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>;
 }
 /**
  * Create a {@link Car} instance for use with {@link https://github.com/ipfs/helia Helia}

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AACnH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,eAAe,CAAA;IACvB,UAAU,EAAE,UAAU,CAAA;IACtB,QAAQ,EAAE,WAAW,CAAA;CACtB;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,QAAQ,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IAE7G;;;OAGG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAA;CAC5B;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,MAAM,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;CAC5G;AAED,cAAc,8BAA8B,CAAA;AAC5C,cAAc,iCAAiC,CAAA;AAE/C,MAAM,WAAW,gBAAiB,SAAQ,YAAY,EAAE,eAAe,CAAC,sBAAsB,CAAC,EAAE,eAAe;IAE9G;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;IAEpB;;;OAGG;IACH,SAAS,CAAC,EAAE,iBAAiB,CAAA;IAE7B;;;OAGG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC1B;AAED;;;GAGG;AACH,MAAM,WAAW,GAAG;IAClB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAE/H;;;;;;;;;;;;;;;;;;;OAmBG;IACH,MAAM,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;CACnG;AAED;;GAEG;AACH,wBAAgB,GAAG,CAAE,KAAK,EAAE,aAAa,EAAE,IAAI,GAAE,GAAQ,GAAG,GAAG,CAE9D"}

package/dist/src/index.js

@@ -23,7 +23,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid)) {
+ * for await (const buf of c.export(cid)) {
  *   out.write(buf)
  * }
  *
@@ -44,7 +44,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid, {
+ * for await (const buf of c.export(cid, {
  *   traversal: new UnixFSPath('/foo/bar/baz.txt')
  * })) {
  *   out.write(buf)

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH,OAAO,EAAE,GAAG,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAA;AAgD1C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,iCAAiC,CAAA;AAgH/C;;GAEG;AACH,MAAM,UAAU,GAAG,CAAE,KAAoB,EAAE,OAAY,EAAE;IACvD,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH,OAAO,EAAE,GAAG,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAA;AAgD1C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,iCAAiC,CAAA;AAgF/C;;GAEG;AACH,MAAM,UAAU,GAAG,CAAE,KAAoB,EAAE,OAAY,EAAE;IACvD,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;AAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/car",
-  "version": "4.1.3",
+  "version": "4.2.0-1f0e7f7d",
   "description": "Import/export car files from Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/car#readme",
@@ -32,13 +32,6 @@
       "import": "./dist/src/index.js"
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs",
-    "parserOptions": {
-      "project": true,
-      "sourceType": "module"
-    }
-  },
   "scripts": {
     "clean": "aegir clean",
     "lint": "aegir lint",
@@ -54,33 +47,32 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@helia/interface": "^5.4.0",
-    "@ipld/car": "^5.3.3",
-    "@ipld/dag-pb": "^4.1.3",
-    "@libp2p/interface": "^2.2.1",
-    "@libp2p/utils": "^6.2.1",
-    "interface-blockstore": "^5.3.1",
-    "ipfs-unixfs": "^11.2.1",
-    "it-drain": "^3.0.7",
-    "it-map": "^3.1.1",
-    "multiformats": "^13.3.1",
-    "p-defer": "^4.0.1",
-    "p-queue": "^8.0.1",
-    "progress-events": "^1.0.1"
+    "@helia/interface": "5.4.0-1f0e7f7d",
+    "@ipld/car": "^5.4.2",
+    "@ipld/dag-pb": "^4.1.5",
+    "@libp2p/interface": "^3.0.2",
+    "@libp2p/utils": "^7.0.5",
+    "interface-blockstore": "^6.0.1",
+    "ipfs-unixfs": "^12.0.0",
+    "it-drain": "^3.0.10",
+    "it-map": "^3.1.4",
+    "it-to-buffer": "^4.0.10",
+    "multiformats": "^13.4.1",
+    "progress-events": "^1.0.1",
+    "race-signal": "^2.0.0"
   },
   "devDependencies": {
-    "@helia/mfs": "^5.0.4",
-    "@helia/unixfs": "^5.0.4",
-    "@ipld/dag-cbor": "^9.2.2",
-    "@libp2p/logger": "^5.1.15",
-    "aegir": "^47.0.7",
-    "blockstore-core": "^5.0.2",
-    "datastore-core": "^10.0.2",
-    "ipfs-unixfs-importer": "^15.3.1",
-    "it-foreach": "^2.1.2",
-    "it-length": "^3.0.7",
-    "it-to-buffer": "^4.0.7",
-    "sinon": "^20.0.0"
+    "@helia/mfs": "5.1.0-1f0e7f7d",
+    "@helia/unixfs": "5.1.0-1f0e7f7d",
+    "@ipld/dag-cbor": "^9.2.5",
+    "@libp2p/logger": "^6.0.5",
+    "aegir": "^47.0.22",
+    "blockstore-core": "^6.0.2",
+    "datastore-core": "^11.0.2",
+    "ipfs-unixfs-importer": "^16.0.1",
+    "it-foreach": "^2.1.4",
+    "it-length": "^3.0.9",
+    "sinon": "^21.0.0"
   },
   "sideEffects": false
 }

package/src/car.ts

@@ -1,9 +1,10 @@
 import { CarWriter } from '@ipld/car'
+import { Queue } from '@libp2p/utils'
 import drain from 'it-drain'
 import map from 'it-map'
+import toBuffer from 'it-to-buffer'
 import { createUnsafe } from 'multiformats/block'
-import defer from 'p-defer'
-import PQueue from 'p-queue'
+import { raceSignal } from 'race-signal'
 import { DAG_WALK_QUEUE_CONCURRENCY } from './constants.js'
 import { SubgraphExporter } from './export-strategies/subgraph-exporter.js'
 import { GraphSearch } from './traversal-strategies/graph-search.js'
@@ -24,7 +25,7 @@ interface TraversalContext {
 
 interface WalkDagContext<Strategy> {
   cid: CID
-  queue: PQueue
+  queue: Queue
   strategy: Strategy
   options?: ExportCarOptions
 }
@@ -50,13 +51,47 @@ export class Car implements CarInterface {
 
   async import (reader: Pick<CarReader, 'blocks'>, options?: AbortOptions & ProgressOptions<PutManyBlocksProgressEvents>): Promise<void> {
     await drain(this.components.blockstore.putMany(
-      map(reader.blocks(), ({ cid, bytes }) => ({ cid, block: bytes })),
+      map(reader.blocks(), ({ cid, bytes }) => ({ cid, bytes })),
       options
     ))
   }
 
-  async export (root: CID | CID[], writer: Pick<CarWriter, 'put' | 'close'>, options?: ExportCarOptions): Promise<void> {
-    const deferred = defer<Error | undefined>()
+  async * export (root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined> {
+    const { writer, out } = CarWriter.create(root)
+    const iter = out[Symbol.asyncIterator]()
+    const controller = new AbortController()
+
+    // has to be done async so we write to `writer` and read from `out` at the
+    // same time
+    this._export(root, writer, options)
+      .catch((err) => {
+        this.log.error('error during streaming export - %e', err)
+        controller.abort(err)
+      })
+
+    while (true) {
+      const { done, value } = await raceSignal(iter.next(), controller.signal)
+
+      // the writer's `out` iterable can yield results synchronously, in which
+      // case the controller may have been aborted but the event may not have
+      // fired yet so check the signal status manually before processing the
+      // next iterable result
+      if (controller.signal.aborted) {
+        throw controller.signal.reason
+      }
+
+      if (value != null) {
+        yield value
+      }
+
+      if (done === true) {
+        break
+      }
+    }
+  }
+
+  private async _export (root: CID | CID[], writer: Pick<CarWriter, 'put' | 'close'>, options?: ExportCarOptions): Promise<void> {
+    const deferred = Promise.withResolvers<Error | void>()
     const roots = Array.isArray(root) ? root : [root]
 
     // Create traversal-specific context
@@ -70,12 +105,12 @@ export class Car implements CarInterface {
 
     // use a queue to walk the DAG instead of recursion so we can traverse very
     // large DAGs
-    const queue = new PQueue({
+    const queue = new Queue({
       concurrency: DAG_WALK_QUEUE_CONCURRENCY
     })
 
     let startedExport = false
-    queue.on('idle', () => {
+    queue.addEventListener('idle', () => {
       if (startedExport) {
         // idle event was called, and started exporting, so we are done.
         deferred.resolve()
@@ -91,7 +126,7 @@ export class Car implements CarInterface {
 
           // Process all verification blocks in the path except the target
           path.slice(0, -1).forEach(cid => {
-            void queue.add(async () => {
+            queue.add(async () => {
               await this.#exportDagNode({ cid, queue, writer, strategy: exportStrategy, options, recursive: false })
             })
               .catch((err) => {
@@ -100,7 +135,7 @@ export class Car implements CarInterface {
           })
 
           // Process the target block (which will recursively export its DAG)
-          void queue.add(async () => {
+          queue.add(async () => {
             await this.#exportDagNode({ cid: targetCid, queue, writer, strategy: exportStrategy, options })
           })
             .catch((err) => {
@@ -116,9 +151,9 @@ export class Car implements CarInterface {
         deferred.reject(new Error('Could not traverse to target CID(s)'))
       }
     })
-    queue.on('error', (err) => {
+    queue.addEventListener('failure', (evt) => {
       queue.clear()
-      deferred.reject(err)
+      deferred.reject(evt.detail.error)
     })
 
     for (const root of roots) {
@@ -139,21 +174,6 @@ export class Car implements CarInterface {
     }
   }
 
-  async * stream (root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined> {
-    const { writer, out } = CarWriter.create(root)
-
-    // has to be done async so we write to `writer` and read from `out` at the
-    // same time
-    this.export(root, writer, options)
-      .catch((err) => {
-        this.log.error('error during streaming export - %e', err)
-      })
-
-    for await (const buf of out) {
-      yield buf
-    }
-  }
-
   /**
    * Traverse a DAG and stop when we reach the target node
    */
@@ -169,7 +189,7 @@ export class Car implements CarInterface {
     }
 
     const codec = await this.components.getCodec(cid.code)
-    const bytes = await this.components.blockstore.get(cid, options)
+    const bytes = await toBuffer(this.components.blockstore.get(cid, options))
 
     // we are recursively traversing the dag
     const decodedBlock = createUnsafe({ bytes, cid, codec })
@@ -193,7 +213,7 @@ export class Car implements CarInterface {
     }
 
     const codec = await this.components.getCodec(cid.code)
-    const bytes = await this.components.blockstore.get(cid, options)
+    const bytes = await toBuffer(this.components.blockstore.get(cid, options))
 
     // Mark as processed
     options?.blockFilter?.add(cid.multihash.bytes)

package/src/index.ts

@@ -23,7 +23,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid)) {
+ * for await (const buf of c.export(cid)) {
  *   out.write(buf)
  * }
  *
@@ -44,7 +44,7 @@
  * const c = car(helia)
  * const out = nodeFs.createWriteStream('example.car')
  *
- * for await (const buf of c.stream(cid, {
+ * for await (const buf of c.export(cid, {
  *   traversal: new UnixFSPath('/foo/bar/baz.txt')
  * })) {
  *   out.write(buf)
@@ -78,10 +78,10 @@
 
 import { Car as CarClass } from './car.js'
 import type { CodecLoader } from '@helia/interface'
-import type { PutManyBlocksProgressEvents, GetBlockProgressEvents } from '@helia/interface/blocks'
-import type { CarWriter, CarReader } from '@ipld/car'
+import type { PutManyBlocksProgressEvents, GetBlockProgressEvents, ProviderOptions } from '@helia/interface/blocks'
+import type { CarReader } from '@ipld/car'
 import type { AbortOptions, ComponentLogger } from '@libp2p/interface'
-import type { Filter } from '@libp2p/utils/filters'
+import type { Filter } from '@libp2p/utils'
 import type { Blockstore } from 'interface-blockstore'
 import type { BlockView } from 'multiformats/block/interface'
 import type { CID } from 'multiformats/cid'
@@ -127,7 +127,7 @@ export interface ExportStrategy {
 export * from './export-strategies/index.js'
 export * from './traversal-strategies/index.js'
 
-export interface ExportCarOptions extends AbortOptions, ProgressOptions<GetBlockProgressEvents> {
+export interface ExportCarOptions extends AbortOptions, ProgressOptions<GetBlockProgressEvents>, ProviderOptions {
 
   /**
    * If true, the blockstore will not do any network requests.
@@ -182,38 +182,6 @@ export interface Car {
    */
   import(reader: Pick<CarReader, 'blocks'>, options?: AbortOptions & ProgressOptions<PutManyBlocksProgressEvents>): Promise<void>
 
-  /**
-   * Store all blocks that make up one or more DAGs in a car file.
-   *
-   * @example
-   *
-   * ```typescript
-   * import fs from 'node:fs'
-   * import { Readable } from 'node:stream'
-   * import { car } from '@helia/car'
-   * import { CarWriter } from '@ipld/car'
-   * import { createHelia } from 'helia'
-   * import { CID } from 'multiformats/cid'
-   * import { pEvent } from 'p-event'
-   *
-   * const helia = await createHelia()
-   * const cid = CID.parse('QmFoo...')
-   *
-   * const c = car(helia)
-   * const { writer, out } = CarWriter.create(cid)
-   * const output = fs.createWriteStream('example.car')
-   * const stream = Readable.from(out).pipe(output)
-   *
-   * await Promise.all([
-   *   c.export(cid, writer),
-   *   pEvent(stream, 'close')
-   * ])
-   * ```
-   *
-   * @deprecated Use `stream` instead. In a future release `stream` will be renamed `export`.
-   */
-  export(root: CID | CID[], writer: Pick<CarWriter, 'put' | 'close'>, options?: ExportCarOptions): Promise<void>
-
   /**
    * Returns an AsyncGenerator that yields CAR file bytes.
    *
@@ -229,12 +197,12 @@ export interface Car {
    *
    * const c = car(helia)
    *
-   * for (const buf of c.stream(cid)) {
+   * for (const buf of c.export(cid)) {
    *   // store or send `buf` somewhere
    * }
    * ```
    */
-  stream(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>
+  export(root: CID | CID[], options?: ExportCarOptions): AsyncGenerator<Uint8Array, void, undefined>
 }
 
 /**