@atproto/repo 0.3.9 → 0.4.1

package/dist/util.js

@@ -0,0 +1,219 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureV3Commit = exports.cidForRecord = exports.cborToLexRecord = exports.cborToLex = exports.verifyCommitSig = exports.signCommit = exports.metaEqual = exports.formatDataKey = exports.parseDataKey = exports.ensureCreates = exports.diffToWriteDescripts = exports.readCarWithRoot = exports.readCarStream = exports.readCar = exports.carToBlocks = exports.blocksToCarFile = exports.blocksToCarStream = exports.writeCar = exports.writeCarStream = exports.verifyIncomingCarBlocks = void 0;
+const promises_1 = require("node:timers/promises");
+const cbor = __importStar(require("@ipld/dag-cbor"));
+const iterator_1 = require("@ipld/car/iterator");
+const writer_1 = require("@ipld/car/writer");
+const common_1 = require("@atproto/common");
+const lexicon_1 = require("@atproto/lexicon");
+const crypto = __importStar(require("@atproto/crypto"));
+const types_1 = require("./types");
+const block_map_1 = __importDefault(require("./block-map"));
+async function* verifyIncomingCarBlocks(car) {
+    for await (const block of car) {
+        await (0, common_1.verifyCidForBytes)(block.cid, block.bytes);
+        yield block;
+    }
+}
+exports.verifyIncomingCarBlocks = verifyIncomingCarBlocks;
+// we have to turn the car writer output into a stream in order to properly handle errors
+function writeCarStream(root, fn) {
+    const { writer, out } = root !== null ? writer_1.CarWriter.create(root) : writer_1.CarWriter.create();
+    const stream = (0, common_1.byteIterableToStream)(out);
+    fn(writer)
+        .catch((err) => {
+        stream.destroy(err);
+    })
+        .finally(() => writer.close());
+    return stream;
+}
+exports.writeCarStream = writeCarStream;
+async function* writeCar(root, fn) {
+    const stream = writeCarStream(root, fn);
+    for await (const chunk of stream) {
+        yield chunk;
+    }
+}
+exports.writeCar = writeCar;
+const blocksToCarStream = (root, blocks) => {
+    return writeCar(root, async (writer) => {
+        for (const entry of blocks.entries()) {
+            await writer.put(entry);
+        }
+    });
+};
+exports.blocksToCarStream = blocksToCarStream;
+const blocksToCarFile = (root, blocks) => {
+    const carStream = (0, exports.blocksToCarStream)(root, blocks);
+    return (0, common_1.streamToBuffer)(carStream);
+};
+exports.blocksToCarFile = blocksToCarFile;
+const carToBlocks = async (car) => {
+    const roots = await car.getRoots();
+    const blocks = new block_map_1.default();
+    for await (const block of verifyIncomingCarBlocks(car)) {
+        blocks.set(block.cid, block.bytes);
+        // break up otherwise "synchronous" work in car parsing
+        await (0, promises_1.setImmediate)();
+    }
+    return {
+        roots,
+        blocks,
+    };
+};
+exports.carToBlocks = carToBlocks;
+const readCar = async (bytes) => {
+    const car = await iterator_1.CarBlockIterator.fromBytes(bytes);
+    return (0, exports.carToBlocks)(car);
+};
+exports.readCar = readCar;
+const readCarStream = async (stream) => {
+    const car = await iterator_1.CarBlockIterator.fromIterable(stream);
+    return (0, exports.carToBlocks)(car);
+};
+exports.readCarStream = readCarStream;
+const readCarWithRoot = async (bytes) => {
+    const { roots, blocks } = await (0, exports.readCar)(bytes);
+    if (roots.length !== 1) {
+        throw new Error(`Expected one root, got ${roots.length}`);
+    }
+    const root = roots[0];
+    return {
+        root,
+        blocks,
+    };
+};
+exports.readCarWithRoot = readCarWithRoot;
+const diffToWriteDescripts = (diff) => {
+    return Promise.all([
+        ...diff.addList().map(async (add) => {
+            const { collection, rkey } = (0, exports.parseDataKey)(add.key);
+            return {
+                action: types_1.WriteOpAction.Create,
+                collection,
+                rkey,
+                cid: add.cid,
+            };
+        }),
+        ...diff.updateList().map(async (upd) => {
+            const { collection, rkey } = (0, exports.parseDataKey)(upd.key);
+            return {
+                action: types_1.WriteOpAction.Update,
+                collection,
+                rkey,
+                cid: upd.cid,
+                prev: upd.prev,
+            };
+        }),
+        ...diff.deleteList().map((del) => {
+            const { collection, rkey } = (0, exports.parseDataKey)(del.key);
+            return {
+                action: types_1.WriteOpAction.Delete,
+                collection,
+                rkey,
+                cid: del.cid,
+            };
+        }),
+    ]);
+};
+exports.diffToWriteDescripts = diffToWriteDescripts;
+const ensureCreates = (descripts) => {
+    const creates = [];
+    for (const descript of descripts) {
+        if (descript.action !== types_1.WriteOpAction.Create) {
+            throw new Error(`Unexpected action: ${descript.action}`);
+        }
+        else {
+            creates.push(descript);
+        }
+    }
+    return creates;
+};
+exports.ensureCreates = ensureCreates;
+const parseDataKey = (key) => {
+    const parts = key.split('/');
+    if (parts.length !== 2)
+        throw new Error(`Invalid record key: ${key}`);
+    return { collection: parts[0], rkey: parts[1] };
+};
+exports.parseDataKey = parseDataKey;
+const formatDataKey = (collection, rkey) => {
+    return collection + '/' + rkey;
+};
+exports.formatDataKey = formatDataKey;
+const metaEqual = (a, b) => {
+    return a.did === b.did && a.version === b.version;
+};
+exports.metaEqual = metaEqual;
+const signCommit = async (unsigned, keypair) => {
+    const encoded = cbor.encode(unsigned);
+    const sig = await keypair.sign(encoded);
+    return {
+        ...unsigned,
+        sig,
+    };
+};
+exports.signCommit = signCommit;
+const verifyCommitSig = async (commit, didKey) => {
+    const { sig, ...rest } = commit;
+    const encoded = cbor.encode(rest);
+    return crypto.verifySignature(didKey, encoded, sig);
+};
+exports.verifyCommitSig = verifyCommitSig;
+const cborToLex = (val) => {
+    return (0, lexicon_1.ipldToLex)((0, common_1.cborDecode)(val));
+};
+exports.cborToLex = cborToLex;
+const cborToLexRecord = (val) => {
+    const parsed = (0, exports.cborToLex)(val);
+    if (!common_1.check.is(parsed, common_1.schema.map)) {
+        throw new Error('lexicon records be a json object');
+    }
+    return parsed;
+};
+exports.cborToLexRecord = cborToLexRecord;
+const cidForRecord = async (val) => {
+    return (0, common_1.cidForCbor)((0, lexicon_1.lexToIpld)(val));
+};
+exports.cidForRecord = cidForRecord;
+const ensureV3Commit = (commit) => {
+    if (commit.version === 3) {
+        return commit;
+    }
+    else {
+        return {
+            ...commit,
+            version: 3,
+            rev: commit.rev ?? common_1.TID.nextStr(),
+        };
+    }
+};
+exports.ensureV3Commit = ensureV3Commit;
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

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

