@ipld/car 3.2.2 → 4.0.0

package/cjs/node-test/common.js

@@ -214,12 +214,87 @@ const goCarIndex = [
     blockLength: 18
   }
 ];
+const goCarV2Bytes = multiformats.bytes.fromHex('0aa16776657273696f6e02000000000000000000000000000000003300000000000000c001000000000000f30100000000000038a265726f6f747381d82a5823001220fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f86776657273696f6e01511220fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f8122d0a221220d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f6261204f09f8da418a40185011220d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f62612310a221220d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f1120962617272656c657965183a122e0a2401551220a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d1204f09f90a11807581220d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f112340a2401551220b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d120a666973686d6f6e67657218042801551220b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d666973682b01551220a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d6c6f62737465720100000028000000c800000000000000a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d9401000000000000b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d6b01000000000000d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f11201000000000000d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f6268b00000000000000fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f83900000000000000');
+const goCarV2Roots = [multiformats.CID.parse('QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z')];
+const goCarV2Index = [
+  {
+    blockLength: 47,
+    blockOffset: 143,
+    cid: multiformats.CID.parse('QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z'),
+    length: 82,
+    offset: 108
+  },
+  {
+    blockLength: 99,
+    blockOffset: 226,
+    cid: multiformats.CID.parse('QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM'),
+    length: 135,
+    offset: 190
+  },
+  {
+    blockLength: 54,
+    blockOffset: 360,
+    cid: multiformats.CID.parse('Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE'),
+    length: 89,
+    offset: 325
+  },
+  {
+    blockLength: 4,
+    blockOffset: 451,
+    cid: multiformats.CID.parse('bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu'),
+    length: 41,
+    offset: 414
+  },
+  {
+    blockLength: 7,
+    blockOffset: 492,
+    cid: multiformats.CID.parse('bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju'),
+    length: 44,
+    offset: 455
+  }
+];
+const goCarV2Contents = {
+  QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z: {
+    Links: [{
+        Hash: multiformats.CID.parse('QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM'),
+        Name: '\uD83C\uDF64',
+        Tsize: 164
+      }]
+  },
+  QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM: {
+    Links: [
+      {
+        Hash: multiformats.CID.parse('Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE'),
+        Name: 'barreleye',
+        Tsize: 58
+      },
+      {
+        Hash: multiformats.CID.parse('bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju'),
+        Name: '\uD83D\uDC21',
+        Tsize: 7
+      }
+    ]
+  },
+  Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE: {
+    Links: [{
+        Hash: multiformats.CID.parse('bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu'),
+        Name: 'fishmonger',
+        Tsize: 4
+      }]
+  },
+  bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu: 'fish',
+  bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju: 'lobster'
+};
 
 exports.assert = assert;
 exports.carBytes = carBytes;
 exports.goCarBytes = goCarBytes;
 exports.goCarIndex = goCarIndex;
 exports.goCarRoots = goCarRoots;
+exports.goCarV2Bytes = goCarV2Bytes;
+exports.goCarV2Contents = goCarV2Contents;
+exports.goCarV2Index = goCarV2Index;
+exports.goCarV2Roots = goCarV2Roots;
 exports.makeData = makeData;
 exports.makeIterable = makeIterable;
 exports.rndCid = rndCid;

package/cjs/node-test/test-errors.js

@@ -26,42 +26,65 @@ describe('Misc errors', () => {
     });
   });
   it('bad version', async () => {
-    const buf2 = multiformats.bytes.fromHex('0aa16776657273696f6e02');
-    common.assert.strictEqual(multiformats.bytes.toHex(makeHeader({ version: 2 })), '0aa16776657273696f6e02');
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 2');
+    const buf2 = multiformats.bytes.fromHex('0aa16776657273696f6e03');
+    common.assert.strictEqual(multiformats.bytes.toHex(makeHeader({ version: 3 })), '0aa16776657273696f6e03');
+    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 3');
   });
