@atcute/car 2.0.3 → 3.0.0

package/dist/atproto-repo.d.ts

@@ -1,17 +1,63 @@
 import * as CBOR from '@atcute/cbor';
 import * as CID from '@atcute/cid';
+import { type CarEntry } from './reader.js';
+export type BlockMap = Map<string, CarEntry>;
 export declare class RepoEntry {
+    /** The collection this record belongs to */
     readonly collection: string;
+    /** Record key */
     readonly rkey: string;
+    /** CID of this record */
     readonly cid: CID.CidLink;
     private blockmap;
-    constructor(collection: string, rkey: string, cid: CID.CidLink, blockmap: BlockMap);
+    constructor(
+    /** The collection this record belongs to */
+    collection: string, 
+    /** Record key */
+    rkey: string, 
+    /** CID of this record */
+    cid: CID.CidLink, blockmap: BlockMap);
+    /**
+     * returns the associated CarEntry for this record
+     */
+    get carEntry(): CarEntry;
+    /**
+     * returns the raw contents of this record
+     */
     get bytes(): Uint8Array;
+    /**
+     * returns the decoded contents of this record
+     */
     get record(): unknown;
 }
 export declare function iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry>;
+/**
+ * collects entries from a CAR archive into a mapping of CID string -> actual bytes
+ * @param iterator a generator that yields objects with a `cid` and `bytes` property
+ * @returns a mapping of CID string -> actual bytes
+ */
+export declare function collectBlock(iterator: Generator<CarEntry>): BlockMap;
+/**
+ * reads a block from the blockmap and validates it against the provided validation function
+ * @param map a mapping of CID string -> actual bytes
+ * @param link a CID link to read
+ * @param validate a validation function to validate the decoded data
+ * @returns the decoded and validated data
+ */
+export declare function readBlock<T>(map: BlockMap, link: CID.CidLink, validate: (value: unknown) => value is T): T;
+/** node entry object */
+export interface NodeEntry {
+    key: string;
+    cid: CID.CidLink;
+}
+/**
+ * walks the entries of a Merkle Sorted Tree (MST) in a depth-first manner
+ * @param map a mapping of CID string -> actual bytes
+ * @param pointer a CID link to the root of the MST
+ * @returns a generator that yields the entries of the MST
+ */
 export declare function walkMstEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry>;