package/jest.config.js

@@ -1,6 +1,6 @@
-const base = require('../../jest.config.base.js')
-
+/** @type {import('jest').Config} */
 module.exports = {
-  ...base,
   displayName: 'Repo',
+  transform: { '^.+\\.(t|j)s$': '@swc/jest' },
+  setupFiles: ['<rootDir>/../../jest.setup.ts'],
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/repo",
-  "version": "0.3.9",
+  "version": "0.4.1",
   "license": "MIT",
   "description": "atproto repo and MST implementation",
   "keywords": [
@@ -14,27 +14,24 @@
     "directory": "packages/repo"
   },
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "dependencies": {
     "@ipld/car": "^3.2.3",
     "@ipld/dag-cbor": "^7.0.0",
     "multiformats": "^9.9.0",
     "uint8arrays": "3.0.0",
-    "zod": "^3.21.4",
-    "@atproto/common": "^0.3.4",
-    "@atproto/common-web": "^0.2.4",
-    "@atproto/crypto": "^0.3.0",
-    "@atproto/identity": "^0.3.3",
-    "@atproto/lexicon": "^0.3.3",
-    "@atproto/syntax": "^0.2.1"
+    "zod": "^3.23.8",
+    "@atproto/common": "^0.4.1",
+    "@atproto/common-web": "^0.3.0",
+    "@atproto/crypto": "^0.4.0",
+    "@atproto/lexicon": "^0.4.0"
+  },
+  "devDependencies": {
+    "jest": "^28.1.2"
   },
   "scripts": {
     "test": "jest",
     "test:profile": "node --inspect ../../node_modules/.bin/jest",
-    "bench": "jest --config jest.bench.config.js",
-    "bench:profile": "node --inspect-brk ../../node_modules/.bin/jest --config jest.bench.config.js",
-    "build": "node ./build.js",
-    "postbuild": "tsc --build tsconfig.build.json",
-    "update-main-to-dist": "node ../../update-main-to-dist.js packages/repo"
-  },
-  "types": "dist/index.d.ts"
+    "build": "tsc --build tsconfig.build.json"
+  }
 }