-  it('bad header', async () => {
-    let buf2 = makeHeader({
-      version: 1,
-      roots: []
+  describe('bad header', async () => {
+    it('sanity check', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: []
+      });
+      await common.assert.isFulfilled(reader.CarReader.fromBytes(buf2));
     });
-    await common.assert.isFulfilled(reader.CarReader.fromBytes(buf2));
-    buf2 = makeHeader({ roots: [] });
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR version: undefined');
-    buf2 = makeHeader({
-      version: '1',
-      roots: []
+    it('no \'version\' array', async () => {
+      const buf2 = makeHeader({ roots: [] });
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
     });
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR version: "1"');
-    buf2 = makeHeader({ version: 1 });
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader({
-      version: 1,
-      roots: {}
+    it('bad \'version\' type', async () => {
+      const buf2 = makeHeader({
+        version: '1',
+        roots: []
+      });
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
     });
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader({
-      version: 1,
-      roots: [],
-      blip: true
+    it('no \'roots\' array', async () => {
+      const buf2 = makeHeader({ version: 1 });
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('bad \'roots\' type', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: {}
+      });
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('extraneous properties', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: [],
+        blip: true
+      });
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('not an object', async () => {
+      const buf2 = makeHeader([
+        1,
+        []
+      ]);
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('not an object', async () => {
+      const buf2 = makeHeader(null);
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('recursive v2 header', async () => {
+      const v2Header = common.goCarV2Bytes.slice(0, 51);
+      const buf2 = new Uint8Array(51 * 2);
+      buf2.set(v2Header, 0);
+      buf2.set(v2Header, 51);
+      await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 2 (expected 1)');
     });
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader([
-      1,
-      []
-    ]);
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader(null);
-    await common.assert.isRejected(reader.CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
   });
 });

package/cjs/node-test/test-indexer.js

@@ -15,6 +15,18 @@ describe('CarIndexer fromBytes()', () => {
     }
     common.assert.deepStrictEqual(indexData, common.goCarIndex);
   });
+  it('v2 complete', async () => {
+    const indexer$1 = await indexer.CarIndexer.fromBytes(common.goCarV2Bytes);
+    const roots = await indexer$1.getRoots();
+    common.assert.strictEqual(roots.length, 1);
+    common.assert(common.goCarV2Roots[0].equals(roots[0]));
+    common.assert.strictEqual(indexer$1.version, 2);
+    const indexData = [];
+    for await (const index of indexer$1) {
+      indexData.push(index);
+    }
+    common.assert.deepStrictEqual(indexData, common.goCarV2Index);
+  });
   it('bad argument', async () => {
     for (const arg of [
         true,

package/cjs/node-test/test-reader.js

@@ -2,11 +2,16 @@
 
 var reader = require('../lib/reader.js');
 var writer = require('../lib/writer.js');
+var decoder = require('../lib/decoder.js');
 var Block = require('multiformats/block');
 var sha2 = require('multiformats/hashes/sha2');
 var raw = require('multiformats/codecs/raw');
+var base64 = require('multiformats/bases/base64');
+var dagPb = require('@ipld/dag-pb');
 var common = require('./common.js');
 var verifyStoreReader = require('./verify-store-reader.js');
+var fixtures = require('./fixtures.js');
+var fixturesExpectations = require('./fixtures-expectations.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -28,6 +33,7 @@ function _interopNamespace(e) {
 
 var Block__namespace = /*#__PURE__*/_interopNamespace(Block);
 var raw__namespace = /*#__PURE__*/_interopNamespace(raw);
+var dagPb__namespace = /*#__PURE__*/_interopNamespace(dagPb);
 
 describe('CarReader fromBytes()', () => {
   it('complete', async () => {
@@ -66,6 +72,29 @@ describe('CarReader fromBytes()', () => {
       message: 'Unexpected end of data'
     });
   });
+  it('v2 complete', async () => {
+    const reader$1 = await reader.CarReader.fromBytes(common.goCarV2Bytes);
+    const roots = await reader$1.getRoots();
+    common.assert.strictEqual(roots.length, 1);
+    common.assert(common.goCarV2Roots[0].equals(roots[0]));
+    common.assert.strictEqual(reader$1.version, 2);
+    for (const {cid} of common.goCarV2Index) {
+      const block = await reader$1.get(cid);
+      common.assert.isDefined(block);
+      if (block) {
+        common.assert(cid.equals(block.cid));
+        let content;
+        if (cid.code === dagPb__namespace.code) {
+          content = dagPb__namespace.decode(block.bytes);
+        } else if (cid.code === 85) {
+          content = new TextDecoder().decode(block.bytes);
+        } else {
+          common.assert.fail('Unexpected codec');
+        }
+        common.assert.deepStrictEqual(content, common.goCarV2Contents[cid.toString()]);
+      }
+    }
+  });
   it('decode error - trailing null bytes', async () => {
     const bytes = new Uint8Array(common.carBytes.length + 5);
     bytes.set(common.carBytes);
@@ -192,4 +221,58 @@ describe('CarReader fromIterable()', () => {
       message: 'Unexpected end of data'
     });
   });
+  it('v2 decode error - truncated', async () => {
+    const bytes = common.goCarV2Bytes.slice();
+    const dv = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    dv.setBigUint64(35, BigInt(448 - 10), true);
+    await common.assert.isRejected(reader.CarReader.fromIterable(common.makeIterable(bytes, 64)), {
+      name: 'Error',
+      message: 'Unexpected end of data'
+    });
+  });
+});
+describe('Shared fixtures', () => {
+  describe('Header', () => {
+    for (const [name, {
+            version: expectedVersion,
+            err: expectedError
+          }] of Object.entries(fixturesExpectations.expectations)) {
+      it(name, async () => {
+        const data = base64.base64.baseDecode(fixtures.data[name]);
+        let header;
+        try {
+          header = await decoder.readHeader(decoder.bytesReader(data));
+        } catch (err) {
+          if (expectedError != null) {
+            common.assert.equal(err.message, expectedError);
+            return;
+          }
+          common.assert.ifError(err);
+        }
+        if (expectedError != null) {
+          common.assert.fail(`Expected error: ${ expectedError }`);
+        }
+        common.assert.isDefined(header, 'did not decode header');
+        if (expectedVersion != null && header != null) {
+          common.assert.strictEqual(header.version, expectedVersion);
+        }
+      });
+    }
+  });
+  describe('Contents', () => {
+    for (const [name, {cids: expectedCids}] of Object.entries(fixturesExpectations.expectations)) {
+      if (expectedCids == null) {
+        continue;
+      }
+      it(name, async () => {
+        const data = base64.base64.baseDecode(fixtures.data[name]);
+        const reader$1 = await reader.CarReader.fromBytes(data);
+        let i = 0;
+        for await (const cid of reader$1.cids()) {
+          common.assert.strictEqual(cid.toString(), expectedCids[i++]);
+        }
+        common.assert.strictEqual(i, expectedCids.length);
+      });
+    }
+  });
 });

package/esm/browser-test/common.js

@@ -186,6 +186,77 @@ const goCarIndex = [
     blockLength: 18
   }
 ];
+const goCarV2Bytes = bytes.fromHex('0aa16776657273696f6e02000000000000000000000000000000003300000000000000c001000000000000f30100000000000038a265726f6f747381d82a5823001220fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f86776657273696f6e01511220fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f8122d0a221220d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f6261204f09f8da418a40185011220d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f62612310a221220d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f1120962617272656c657965183a122e0a2401551220a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d1204f09f90a11807581220d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f112340a2401551220b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d120a666973686d6f6e67657218042801551220b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d666973682b01551220a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d6c6f62737465720100000028000000c800000000000000a2e1c40da1ae335d4dffe729eb4d5ca23b74b9e51fc535f4a804a261080c294d9401000000000000b474a99a2705e23cf905a484ec6d14ef58b56bbe62e9292783466ec363b5072d6b01000000000000d745b7757f5b4593eeab7820306c7bc64eb496a7410a0d07df7a34ffec4b97f11201000000000000d9c0d5376d26f1931f7ad52d7acc00fc1090d2edb0808bf61eeb0a152826f6268b00000000000000fb16f5083412ef1371d031ed4aa239903d84efdadf1ba3cd678e6475b1a232f83900000000000000');
+const goCarV2Roots = [CID.parse('QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z')];
+const goCarV2Index = [
+  {
+    blockLength: 47,
+    blockOffset: 143,
+    cid: CID.parse('QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z'),
+    length: 82,
+    offset: 108
+  },
+  {
+    blockLength: 99,
+    blockOffset: 226,
+    cid: CID.parse('QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM'),
+    length: 135,
+    offset: 190
+  },
+  {
+    blockLength: 54,
+    blockOffset: 360,
+    cid: CID.parse('Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE'),
+    length: 89,
+    offset: 325
+  },
+  {
+    blockLength: 4,
+    blockOffset: 451,
+    cid: CID.parse('bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu'),
+    length: 41,
+    offset: 414
+  },
+  {
+    blockLength: 7,
+    blockOffset: 492,
+    cid: CID.parse('bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju'),
+    length: 44,
+    offset: 455
+  }
+];
+const goCarV2Contents = {
+  QmfEoLyB5NndqeKieExd1rtJzTduQUPEV8TwAYcUiy3H5Z: {
+    Links: [{
+        Hash: CID.parse('QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM'),
+        Name: '\uD83C\uDF64',
+        Tsize: 164
+      }]
+  },
+  QmczfirA7VEH7YVvKPTPoU69XM3qY4DC39nnTsWd4K3SkM: {
+    Links: [
+      {
+        Hash: CID.parse('Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE'),
+        Name: 'barreleye',
+        Tsize: 58
+      },
+      {
+        Hash: CID.parse('bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju'),
+        Name: '\uD83D\uDC21',
+        Tsize: 7
+      }
+    ]
+  },
+  Qmcpz2FHJD7VAhg1fxFXdYJKePtkx1BsHuCrAgWVnaHMTE: {
+    Links: [{
+        Hash: CID.parse('bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu'),
+        Name: 'fishmonger',
+        Tsize: 4
+      }]
+  },
+  bafkreifuosuzujyf4i6psbneqtwg2fhplc2wxptc5euspa2gn3bwhnihfu: 'fish',
+  bafkreifc4hca3inognou377hfhvu2xfchn2ltzi7yu27jkaeujqqqdbjju: 'lobster'
+};
 export {
   toBlock,
   assert,
@@ -195,5 +266,9 @@ export {
   carBytes,
   goCarBytes,
   goCarRoots,
-  goCarIndex
+  goCarIndex,
+  goCarV2Bytes,
+  goCarV2Roots,
+  goCarV2Index,
+  goCarV2Contents
 };

package/esm/browser-test/test-errors.js

@@ -4,7 +4,8 @@ import { encode as vEncode } from 'varint';
 import { CarReader } from '../lib/reader-browser.js';
 import {
   carBytes,
-  assert
+  assert,
+  goCarV2Bytes
 } from './common.js';
 function makeHeader(block) {
   const u = cbEncode(block);
@@ -26,42 +27,65 @@ describe('Misc errors', () => {
     });
   });
   it('bad version', async () => {
-    const buf2 = bytes.fromHex('0aa16776657273696f6e02');
-    assert.strictEqual(bytes.toHex(makeHeader({ version: 2 })), '0aa16776657273696f6e02');
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 2');
+    const buf2 = bytes.fromHex('0aa16776657273696f6e03');
+    assert.strictEqual(bytes.toHex(makeHeader({ version: 3 })), '0aa16776657273696f6e03');
+    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 3');
   });
-  it('bad header', async () => {
-    let buf2 = makeHeader({
-      version: 1,
-      roots: []
+  describe('bad header', async () => {
+    it('sanity check', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: []
+      });
+      await assert.isFulfilled(CarReader.fromBytes(buf2));
     });
-    await assert.isFulfilled(CarReader.fromBytes(buf2));
-    buf2 = makeHeader({ roots: [] });
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR version: undefined');
-    buf2 = makeHeader({
-      version: '1',
-      roots: []
+    it('no \'version\' array', async () => {
+      const buf2 = makeHeader({ roots: [] });
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
     });
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR version: "1"');
-    buf2 = makeHeader({ version: 1 });
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader({
-      version: 1,
-      roots: {}
+    it('bad \'version\' type', async () => {
+      const buf2 = makeHeader({
+        version: '1',
+        roots: []
+      });
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
     });
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader({
-      version: 1,
-      roots: [],
-      blip: true
+    it('no \'roots\' array', async () => {
+      const buf2 = makeHeader({ version: 1 });
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('bad \'roots\' type', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: {}
+      });
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('extraneous properties', async () => {
+      const buf2 = makeHeader({
+        version: 1,
+        roots: [],
+        blip: true
+      });
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('not an object', async () => {
+      const buf2 = makeHeader([
+        1,
+        []
+      ]);
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('not an object', async () => {
+      const buf2 = makeHeader(null);
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
+    });
+    it('recursive v2 header', async () => {
+      const v2Header = goCarV2Bytes.slice(0, 51);
+      const buf2 = new Uint8Array(51 * 2);
+      buf2.set(v2Header, 0);
+      buf2.set(v2Header, 51);
+      await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR version: 2 (expected 1)');
     });
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader([
-      1,
-      []
-    ]);
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
-    buf2 = makeHeader(null);
-    await assert.isRejected(CarReader.fromBytes(buf2), Error, 'Invalid CAR header format');
   });
 });

package/esm/browser-test/test-indexer.js

@@ -2,6 +2,9 @@ import { CarIndexer } from '../lib/indexer.js';
 import {
   goCarBytes,
   goCarIndex,
+  goCarV2Bytes,
+  goCarV2Roots,
+  goCarV2Index,
   makeIterable,
   assert
 } from './common.js';
@@ -17,6 +20,18 @@ describe('CarIndexer fromBytes()', () => {
     }
     assert.deepStrictEqual(indexData, goCarIndex);
   });
+  it('v2 complete', async () => {
+    const indexer = await CarIndexer.fromBytes(goCarV2Bytes);
+    const roots = await indexer.getRoots();
+    assert.strictEqual(roots.length, 1);
+    assert(goCarV2Roots[0].equals(roots[0]));
+    assert.strictEqual(indexer.version, 2);
+    const indexData = [];
+    for await (const index of indexer) {
+      indexData.push(index);
+    }
+    assert.deepStrictEqual(indexData, goCarV2Index);
+  });
   it('bad argument', async () => {
     for (const arg of [
         true,

package/esm/browser-test/test-reader.js

@@ -1,12 +1,22 @@
 import { CarReader } from '../lib/reader-browser.js';
 import { CarWriter } from '../lib/writer-browser.js';
+import {
+  bytesReader,
+  readHeader
+} from '../lib/decoder.js';
 import * as Block from 'multiformats/block';
 import { sha256 } from 'multiformats/hashes/sha2';
 import * as raw from 'multiformats/codecs/raw';
+import { base64 } from 'multiformats/bases/base64';
+import * as dagPb from '@ipld/dag-pb';
 import {
   carBytes,
   makeIterable,
-  assert
+  assert,
+  goCarV2Bytes,
+  goCarV2Roots,
+  goCarV2Index,
+  goCarV2Contents
 } from './common.js';
 import {
   verifyRoots,
@@ -15,6 +25,8 @@ import {
   verifyBlocks,
   verifyCids
 } from './verify-store-reader.js';
+import { data as fixtures } from './fixtures.js';
+import { expectations as fixtureExpectations } from './fixtures-expectations.js';
 describe('CarReader fromBytes()', () => {
   it('complete', async () => {
     const reader = await CarReader.fromBytes(carBytes);
@@ -52,6 +64,29 @@ describe('CarReader fromBytes()', () => {
       message: 'Unexpected end of data'
     });
   });
+  it('v2 complete', async () => {
+    const reader = await CarReader.fromBytes(goCarV2Bytes);
+    const roots = await reader.getRoots();
+    assert.strictEqual(roots.length, 1);
+    assert(goCarV2Roots[0].equals(roots[0]));
+    assert.strictEqual(reader.version, 2);
+    for (const {cid} of goCarV2Index) {
+      const block = await reader.get(cid);
+      assert.isDefined(block);
+      if (block) {
+        assert(cid.equals(block.cid));
+        let content;
+        if (cid.code === dagPb.code) {
+          content = dagPb.decode(block.bytes);
+        } else if (cid.code === 85) {
+          content = new TextDecoder().decode(block.bytes);
+        } else {
+          assert.fail('Unexpected codec');
+        }
+        assert.deepStrictEqual(content, goCarV2Contents[cid.toString()]);
+      }
+    }
+  });
   it('decode error - trailing null bytes', async () => {
     const bytes = new Uint8Array(carBytes.length + 5);
     bytes.set(carBytes);
@@ -178,4 +213,58 @@ describe('CarReader fromIterable()', () => {
       message: 'Unexpected end of data'
     });
   });
+  it('v2 decode error - truncated', async () => {
+    const bytes = goCarV2Bytes.slice();
+    const dv = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    dv.setBigUint64(35, BigInt(448 - 10), true);
+    await assert.isRejected(CarReader.fromIterable(makeIterable(bytes, 64)), {
+      name: 'Error',
+      message: 'Unexpected end of data'
+    });
+  });
+});
+describe('Shared fixtures', () => {
+  describe('Header', () => {
+    for (const [name, {
+            version: expectedVersion,
+            err: expectedError
+          }] of Object.entries(fixtureExpectations)) {
+      it(name, async () => {
+        const data = base64.baseDecode(fixtures[name]);
+        let header;
+        try {
+          header = await readHeader(bytesReader(data));
+        } catch (err) {
+          if (expectedError != null) {
+            assert.equal(err.message, expectedError);
+            return;
+          }
+          assert.ifError(err);
+        }
+        if (expectedError != null) {
+          assert.fail(`Expected error: ${ expectedError }`);
+        }
+        assert.isDefined(header, 'did not decode header');
+        if (expectedVersion != null && header != null) {
+          assert.strictEqual(header.version, expectedVersion);
+        }
+      });
+    }
+  });
+  describe('Contents', () => {
+    for (const [name, {cids: expectedCids}] of Object.entries(fixtureExpectations)) {
+      if (expectedCids == null) {
+        continue;
+      }
+      it(name, async () => {
+        const data = base64.baseDecode(fixtures[name]);
+        const reader = await CarReader.fromBytes(data);
+        let i = 0;
+        for await (const cid of reader.cids()) {
+          assert.strictEqual(cid.toString(), expectedCids[i++]);
+        }
+        assert.strictEqual(i, expectedCids.length);
+      });
+    }
+  });
 });