-export type BlockMap = Map<string, Uint8Array>;
+/** commit object */
 export interface Commit {
     version: 3;
     did: string;
@@ -20,7 +66,13 @@ export interface Commit {
     prev: CID.CidLink | null;
     sig: CBOR.Bytes;
 }
+/**
+ * checks if a value is a valid commit object
+ * @param value the value to check
+ * @returns true if the value is a valid commit object, false otherwise
+ */
 export declare const isCommit: (value: unknown) => value is Commit;
+/** mst tree entry object */
 export interface TreeEntry {
     /** count of bytes shared with previous TreeEntry in this Node (if any) */
     p: number;
@@ -31,15 +83,22 @@ export interface TreeEntry {
     /** next subtree (to the right of leaf) */
     t: CID.CidLink | null;
 }
+/**
+ * checks if a value is a valid mst tree entry object
+ * @param value the value to check
+ * @returns true if the value is a valid mst tree entry object, false otherwise
+ */
 export declare const isTreeEntry: (value: unknown) => value is TreeEntry;
+/** mst node object */
 export interface MstNode {
     /** link to sub-tree Node on a lower level and with all keys sorting before keys at this node */
     l: CID.CidLink | null;
     /** ordered list of TreeEntry objects */
     e: TreeEntry[];
 }
+/**
+ * checks if a value is a valid mst node object
+ * @param value the value to check
+ * @returns true if the value is a valid mst node object, false otherwise
+ */
 export declare const isMstNode: (value: unknown) => value is MstNode;
-export interface NodeEntry {
-    key: string;
-    cid: CID.CidLink;
-}

package/dist/atproto-repo.js

@@ -7,47 +7,87 @@ export class RepoEntry {
     rkey;
     cid;
     blockmap;
-    constructor(collection, rkey, cid, blockmap) {
+    constructor(
+    /** The collection this record belongs to */
+    collection, 
+    /** Record key */
+    rkey, 
+    /** CID of this record */
+    cid, blockmap) {
         this.collection = collection;
         this.rkey = rkey;
         this.cid = cid;
         this.blockmap = blockmap;
     }
-    get bytes() {
+    /**
+     * returns the associated CarEntry for this record
+     */
+    get carEntry() {
         const cid = this.cid.$link;
-        const bytes = this.blockmap.get(cid);
-        assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
-        return bytes;
+        const entry = this.blockmap.get(cid);
+        assert(entry != null, `cid not found in blockmap; cid=${cid}`);
+        return entry;
+    }
+    /**
+     * returns the raw contents of this record
+     */
+    get bytes() {
+        return this.carEntry.bytes;
     }
+    /**
+     * returns the decoded contents of this record
+     */
     get record() {
         return CBOR.decode(this.bytes);
     }
 }
 export function* iterateAtpRepo(buf) {
-    const { roots, iterate } = readCar(buf);
+    const { header, iterate } = readCar(buf);
+    const roots = header.data.roots;
     assert(roots.length === 1, `expected only 1 root in the car archive; got=${roots.length}`);
-    // Collect all archive entries into a mapping of CID string -> actual bytes
-    const blockmap = new Map();
-    for (const entry of iterate()) {
-        blockmap.set(CID.toString(entry.cid), entry.bytes);
-    }
-    // Read the head, then walk through the MST tree from there.
-    const commit = readObject(blockmap, roots[0], isCommit);
+    const blockmap = collectBlock(iterate());
+    assert(blockmap.size > 0, `expected at least 1 block in the archive; got=${blockmap.size}`);
+    const commit = readBlock(blockmap, roots[0], isCommit);
     for (const { key, cid } of walkMstEntries(blockmap, commit.data)) {
         const [collection, rkey] = key.split('/');
         yield new RepoEntry(collection, rkey, cid, blockmap);
     }
 }
-function readObject(map, link, validate) {
+/**
+ * collects entries from a CAR archive into a mapping of CID string -> actual bytes
+ * @param iterator a generator that yields objects with a `cid` and `bytes` property
+ * @returns a mapping of CID string -> actual bytes
+ */
+export function collectBlock(iterator) {
+    const blockmap = new Map();
+    for (const entry of iterator) {
+        blockmap.set(CID.toString(entry.cid), entry);
+    }
+    return blockmap;
+}
+/**
+ * reads a block from the blockmap and validates it against the provided validation function
+ * @param map a mapping of CID string -> actual bytes
+ * @param link a CID link to read
+ * @param validate a validation function to validate the decoded data
+ * @returns the decoded and validated data
+ */
+export function readBlock(map, link, validate) {
     const cid = link.$link;
-    const bytes = map.get(cid);
-    assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
-    const data = CBOR.decode(bytes);
+    const entry = map.get(cid);
+    assert(entry != null, `cid not found in blockmap; cid=${cid}`);
+    const data = CBOR.decode(entry.bytes);
     assert(validate(data), `validation failed for cid=${cid}`);
     return data;
 }
+/**
+ * walks the entries of a Merkle Sorted Tree (MST) in a depth-first manner
+ * @param map a mapping of CID string -> actual bytes
+ * @param pointer a CID link to the root of the MST
+ * @returns a generator that yields the entries of the MST
+ */
 export function* walkMstEntries(map, pointer) {
-    const data = readObject(map, pointer, isMstNode);
+    const data = readBlock(map, pointer, isMstNode);
     const entries = data.e;
     let lastKey = '';
     if (data.l !== null) {
@@ -87,6 +127,11 @@ const isBytes = (value) => {
     }
     return '$bytes' in value && typeof value.$bytes === 'string';
 };
+/**
+ * checks if a value is a valid commit object
+ * @param value the value to check
+ * @returns true if the value is a valid commit object, false otherwise
+ */
 export const isCommit = (value) => {
     if (value === null || typeof value !== 'object') {
         return false;
@@ -99,6 +144,11 @@ export const isCommit = (value) => {
         (obj.prev === null || isCidLink(obj.prev)) &&
         isBytes(obj.sig));
 };
+/**
+ * checks if a value is a valid mst tree entry object
+ * @param value the value to check
+ * @returns true if the value is a valid mst tree entry object, false otherwise
+ */
 export const isTreeEntry = (value) => {
     if (value === null || typeof value !== 'object') {
         return false;
@@ -106,6 +156,11 @@ export const isTreeEntry = (value) => {
     const obj = value;
     return (typeof obj.p === 'number' && isBytes(obj.k) && isCidLink(obj.v) && (obj.t === null || isCidLink(obj.t)));
 };
+/**
+ * checks if a value is a valid mst node object
+ * @param value the value to check
+ * @returns true if the value is a valid mst node object, false otherwise
+ */
 export const isMstNode = (value) => {
     if (value === null || typeof value !== 'object') {
         return false;

package/dist/atproto-repo.js.map

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

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
-export { readCar } from './reader.js';
+export * from './atproto-repo.js';
+export * from './reader.js';

package/dist/index.js

@@ -1,3 +1,3 @@
-export { iterateAtpRepo } from './atproto-repo.js';
-export { readCar } from './reader.js';
+export * from './atproto-repo.js';
+export * from './reader.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAkB,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}

package/dist/reader.d.ts

@@ -1,7 +1,4 @@
-export declare const readCar: (buffer: Uint8Array) => {
-    roots: import("@atcute/cid").CidLink[];
-    iterate(): Generator<{
-        cid: import("@atcute/cid").Cid;
-        bytes: Uint8Array;
-    }>;
-};
+import { type SyncCarReader } from './utilities/sync-car-reader.js';
+export type { CarEntry, CarHeader, CarV1Header } from './utilities/car.js';
+export type { SyncCarReader } from './utilities/sync-car-reader.js';
+export declare const readCar: (buffer: Uint8Array) => SyncCarReader;

package/dist/reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"reader.js","sourceRoot":"","sources":["../lib/reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAkB,EAAE,EAAE;IAC7C,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC"}
+{"version":3,"file":"reader.js","sourceRoot":"","sources":["../lib/reader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAsB,MAAM,gCAAgC,CAAC;AAKrF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,MAAkB,EAAiB,EAAE;IAC5D,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC"}

package/dist/utilities/car.d.ts

@@ -4,3 +4,20 @@ export interface CarV1Header {
     roots: CID.CidLink[];
 }
 export declare const isCarV1Header: (value: unknown) => value is CarV1Header;
+export interface CarHeader {
+    headerStart: number;
+    headerEnd: number;
+    data: CarV1Header;
+    dataStart: number;
+    dataEnd: number;
+}
+export interface CarEntry {
+    entryStart: number;
+    entryEnd: number;
+    cid: CID.Cid;
+    cidStart: number;
+    cidEnd: number;
+    bytes: Uint8Array;
+    bytesStart: number;
+    bytesEnd: number;
+}

package/dist/utilities/sync-byte-reader.js

@@ -11,7 +11,7 @@ export const createUint8Reader = (buf) => {
             pos += size;
         },
         upto(size) {
-            return buf.subarray(pos, pos + Math.min(size, buf.length - pos));
+            return buf.subarray(pos, pos + size);
         },
         exactly(size, seek) {
             if (size > buf.length - pos) {

package/dist/utilities/sync-byte-reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-byte-reader.js","sourceRoot":"","sources":["../../lib/utilities/sync-byte-reader.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAe,EAAkB,EAAE;IACpE,IAAI,GAAG,GAAG,CAAC,CAAC;IAEZ,OAAO;QACN,IAAI,GAAG;YACN,OAAO,GAAG,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,IAAI;YACR,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC7B,MAAM,IAAI,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAChD,CAAC;YAED,GAAG,IAAI,IAAI,CAAC;QACb,CAAC;QACD,IAAI,CAAC,IAAI;YACR,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,IAAI;YACjB,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC7B,MAAM,IAAI,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAChD,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACV,GAAG,IAAI,IAAI,CAAC;YACb,CAAC;YAED,OAAO,KAAK,CAAC;QACd,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"sync-byte-reader.js","sourceRoot":"","sources":["../../lib/utilities/sync-byte-reader.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAe,EAAkB,EAAE;IACpE,IAAI,GAAG,GAAG,CAAC,CAAC;IAEZ,OAAO;QACN,IAAI,GAAG;YACN,OAAO,GAAG,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,IAAI;YACR,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC7B,MAAM,IAAI,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAChD,CAAC;YAED,GAAG,IAAI,IAAI,CAAC;QACb,CAAC;QACD,IAAI,CAAC,IAAI;YACR,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,IAAI;YACjB,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBAC7B,MAAM,IAAI,UAAU,CAAC,wBAAwB,CAAC,CAAC;YAChD,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACV,GAAG,IAAI,IAAI,CAAC;YACb,CAAC;YAED,OAAO,KAAK,CAAC;QACd,CAAC;KACD,CAAC;AACH,CAAC,CAAC"}

package/dist/utilities/sync-car-reader.d.ts

@@ -1,10 +1,7 @@
-import * as CBOR from '@atcute/cbor';
-import * as CID from '@atcute/cid';
+import { type CarEntry, type CarHeader } from './car.js';
 import type { SyncByteReader } from './sync-byte-reader.js';
-export declare const createCarReader: (reader: SyncByteReader) => {
-    roots: CBOR.CidLink[];
-    iterate(): Generator<{
-        cid: CID.Cid;
-        bytes: Uint8Array;
-    }>;
-};
+export interface SyncCarReader {
+    header: CarHeader;
+    iterate(): Generator<CarEntry>;
+}
+export declare const createCarReader: (reader: SyncByteReader) => SyncCarReader;

package/dist/utilities/sync-car-reader.js

@@ -12,65 +12,78 @@ const readVarint = (reader, size) => {
     return int;
 };
 const readHeader = (reader) => {
+    const headerStart = reader.pos;
     const length = readVarint(reader, 8);
     if (length === 0) {
         throw new RangeError(`invalid car header; length=0`);
     }
+    const dataStart = reader.pos;
     const rawHeader = reader.exactly(length, true);
-    const header = CBOR.decode(rawHeader);
-    if (!isCarV1Header(header)) {
+    const data = CBOR.decode(rawHeader);
+    if (!isCarV1Header(data)) {
         throw new TypeError(`expected a car v1 archive`);
     }
-    return header;
+    const dataEnd = reader.pos;
+    const headerEnd = dataEnd;
+    return { data, headerStart, headerEnd, dataStart, dataEnd };
 };
 const readCid = (reader) => {
-    const head = reader.upto(3 + 4);
+    const head = reader.exactly(4, false);
     const version = head[0];
     const codec = head[1];
-    const digestCodec = head[2];
+    const digestType = head[2];
+    const digestSize = head[3];
     if (version !== CID.CID_VERSION) {
         throw new RangeError(`incorrect cid version (got v${version})`);
     }
     if (codec !== CID.CODEC_DCBOR && codec !== CID.CODEC_RAW) {
         throw new RangeError(`incorrect cid codec (got 0x${codec.toString(16)})`);
     }
-    if (digestCodec !== CID.HASH_SHA256) {
-        throw new RangeError(`incorrect cid hash type (got 0x${digestCodec.toString(16)})`);
+    if (digestType !== CID.HASH_SHA256) {
+        throw new RangeError(`incorrect cid hash type (got 0x${digestType.toString(16)})`);
     }
-    const [digestSize, digestLebSize] = varint.decode(head, 3);
-    const bytes = reader.exactly(3 + digestLebSize + digestSize, true);
-    const digest = bytes.subarray(3 + digestLebSize);
+    if (digestSize !== 32 && digestSize !== 0) {
+        throw new RangeError(`incorrect cid digest size (got ${digestSize})`);
+    }
+    const bytes = reader.exactly(4 + digestSize, true);
+    const digest = bytes.subarray(4, 4 + digestSize);
     const cid = {
         version: version,
         codec: codec,
         digest: {
-            codec: digestCodec,
+            codec: digestType,
             contents: digest,
         },
         bytes: bytes,
     };
     return cid;
 };
-const readBlockHeader = (reader) => {
-    const start = reader.pos;
-    let size = readVarint(reader, 8);
-    if (size === 0) {
-        throw new Error(`invalid car section; length=0`);
-    }
-    size += reader.pos - start;
-    const cid = readCid(reader);
-    const blockSize = size - (reader.pos - start);
-    return { cid, blockSize };
-};
 export const createCarReader = (reader) => {
-    const { roots } = readHeader(reader);
+    const header = readHeader(reader);
     return {
-        roots,
+        header,
         *iterate() {
-            while (reader.upto(8).length > 0) {
-                const { cid, blockSize } = readBlockHeader(reader);
-                const bytes = reader.exactly(blockSize, true);
-                yield { cid, bytes };
+            while (reader.upto(8 + 36).length > 0) {
+                const entryStart = reader.pos;
+                const entrySize = readVarint(reader, 8);
+                const cidStart = reader.pos;
+                const cid = readCid(reader);
+                const bytesStart = reader.pos;
+                const bytesSize = entrySize - (bytesStart - cidStart);
+                const bytes = reader.exactly(bytesSize, true);
+                const cidEnd = bytesStart;
+                const bytesEnd = reader.pos;
+                const entryEnd = bytesEnd;
+                yield {
+                    cid,
+                    bytes,
+                    entryStart,
+                    entryEnd,
+                    cidStart,
+                    cidEnd,
+                    bytesStart,
+                    bytesEnd,
+                };
             }
         },
     };

package/dist/utilities/sync-car-reader.js.map

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

package/lib/atproto-repo.ts

@@ -1,44 +1,60 @@
 import * as CBOR from '@atcute/cbor';
 import * as CID from '@atcute/cid';
 
-import { readCar } from './reader.js';
+import { readCar, type CarEntry } from './reader.js';
 
 const decoder = new TextDecoder();
 
+export type BlockMap = Map<string, CarEntry>;
+
 export class RepoEntry {
 	constructor(
+		/** The collection this record belongs to */
 		public readonly collection: string,
+		/** Record key */
 		public readonly rkey: string,
+		/** CID of this record */
 		public readonly cid: CID.CidLink,
 		private blockmap: BlockMap,
 	) {}
 
-	get bytes(): Uint8Array {
+	/**
+	 * returns the associated CarEntry for this record
+	 */
+	get carEntry(): CarEntry {
 		const cid = this.cid.$link;
 
-		const bytes = this.blockmap.get(cid);
-		assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
+		const entry = this.blockmap.get(cid);
+		assert(entry != null, `cid not found in blockmap; cid=${cid}`);
+
+		return entry;
+	}
 
-		return bytes;
+	/**
+	 * returns the raw contents of this record
+	 */
+	get bytes(): Uint8Array {
+		return this.carEntry.bytes;
 	}
 
+	/**
+	 * returns the decoded contents of this record
+	 */
 	get record(): unknown {
 		return CBOR.decode(this.bytes);
 	}
 }
 
 export function* iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry> {
-	const { roots, iterate } = readCar(buf);
+	const { header, iterate } = readCar(buf);
+	const roots = header.data.roots;
+
 	assert(roots.length === 1, `expected only 1 root in the car archive; got=${roots.length}`);
 
-	// Collect all archive entries into a mapping of CID string -> actual bytes
-	const blockmap: BlockMap = new Map();
-	for (const entry of iterate()) {
-		blockmap.set(CID.toString(entry.cid), entry.bytes);
-	}
+	const blockmap = collectBlock(iterate());
+	assert(blockmap.size > 0, `expected at least 1 block in the archive; got=${blockmap.size}`);
 
-	// Read the head, then walk through the MST tree from there.
-	const commit = readObject(blockmap, roots[0], isCommit);
+	const commit = readBlock(blockmap, roots[0], isCommit);
 	for (const { key, cid } of walkMstEntries(blockmap, commit.data)) {
 		const [collection, rkey] = key.split('/');
 
@@ -46,20 +62,53 @@ export function* iterateAtpRepo(buf: Uint8Array): Generator<RepoEntry> {
 	}
 }
 
-function readObject<T>(map: BlockMap, link: CID.CidLink, validate: (value: unknown) => value is T): T {
+/**
+ * collects entries from a CAR archive into a mapping of CID string -> actual bytes
+ * @param iterator a generator that yields objects with a `cid` and `bytes` property
+ * @returns a mapping of CID string -> actual bytes
+ */
+export function collectBlock(iterator: Generator<CarEntry>): BlockMap {
+	const blockmap: BlockMap = new Map();
+	for (const entry of iterator) {
+		blockmap.set(CID.toString(entry.cid), entry);
+	}
+
+	return blockmap;
+}
+
+/**
+ * reads a block from the blockmap and validates it against the provided validation function
+ * @param map a mapping of CID string -> actual bytes
+ * @param link a CID link to read
+ * @param validate a validation function to validate the decoded data
+ * @returns the decoded and validated data
+ */
+export function readBlock<T>(map: BlockMap, link: CID.CidLink, validate: (value: unknown) => value is T): T {
 	const cid = link.$link;
 
-	const bytes = map.get(cid);
-	assert(bytes != null, `cid not found in blockmap; cid=${cid}`);
+	const entry = map.get(cid);
+	assert(entry != null, `cid not found in blockmap; cid=${cid}`);
 
-	const data = CBOR.decode(bytes);
+	const data = CBOR.decode(entry.bytes);
 	assert(validate(data), `validation failed for cid=${cid}`);
 
 	return data;
 }
 
+/** node entry object */
+export interface NodeEntry {
+	key: string;
+	cid: CID.CidLink;
+}
+
+/**
+ * walks the entries of a Merkle Sorted Tree (MST) in a depth-first manner
+ * @param map a mapping of CID string -> actual bytes
+ * @param pointer a CID link to the root of the MST
+ * @returns a generator that yields the entries of the MST
+ */
 export function* walkMstEntries(map: BlockMap, pointer: CID.CidLink): Generator<NodeEntry> {
-	const data = readObject(map, pointer, isMstNode);
+	const data = readBlock(map, pointer, isMstNode);
 	const entries = data.e;
 
 	let lastKey = '';
@@ -90,8 +139,6 @@ function assert(condition: boolean, message: string): asserts condition {
 	}
 }
 
-export type BlockMap = Map<string, Uint8Array>;
-
 const isCidLink = (value: unknown): value is CID.CidLink => {
 	if (value instanceof CID.CidLinkWrapper) {
 		return true;
@@ -116,6 +163,7 @@ const isBytes = (value: unknown): value is CBOR.Bytes => {
 	return '$bytes' in value && typeof value.$bytes === 'string';
 };
 
+/** commit object */
 export interface Commit {
 	version: 3;
 	did: string;
@@ -125,6 +173,11 @@ export interface Commit {
 	sig: CBOR.Bytes;
 }
 
+/**
+ * checks if a value is a valid commit object
+ * @param value the value to check
+ * @returns true if the value is a valid commit object, false otherwise
+ */
 export const isCommit = (value: unknown): value is Commit => {
 	if (value === null || typeof value !== 'object') {
 		return false;
@@ -142,6 +195,7 @@ export const isCommit = (value: unknown): value is Commit => {
 	);
 };
 
+/** mst tree entry object */
 export interface TreeEntry {
 	/** count of bytes shared with previous TreeEntry in this Node (if any) */
 	p: number;
@@ -153,6 +207,11 @@ export interface TreeEntry {
 	t: CID.CidLink | null;
 }
 
+/**
+ * checks if a value is a valid mst tree entry object
+ * @param value the value to check
+ * @returns true if the value is a valid mst tree entry object, false otherwise
+ */
 export const isTreeEntry = (value: unknown): value is TreeEntry => {
 	if (value === null || typeof value !== 'object') {
 		return false;
@@ -165,6 +224,7 @@ export const isTreeEntry = (value: unknown): value is TreeEntry => {
 	);
 };
 
+/** mst node object */
 export interface MstNode {
 	/** link to sub-tree Node on a lower level and with all keys sorting before keys at this node */
 	l: CID.CidLink | null;
@@ -172,6 +232,11 @@ export interface MstNode {
 	e: TreeEntry[];
 }
 
+/**
+ * checks if a value is a valid mst node object
+ * @param value the value to check
+ * @returns true if the value is a valid mst node object, false otherwise
+ */
 export const isMstNode = (value: unknown): value is MstNode => {
 	if (value === null || typeof value !== 'object') {
 		return false;
@@ -181,8 +246,3 @@ export const isMstNode = (value: unknown): value is MstNode => {
 
 	return (obj.l === null || isCidLink(obj.l)) && Array.isArray(obj.e) && obj.e.every(isTreeEntry);
 };
-
-export interface NodeEntry {
-	key: string;
-	cid: CID.CidLink;
-}

package/lib/index.ts

@@ -1,2 +1,2 @@
-export { iterateAtpRepo, type RepoEntry } from './atproto-repo.js';
-export { readCar } from './reader.js';
+export * from './atproto-repo.js';
+export * from './reader.js';

package/lib/reader.ts

@@ -1,7 +1,10 @@
 import { createUint8Reader } from './utilities/sync-byte-reader.js';
-import { createCarReader } from './utilities/sync-car-reader.js';
+import { createCarReader, type SyncCarReader } from './utilities/sync-car-reader.js';
 
-export const readCar = (buffer: Uint8Array) => {
+export type { CarEntry, CarHeader, CarV1Header } from './utilities/car.js';
+export type { SyncCarReader } from './utilities/sync-car-reader.js';
+
+export const readCar = (buffer: Uint8Array): SyncCarReader => {
 	const reader = createUint8Reader(buffer);
 	return createCarReader(reader);
 };

package/lib/utilities/car.ts

@@ -14,3 +14,25 @@ export const isCarV1Header = (value: unknown): value is CarV1Header => {
 	const { version, roots } = value as CarV1Header;
 	return version === 1 && Array.isArray(roots) && roots.every((root) => root instanceof CBOR.CidLinkWrapper);
 };
+
+export interface CarHeader {
+	headerStart: number;
+	headerEnd: number;
+
+	data: CarV1Header;
+	dataStart: number;
+	dataEnd: number;
+}
+
+export interface CarEntry {
+	entryStart: number;
+	entryEnd: number;
+
+	cid: CID.Cid;
+	cidStart: number;
+	cidEnd: number;
+
+	bytes: Uint8Array;
+	bytesStart: number;
+	bytesEnd: number;
+}

package/lib/utilities/sync-byte-reader.ts

@@ -21,7 +21,7 @@ export const createUint8Reader = (buf: Uint8Array): SyncByteReader => {
 			pos += size;
 		},
 		upto(size) {
-			return buf.subarray(pos, pos + Math.min(size, buf.length - pos));
+			return buf.subarray(pos, pos + size);
 		},
 		exactly(size, seek) {
 			if (size > buf.length - pos) {

package/lib/utilities/sync-car-reader.ts

@@ -2,9 +2,14 @@ import * as CBOR from '@atcute/cbor';
 import * as CID from '@atcute/cid';
 import * as varint from '@atcute/varint';
 
-import { isCarV1Header, type CarV1Header } from './car.js';
+import { isCarV1Header, type CarEntry, type CarHeader } from './car.js';
 import type { SyncByteReader } from './sync-byte-reader.js';
 
+export interface SyncCarReader {
+	header: CarHeader;
+	iterate(): Generator<CarEntry>;
+}
+
 const readVarint = (reader: SyncByteReader, size: number): number => {
 	const buf = reader.upto(size);
 	if (buf.length === 0) {
@@ -17,27 +22,34 @@ const readVarint = (reader: SyncByteReader, size: number): number => {
 	return int;
 };
 
-const readHeader = (reader: SyncByteReader): CarV1Header => {
+const readHeader = (reader: SyncByteReader): CarHeader => {
+	const headerStart = reader.pos;
 	const length = readVarint(reader, 8);
 	if (length === 0) {
 		throw new RangeError(`invalid car header; length=0`);
 	}
 
+	const dataStart = reader.pos;
 	const rawHeader = reader.exactly(length, true);
-	const header = CBOR.decode(rawHeader);
-	if (!isCarV1Header(header)) {
+
+	const data = CBOR.decode(rawHeader);
+	if (!isCarV1Header(data)) {
 		throw new TypeError(`expected a car v1 archive`);
 	}
 
-	return header;
+	const dataEnd = reader.pos;
+	const headerEnd = dataEnd;
+
+	return { data, headerStart, headerEnd, dataStart, dataEnd };
 };
 
 const readCid = (reader: SyncByteReader): CID.Cid => {
-	const head = reader.upto(3 + 4);
+	const head = reader.exactly(4, false);
 
 	const version = head[0];
 	const codec = head[1];
-	const digestCodec = head[2];
+	const digestType = head[2];
+	const digestSize = head[3];
 
 	if (version !== CID.CID_VERSION) {
 		throw new RangeError(`incorrect cid version (got v${version})`);
@@ -47,20 +59,22 @@ const readCid = (reader: SyncByteReader): CID.Cid => {
 		throw new RangeError(`incorrect cid codec (got 0x${codec.toString(16)})`);
 	}
 
-	if (digestCodec !== CID.HASH_SHA256) {
-		throw new RangeError(`incorrect cid hash type (got 0x${digestCodec.toString(16)})`);
+	if (digestType !== CID.HASH_SHA256) {
+		throw new RangeError(`incorrect cid hash type (got 0x${digestType.toString(16)})`);
 	}
 
-	const [digestSize, digestLebSize] = varint.decode(head, 3);
+	if (digestSize !== 32 && digestSize !== 0) {
+		throw new RangeError(`incorrect cid digest size (got ${digestSize})`);
+	}
 
-	const bytes = reader.exactly(3 + digestLebSize + digestSize, true);
-	const digest = bytes.subarray(3 + digestLebSize);
+	const bytes = reader.exactly(4 + digestSize, true);
+	const digest = bytes.subarray(4, 4 + digestSize);
 
 	const cid: CID.Cid = {
 		version: version,
 		codec: codec,
 		digest: {
-			codec: digestCodec,
+			codec: digestType,
 			contents: digest,
 		},
 		bytes: bytes,
@@ -69,33 +83,38 @@ const readCid = (reader: SyncByteReader): CID.Cid => {
 	return cid;
 };
 
-const readBlockHeader = (reader: SyncByteReader): { cid: CID.Cid; blockSize: number } => {
-	const start = reader.pos;
-
-	let size = readVarint(reader, 8);
-	if (size === 0) {
-		throw new Error(`invalid car section; length=0`);
-	}
-
-	size += reader.pos - start;
-
-	const cid = readCid(reader);
-	const blockSize = size - (reader.pos - start);
-
-	return { cid, blockSize };
-};
-
-export const createCarReader = (reader: SyncByteReader) => {
-	const { roots } = readHeader(reader);
+export const createCarReader = (reader: SyncByteReader): SyncCarReader => {
+	const header = readHeader(reader);
 
 	return {
-		roots,
-		*iterate(): Generator<{ cid: CID.Cid; bytes: Uint8Array }> {
-			while (reader.upto(8).length > 0) {
-				const { cid, blockSize } = readBlockHeader(reader);
-				const bytes = reader.exactly(blockSize, true);
-
-				yield { cid, bytes };
+		header,
+		*iterate() {
+			while (reader.upto(8 + 36).length > 0) {
+				const entryStart = reader.pos;
+				const entrySize = readVarint(reader, 8);
+
+				const cidStart = reader.pos;
+				const cid = readCid(reader);
+
+				const bytesStart = reader.pos;
+				const bytesSize = entrySize - (bytesStart - cidStart);
+				const bytes = reader.exactly(bytesSize, true);
+
+				const cidEnd = bytesStart;
+				const bytesEnd = reader.pos;
+				const entryEnd = bytesEnd;
+
+				yield {
+					cid,
+					bytes,
+
+					entryStart,
+					entryEnd,
+					cidStart,
+					cidEnd,
+					bytesStart,
+					bytesEnd,
+				};
 			}
 		},
 	};

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@atcute/car",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "description": "lightweight DASL CAR and atproto repository decoder for AT Protocol.",
   "keywords": [
     "atproto",
@@ -28,9 +28,9 @@
     "@atcute/multibase": "^1.1.2"
   },
   "dependencies": {
-    "@atcute/cbor": "^2.1.3",
+    "@atcute/cid": "^2.2.0",
     "@atcute/varint": "^1.0.2",
-    "@atcute/cid": "^2.1.0"
+    "@atcute/cbor": "^2.2.0"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",