package/src/error.ts

@@ -1,7 +1,10 @@
 import { CID } from 'multiformats/cid'
 
 export class MissingBlockError extends Error {
-  constructor(public cid: CID, def?: string) {
+  constructor(
+    public cid: CID,
+    def?: string,
+  ) {
     let msg = `block not found: ${cid.toString()}`
     if (def) {
       msg += `, expected type: ${def}`
@@ -11,21 +14,30 @@ export class MissingBlockError extends Error {
 }
 
 export class MissingBlocksError extends Error {
-  constructor(public context: string, public cids: CID[]) {
+  constructor(
+    public context: string,
+    public cids: CID[],
+  ) {
     const cidStr = cids.map((c) => c.toString())
     super(`missing ${context} blocks: ${cidStr}`)
   }
 }
 
 export class MissingCommitBlocksError extends Error {
-  constructor(public commit: CID, public cids: CID[]) {
+  constructor(
+    public commit: CID,
+    public cids: CID[],
+  ) {
     const cidStr = cids.map((c) => c.toString())
     super(`missing blocks for commit ${commit.toString()}: ${cidStr}`)
   }
 }
 
 export class UnexpectedObjectError extends Error {
-  constructor(public cid: CID, public def: string) {
+  constructor(
+    public cid: CID,
+    public def: string,
+  ) {
     super(`unexpected object at ${cid.toString()}, expected: ${def}`)
   }
 }

package/src/mst/mst.ts

@@ -3,7 +3,7 @@ import { CID } from 'multiformats'
 
 import { ReadableBlockstore } from '../storage'
 import { schema as common, cidForCbor, dataToCborBlock } from '@atproto/common'
-import { BlockWriter } from '@ipld/car/api'
+import { BlockWriter } from '@ipld/car/writer'
 import * as util from './util'
 import BlockMap from '../block-map'
 import CidSet from '../cid-set'
@@ -776,7 +776,10 @@ export class MST {
 }
 
 export class Leaf {
-  constructor(public key: string, public value: CID) {}
+  constructor(
+    public key: string,
+    public value: CID,
+  ) {}
 
   isTree(): this is MST {
     return false

package/src/types.ts

@@ -2,7 +2,6 @@ import { z } from 'zod'
 import { def as commonDef } from '@atproto/common-web'
 import { schema as common } from '@atproto/common'
 import { CID } from 'multiformats'
-import * as car from '@ipld/car/api'
 import BlockMap from './block-map'
 import { RepoRecord } from '@atproto/lexicon'
 import CidSet from './cid-set'
@@ -174,4 +173,7 @@ export type VerifiedRepo = {
   commit: CommitData
 }
 
-export type CarBlock = car.Block
+export type CarBlock = {
+  cid: CID
+  bytes: Uint8Array
+}

package/src/util.ts

@@ -1,7 +1,7 @@
 import { setImmediate } from 'node:timers/promises'
 import { CID } from 'multiformats/cid'
 import * as cbor from '@ipld/dag-cbor'
-import { CarBlockIterator } from '@ipld/car'
+import { CarBlockIterator } from '@ipld/car/iterator'
 import { BlockWriter, CarWriter } from '@ipld/car/writer'
 import {
   streamToBuffer,

package/tests/_util.ts

@@ -24,6 +24,7 @@ type IdMapping = Record<string, CID>
 export const randomCid = async (storage?: RepoStorage): Promise<CID> => {
   const block = await dataToCborBlock({ test: randomStr(50) })
   if (storage) {
+    // @ts-expect-error FIXME remove this comment (and fix the TS error)
     await storage.putBlock(block.cid, block.bytes)
   }
   return block.cid
@@ -189,6 +190,7 @@ export const pathsForOps = (ops: RecordWriteOp[]): RecordPath[] =>
 
 export const saveMst = async (storage: RepoStorage, mst: MST): Promise<CID> => {
   const diff = await mst.getUnstoredBlocks()
+  // @ts-expect-error FIXME remove this comment (and fix the TS error)
   await storage.putMany(diff.blocks)
   return diff.root
 }
@@ -215,6 +217,8 @@ export const addBadCommit = async (
     sig: await keypair.sign(randomBytes(256)),
   }
   const commitCid = await newBlocks.add(commit)
+
+  // @ts-expect-error FIXME remove this comment (and fix the TS error)
   await repo.storage.applyCommit({
     cid: commitCid,
     rev,

package/tsconfig.build.json

@@ -1,4 +1,8 @@
 {
-  "extends": "./tsconfig.json",
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"]
+  "extends": "../../tsconfig/node.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "./dist"
+  },
+  "include": ["./src"]
 }

package/tsconfig.json

@@ -1,15 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "./dist", // Your outDir,
-    "emitDeclarationOnly": true
-  },
-  "include": ["./src", "__tests__/**/**.ts"],
+  "include": [],
   "references": [
-    { "path": "../common/tsconfig.build.json" },
-    { "path": "../crypto/tsconfig.build.json" },
-    { "path": "../identity/tsconfig.build.json" },
-    { "path": "../nsid/tsconfig.build.json" }
+    { "path": "./tsconfig.build.json" },
+    { "path": "./tsconfig.tests.json" }
   ]
 }

package/tsconfig.tests.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig/tests.json",
+  "compilerOptions": {
+    "rootDir": "."
+  },
+  "include": ["./tests"]
+}

package/babel.config.js

@@ -1 +0,0 @@
-module.exports = require('../../babel.config.js')

package/build.js

@@ -1,14 +0,0 @@
-const { nodeExternalsPlugin } = require('esbuild-node-externals')
-
-const buildShallow =
-  process.argv.includes('--shallow') || process.env.ATP_BUILD_SHALLOW === 'true'
-
-require('esbuild').build({
-  logLevel: 'info',
-  entryPoints: ['src/index.ts'],
-  bundle: true,
-  sourcemap: true,
-  outdir: 'dist',
-  platform: 'node',
-  plugins: buildShallow ? [nodeExternalsPlugin()] : [],
-})

package/jest.bench.config.js

@@ -1,8 +0,0 @@
-const base = require('./jest.config')
-
-module.exports = {
-  ...base,
-  roots: ['<rootDir>/bench'],
-  testRegex: '(.*.bench)',
-  testTimeout: 3000000,
-}