@atproto/pds 0.4.223 → 0.4.224

package/dist/actor-store/actor-store-writer.js

@@ -1,14 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActorStoreWriter = void 0;
-const actor_store_transactor_1 = require("./actor-store-transactor");
-class ActorStoreWriter extends actor_store_transactor_1.ActorStoreTransactor {
+import { ActorStoreTransactor } from './actor-store-transactor.js';
+export class ActorStoreWriter extends ActorStoreTransactor {
     async transact(fn) {
         return this.db.transaction((dbTxn) => {
-            const transactor = new actor_store_transactor_1.ActorStoreTransactor(this.did, dbTxn, this.keypair, this.resources);
+            const transactor = new ActorStoreTransactor(this.did, dbTxn, this.keypair, this.resources);
             return fn(transactor);
         });
     }
 }
-exports.ActorStoreWriter = ActorStoreWriter;
 //# sourceMappingURL=actor-store-writer.js.map

package/dist/actor-store/actor-store-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"actor-store-writer.js","sourceRoot":"","sources":["../../src/actor-store/actor-store-writer.ts"],"names":[],"mappings":";;;AAAA,qEAA+D;AAE/D,MAAa,gBAAiB,SAAQ,6CAAoB;IACxD,KAAK,CAAC,QAAQ,CACZ,EAAoD;QAEpD,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,6CAAoB,CACzC,IAAI,CAAC,GAAG,EACR,KAAK,EACL,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,CACf,CAAA;YACD,OAAO,EAAE,CAAC,UAAU,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAdD,4CAcC","sourcesContent":["import { ActorStoreTransactor } from './actor-store-transactor'\n\nexport class ActorStoreWriter extends ActorStoreTransactor {\n  async transact<T>(\n    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,\n  ): Promise<T> {\n    return this.db.transaction((dbTxn) => {\n      const transactor = new ActorStoreTransactor(\n        this.did,\n        dbTxn,\n        this.keypair,\n        this.resources,\n      )\n      return fn(transactor)\n    })\n  }\n}\n"]}
+{"version":3,"file":"actor-store-writer.js","sourceRoot":"","sources":["../../src/actor-store/actor-store-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,MAAM,OAAO,gBAAiB,SAAQ,oBAAoB;IACxD,KAAK,CAAC,QAAQ,CACZ,EAAoD;QAEpD,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE;YACnC,MAAM,UAAU,GAAG,IAAI,oBAAoB,CACzC,IAAI,CAAC,GAAG,EACR,KAAK,EACL,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,SAAS,CACf,CAAA;YACD,OAAO,EAAE,CAAC,UAAU,CAAC,CAAA;QACvB,CAAC,CAAC,CAAA;IACJ,CAAC;CACF","sourcesContent":["import { ActorStoreTransactor } from './actor-store-transactor.js'\n\nexport class ActorStoreWriter extends ActorStoreTransactor {\n  async transact<T>(\n    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,\n  ): Promise<T> {\n    return this.db.transaction((dbTxn) => {\n      const transactor = new ActorStoreTransactor(\n        this.did,\n        dbTxn,\n        this.keypair,\n        this.resources,\n      )\n      return fn(transactor)\n    })\n  }\n}\n"]}

package/dist/actor-store/actor-store.d.ts

@@ -1,10 +1,10 @@
 import { ExportableKeypair, Keypair } from '@atproto/crypto';
-import { ActorStoreConfig } from '../config';
-import { ActorStoreReader } from './actor-store-reader';
-import { ActorStoreResources } from './actor-store-resources';
-import { ActorStoreTransactor } from './actor-store-transactor';
-import { ActorStoreWriter } from './actor-store-writer';
-import { ActorDb } from './db';
+import { ActorStoreConfig } from '../config/index.js';
+import { ActorStoreReader } from './actor-store-reader.js';
+import { ActorStoreResources } from './actor-store-resources.js';
+import { ActorStoreTransactor } from './actor-store-transactor.js';
+import { ActorStoreWriter } from './actor-store-writer.js';
+import { ActorDb } from './db/index.js';
 export declare class ActorStore {
     cfg: ActorStoreConfig;
     resources: ActorStoreResources;

package/dist/actor-store/actor-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actor-store.d.ts","sourceRoot":"","sources":["../../src/actor-store/actor-store.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAI5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,EAAE,OAAO,EAAsB,MAAM,MAAM,CAAA;AAElD,qBAAa,UAAU;IAIZ,GAAG,EAAE,gBAAgB;IACrB,SAAS,EAAE,mBAAmB;IAJvC,cAAc,EAAE,MAAM,CAAA;gBAGb,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,mBAAmB;IAKjC,WAAW,CAAC,GAAG,EAAE,MAAM;;;;;IAQvB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMtC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBrC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAUrE,QAAQ,CAAC,CAAC,EACd,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAahD,kBAAkB,CAAC,CAAC,EACxB,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAW5C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB;IAqB9C,OAAO,CAAC,GAAG,EAAE,MAAM;IAiBnB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB7C,kBAAkB,CACtB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAInC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAOjD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU;IAMtC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAM1C,UAAU,CAAC,GAAG,EAAE,MAAM;CAK7B"}
+{"version":3,"file":"actor-store.d.ts","sourceRoot":"","sources":["../../src/actor-store/actor-store.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAIrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAsB,MAAM,eAAe,CAAA;AAE3D,qBAAa,UAAU;IAIZ,GAAG,EAAE,gBAAgB;IACrB,SAAS,EAAE,mBAAmB;IAJvC,cAAc,EAAE,MAAM,CAAA;gBAGb,GAAG,EAAE,gBAAgB,EACrB,SAAS,EAAE,mBAAmB;IAKjC,WAAW,CAAC,GAAG,EAAE,MAAM;;;;;IAQvB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMtC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBrC,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAUrE,QAAQ,CAAC,CAAC,EACd,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAahD,kBAAkB,CAAC,CAAC,EACxB,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,CAAC,EAAE,EAAE,gBAAgB,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;IAW5C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB;IAqB9C,OAAO,CAAC,GAAG,EAAE,MAAM;IAiBnB,cAAc,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAkB7C,kBAAkB,CACtB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAInC,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAOjD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU;IAMtC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAM1C,UAAU,CAAC,GAAG,EAAE,MAAM;CAK7B"}

package/dist/actor-store/actor-store.js

@@ -1,103 +1,48 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __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.ActorStore = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const promises_1 = __importStar(require("node:fs/promises"));
-const node_path_1 = __importDefault(require("node:path"));
-const common_1 = require("@atproto/common");
-const crypto = __importStar(require("@atproto/crypto"));
-const xrpc_server_1 = require("@atproto/xrpc-server");
-const db_1 = require("../db");
-const disk_blobstore_1 = require("../disk-blobstore");
-const logger_1 = require("../logger");
-const actor_store_reader_1 = require("./actor-store-reader");
-const actor_store_transactor_1 = require("./actor-store-transactor");
-const actor_store_writer_1 = require("./actor-store-writer");
-const db_2 = require("./db");
-class ActorStore {
+import assert from 'node:assert';
+import fs, { mkdir } from 'node:fs/promises';
+import path from 'node:path';
+import { fileExists, readIfExists, rmIfExists } from '@atproto/common';
+import * as crypto from '@atproto/crypto';
+import { InvalidRequestError } from '@atproto/xrpc-server';
+import { retrySqlite } from '../db/index.js';
+import { DiskBlobStore } from '../disk-blobstore.js';
+import { blobStoreLogger } from '../logger.js';
+import { ActorStoreReader } from './actor-store-reader.js';
+import { ActorStoreTransactor } from './actor-store-transactor.js';
+import { ActorStoreWriter } from './actor-store-writer.js';
+import { getDb, getMigrator } from './db/index.js';
+export class ActorStore {
     constructor(cfg, resources) {
-        Object.defineProperty(this, "cfg", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: cfg
-        });
-        Object.defineProperty(this, "resources", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: resources
-        });
-        Object.defineProperty(this, "reservedKeyDir", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.reservedKeyDir = node_path_1.default.join(cfg.directory, 'reserved_keys');
+        this.cfg = cfg;
+        this.resources = resources;
+        this.reservedKeyDir = path.join(cfg.directory, 'reserved_keys');
     }
     async getLocation(did) {
         const didHash = await crypto.sha256Hex(did);
-        const directory = node_path_1.default.join(this.cfg.directory, didHash.slice(0, 2), did);
-        const dbLocation = node_path_1.default.join(directory, `store.sqlite`);
-        const keyLocation = node_path_1.default.join(directory, `key`);
+        const directory = path.join(this.cfg.directory, didHash.slice(0, 2), did);
+        const dbLocation = path.join(directory, `store.sqlite`);
+        const keyLocation = path.join(directory, `key`);
         return { directory, dbLocation, keyLocation };
     }
     async exists(did) {
         const location = await this.getLocation(did);
-        return await (0, common_1.fileExists)(location.dbLocation);
+        return await fileExists(location.dbLocation);
     }
     async keypair(did) {
         const { keyLocation } = await this.getLocation(did);
-        const privKey = await promises_1.default.readFile(keyLocation);
+        const privKey = await fs.readFile(keyLocation);
         return crypto.Secp256k1Keypair.import(privKey);
     }
     async openDb(did) {
         const { dbLocation } = await this.getLocation(did);
-        const exists = await (0, common_1.fileExists)(dbLocation);
+        const exists = await fileExists(dbLocation);
         if (!exists) {
-            throw new xrpc_server_1.InvalidRequestError('Repo not found', 'NotFound');
+            throw new InvalidRequestError('Repo not found', 'NotFound');
         }
-        const db = (0, db_2.getDb)(dbLocation, this.cfg.disableWalAutoCheckpoint);
+        const db = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint);
         // run a simple select with retry logic to ensure the db is ready (not in wal recovery mode)
         try {
-            await (0, db_1.retrySqlite)(() => db.db.selectFrom('repo_root').selectAll().execute());
+            await retrySqlite(() => db.db.selectFrom('repo_root').selectAll().execute());
         }
         catch (err) {
             db.close();
@@ -109,7 +54,7 @@ class ActorStore {
         const db = await this.openDb(did);
         try {
             const getKeypair = () => this.keypair(did);
-            return await fn(new actor_store_reader_1.ActorStoreReader(did, db, this.resources, getKeypair));
+            return await fn(new ActorStoreReader(did, db, this.resources, getKeypair));
         }
         finally {
             db.close();
@@ -120,7 +65,7 @@ class ActorStore {
         const db = await this.openDb(did);
         try {
             return await db.transaction((dbTxn) => {
-                return fn(new actor_store_transactor_1.ActorStoreTransactor(did, dbTxn, keypair, this.resources));
+                return fn(new ActorStoreTransactor(did, dbTxn, keypair, this.resources));
             });
         }
         finally {
@@ -131,7 +76,7 @@ class ActorStore {
         const keypair = await this.keypair(did);
         const db = await this.openDb(did);
         try {
-            return await fn(new actor_store_writer_1.ActorStoreWriter(did, db, keypair, this.resources));
+            return await fn(new ActorStoreWriter(did, db, keypair, this.resources));
         }
         finally {
             db.close();
@@ -140,17 +85,17 @@ class ActorStore {
     async create(did, keypair) {
         const { directory, dbLocation, keyLocation } = await this.getLocation(did);
         // ensure subdir exists
-        await (0, promises_1.mkdir)(directory, { recursive: true });
-        const exists = await (0, common_1.fileExists)(dbLocation);
+        await mkdir(directory, { recursive: true });
+        const exists = await fileExists(dbLocation);
         if (exists) {
-            throw new xrpc_server_1.InvalidRequestError('Repo already exists', 'AlreadyExists');
+            throw new InvalidRequestError('Repo already exists', 'AlreadyExists');
         }
         const privKey = await keypair.export();
-        await promises_1.default.writeFile(keyLocation, privKey);
-        const db = (0, db_2.getDb)(dbLocation, this.cfg.disableWalAutoCheckpoint);
+        await fs.writeFile(keyLocation, privKey);
+        const db = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint);
         try {
             await db.ensureWal();
-            const migrator = (0, db_2.getMigrator)(db);
+            const migrator = getMigrator(db);
             await migrator.migrateToLatestOrThrow();
         }
         finally {
@@ -159,23 +104,23 @@ class ActorStore {
     }
     async destroy(did) {
         const blobstore = this.resources.blobstore(did);
-        if (blobstore instanceof disk_blobstore_1.DiskBlobStore) {
+        if (blobstore instanceof DiskBlobStore) {
             await blobstore.deleteAll();
         }
         else {
             const cids = await this.read(did, async (store) => store.repo.blob.getBlobCids());
             await blobstore.deleteMany(cids).catch((err) => {
-                logger_1.blobStoreLogger.error('Failed to delete blobs', { did, cids, err });
+                blobStoreLogger.error('Failed to delete blobs', { did, cids, err });
             });
         }
         const { directory } = await this.getLocation(did);
-        await (0, common_1.rmIfExists)(directory, true);
+        await rmIfExists(directory, true);
     }
     async reserveKeypair(did) {
         let keyLoc;
         if (did) {
             assertSafePathPart(did);
-            keyLoc = node_path_1.default.join(this.reservedKeyDir, did);
+            keyLoc = path.join(this.reservedKeyDir, did);
             const maybeKey = await loadKey(keyLoc);
             if (maybeKey) {
                 return maybeKey.did();
@@ -183,46 +128,45 @@ class ActorStore {
         }
         const keypair = await crypto.Secp256k1Keypair.create({ exportable: true });
         const keyDid = keypair.did();
-        keyLoc = keyLoc ?? node_path_1.default.join(this.reservedKeyDir, keyDid);
-        await (0, promises_1.mkdir)(this.reservedKeyDir, { recursive: true });
-        await promises_1.default.writeFile(keyLoc, await keypair.export());
+        keyLoc = keyLoc ?? path.join(this.reservedKeyDir, keyDid);
+        await mkdir(this.reservedKeyDir, { recursive: true });
+        await fs.writeFile(keyLoc, await keypair.export());
         return keyDid;
     }
     async getReservedKeypair(signingKeyOrDid) {
-        return loadKey(node_path_1.default.join(this.reservedKeyDir, signingKeyOrDid));
+        return loadKey(path.join(this.reservedKeyDir, signingKeyOrDid));
     }
     async clearReservedKeypair(keyDid, did) {
-        await (0, common_1.rmIfExists)(node_path_1.default.join(this.reservedKeyDir, keyDid));
+        await rmIfExists(path.join(this.reservedKeyDir, keyDid));
         if (did) {
-            await (0, common_1.rmIfExists)(node_path_1.default.join(this.reservedKeyDir, did));
+            await rmIfExists(path.join(this.reservedKeyDir, did));
         }
     }
     async storePlcOp(did, op) {
         const { directory } = await this.getLocation(did);
-        const opLoc = node_path_1.default.join(directory, `did-op`);
-        await promises_1.default.writeFile(opLoc, op);
+        const opLoc = path.join(directory, `did-op`);
+        await fs.writeFile(opLoc, op);
     }
     async getPlcOp(did) {
         const { directory } = await this.getLocation(did);
-        const opLoc = node_path_1.default.join(directory, `did-op`);
-        return await promises_1.default.readFile(opLoc);
+        const opLoc = path.join(directory, `did-op`);
+        return await fs.readFile(opLoc);
     }
     async clearPlcOp(did) {
         const { directory } = await this.getLocation(did);
-        const opLoc = node_path_1.default.join(directory, `did-op`);
-        await (0, common_1.rmIfExists)(opLoc);
+        const opLoc = path.join(directory, `did-op`);
+        await rmIfExists(opLoc);
     }
 }
-exports.ActorStore = ActorStore;
 const loadKey = async (loc) => {
-    const privKey = await (0, common_1.readIfExists)(loc);
+    const privKey = await readIfExists(loc);
     if (!privKey)
         return undefined;
     return crypto.Secp256k1Keypair.import(privKey, { exportable: true });
 };
 function assertSafePathPart(part) {
-    const normalized = node_path_1.default.normalize(part);
-    (0, node_assert_1.default)(part === normalized &&
+    const normalized = path.normalize(part);
+    assert(part === normalized &&
         !part.startsWith('.') &&
         !part.includes('/') &&
         !part.includes('\\'), `unsafe path part: ${part}`);

package/dist/actor-store/actor-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"actor-store.js","sourceRoot":"","sources":["../../src/actor-store/actor-store.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport fs, { mkdir } from 'node:fs/promises'\nimport path from 'node:path'\nimport { fileExists, readIfExists, rmIfExists } from '@atproto/common'\nimport * as crypto from '@atproto/crypto'\nimport { ExportableKeypair, Keypair } from '@atproto/crypto'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { ActorStoreConfig } from '../config'\nimport { retrySqlite } from '../db'\nimport { DiskBlobStore } from '../disk-blobstore'\nimport { blobStoreLogger } from '../logger'\nimport { ActorStoreReader } from './actor-store-reader'\nimport { ActorStoreResources } from './actor-store-resources'\nimport { ActorStoreTransactor } from './actor-store-transactor'\nimport { ActorStoreWriter } from './actor-store-writer'\nimport { ActorDb, getDb, getMigrator } from './db'\n\nexport class ActorStore {\n  reservedKeyDir: string\n\n  constructor(\n    public cfg: ActorStoreConfig,\n    public resources: ActorStoreResources,\n  ) {\n    this.reservedKeyDir = path.join(cfg.directory, 'reserved_keys')\n  }\n\n  async getLocation(did: string) {\n    const didHash = await crypto.sha256Hex(did)\n    const directory = path.join(this.cfg.directory, didHash.slice(0, 2), did)\n    const dbLocation = path.join(directory, `store.sqlite`)\n    const keyLocation = path.join(directory, `key`)\n    return { directory, dbLocation, keyLocation }\n  }\n\n  async exists(did: string): Promise<boolean> {\n    const location = await this.getLocation(did)\n    return await fileExists(location.dbLocation)\n  }\n\n  async keypair(did: string): Promise<Keypair> {\n    const { keyLocation } = await this.getLocation(did)\n    const privKey = await fs.readFile(keyLocation)\n    return crypto.Secp256k1Keypair.import(privKey)\n  }\n\n  async openDb(did: string): Promise<ActorDb> {\n    const { dbLocation } = await this.getLocation(did)\n    const exists = await fileExists(dbLocation)\n    if (!exists) {\n      throw new InvalidRequestError('Repo not found', 'NotFound')\n    }\n\n    const db = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint)\n\n    // run a simple select with retry logic to ensure the db is ready (not in wal recovery mode)\n    try {\n      await retrySqlite(() =>\n        db.db.selectFrom('repo_root').selectAll().execute(),\n      )\n    } catch (err) {\n      db.close()\n      throw err\n    }\n\n    return db\n  }\n\n  async read<T>(did: string, fn: (fn: ActorStoreReader) => T | PromiseLike<T>) {\n    const db = await this.openDb(did)\n    try {\n      const getKeypair = () => this.keypair(did)\n      return await fn(new ActorStoreReader(did, db, this.resources, getKeypair))\n    } finally {\n      db.close()\n    }\n  }\n\n  async transact<T>(\n    did: string,\n    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,\n  ) {\n    const keypair = await this.keypair(did)\n    const db = await this.openDb(did)\n    try {\n      return await db.transaction((dbTxn) => {\n        return fn(new ActorStoreTransactor(did, dbTxn, keypair, this.resources))\n      })\n    } finally {\n      db.close()\n    }\n  }\n\n  async writeNoTransaction<T>(\n    did: string,\n    fn: (fn: ActorStoreWriter) => T | PromiseLike<T>,\n  ) {\n    const keypair = await this.keypair(did)\n    const db = await this.openDb(did)\n    try {\n      return await fn(new ActorStoreWriter(did, db, keypair, this.resources))\n    } finally {\n      db.close()\n    }\n  }\n\n  async create(did: string, keypair: ExportableKeypair) {\n    const { directory, dbLocation, keyLocation } = await this.getLocation(did)\n    // ensure subdir exists\n    await mkdir(directory, { recursive: true })\n    const exists = await fileExists(dbLocation)\n    if (exists) {\n      throw new InvalidRequestError('Repo already exists', 'AlreadyExists')\n    }\n    const privKey = await keypair.export()\n    await fs.writeFile(keyLocation, privKey)\n\n    const db: ActorDb = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint)\n    try {\n      await db.ensureWal()\n      const migrator = getMigrator(db)\n      await migrator.migrateToLatestOrThrow()\n    } finally {\n      db.close()\n    }\n  }\n\n  async destroy(did: string) {\n    const blobstore = this.resources.blobstore(did)\n    if (blobstore instanceof DiskBlobStore) {\n      await blobstore.deleteAll()\n    } else {\n      const cids = await this.read(did, async (store) =>\n        store.repo.blob.getBlobCids(),\n      )\n      await blobstore.deleteMany(cids).catch((err) => {\n        blobStoreLogger.error('Failed to delete blobs', { did, cids, err })\n      })\n    }\n\n    const { directory } = await this.getLocation(did)\n    await rmIfExists(directory, true)\n  }\n\n  async reserveKeypair(did?: string): Promise<string> {\n    let keyLoc: string | undefined\n    if (did) {\n      assertSafePathPart(did)\n      keyLoc = path.join(this.reservedKeyDir, did)\n      const maybeKey = await loadKey(keyLoc)\n      if (maybeKey) {\n        return maybeKey.did()\n      }\n    }\n    const keypair = await crypto.Secp256k1Keypair.create({ exportable: true })\n    const keyDid = keypair.did()\n    keyLoc = keyLoc ?? path.join(this.reservedKeyDir, keyDid)\n    await mkdir(this.reservedKeyDir, { recursive: true })\n    await fs.writeFile(keyLoc, await keypair.export())\n    return keyDid\n  }\n\n  async getReservedKeypair(\n    signingKeyOrDid: string,\n  ): Promise<ExportableKeypair | undefined> {\n    return loadKey(path.join(this.reservedKeyDir, signingKeyOrDid))\n  }\n\n  async clearReservedKeypair(keyDid: string, did?: string) {\n    await rmIfExists(path.join(this.reservedKeyDir, keyDid))\n    if (did) {\n      await rmIfExists(path.join(this.reservedKeyDir, did))\n    }\n  }\n\n  async storePlcOp(did: string, op: Uint8Array) {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    await fs.writeFile(opLoc, op)\n  }\n\n  async getPlcOp(did: string): Promise<Uint8Array> {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    return await fs.readFile(opLoc)\n  }\n\n  async clearPlcOp(did: string) {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    await rmIfExists(opLoc)\n  }\n}\n\nconst loadKey = async (loc: string): Promise<ExportableKeypair | undefined> => {\n  const privKey = await readIfExists(loc)\n  if (!privKey) return undefined\n  return crypto.Secp256k1Keypair.import(privKey, { exportable: true })\n}\n\nfunction assertSafePathPart(part: string) {\n  const normalized = path.normalize(part)\n  assert(\n    part === normalized &&\n      !part.startsWith('.') &&\n      !part.includes('/') &&\n      !part.includes('\\\\'),\n    `unsafe path part: ${part}`,\n  )\n}\n"]}
+{"version":3,"file":"actor-store.js","sourceRoot":"","sources":["../../src/actor-store/actor-store.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport fs, { mkdir } from 'node:fs/promises'\nimport path from 'node:path'\nimport { fileExists, readIfExists, rmIfExists } from '@atproto/common'\nimport * as crypto from '@atproto/crypto'\nimport { ExportableKeypair, Keypair } from '@atproto/crypto'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { ActorStoreConfig } from '../config/index.js'\nimport { retrySqlite } from '../db/index.js'\nimport { DiskBlobStore } from '../disk-blobstore.js'\nimport { blobStoreLogger } from '../logger.js'\nimport { ActorStoreReader } from './actor-store-reader.js'\nimport { ActorStoreResources } from './actor-store-resources.js'\nimport { ActorStoreTransactor } from './actor-store-transactor.js'\nimport { ActorStoreWriter } from './actor-store-writer.js'\nimport { ActorDb, getDb, getMigrator } from './db/index.js'\n\nexport class ActorStore {\n  reservedKeyDir: string\n\n  constructor(\n    public cfg: ActorStoreConfig,\n    public resources: ActorStoreResources,\n  ) {\n    this.reservedKeyDir = path.join(cfg.directory, 'reserved_keys')\n  }\n\n  async getLocation(did: string) {\n    const didHash = await crypto.sha256Hex(did)\n    const directory = path.join(this.cfg.directory, didHash.slice(0, 2), did)\n    const dbLocation = path.join(directory, `store.sqlite`)\n    const keyLocation = path.join(directory, `key`)\n    return { directory, dbLocation, keyLocation }\n  }\n\n  async exists(did: string): Promise<boolean> {\n    const location = await this.getLocation(did)\n    return await fileExists(location.dbLocation)\n  }\n\n  async keypair(did: string): Promise<Keypair> {\n    const { keyLocation } = await this.getLocation(did)\n    const privKey = await fs.readFile(keyLocation)\n    return crypto.Secp256k1Keypair.import(privKey)\n  }\n\n  async openDb(did: string): Promise<ActorDb> {\n    const { dbLocation } = await this.getLocation(did)\n    const exists = await fileExists(dbLocation)\n    if (!exists) {\n      throw new InvalidRequestError('Repo not found', 'NotFound')\n    }\n\n    const db = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint)\n\n    // run a simple select with retry logic to ensure the db is ready (not in wal recovery mode)\n    try {\n      await retrySqlite(() =>\n        db.db.selectFrom('repo_root').selectAll().execute(),\n      )\n    } catch (err) {\n      db.close()\n      throw err\n    }\n\n    return db\n  }\n\n  async read<T>(did: string, fn: (fn: ActorStoreReader) => T | PromiseLike<T>) {\n    const db = await this.openDb(did)\n    try {\n      const getKeypair = () => this.keypair(did)\n      return await fn(new ActorStoreReader(did, db, this.resources, getKeypair))\n    } finally {\n      db.close()\n    }\n  }\n\n  async transact<T>(\n    did: string,\n    fn: (fn: ActorStoreTransactor) => T | PromiseLike<T>,\n  ) {\n    const keypair = await this.keypair(did)\n    const db = await this.openDb(did)\n    try {\n      return await db.transaction((dbTxn) => {\n        return fn(new ActorStoreTransactor(did, dbTxn, keypair, this.resources))\n      })\n    } finally {\n      db.close()\n    }\n  }\n\n  async writeNoTransaction<T>(\n    did: string,\n    fn: (fn: ActorStoreWriter) => T | PromiseLike<T>,\n  ) {\n    const keypair = await this.keypair(did)\n    const db = await this.openDb(did)\n    try {\n      return await fn(new ActorStoreWriter(did, db, keypair, this.resources))\n    } finally {\n      db.close()\n    }\n  }\n\n  async create(did: string, keypair: ExportableKeypair) {\n    const { directory, dbLocation, keyLocation } = await this.getLocation(did)\n    // ensure subdir exists\n    await mkdir(directory, { recursive: true })\n    const exists = await fileExists(dbLocation)\n    if (exists) {\n      throw new InvalidRequestError('Repo already exists', 'AlreadyExists')\n    }\n    const privKey = await keypair.export()\n    await fs.writeFile(keyLocation, privKey)\n\n    const db: ActorDb = getDb(dbLocation, this.cfg.disableWalAutoCheckpoint)\n    try {\n      await db.ensureWal()\n      const migrator = getMigrator(db)\n      await migrator.migrateToLatestOrThrow()\n    } finally {\n      db.close()\n    }\n  }\n\n  async destroy(did: string) {\n    const blobstore = this.resources.blobstore(did)\n    if (blobstore instanceof DiskBlobStore) {\n      await blobstore.deleteAll()\n    } else {\n      const cids = await this.read(did, async (store) =>\n        store.repo.blob.getBlobCids(),\n      )\n      await blobstore.deleteMany(cids).catch((err) => {\n        blobStoreLogger.error('Failed to delete blobs', { did, cids, err })\n      })\n    }\n\n    const { directory } = await this.getLocation(did)\n    await rmIfExists(directory, true)\n  }\n\n  async reserveKeypair(did?: string): Promise<string> {\n    let keyLoc: string | undefined\n    if (did) {\n      assertSafePathPart(did)\n      keyLoc = path.join(this.reservedKeyDir, did)\n      const maybeKey = await loadKey(keyLoc)\n      if (maybeKey) {\n        return maybeKey.did()\n      }\n    }\n    const keypair = await crypto.Secp256k1Keypair.create({ exportable: true })\n    const keyDid = keypair.did()\n    keyLoc = keyLoc ?? path.join(this.reservedKeyDir, keyDid)\n    await mkdir(this.reservedKeyDir, { recursive: true })\n    await fs.writeFile(keyLoc, await keypair.export())\n    return keyDid\n  }\n\n  async getReservedKeypair(\n    signingKeyOrDid: string,\n  ): Promise<ExportableKeypair | undefined> {\n    return loadKey(path.join(this.reservedKeyDir, signingKeyOrDid))\n  }\n\n  async clearReservedKeypair(keyDid: string, did?: string) {\n    await rmIfExists(path.join(this.reservedKeyDir, keyDid))\n    if (did) {\n      await rmIfExists(path.join(this.reservedKeyDir, did))\n    }\n  }\n\n  async storePlcOp(did: string, op: Uint8Array) {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    await fs.writeFile(opLoc, op)\n  }\n\n  async getPlcOp(did: string): Promise<Uint8Array> {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    return await fs.readFile(opLoc)\n  }\n\n  async clearPlcOp(did: string) {\n    const { directory } = await this.getLocation(did)\n    const opLoc = path.join(directory, `did-op`)\n    await rmIfExists(opLoc)\n  }\n}\n\nconst loadKey = async (loc: string): Promise<ExportableKeypair | undefined> => {\n  const privKey = await readIfExists(loc)\n  if (!privKey) return undefined\n  return crypto.Secp256k1Keypair.import(privKey, { exportable: true })\n}\n\nfunction assertSafePathPart(part: string) {\n  const normalized = path.normalize(part)\n  assert(\n    part === normalized &&\n      !part.startsWith('.') &&\n      !part.includes('/') &&\n      !part.includes('\\\\'),\n    `unsafe path part: ${part}`,\n  )\n}\n"]}

package/dist/actor-store/blob/reader.d.ts

@@ -3,7 +3,7 @@ import { Cid } from '@atproto/lex-data';
 import { BlobStore } from '@atproto/repo';
 import { AtUriString } from '@atproto/syntax';
 import { com } from '../../lexicons/index.js';
-import { ActorDb } from '../db';
+import { ActorDb } from '../db/index.js';
 export declare class BlobReader {
     db: ActorDb;
     blobstore: BlobStore;

package/dist/actor-store/blob/reader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reader.d.ts","sourceRoot":"","sources":["../../../src/actor-store/blob/reader.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAE,GAAG,EAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAqB,SAAS,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,qBAAa,UAAU;IAEZ,EAAE,EAAE,OAAO;IACX,SAAS,EAAE,SAAS;gBADpB,EAAE,EAAE,OAAO,EACX,SAAS,EAAE,SAAS;IAGvB,eAAe,CACnB,GAAG,EAAE,GAAG,GACP,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;KAAE,CAAC;IAiBxD,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;QAC/B,IAAI,EAAE,MAAM,CAAA;QACZ,QAAQ,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;QAChC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAA;KACxB,CAAC;IAYI,SAAS,CAAC,IAAI,EAAE;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;KACd,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoBf,qBAAqB,CACzB,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAY9C,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAU7C,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAUvD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAQ5B,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IASlC,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;KACd,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;IAwBhD,WAAW;CAIlB"}
+{"version":3,"file":"reader.d.ts","sourceRoot":"","sources":["../../../src/actor-store/blob/reader.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAE,GAAG,EAAY,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAqB,SAAS,EAAE,MAAM,eAAe,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC,qBAAa,UAAU;IAEZ,EAAE,EAAE,OAAO;IACX,SAAS,EAAE,SAAS;gBADpB,EAAE,EAAE,OAAO,EACX,SAAS,EAAE,SAAS;IAGvB,eAAe,CACnB,GAAG,EAAE,GAAG,GACP,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;KAAE,CAAC;IAiBxD,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC;QAC/B,IAAI,EAAE,MAAM,CAAA;QACZ,QAAQ,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAA;QAChC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAA;KACxB,CAAC;IAYI,SAAS,CAAC,IAAI,EAAE;QACpB,KAAK,CAAC,EAAE,MAAM,CAAA;QACd,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;KACd,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAoBf,qBAAqB,CACzB,GAAG,EAAE,GAAG,GACP,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IAY9C,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAU7C,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAUvD,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IAQ5B,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IASlC,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,KAAK,EAAE,MAAM,CAAA;KACd,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,WAAW,CAAA;KAAE,EAAE,CAAC;IAwBhD,WAAW;CAIlB"}

package/dist/actor-store/blob/reader.js

@@ -1,24 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlobReader = void 0;
-const lex_data_1 = require("@atproto/lex-data");
-const repo_1 = require("@atproto/repo");
-const xrpc_server_1 = require("@atproto/xrpc-server");
-const util_1 = require("../../db/util");
-class BlobReader {
+import { parseCid } from '@atproto/lex-data';
+import { BlobNotFoundError } from '@atproto/repo';
+import { InvalidRequestError } from '@atproto/xrpc-server';
+import { countAll, countDistinct, notSoftDeletedClause } from '../../db/util.js';
+export class BlobReader {
     constructor(db, blobstore) {
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: db
-        });
-        Object.defineProperty(this, "blobstore", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: blobstore
-        });
+        this.db = db;
+        this.blobstore = blobstore;
     }
     async getBlobMetadata(cid) {
         const { ref } = this.db.db.dynamic;
@@ -26,10 +13,10 @@ class BlobReader {
             .selectFrom('blob')
             .selectAll()
             .where('blob.cid', '=', cid.toString())
-            .where((0, util_1.notSoftDeletedClause)(ref('blob')))
+            .where(notSoftDeletedClause(ref('blob')))
             .executeTakeFirst();
         if (!found) {
-            throw new xrpc_server_1.InvalidRequestError('Blob not found');
+            throw new InvalidRequestError('Blob not found');
         }
         return {
             size: found.size,
@@ -39,8 +26,8 @@ class BlobReader {
     async getBlob(cid) {
         const metadata = await this.getBlobMetadata(cid);
         const stream = await this.blobstore.getStream(cid).catch((err) => {
-            if (err instanceof repo_1.BlobNotFoundError) {
-                throw new xrpc_server_1.InvalidRequestError('Blob not found');
+            if (err instanceof BlobNotFoundError) {
+                throw new InvalidRequestError('Blob not found');
             }
             throw err;
         });
@@ -98,7 +85,7 @@ class BlobReader {
     async blobCount() {
         const res = await this.db.db
             .selectFrom('blob')
-            .select(util_1.countAll.as('count'))
+            .select(countAll.as('count'))
             .executeTakeFirst();
         return res?.count ?? 0;
     }
@@ -106,7 +93,7 @@ class BlobReader {
         const { ref } = this.db.db.dynamic;
         const res = await this.db.db
             .selectFrom('record_blob')
-            .select((0, util_1.countDistinct)(ref('blobCid')).as('count'))
+            .select(countDistinct(ref('blobCid')).as('count'))
             .executeTakeFirst();
         return res?.count ?? 0;
     }
@@ -133,8 +120,7 @@ class BlobReader {
     }
     async getBlobCids() {
         const blobRows = await this.db.db.selectFrom('blob').select('cid').execute();
-        return blobRows.map((row) => (0, lex_data_1.parseCid)(row.cid));
+        return blobRows.map((row) => parseCid(row.cid));
     }
 }
-exports.BlobReader = BlobReader;
 //# sourceMappingURL=reader.js.map

package/dist/actor-store/blob/reader.js.map

@@ -1 +1 @@
-{"version":3,"file":"reader.js","sourceRoot":"","sources":["../../../src/actor-store/blob/reader.ts"],"names":[],"mappings":"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","sourcesContent":["import stream from 'node:stream'\nimport { Cid, parseCid } from '@atproto/lex-data'\nimport { BlobNotFoundError, BlobStore } from '@atproto/repo'\nimport { AtUriString } from '@atproto/syntax'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { countAll, countDistinct, notSoftDeletedClause } from '../../db/util'\nimport { com } from '../../lexicons/index.js'\nimport { ActorDb } from '../db'\n\nexport class BlobReader {\n  constructor(\n    public db: ActorDb,\n    public blobstore: BlobStore,\n  ) {}\n\n  async getBlobMetadata(\n    cid: Cid,\n  ): Promise<{ size: number; mimeType?: `${string}/${string}` }> {\n    const { ref } = this.db.db.dynamic\n    const found = await this.db.db\n      .selectFrom('blob')\n      .selectAll()\n      .where('blob.cid', '=', cid.toString())\n      .where(notSoftDeletedClause(ref('blob')))\n      .executeTakeFirst()\n    if (!found) {\n      throw new InvalidRequestError('Blob not found')\n    }\n    return {\n      size: found.size,\n      mimeType: found.mimeType as `${string}/${string}` | undefined,\n    }\n  }\n\n  async getBlob(cid: Cid): Promise<{\n    size: number\n    mimeType?: `${string}/${string}`\n    stream: stream.Readable\n  }> {\n    const metadata = await this.getBlobMetadata(cid)\n    const stream = await this.blobstore.getStream(cid).catch((err) => {\n      if (err instanceof BlobNotFoundError) {\n        throw new InvalidRequestError('Blob not found')\n      }\n      throw err\n    })\n\n    return { ...metadata, stream }\n  }\n\n  async listBlobs(opts: {\n    since?: string\n    cursor?: string\n    limit: number\n  }): Promise<string[]> {\n    const { since, cursor, limit } = opts\n    let builder = this.db.db\n      .selectFrom('record_blob')\n      .select('blobCid')\n      .orderBy('blobCid', 'asc')\n      .groupBy('blobCid')\n      .limit(limit)\n    if (since) {\n      builder = builder\n        .innerJoin('record', 'record.uri', 'record_blob.recordUri')\n        .where('record.repoRev', '>', since)\n    }\n    if (cursor) {\n      builder = builder.where('blobCid', '>', cursor)\n    }\n    const res = await builder.execute()\n    return res.map((row) => row.blobCid)\n  }\n\n  async getBlobTakedownStatus(\n    cid: Cid,\n  ): Promise<com.atproto.admin.defs.StatusAttr | null> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .select('takedownRef')\n      .where('cid', '=', cid.toString())\n      .executeTakeFirst()\n    if (!res) return null\n    return res.takedownRef\n      ? { applied: true, ref: res.takedownRef }\n      : { applied: false }\n  }\n\n  async hasRecordsForBlob(cid: Cid): Promise<boolean> {\n    const res = await this.db.db\n      .selectFrom('record_blob')\n      .where('blobCid', '=', cid.toString())\n      .select('blobCid')\n      .limit(1)\n      .executeTakeFirst()\n    return res != null\n  }\n\n  async getBlobsForRecord(recordUri: string): Promise<string[]> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .innerJoin('record_blob', 'record_blob.blobCid', 'blob.cid')\n      .where('recordUri', '=', recordUri)\n      .select('blob.cid')\n      .execute()\n    return res.map((row) => row.cid)\n  }\n\n  async blobCount(): Promise<number> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .select(countAll.as('count'))\n      .executeTakeFirst()\n    return res?.count ?? 0\n  }\n\n  async recordBlobCount(): Promise<number> {\n    const { ref } = this.db.db.dynamic\n    const res = await this.db.db\n      .selectFrom('record_blob')\n      .select(countDistinct(ref('blobCid')).as('count'))\n      .executeTakeFirst()\n    return res?.count ?? 0\n  }\n\n  async listMissingBlobs(opts: {\n    cursor?: string\n    limit: number\n  }): Promise<{ cid: string; recordUri: AtUriString }[]> {\n    const { cursor, limit } = opts\n    let builder = this.db.db\n      .selectFrom('record_blob')\n      .whereNotExists((qb) =>\n        qb\n          .selectFrom('blob')\n          .selectAll()\n          .whereRef('blob.cid', '=', 'record_blob.blobCid'),\n      )\n      .selectAll()\n      .orderBy('blobCid', 'asc')\n      .groupBy('blobCid')\n      .limit(limit)\n    if (cursor) {\n      builder = builder.where('blobCid', '>', cursor)\n    }\n    const res = await builder.execute()\n    return res.map((row) => ({\n      cid: row.blobCid,\n      recordUri: row.recordUri as AtUriString,\n    }))\n  }\n\n  async getBlobCids() {\n    const blobRows = await this.db.db.selectFrom('blob').select('cid').execute()\n    return blobRows.map((row) => parseCid(row.cid))\n  }\n}\n"]}
+{"version":3,"file":"reader.js","sourceRoot":"","sources":["../../../src/actor-store/blob/reader.ts"],"names":[],"mappings":"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","sourcesContent":["import stream from 'node:stream'\nimport { Cid, parseCid } from '@atproto/lex-data'\nimport { BlobNotFoundError, BlobStore } from '@atproto/repo'\nimport { AtUriString } from '@atproto/syntax'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { countAll, countDistinct, notSoftDeletedClause } from '../../db/util.js'\nimport { com } from '../../lexicons/index.js'\nimport { ActorDb } from '../db/index.js'\n\nexport class BlobReader {\n  constructor(\n    public db: ActorDb,\n    public blobstore: BlobStore,\n  ) {}\n\n  async getBlobMetadata(\n    cid: Cid,\n  ): Promise<{ size: number; mimeType?: `${string}/${string}` }> {\n    const { ref } = this.db.db.dynamic\n    const found = await this.db.db\n      .selectFrom('blob')\n      .selectAll()\n      .where('blob.cid', '=', cid.toString())\n      .where(notSoftDeletedClause(ref('blob')))\n      .executeTakeFirst()\n    if (!found) {\n      throw new InvalidRequestError('Blob not found')\n    }\n    return {\n      size: found.size,\n      mimeType: found.mimeType as `${string}/${string}` | undefined,\n    }\n  }\n\n  async getBlob(cid: Cid): Promise<{\n    size: number\n    mimeType?: `${string}/${string}`\n    stream: stream.Readable\n  }> {\n    const metadata = await this.getBlobMetadata(cid)\n    const stream = await this.blobstore.getStream(cid).catch((err) => {\n      if (err instanceof BlobNotFoundError) {\n        throw new InvalidRequestError('Blob not found')\n      }\n      throw err\n    })\n\n    return { ...metadata, stream }\n  }\n\n  async listBlobs(opts: {\n    since?: string\n    cursor?: string\n    limit: number\n  }): Promise<string[]> {\n    const { since, cursor, limit } = opts\n    let builder = this.db.db\n      .selectFrom('record_blob')\n      .select('blobCid')\n      .orderBy('blobCid', 'asc')\n      .groupBy('blobCid')\n      .limit(limit)\n    if (since) {\n      builder = builder\n        .innerJoin('record', 'record.uri', 'record_blob.recordUri')\n        .where('record.repoRev', '>', since)\n    }\n    if (cursor) {\n      builder = builder.where('blobCid', '>', cursor)\n    }\n    const res = await builder.execute()\n    return res.map((row) => row.blobCid)\n  }\n\n  async getBlobTakedownStatus(\n    cid: Cid,\n  ): Promise<com.atproto.admin.defs.StatusAttr | null> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .select('takedownRef')\n      .where('cid', '=', cid.toString())\n      .executeTakeFirst()\n    if (!res) return null\n    return res.takedownRef\n      ? { applied: true, ref: res.takedownRef }\n      : { applied: false }\n  }\n\n  async hasRecordsForBlob(cid: Cid): Promise<boolean> {\n    const res = await this.db.db\n      .selectFrom('record_blob')\n      .where('blobCid', '=', cid.toString())\n      .select('blobCid')\n      .limit(1)\n      .executeTakeFirst()\n    return res != null\n  }\n\n  async getBlobsForRecord(recordUri: string): Promise<string[]> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .innerJoin('record_blob', 'record_blob.blobCid', 'blob.cid')\n      .where('recordUri', '=', recordUri)\n      .select('blob.cid')\n      .execute()\n    return res.map((row) => row.cid)\n  }\n\n  async blobCount(): Promise<number> {\n    const res = await this.db.db\n      .selectFrom('blob')\n      .select(countAll.as('count'))\n      .executeTakeFirst()\n    return res?.count ?? 0\n  }\n\n  async recordBlobCount(): Promise<number> {\n    const { ref } = this.db.db.dynamic\n    const res = await this.db.db\n      .selectFrom('record_blob')\n      .select(countDistinct(ref('blobCid')).as('count'))\n      .executeTakeFirst()\n    return res?.count ?? 0\n  }\n\n  async listMissingBlobs(opts: {\n    cursor?: string\n    limit: number\n  }): Promise<{ cid: string; recordUri: AtUriString }[]> {\n    const { cursor, limit } = opts\n    let builder = this.db.db\n      .selectFrom('record_blob')\n      .whereNotExists((qb) =>\n        qb\n          .selectFrom('blob')\n          .selectAll()\n          .whereRef('blob.cid', '=', 'record_blob.blobCid'),\n      )\n      .selectAll()\n      .orderBy('blobCid', 'asc')\n      .groupBy('blobCid')\n      .limit(limit)\n    if (cursor) {\n      builder = builder.where('blobCid', '>', cursor)\n    }\n    const res = await builder.execute()\n    return res.map((row) => ({\n      cid: row.blobCid,\n      recordUri: row.recordUri as AtUriString,\n    }))\n  }\n\n  async getBlobCids() {\n    const blobRows = await this.db.db.selectFrom('blob').select('cid').execute()\n    return blobRows.map((row) => parseCid(row.cid))\n  }\n}\n"]}

package/dist/actor-store/blob/transactor.d.ts

@@ -2,11 +2,11 @@ import stream from 'node:stream';
 import { BlobRef, Cid, TypedBlobRef } from '@atproto/lex-data';
 import { BlobStore } from '@atproto/repo';
 import { AtUri } from '@atproto/syntax';
-import { BackgroundQueue } from '../../background';
+import { BackgroundQueue } from '../../background.js';
 import { com } from '../../lexicons/index.js';
-import { PreparedWrite } from '../../repo/types';
-import { ActorDb } from '../db';
-import { BlobReader } from './reader';
+import { PreparedWrite } from '../../repo/types.js';
+import { ActorDb } from '../db/index.js';
+import { BlobReader } from './reader.js';
 export type BlobMetadata = {
     tempKey: string;
     size: number;

package/dist/actor-store/blob/transactor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactor.d.ts","sourceRoot":"","sources":["../../../src/actor-store/blob/transactor.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAIhC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAIb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAqB,SAAS,EAAiB,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,KAAK,EAAyB,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAqB,MAAM,OAAO,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,cAAe,SAAQ,UAAU;IAEnC,EAAE,EAAE,OAAO;IACX,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,eAAe;gBAFhC,EAAE,EAAE,OAAO,EACX,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe;IAKnC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC;IAevD,wBAAwB,CAC5B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,CAAC,QAAQ,GAC1B,OAAO,CAAC,YAAY,CAAC;IAgBlB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAsClE,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;IAuCtD,wBAAwB,CAC5B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU;IAgCvC,uBAAuB,CAC3B,MAAM,EAAE,aAAa,EAAE,EACvB,aAAa,CAAC,EAAE,OAAO;IAyDnB,0BAA0B,CAC9B,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IAiDV,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAUzE;AAED,qBAAa,WAAY,SAAQ,KAAK;IACpC,GAAG,EAAE,GAAG,CAAA;gBACI,GAAG,EAAE,GAAG;CAIrB"}
+{"version":3,"file":"transactor.d.ts","sourceRoot":"","sources":["../../../src/actor-store/blob/transactor.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAA;AAMhC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAIb,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAqB,SAAS,EAAiB,MAAM,eAAe,CAAA;AAC3E,OAAO,EAAE,KAAK,EAAyB,MAAM,iBAAiB,CAAA;AAE9D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAE7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,OAAO,EAAqB,MAAM,gBAAgB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAExC,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,qBAAa,cAAe,SAAQ,UAAU;IAEnC,EAAE,EAAE,OAAO;IACX,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,eAAe;gBAFhC,EAAE,EAAE,OAAO,EACX,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe;IAKnC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC;IAevD,wBAAwB,CAC5B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,CAAC,QAAQ,GAC1B,OAAO,CAAC,YAAY,CAAC;IAgBlB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IAsClE,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;IAuCtD,wBAAwB,CAC5B,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU;IAgCvC,uBAAuB,CAC3B,MAAM,EAAE,aAAa,EAAE,EACvB,aAAa,CAAC,EAAE,OAAO;IAyDnB,0BAA0B,CAC9B,IAAI,EAAE,YAAY,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC;IAiDV,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAarD,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;CAUzE;AAED,qBAAa,WAAY,SAAQ,KAAK;IACpC,GAAG,EAAE,GAAG,CAAA;gBACI,GAAG,EAAE,GAAG;CAIrB"}