@atproto/pds 0.4.223 → 0.4.225

package/dist/scripts/rebuild-repo.js

@@ -1,34 +1,27 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rebuildRepo = exports.rebuildRepoScript = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const promises_1 = __importDefault(require("node:readline/promises"));
-const common_1 = require("@atproto/common");
-const lex_1 = require("@atproto/lex");
-const repo_1 = require("@atproto/repo");
-const rebuildRepoScript = async (ctx, args) => {
+import assert from 'node:assert';
+import readline from 'node:readline/promises';
+import { TID } from '@atproto/common';
+import { isDidString } from '@atproto/lex';
+import { BlockMap, CidSet, MST, MemoryBlockstore, signCommit, } from '@atproto/repo';
+export const rebuildRepoScript = async (ctx, args) => {
     const did = args[0];
-    (0, node_assert_1.default)((0, lex_1.isDidString)(did), 'Expected DID as argument');
-    return (0, exports.rebuildRepo)(ctx, did, true);
+    assert(isDidString(did), 'Expected DID as argument');
+    return rebuildRepo(ctx, did, true);
 };
-exports.rebuildRepoScript = rebuildRepoScript;
-const rebuildRepo = async (ctx, did, promptUser) => {
-    const memoryStore = new repo_1.MemoryBlockstore();
+export const rebuildRepo = async (ctx, did, promptUser) => {
+    const memoryStore = new MemoryBlockstore();
     const commit = await ctx.actorStore.transact(did, async (store) => {
         const rootDetails = await store.repo.storage.getRootDetailed();
         const records = await store.record.listAll();
         const existingCids = await store.record.listExistingBlocks();
         // increment existing rev by 1 ms
-        const revTid = common_1.TID.fromStr(rootDetails.rev);
-        const rev = common_1.TID.fromTime(revTid.timestamp() + 1, revTid.clockid()).toString();
-        let mst = await repo_1.MST.create(memoryStore);
+        const revTid = TID.fromStr(rootDetails.rev);
+        const rev = TID.fromTime(revTid.timestamp() + 1, revTid.clockid()).toString();
+        let mst = await MST.create(memoryStore);
         for (const record of records) {
             mst = await mst.add(record.path, record.cid);
         }
-        const newBlocks = new repo_1.BlockMap();
+        const newBlocks = new BlockMap();
         for await (const node of mst.walk()) {
             if (node.isTree()) {
                 const pointer = await node.getPointer();
@@ -39,8 +32,8 @@ const rebuildRepo = async (ctx, did, promptUser) => {
             }
         }
         const mstCids = await mst.allCids();
-        const toDelete = new repo_1.CidSet(existingCids.toList()).subtractSet(mstCids);
-        const newCommit = await (0, repo_1.signCommit)({
+        const toDelete = new CidSet(existingCids.toList()).subtractSet(mstCids);
+        const newCommit = await signCommit({
             did,
             version: 3,
             rev,
@@ -70,7 +63,7 @@ const rebuildRepo = async (ctx, did, promptUser) => {
             relevantBlocks: newBlocks,
             removedCids: toDelete,
             ops: [],
-            blobs: new repo_1.CidSet(),
+            blobs: new CidSet(),
             prevData: null,
         };
     });
@@ -78,9 +71,8 @@ const rebuildRepo = async (ctx, did, promptUser) => {
     const syncData = await ctx.actorStore.read(did, (store) => store.repo.getSyncEventData());
     await ctx.sequencer.sequenceSyncEvt(did, syncData);
 };
-exports.rebuildRepo = rebuildRepo;
 const promptContinue = async () => {
-    const rl = promises_1.default.createInterface({
+    const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });

package/dist/scripts/rebuild-repo.js.map

@@ -1 +1 @@
-{"version":3,"file":"rebuild-repo.js","sourceRoot":"","sources":["../../src/scripts/rebuild-repo.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport readline from 'node:readline/promises'\nimport { TID } from '@atproto/common'\nimport { DidString, isDidString } from '@atproto/lex'\nimport {\n  BlockMap,\n  CidSet,\n  MST,\n  MemoryBlockstore,\n  signCommit,\n} from '@atproto/repo'\nimport { AccountManager } from '../account-manager/account-manager'\nimport { ActorStore } from '../actor-store/actor-store'\nimport { Sequencer } from '../sequencer'\n\nexport interface RebuildContext {\n  sequencer: Sequencer\n  accountManager: AccountManager\n  actorStore: ActorStore\n}\n\nexport const rebuildRepoScript = async (\n  ctx: RebuildContext,\n  args: string[],\n) => {\n  const did = args[0]\n  assert(isDidString(did), 'Expected DID as argument')\n  return rebuildRepo(ctx, did, true)\n}\n\nexport const rebuildRepo = async (\n  ctx: RebuildContext,\n  did: DidString,\n  promptUser: boolean,\n) => {\n  const memoryStore = new MemoryBlockstore()\n  const commit = await ctx.actorStore.transact(did, async (store) => {\n    const rootDetails = await store.repo.storage.getRootDetailed()\n    const records = await store.record.listAll()\n    const existingCids = await store.record.listExistingBlocks()\n\n    // increment existing rev by 1 ms\n    const revTid = TID.fromStr(rootDetails.rev)\n    const rev = TID.fromTime(\n      revTid.timestamp() + 1,\n      revTid.clockid(),\n    ).toString()\n\n    let mst = await MST.create(memoryStore)\n    for (const record of records) {\n      mst = await mst.add(record.path, record.cid)\n    }\n    const newBlocks = new BlockMap()\n    for await (const node of mst.walk()) {\n      if (node.isTree()) {\n        const pointer = await node.getPointer()\n        if (!existingCids.has(pointer)) {\n          const serialized = await node.serialize()\n          newBlocks.set(serialized.cid, serialized.bytes)\n        }\n      }\n    }\n    const mstCids = await mst.allCids()\n    const toDelete = new CidSet(existingCids.toList()).subtractSet(mstCids)\n    const newCommit = await signCommit(\n      {\n        did,\n        version: 3,\n        rev,\n        prev: null,\n        data: await mst.getPointer(),\n      },\n      store.repo.signingKey,\n    )\n    const commitCid = await newBlocks.add(newCommit)\n\n    if (promptUser) {\n      console.log('Record count: ', records.length)\n      console.log('Existing blocks: ', existingCids.toList().length)\n      console.log('Deleting blocks:', toDelete.toList().length)\n      console.log('Adding blocks: ', newBlocks.size)\n\n      const shouldContinue = await promptContinue()\n      if (!shouldContinue) {\n        throw new Error('Aborted')\n      }\n    }\n\n    await store.repo.storage.deleteMany(toDelete.toList())\n    await store.repo.storage.putMany(newBlocks, rev)\n    await store.repo.storage.updateRoot(commitCid, rev)\n    return {\n      cid: commitCid,\n      rev,\n      since: null,\n      prev: null,\n      newBlocks,\n      relevantBlocks: newBlocks,\n      removedCids: toDelete,\n      ops: [],\n      blobs: new CidSet(),\n      prevData: null,\n    }\n  })\n  await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)\n  const syncData = await ctx.actorStore.read(did, (store) =>\n    store.repo.getSyncEventData(),\n  )\n  await ctx.sequencer.sequenceSyncEvt(did, syncData)\n}\n\nconst promptContinue = async (): Promise<boolean> => {\n  const rl = readline.createInterface({\n    input: process.stdin,\n    output: process.stdout,\n  })\n  const answer = await rl.question('Continue? y/n ')\n  return answer === ''\n}\n"]}
+{"version":3,"file":"rebuild-repo.js","sourceRoot":"","sources":["../../src/scripts/rebuild-repo.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport readline from 'node:readline/promises'\nimport { TID } from '@atproto/common'\nimport { DidString, isDidString } from '@atproto/lex'\nimport {\n  BlockMap,\n  CidSet,\n  MST,\n  MemoryBlockstore,\n  signCommit,\n} from '@atproto/repo'\nimport { AccountManager } from '../account-manager/account-manager.js'\nimport { ActorStore } from '../actor-store/actor-store.js'\nimport { Sequencer } from '../sequencer/index.js'\n\nexport interface RebuildContext {\n  sequencer: Sequencer\n  accountManager: AccountManager\n  actorStore: ActorStore\n}\n\nexport const rebuildRepoScript = async (\n  ctx: RebuildContext,\n  args: string[],\n) => {\n  const did = args[0]\n  assert(isDidString(did), 'Expected DID as argument')\n  return rebuildRepo(ctx, did, true)\n}\n\nexport const rebuildRepo = async (\n  ctx: RebuildContext,\n  did: DidString,\n  promptUser: boolean,\n) => {\n  const memoryStore = new MemoryBlockstore()\n  const commit = await ctx.actorStore.transact(did, async (store) => {\n    const rootDetails = await store.repo.storage.getRootDetailed()\n    const records = await store.record.listAll()\n    const existingCids = await store.record.listExistingBlocks()\n\n    // increment existing rev by 1 ms\n    const revTid = TID.fromStr(rootDetails.rev)\n    const rev = TID.fromTime(\n      revTid.timestamp() + 1,\n      revTid.clockid(),\n    ).toString()\n\n    let mst = await MST.create(memoryStore)\n    for (const record of records) {\n      mst = await mst.add(record.path, record.cid)\n    }\n    const newBlocks = new BlockMap()\n    for await (const node of mst.walk()) {\n      if (node.isTree()) {\n        const pointer = await node.getPointer()\n        if (!existingCids.has(pointer)) {\n          const serialized = await node.serialize()\n          newBlocks.set(serialized.cid, serialized.bytes)\n        }\n      }\n    }\n    const mstCids = await mst.allCids()\n    const toDelete = new CidSet(existingCids.toList()).subtractSet(mstCids)\n    const newCommit = await signCommit(\n      {\n        did,\n        version: 3,\n        rev,\n        prev: null,\n        data: await mst.getPointer(),\n      },\n      store.repo.signingKey,\n    )\n    const commitCid = await newBlocks.add(newCommit)\n\n    if (promptUser) {\n      console.log('Record count: ', records.length)\n      console.log('Existing blocks: ', existingCids.toList().length)\n      console.log('Deleting blocks:', toDelete.toList().length)\n      console.log('Adding blocks: ', newBlocks.size)\n\n      const shouldContinue = await promptContinue()\n      if (!shouldContinue) {\n        throw new Error('Aborted')\n      }\n    }\n\n    await store.repo.storage.deleteMany(toDelete.toList())\n    await store.repo.storage.putMany(newBlocks, rev)\n    await store.repo.storage.updateRoot(commitCid, rev)\n    return {\n      cid: commitCid,\n      rev,\n      since: null,\n      prev: null,\n      newBlocks,\n      relevantBlocks: newBlocks,\n      removedCids: toDelete,\n      ops: [],\n      blobs: new CidSet(),\n      prevData: null,\n    }\n  })\n  await ctx.accountManager.updateRepoRoot(did, commit.cid, commit.rev)\n  const syncData = await ctx.actorStore.read(did, (store) =>\n    store.repo.getSyncEventData(),\n  )\n  await ctx.sequencer.sequenceSyncEvt(did, syncData)\n}\n\nconst promptContinue = async (): Promise<boolean> => {\n  const rl = readline.createInterface({\n    input: process.stdin,\n    output: process.stdout,\n  })\n  const answer = await rl.question('Continue? y/n ')\n  return answer === ''\n}\n"]}

package/dist/scripts/rotate-keys.d.ts

@@ -2,8 +2,8 @@ import * as plc from '@did-plc/lib';
 import AtpAgent from '@atproto/api';
 import { Keypair } from '@atproto/crypto';
 import { IdResolver } from '@atproto/identity';
-import { ActorStore } from '../actor-store/actor-store';
-import { Sequencer } from '../sequencer';
+import { ActorStore } from '../actor-store/actor-store.js';
+import { Sequencer } from '../sequencer/index.js';
 export type RotateKeysContext = {
     sequencer: Sequencer;
     actorStore: ActorStore;

package/dist/scripts/rotate-keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rotate-keys.d.ts","sourceRoot":"","sources":["../../src/scripts/rotate-keys.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AAEnC,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAIxC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAA;IACrB,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,CAAC,EAAE,QAAQ,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,KAAK,iBAAiB,EAAE,MAAM,MAAM,EAAE,kBAItE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,KAAK,iBAAiB,EACtB,MAAM,MAAM,EAAE,kBAiBf,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,KAAK,iBAAiB,EACtB,MAAM,MAAM,EAAE,kBAqBf,CAAA"}
+{"version":3,"file":"rotate-keys.d.ts","sourceRoot":"","sources":["../../src/scripts/rotate-keys.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,GAAG,MAAM,cAAc,CAAA;AAEnC,OAAO,QAAQ,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAIjD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,SAAS,CAAA;IACpB,UAAU,EAAE,UAAU,CAAA;IACtB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAA;IACrB,cAAc,EAAE,OAAO,CAAA;IACvB,kBAAkB,CAAC,EAAE,QAAQ,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,UAAU,GAAU,KAAK,iBAAiB,EAAE,MAAM,MAAM,EAAE,kBAItE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,KAAK,iBAAiB,EACtB,MAAM,MAAM,EAAE,kBAiBf,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,KAAK,iBAAiB,EACtB,MAAM,MAAM,EAAE,kBAqBf,CAAA"}

package/dist/scripts/rotate-keys.js

@@ -1,40 +1,32 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rotateKeysRecovery = exports.rotateKeysFromFile = exports.rotateKeys = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const promises_1 = __importDefault(require("node:fs/promises"));
-const p_queue_1 = __importDefault(require("p-queue"));
-const lex_1 = require("@atproto/lex");
-const recovery_db_1 = require("./sequencer-recovery/recovery-db");
-const util_1 = require("./util");
-const rotateKeys = async (ctx, args) => {
+import assert from 'node:assert';
+import fs from 'node:fs/promises';
+import PQueue from 'p-queue';
+import { isDidString } from '@atproto/lex';
+import { getRecoveryDbFromSequencerLoc } from './sequencer-recovery/recovery-db.js';
+import { parseIntArg } from './util.js';
+export const rotateKeys = async (ctx, args) => {
     const dids = args;
-    (0, node_assert_1.default)(dids.every(lex_1.isDidString), 'All arguments must be DIDs');
+    assert(dids.every(isDidString), 'All arguments must be DIDs');
     await rotateKeysForRepos(ctx, dids, 10);
 };
-exports.rotateKeys = rotateKeys;
-const rotateKeysFromFile = async (ctx, args) => {
+export const rotateKeysFromFile = async (ctx, args) => {
     const filepath = args[0];
     if (!filepath) {
         throw new Error('Expected filepath as argument');
     }
-    const concurrency = args[1] ? (0, util_1.parseIntArg)(args[1]) : 25;
-    const file = await promises_1.default.readFile(filepath);
+    const concurrency = args[1] ? parseIntArg(args[1]) : 25;
+    const file = await fs.readFile(filepath);
     const dids = file
         .toString()
         .split('\n')
         .map((did) => did.trim())
         .filter((did) => did.startsWith('did:plc'));
-    (0, node_assert_1.default)(dids.every(lex_1.isDidString), 'File contains invalid DIDs');
+    assert(dids.every(isDidString), 'File contains invalid DIDs');
     await rotateKeysForRepos(ctx, dids, concurrency);
 };
-exports.rotateKeysFromFile = rotateKeysFromFile;
-const rotateKeysRecovery = async (ctx, args) => {
-    const concurrency = args[1] ? (0, util_1.parseIntArg)(args[0]) : 10;
-    const recoveryDb = await (0, recovery_db_1.getRecoveryDbFromSequencerLoc)(ctx.sequencer.dbLocation);
+export const rotateKeysRecovery = async (ctx, args) => {
+    const concurrency = args[1] ? parseIntArg(args[0]) : 10;
+    const recoveryDb = await getRecoveryDbFromSequencerLoc(ctx.sequencer.dbLocation);
     const rows = await recoveryDb.db
         .selectFrom('new_account')
         .select('did')
@@ -49,9 +41,8 @@ const rotateKeysRecovery = async (ctx, args) => {
             .execute();
     });
 };
-exports.rotateKeysRecovery = rotateKeysRecovery;
 const rotateKeysForRepos = async (ctx, dids, concurrency, onSuccess) => {
-    const queue = new p_queue_1.default({ concurrency });
+    const queue = new PQueue({ concurrency });
     let completed = 0;
     for (const did of dids) {
         queue.add(async () => {

package/dist/scripts/rotate-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"rotate-keys.js","sourceRoot":"","sources":["../../src/scripts/rotate-keys.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport fs from 'node:fs/promises'\nimport * as plc from '@did-plc/lib'\nimport PQueue from 'p-queue'\nimport AtpAgent from '@atproto/api'\nimport { Keypair } from '@atproto/crypto'\nimport { IdResolver } from '@atproto/identity'\nimport { DidString, isDidString } from '@atproto/lex'\nimport { ActorStore } from '../actor-store/actor-store'\nimport { SyncEvtData } from '../repo'\nimport { Sequencer } from '../sequencer'\nimport { getRecoveryDbFromSequencerLoc } from './sequencer-recovery/recovery-db'\nimport { parseIntArg } from './util'\n\nexport type RotateKeysContext = {\n  sequencer: Sequencer\n  actorStore: ActorStore\n  idResolver: IdResolver\n  plcClient: plc.Client\n  plcRotationKey: Keypair\n  entrywayAdminAgent?: AtpAgent\n}\n\nexport const rotateKeys = async (ctx: RotateKeysContext, args: string[]) => {\n  const dids = args\n  assert(dids.every(isDidString), 'All arguments must be DIDs')\n  await rotateKeysForRepos(ctx, dids, 10)\n}\n\nexport const rotateKeysFromFile = async (\n  ctx: RotateKeysContext,\n  args: string[],\n) => {\n  const filepath = args[0]\n  if (!filepath) {\n    throw new Error('Expected filepath as argument')\n  }\n  const concurrency = args[1] ? parseIntArg(args[1]) : 25\n  const file = await fs.readFile(filepath)\n  const dids = file\n    .toString()\n    .split('\\n')\n    .map((did) => did.trim())\n    .filter((did) => did.startsWith('did:plc'))\n\n  assert(dids.every(isDidString), 'File contains invalid DIDs')\n\n  await rotateKeysForRepos(ctx, dids, concurrency)\n}\n\nexport const rotateKeysRecovery = async (\n  ctx: RotateKeysContext,\n  args: string[],\n) => {\n  const concurrency = args[1] ? parseIntArg(args[0]) : 10\n\n  const recoveryDb = await getRecoveryDbFromSequencerLoc(\n    ctx.sequencer.dbLocation,\n  )\n  const rows = await recoveryDb.db\n    .selectFrom('new_account')\n    .select('did')\n    .where('new_account.published', '=', 0)\n    .execute()\n  const dids = rows.map((r) => r.did as DidString)\n\n  await rotateKeysForRepos(ctx, dids, concurrency, async (did) => {\n    await recoveryDb.db\n      .updateTable('new_account')\n      .set({ published: 1 })\n      .where('did', '=', did)\n      .execute()\n  })\n}\n\nconst rotateKeysForRepos = async (\n  ctx: RotateKeysContext,\n  dids: DidString[],\n  concurrency: number,\n  onSuccess?: (did: DidString) => Promise<void>,\n) => {\n  const queue = new PQueue({ concurrency })\n  let completed = 0\n  for (const did of dids) {\n    queue.add(async () => {\n      try {\n        await updatePlcSigningKey(ctx, did)\n      } catch (err) {\n        console.error(`failed to update key for ${did}: ${err}`)\n        return\n      }\n      let syncData: SyncEvtData\n      try {\n        syncData = await ctx.actorStore.transact(did, async (actorTxn) => {\n          await actorTxn.repo.processWrites([])\n          return actorTxn.repo.getSyncEventData()\n        })\n      } catch (err) {\n        console.error(`failed to write new commit for ${did}: ${err}`)\n        return\n      }\n      try {\n        await ctx.sequencer.sequenceIdentityEvt(did)\n      } catch (err) {\n        console.error(`failed to sequence new identity evt for ${did}: ${err}`)\n        return\n      }\n      try {\n        await ctx.sequencer.sequenceSyncEvt(did, syncData)\n      } catch (err) {\n        console.error(`failed to sequence for ${did}: ${err}`)\n        return\n      }\n      if (onSuccess) {\n        await onSuccess(did)\n      }\n      completed++\n      if (completed % 10 === 0) {\n        console.log(`${completed}/${dids.length}`)\n      }\n    })\n  }\n  await queue.onIdle()\n  console.log('DONE')\n}\n\nconst updatePlcSigningKey = async (ctx: RotateKeysContext, did: DidString) => {\n  const updateTo = await ctx.actorStore.keypair(did)\n  const currSigningKey = await ctx.idResolver.did.resolveAtprotoKey(did, true)\n  if (updateTo.did() === currSigningKey) {\n    // already up to date\n    return\n  }\n  if (ctx.entrywayAdminAgent) {\n    await ctx.entrywayAdminAgent.api.com.atproto.admin.updateAccountSigningKey({\n      did,\n      signingKey: updateTo.did(),\n    })\n  } else {\n    await ctx.plcClient.updateAtprotoKey(\n      did,\n      ctx.plcRotationKey,\n      updateTo.did(),\n    )\n  }\n}\n"]}
+{"version":3,"file":"rotate-keys.js","sourceRoot":"","sources":["../../src/scripts/rotate-keys.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport fs from 'node:fs/promises'\nimport * as plc from '@did-plc/lib'\nimport PQueue from 'p-queue'\nimport AtpAgent from '@atproto/api'\nimport { Keypair } from '@atproto/crypto'\nimport { IdResolver } from '@atproto/identity'\nimport { DidString, isDidString } from '@atproto/lex'\nimport { ActorStore } from '../actor-store/actor-store.js'\nimport { SyncEvtData } from '../repo/index.js'\nimport { Sequencer } from '../sequencer/index.js'\nimport { getRecoveryDbFromSequencerLoc } from './sequencer-recovery/recovery-db.js'\nimport { parseIntArg } from './util.js'\n\nexport type RotateKeysContext = {\n  sequencer: Sequencer\n  actorStore: ActorStore\n  idResolver: IdResolver\n  plcClient: plc.Client\n  plcRotationKey: Keypair\n  entrywayAdminAgent?: AtpAgent\n}\n\nexport const rotateKeys = async (ctx: RotateKeysContext, args: string[]) => {\n  const dids = args\n  assert(dids.every(isDidString), 'All arguments must be DIDs')\n  await rotateKeysForRepos(ctx, dids, 10)\n}\n\nexport const rotateKeysFromFile = async (\n  ctx: RotateKeysContext,\n  args: string[],\n) => {\n  const filepath = args[0]\n  if (!filepath) {\n    throw new Error('Expected filepath as argument')\n  }\n  const concurrency = args[1] ? parseIntArg(args[1]) : 25\n  const file = await fs.readFile(filepath)\n  const dids = file\n    .toString()\n    .split('\\n')\n    .map((did) => did.trim())\n    .filter((did) => did.startsWith('did:plc'))\n\n  assert(dids.every(isDidString), 'File contains invalid DIDs')\n\n  await rotateKeysForRepos(ctx, dids, concurrency)\n}\n\nexport const rotateKeysRecovery = async (\n  ctx: RotateKeysContext,\n  args: string[],\n) => {\n  const concurrency = args[1] ? parseIntArg(args[0]) : 10\n\n  const recoveryDb = await getRecoveryDbFromSequencerLoc(\n    ctx.sequencer.dbLocation,\n  )\n  const rows = await recoveryDb.db\n    .selectFrom('new_account')\n    .select('did')\n    .where('new_account.published', '=', 0)\n    .execute()\n  const dids = rows.map((r) => r.did as DidString)\n\n  await rotateKeysForRepos(ctx, dids, concurrency, async (did) => {\n    await recoveryDb.db\n      .updateTable('new_account')\n      .set({ published: 1 })\n      .where('did', '=', did)\n      .execute()\n  })\n}\n\nconst rotateKeysForRepos = async (\n  ctx: RotateKeysContext,\n  dids: DidString[],\n  concurrency: number,\n  onSuccess?: (did: DidString) => Promise<void>,\n) => {\n  const queue = new PQueue({ concurrency })\n  let completed = 0\n  for (const did of dids) {\n    queue.add(async () => {\n      try {\n        await updatePlcSigningKey(ctx, did)\n      } catch (err) {\n        console.error(`failed to update key for ${did}: ${err}`)\n        return\n      }\n      let syncData: SyncEvtData\n      try {\n        syncData = await ctx.actorStore.transact(did, async (actorTxn) => {\n          await actorTxn.repo.processWrites([])\n          return actorTxn.repo.getSyncEventData()\n        })\n      } catch (err) {\n        console.error(`failed to write new commit for ${did}: ${err}`)\n        return\n      }\n      try {\n        await ctx.sequencer.sequenceIdentityEvt(did)\n      } catch (err) {\n        console.error(`failed to sequence new identity evt for ${did}: ${err}`)\n        return\n      }\n      try {\n        await ctx.sequencer.sequenceSyncEvt(did, syncData)\n      } catch (err) {\n        console.error(`failed to sequence for ${did}: ${err}`)\n        return\n      }\n      if (onSuccess) {\n        await onSuccess(did)\n      }\n      completed++\n      if (completed % 10 === 0) {\n        console.log(`${completed}/${dids.length}`)\n      }\n    })\n  }\n  await queue.onIdle()\n  console.log('DONE')\n}\n\nconst updatePlcSigningKey = async (ctx: RotateKeysContext, did: DidString) => {\n  const updateTo = await ctx.actorStore.keypair(did)\n  const currSigningKey = await ctx.idResolver.did.resolveAtprotoKey(did, true)\n  if (updateTo.did() === currSigningKey) {\n    // already up to date\n    return\n  }\n  if (ctx.entrywayAdminAgent) {\n    await ctx.entrywayAdminAgent.api.com.atproto.admin.updateAccountSigningKey({\n      did,\n      signingKey: updateTo.did(),\n    })\n  } else {\n    await ctx.plcClient.updateAtprotoKey(\n      did,\n      ctx.plcRotationKey,\n      updateTo.did(),\n    )\n  }\n}\n"]}

package/dist/scripts/sequencer-recovery/index.d.ts

@@ -1,3 +1,3 @@
-import { RecovererContextNoDb } from './recoverer';
+import { RecovererContextNoDb } from './recoverer.js';
 export declare const sequencerRecovery: (ctx: RecovererContextNoDb, args: string[]) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/scripts/sequencer-recovery/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAG7D,eAAO,MAAM,iBAAiB,GAC5B,KAAK,oBAAoB,EACzB,MAAM,MAAM,EAAE,kBAgBf,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAGhE,eAAO,MAAM,iBAAiB,GAC5B,KAAK,oBAAoB,EACzB,MAAM,MAAM,EAAE,kBAgBf,CAAA"}

package/dist/scripts/sequencer-recovery/index.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sequencerRecovery = void 0;
-const util_1 = require("../util");
-const recoverer_1 = require("./recoverer");
-const recovery_db_1 = require("./recovery-db");
-const sequencerRecovery = async (ctx, args) => {
-    const cursor = args[0] ? (0, util_1.parseIntArg)(args[0]) : 0;
-    const concurrency = args[1] ? (0, util_1.parseIntArg)(args[1]) : 10;
-    const recoveryDb = await (0, recovery_db_1.getRecoveryDbFromSequencerLoc)(ctx.sequencer.dbLocation);
-    const recover = new recoverer_1.Recoverer({ ...ctx, recoveryDb }, {
+import { parseIntArg } from '../util.js';
+import { Recoverer } from './recoverer.js';
+import { getRecoveryDbFromSequencerLoc } from './recovery-db.js';
+export const sequencerRecovery = async (ctx, args) => {
+    const cursor = args[0] ? parseIntArg(args[0]) : 0;
+    const concurrency = args[1] ? parseIntArg(args[1]) : 10;
+    const recoveryDb = await getRecoveryDbFromSequencerLoc(ctx.sequencer.dbLocation);
+    const recover = new Recoverer({ ...ctx, recoveryDb }, {
         concurrency,
     });
     await recover.run(cursor);
 };
-exports.sequencerRecovery = sequencerRecovery;
 //# sourceMappingURL=index.js.map

package/dist/scripts/sequencer-recovery/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/index.ts"],"names":[],"mappings":";;;AAAA,kCAAqC;AACrC,2CAA6D;AAC7D,+CAA6D;AAEtD,MAAM,iBAAiB,GAAG,KAAK,EACpC,GAAyB,EACzB,IAAc,EACd,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,kBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEvD,MAAM,UAAU,GAAG,MAAM,IAAA,2CAA6B,EACpD,GAAG,CAAC,SAAS,CAAC,UAAU,CACzB,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,qBAAS,CAC3B,EAAE,GAAG,GAAG,EAAE,UAAU,EAAE,EACtB;QACE,WAAW;KACZ,CACF,CAAA;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC,CAAA;AAlBY,QAAA,iBAAiB,qBAkB7B","sourcesContent":["import { parseIntArg } from '../util'\nimport { Recoverer, RecovererContextNoDb } from './recoverer'\nimport { getRecoveryDbFromSequencerLoc } from './recovery-db'\n\nexport const sequencerRecovery = async (\n  ctx: RecovererContextNoDb,\n  args: string[],\n) => {\n  const cursor = args[0] ? parseIntArg(args[0]) : 0\n  const concurrency = args[1] ? parseIntArg(args[1]) : 10\n\n  const recoveryDb = await getRecoveryDbFromSequencerLoc(\n    ctx.sequencer.dbLocation,\n  )\n\n  const recover = new Recoverer(\n    { ...ctx, recoveryDb },\n    {\n      concurrency,\n    },\n  )\n  await recover.run(cursor)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AACxC,OAAO,EAAE,SAAS,EAAwB,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAEhE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,GAAyB,EACzB,IAAc,EACd,EAAE;IACF,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEvD,MAAM,UAAU,GAAG,MAAM,6BAA6B,CACpD,GAAG,CAAC,SAAS,CAAC,UAAU,CACzB,CAAA;IAED,MAAM,OAAO,GAAG,IAAI,SAAS,CAC3B,EAAE,GAAG,GAAG,EAAE,UAAU,EAAE,EACtB;QACE,WAAW;KACZ,CACF,CAAA;IACD,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC3B,CAAC,CAAA","sourcesContent":["import { parseIntArg } from '../util.js'\nimport { Recoverer, RecovererContextNoDb } from './recoverer.js'\nimport { getRecoveryDbFromSequencerLoc } from './recovery-db.js'\n\nexport const sequencerRecovery = async (\n  ctx: RecovererContextNoDb,\n  args: string[],\n) => {\n  const cursor = args[0] ? parseIntArg(args[0]) : 0\n  const concurrency = args[1] ? parseIntArg(args[1]) : 10\n\n  const recoveryDb = await getRecoveryDbFromSequencerLoc(\n    ctx.sequencer.dbLocation,\n  )\n\n  const recover = new Recoverer(\n    { ...ctx, recoveryDb },\n    {\n      concurrency,\n    },\n  )\n  await recover.run(cursor)\n}\n"]}

package/dist/scripts/sequencer-recovery/recoverer.d.ts

@@ -1,8 +1,8 @@
-import { AccountManager } from '../../account-manager/account-manager';
-import { ActorStore } from '../../actor-store/actor-store';
-import { SeqEvt, Sequencer } from '../../sequencer';
-import { RecoveryDb } from './recovery-db';
-import { UserQueues } from './user-queues';
+import { AccountManager } from '../../account-manager/account-manager.js';
+import { ActorStore } from '../../actor-store/actor-store.js';
+import { SeqEvt, Sequencer } from '../../sequencer/index.js';
+import { RecoveryDb } from './recovery-db.js';
+import { UserQueues } from './user-queues.js';
 export type RecovererContextNoDb = {
     sequencer: Sequencer;
     accountManager: AccountManager;

package/dist/scripts/sequencer-recovery/recoverer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recoverer.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recoverer.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,cAAc,EAEf,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAA;AAS1D,OAAO,EAAyB,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IACpD,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAID,qBAAa,SAAS;IAKX,GAAG,EAAE,gBAAgB;IAJ9B,MAAM,EAAE,UAAU,CAAA;IAClB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAGV,GAAG,EAAE,gBAAgB,EAC5B,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE;IAMzB,GAAG,CAAC,WAAW,SAAI;IAmCnB,UAAU;IAIV,OAAO;IAIb,YAAY,CAAC,GAAG,EAAE,MAAM;CAezB;AAED,eAAO,MAAM,aAAa,GAAU,KAAK,gBAAgB,EAAE,KAAK,MAAM,kBAQrE,CAAA"}
+{"version":3,"file":"recoverer.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recoverer.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,cAAc,EAEf,MAAM,0CAA0C,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAA;AAQ7D,OAAO,EAGL,MAAM,EACN,SAAS,EACV,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAE7C,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,SAAS,CAAA;IACpB,cAAc,EAAE,cAAc,CAAA;IAC9B,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,oBAAoB,GAAG;IACpD,UAAU,EAAE,UAAU,CAAA;CACvB,CAAA;AAID,qBAAa,SAAS;IAKX,GAAG,EAAE,gBAAgB;IAJ9B,MAAM,EAAE,UAAU,CAAA;IAClB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAGV,GAAG,EAAE,gBAAgB,EAC5B,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE;IAMzB,GAAG,CAAC,WAAW,SAAI;IAmCnB,UAAU;IAIV,OAAO;IAIb,YAAY,CAAC,GAAG,EAAE,MAAM;CAezB;AAED,eAAO,MAAM,aAAa,GAAU,KAAK,gBAAgB,EAAE,KAAK,MAAM,kBAQrE,CAAA"}

package/dist/scripts/sequencer-recovery/recoverer.js

@@ -1,36 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.processSeqEvt = exports.Recoverer = void 0;
-const common_1 = require("@atproto/common");
-const crypto_1 = require("@atproto/crypto");
-const lex_1 = require("@atproto/lex");
-const repo_1 = require("@atproto/repo");
-const account_manager_1 = require("../../account-manager/account-manager");
-const db_1 = require("../../db");
-const repo_2 = require("../../repo");
-const user_queues_1 = require("./user-queues");
+import { rmIfExists } from '@atproto/common';
+import { Secp256k1Keypair } from '@atproto/crypto';
+import { isNsidString, isRecordKeyString } from '@atproto/lex';
+import { BlockMap, CidSet, WriteOpAction, cborToLexRecord, parseDataKey, readCar, } from '@atproto/repo';
+import { AccountStatus, } from '../../account-manager/account-manager.js';
+import { countAll } from '../../db/index.js';
+import { prepareCreate, prepareDelete, prepareUpdate, } from '../../repo/index.js';
+import { UserQueues } from './user-queues.js';
 const PAGE_SIZE = 5000;
-class Recoverer {
+export class Recoverer {
     constructor(ctx, opts) {
-        Object.defineProperty(this, "ctx", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ctx
-        });
-        Object.defineProperty(this, "queues", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "failed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.queues = new user_queues_1.UserQueues(opts.concurrency);
+        this.ctx = ctx;
+        this.queues = new UserQueues(opts.concurrency);
         this.failed = new Set();
     }
     async run(startCursor = 0) {
@@ -43,7 +23,7 @@ class Recoverer {
         }
         const totalRes = await this.ctx.sequencer.db.db
             .selectFrom('repo_seq')
-            .select(db_1.countAll.as('count'))
+            .select(countAll.as('count'))
             .executeTakeFirstOrThrow();
         const totalEvts = totalRes.count;
         let completed = 0;
@@ -77,15 +57,14 @@ class Recoverer {
             if (this.failed.has(did)) {
                 return;
             }
-            await (0, exports.processSeqEvt)(this.ctx, evt).catch(async (err) => {
+            await processSeqEvt(this.ctx, evt).catch(async (err) => {
                 this.failed.add(did);
                 await trackFailure(this.ctx.recoveryDb, did, err);
             });
         });
     }
 }
-exports.Recoverer = Recoverer;
-const processSeqEvt = async (ctx, evt) => {
+export const processSeqEvt = async (ctx, evt) => {
     // only need to process commits & tombstones
     if (evt.type === 'account') {
         await processAccountEvt(ctx, evt.evt);
@@ -94,7 +73,6 @@ const processSeqEvt = async (ctx, evt) => {
         await processCommit(ctx, evt.evt).catch();
     }
 };
-exports.processSeqEvt = processSeqEvt;
 const processCommit = async (ctx, evt) => {
     const did = evt.repo;
     const { writes, blocks } = await parseCommitEvt(evt);
@@ -121,7 +99,7 @@ const processCommit = async (ctx, evt) => {
 };
 const processRepoCreation = async (ctx, evt, writes, blocks) => {
     const did = evt.repo;
-    const keypair = await crypto_1.Secp256k1Keypair.create({ exportable: true });
+    const keypair = await Secp256k1Keypair.create({ exportable: true });
     await ctx.actorStore.create(did, keypair);
     const commit = {
         cid: evt.commit,
@@ -129,8 +107,8 @@ const processRepoCreation = async (ctx, evt, writes, blocks) => {
         since: evt.since,
         prev: null,
         newBlocks: blocks,
-        relevantBlocks: new repo_1.BlockMap(),
-        removedCids: new repo_1.CidSet(),
+        relevantBlocks: new BlockMap(),
+        removedCids: new CidSet(),
     };
     await ctx.actorStore.transact(did, async (actorTxn) => {
         await actorTxn.repo.storage.applyCommit(commit, true);
@@ -141,18 +119,18 @@ const processRepoCreation = async (ctx, evt, writes, blocks) => {
 };
 const processAccountEvt = async (ctx, evt) => {
     // do not need to process deactivation/takedowns because we backup account DB as well
-    if (evt.status !== account_manager_1.AccountStatus.Deleted) {
+    if (evt.status !== AccountStatus.Deleted) {
         return;
     }
     const { directory } = await ctx.actorStore.getLocation(evt.did);
-    await (0, common_1.rmIfExists)(directory, true);
+    await rmIfExists(directory, true);
     await ctx.accountManager.deleteAccount(evt.did);
 };
 const trackBlobs = async (store, writes) => {
     await store.repo.blob.deleteDereferencedBlobs(writes);
     for (const write of writes) {
-        if (write.action === repo_1.WriteOpAction.Create ||
-            write.action === repo_1.WriteOpAction.Update) {
+        if (write.action === WriteOpAction.Create ||
+            write.action === WriteOpAction.Update) {
             for (const blob of write.blobs) {
                 await store.repo.blob.insertBlobMetadata(blob);
                 await store.repo.blob.associateBlob(blob, write.uri);
@@ -183,24 +161,24 @@ const trackNewAccount = async (recoveryDb, did) => {
 };
 const parseCommitEvt = async (evt) => {
     const did = evt.repo;
-    const evtCar = await (0, repo_1.readCar)(evt.blocks, { skipCidVerification: true });
+    const evtCar = await readCar(evt.blocks, { skipCidVerification: true });
     const writesUnfiltered = await Promise.all(evt.ops.map(async (op) => {
-        const { collection, rkey } = (0, repo_1.parseDataKey)(op.path);
-        if (!(0, lex_1.isNsidString)(collection))
+        const { collection, rkey } = parseDataKey(op.path);
+        if (!isNsidString(collection))
             return undefined;
-        if (!(0, lex_1.isRecordKeyString)(rkey))
+        if (!isRecordKeyString(rkey))
             return undefined;
         if (op.action === 'delete') {
-            return (0, repo_2.prepareDelete)({ did, collection, rkey });
+            return prepareDelete({ did, collection, rkey });
         }
         if (!op.cid)
             return undefined;
         const recordBytes = evtCar.blocks.get(op.cid);
         if (!recordBytes)
             return undefined;
-        const record = (0, repo_1.cborToLexRecord)(recordBytes);
+        const record = cborToLexRecord(recordBytes);
         if (op.action === 'create') {
-            return (0, repo_2.prepareCreate)({
+            return prepareCreate({
                 did,
                 collection,
                 rkey,
@@ -209,7 +187,7 @@ const parseCommitEvt = async (evt) => {
             });
         }
         else {
-            return (0, repo_2.prepareUpdate)({
+            return prepareUpdate({
                 did,
                 collection,
                 rkey,

package/dist/scripts/sequencer-recovery/recoverer.js.map

@@ -1 +1 @@
-{"version":3,"file":"recoverer.js","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recoverer.ts"],"names":[],"mappings":"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","sourcesContent":["import { rmIfExists } from '@atproto/common'\nimport { Secp256k1Keypair } from '@atproto/crypto'\nimport { DidString, isNsidString, isRecordKeyString } from '@atproto/lex'\nimport {\n  BlockMap,\n  CidSet,\n  CommitData,\n  WriteOpAction,\n  cborToLexRecord,\n  parseDataKey,\n  readCar,\n} from '@atproto/repo'\nimport {\n  AccountManager,\n  AccountStatus,\n} from '../../account-manager/account-manager'\nimport { ActorStore } from '../../actor-store/actor-store'\nimport { ActorStoreTransactor } from '../../actor-store/actor-store-transactor'\nimport { countAll } from '../../db'\nimport {\n  PreparedWrite,\n  prepareCreate,\n  prepareDelete,\n  prepareUpdate,\n} from '../../repo'\nimport { AccountEvt, CommitEvt, SeqEvt, Sequencer } from '../../sequencer'\nimport { RecoveryDb } from './recovery-db'\nimport { UserQueues } from './user-queues'\n\nexport type RecovererContextNoDb = {\n  sequencer: Sequencer\n  accountManager: AccountManager\n  actorStore: ActorStore\n}\n\nexport type RecovererContext = RecovererContextNoDb & {\n  recoveryDb: RecoveryDb\n}\n\nconst PAGE_SIZE = 5000\n\nexport class Recoverer {\n  queues: UserQueues\n  failed: Set<string>\n\n  constructor(\n    public ctx: RecovererContext,\n    opts: { concurrency: number },\n  ) {\n    this.queues = new UserQueues(opts.concurrency)\n    this.failed = new Set()\n  }\n\n  async run(startCursor = 0) {\n    const failed = await this.ctx.recoveryDb.db\n      .selectFrom('failed')\n      .select('did')\n      .execute()\n    for (const row of failed) {\n      this.failed.add(row.did)\n    }\n\n    const totalRes = await this.ctx.sequencer.db.db\n      .selectFrom('repo_seq')\n      .select(countAll.as('count'))\n      .executeTakeFirstOrThrow()\n    const totalEvts = totalRes.count\n    let completed = 0\n\n    let cursor: number | undefined = startCursor\n    while (cursor !== undefined) {\n      const page = await this.ctx.sequencer.requestSeqRange({\n        earliestSeq: cursor,\n        limit: PAGE_SIZE,\n      })\n      page.forEach((evt) => this.processEvent(evt))\n      cursor = page.at(-1)?.seq\n\n      await this.queues.onEmpty()\n\n      completed += PAGE_SIZE\n      const percentComplete = (completed / totalEvts) * 100\n      console.log(`${percentComplete.toFixed(2)}% - ${cursor}`)\n    }\n\n    await this.queues.processAll()\n  }\n\n  async processAll() {\n    await this.queues.processAll()\n  }\n\n  async destroy() {\n    await this.queues.destroy()\n  }\n\n  processEvent(evt: SeqEvt) {\n    const did = didFromEvt(evt)\n    if (!did) {\n      return\n    }\n    this.queues.addToUser(did, async () => {\n      if (this.failed.has(did)) {\n        return\n      }\n      await processSeqEvt(this.ctx, evt).catch(async (err) => {\n        this.failed.add(did)\n        await trackFailure(this.ctx.recoveryDb, did, err)\n      })\n    })\n  }\n}\n\nexport const processSeqEvt = async (ctx: RecovererContext, evt: SeqEvt) => {\n  // only need to process commits & tombstones\n  if (evt.type === 'account') {\n    await processAccountEvt(ctx, evt.evt)\n  }\n  if (evt.type === 'commit') {\n    await processCommit(ctx, evt.evt).catch()\n  }\n}\n\nconst processCommit = async (ctx: RecovererContext, evt: CommitEvt) => {\n  const did = evt.repo\n  const { writes, blocks } = await parseCommitEvt(evt)\n  if (evt.since === null) {\n    const actorExists = await ctx.actorStore.exists(did)\n    if (!actorExists) {\n      await processRepoCreation(ctx, evt, writes, blocks)\n      return\n    }\n  }\n  await ctx.actorStore.transact(did, async (actorTxn) => {\n    const root = await actorTxn.repo.storage.getRootDetailed()\n    if (root.rev >= evt.rev) {\n      return\n    }\n    const commit = await actorTxn.repo.formatCommit(writes)\n    commit.newBlocks = blocks\n    commit.cid = evt.commit\n    commit.rev = evt.rev\n    await actorTxn.repo.storage.applyCommit(commit)\n    await actorTxn.repo.indexWrites(writes, commit.rev)\n    await trackBlobs(actorTxn, writes)\n  })\n}\n\nconst processRepoCreation = async (\n  ctx: RecovererContext,\n  evt: CommitEvt,\n  writes: PreparedWrite[],\n  blocks: BlockMap,\n) => {\n  const did = evt.repo\n  const keypair = await Secp256k1Keypair.create({ exportable: true })\n  await ctx.actorStore.create(did, keypair)\n  const commit: CommitData = {\n    cid: evt.commit,\n    rev: evt.rev,\n    since: evt.since,\n    prev: null,\n    newBlocks: blocks,\n    relevantBlocks: new BlockMap(),\n    removedCids: new CidSet(),\n  }\n  await ctx.actorStore.transact(did, async (actorTxn) => {\n    await actorTxn.repo.storage.applyCommit(commit, true)\n    await actorTxn.repo.indexWrites(writes, commit.rev)\n    await actorTxn.repo.blob.processWriteBlobs(commit.rev, writes)\n  })\n  await trackNewAccount(ctx.recoveryDb, did)\n}\n\nconst processAccountEvt = async (ctx: RecovererContext, evt: AccountEvt) => {\n  // do not need to process deactivation/takedowns because we backup account DB as well\n  if (evt.status !== AccountStatus.Deleted) {\n    return\n  }\n  const { directory } = await ctx.actorStore.getLocation(evt.did)\n  await rmIfExists(directory, true)\n  await ctx.accountManager.deleteAccount(evt.did)\n}\n\nconst trackBlobs = async (\n  store: ActorStoreTransactor,\n  writes: PreparedWrite[],\n) => {\n  await store.repo.blob.deleteDereferencedBlobs(writes)\n\n  for (const write of writes) {\n    if (\n      write.action === WriteOpAction.Create ||\n      write.action === WriteOpAction.Update\n    ) {\n      for (const blob of write.blobs) {\n        await store.repo.blob.insertBlobMetadata(blob)\n        await store.repo.blob.associateBlob(blob, write.uri)\n      }\n    }\n  }\n}\n\nconst trackFailure = async (\n  recoveryDb: RecoveryDb,\n  did: DidString,\n  err: unknown,\n) => {\n  await recoveryDb.db\n    .insertInto('failed')\n    .values({\n      did,\n      error: err?.toString(),\n      fixed: 0,\n    })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nconst trackNewAccount = async (recoveryDb: RecoveryDb, did: DidString) => {\n  await recoveryDb.db\n    .insertInto('new_account')\n    .values({\n      did,\n      published: 0,\n    })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nconst parseCommitEvt = async (\n  evt: CommitEvt,\n): Promise<{\n  writes: PreparedWrite[]\n  blocks: BlockMap\n}> => {\n  const did = evt.repo\n  const evtCar = await readCar(evt.blocks, { skipCidVerification: true })\n  const writesUnfiltered = await Promise.all(\n    evt.ops.map(async (op) => {\n      const { collection, rkey } = parseDataKey(op.path)\n      if (!isNsidString(collection)) return undefined\n      if (!isRecordKeyString(rkey)) return undefined\n\n      if (op.action === 'delete') {\n        return prepareDelete({ did, collection, rkey })\n      }\n      if (!op.cid) return undefined\n\n      const recordBytes = evtCar.blocks.get(op.cid)\n      if (!recordBytes) return undefined\n      const record = cborToLexRecord(recordBytes)\n\n      if (op.action === 'create') {\n        return prepareCreate({\n          did,\n          collection,\n          rkey,\n          record,\n          validate: false,\n        })\n      } else {\n        return prepareUpdate({\n          did,\n          collection,\n          rkey,\n          record,\n          validate: false,\n        })\n      }\n    }),\n  )\n\n  return {\n    writes: writesUnfiltered.filter((w) => w != null),\n    blocks: evtCar.blocks,\n  }\n}\n\nconst didFromEvt = (evt: SeqEvt): DidString | null => {\n  if (evt.type === 'account') {\n    return evt.evt.did\n  } else if (evt.type === 'commit') {\n    return evt.evt.repo\n  } else {\n    return null\n  }\n}\n"]}
+{"version":3,"file":"recoverer.js","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recoverer.ts"],"names":[],"mappings":"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","sourcesContent":["import { rmIfExists } from '@atproto/common'\nimport { Secp256k1Keypair } from '@atproto/crypto'\nimport { DidString, isNsidString, isRecordKeyString } from '@atproto/lex'\nimport {\n  BlockMap,\n  CidSet,\n  CommitData,\n  WriteOpAction,\n  cborToLexRecord,\n  parseDataKey,\n  readCar,\n} from '@atproto/repo'\nimport {\n  AccountManager,\n  AccountStatus,\n} from '../../account-manager/account-manager.js'\nimport { ActorStoreTransactor } from '../../actor-store/actor-store-transactor.js'\nimport { ActorStore } from '../../actor-store/actor-store.js'\nimport { countAll } from '../../db/index.js'\nimport {\n  PreparedWrite,\n  prepareCreate,\n  prepareDelete,\n  prepareUpdate,\n} from '../../repo/index.js'\nimport {\n  AccountEvt,\n  CommitEvt,\n  SeqEvt,\n  Sequencer,\n} from '../../sequencer/index.js'\nimport { RecoveryDb } from './recovery-db.js'\nimport { UserQueues } from './user-queues.js'\n\nexport type RecovererContextNoDb = {\n  sequencer: Sequencer\n  accountManager: AccountManager\n  actorStore: ActorStore\n}\n\nexport type RecovererContext = RecovererContextNoDb & {\n  recoveryDb: RecoveryDb\n}\n\nconst PAGE_SIZE = 5000\n\nexport class Recoverer {\n  queues: UserQueues\n  failed: Set<string>\n\n  constructor(\n    public ctx: RecovererContext,\n    opts: { concurrency: number },\n  ) {\n    this.queues = new UserQueues(opts.concurrency)\n    this.failed = new Set()\n  }\n\n  async run(startCursor = 0) {\n    const failed = await this.ctx.recoveryDb.db\n      .selectFrom('failed')\n      .select('did')\n      .execute()\n    for (const row of failed) {\n      this.failed.add(row.did)\n    }\n\n    const totalRes = await this.ctx.sequencer.db.db\n      .selectFrom('repo_seq')\n      .select(countAll.as('count'))\n      .executeTakeFirstOrThrow()\n    const totalEvts = totalRes.count\n    let completed = 0\n\n    let cursor: number | undefined = startCursor\n    while (cursor !== undefined) {\n      const page = await this.ctx.sequencer.requestSeqRange({\n        earliestSeq: cursor,\n        limit: PAGE_SIZE,\n      })\n      page.forEach((evt) => this.processEvent(evt))\n      cursor = page.at(-1)?.seq\n\n      await this.queues.onEmpty()\n\n      completed += PAGE_SIZE\n      const percentComplete = (completed / totalEvts) * 100\n      console.log(`${percentComplete.toFixed(2)}% - ${cursor}`)\n    }\n\n    await this.queues.processAll()\n  }\n\n  async processAll() {\n    await this.queues.processAll()\n  }\n\n  async destroy() {\n    await this.queues.destroy()\n  }\n\n  processEvent(evt: SeqEvt) {\n    const did = didFromEvt(evt)\n    if (!did) {\n      return\n    }\n    this.queues.addToUser(did, async () => {\n      if (this.failed.has(did)) {\n        return\n      }\n      await processSeqEvt(this.ctx, evt).catch(async (err) => {\n        this.failed.add(did)\n        await trackFailure(this.ctx.recoveryDb, did, err)\n      })\n    })\n  }\n}\n\nexport const processSeqEvt = async (ctx: RecovererContext, evt: SeqEvt) => {\n  // only need to process commits & tombstones\n  if (evt.type === 'account') {\n    await processAccountEvt(ctx, evt.evt)\n  }\n  if (evt.type === 'commit') {\n    await processCommit(ctx, evt.evt).catch()\n  }\n}\n\nconst processCommit = async (ctx: RecovererContext, evt: CommitEvt) => {\n  const did = evt.repo\n  const { writes, blocks } = await parseCommitEvt(evt)\n  if (evt.since === null) {\n    const actorExists = await ctx.actorStore.exists(did)\n    if (!actorExists) {\n      await processRepoCreation(ctx, evt, writes, blocks)\n      return\n    }\n  }\n  await ctx.actorStore.transact(did, async (actorTxn) => {\n    const root = await actorTxn.repo.storage.getRootDetailed()\n    if (root.rev >= evt.rev) {\n      return\n    }\n    const commit = await actorTxn.repo.formatCommit(writes)\n    commit.newBlocks = blocks\n    commit.cid = evt.commit\n    commit.rev = evt.rev\n    await actorTxn.repo.storage.applyCommit(commit)\n    await actorTxn.repo.indexWrites(writes, commit.rev)\n    await trackBlobs(actorTxn, writes)\n  })\n}\n\nconst processRepoCreation = async (\n  ctx: RecovererContext,\n  evt: CommitEvt,\n  writes: PreparedWrite[],\n  blocks: BlockMap,\n) => {\n  const did = evt.repo\n  const keypair = await Secp256k1Keypair.create({ exportable: true })\n  await ctx.actorStore.create(did, keypair)\n  const commit: CommitData = {\n    cid: evt.commit,\n    rev: evt.rev,\n    since: evt.since,\n    prev: null,\n    newBlocks: blocks,\n    relevantBlocks: new BlockMap(),\n    removedCids: new CidSet(),\n  }\n  await ctx.actorStore.transact(did, async (actorTxn) => {\n    await actorTxn.repo.storage.applyCommit(commit, true)\n    await actorTxn.repo.indexWrites(writes, commit.rev)\n    await actorTxn.repo.blob.processWriteBlobs(commit.rev, writes)\n  })\n  await trackNewAccount(ctx.recoveryDb, did)\n}\n\nconst processAccountEvt = async (ctx: RecovererContext, evt: AccountEvt) => {\n  // do not need to process deactivation/takedowns because we backup account DB as well\n  if (evt.status !== AccountStatus.Deleted) {\n    return\n  }\n  const { directory } = await ctx.actorStore.getLocation(evt.did)\n  await rmIfExists(directory, true)\n  await ctx.accountManager.deleteAccount(evt.did)\n}\n\nconst trackBlobs = async (\n  store: ActorStoreTransactor,\n  writes: PreparedWrite[],\n) => {\n  await store.repo.blob.deleteDereferencedBlobs(writes)\n\n  for (const write of writes) {\n    if (\n      write.action === WriteOpAction.Create ||\n      write.action === WriteOpAction.Update\n    ) {\n      for (const blob of write.blobs) {\n        await store.repo.blob.insertBlobMetadata(blob)\n        await store.repo.blob.associateBlob(blob, write.uri)\n      }\n    }\n  }\n}\n\nconst trackFailure = async (\n  recoveryDb: RecoveryDb,\n  did: DidString,\n  err: unknown,\n) => {\n  await recoveryDb.db\n    .insertInto('failed')\n    .values({\n      did,\n      error: err?.toString(),\n      fixed: 0,\n    })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nconst trackNewAccount = async (recoveryDb: RecoveryDb, did: DidString) => {\n  await recoveryDb.db\n    .insertInto('new_account')\n    .values({\n      did,\n      published: 0,\n    })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nconst parseCommitEvt = async (\n  evt: CommitEvt,\n): Promise<{\n  writes: PreparedWrite[]\n  blocks: BlockMap\n}> => {\n  const did = evt.repo\n  const evtCar = await readCar(evt.blocks, { skipCidVerification: true })\n  const writesUnfiltered = await Promise.all(\n    evt.ops.map(async (op) => {\n      const { collection, rkey } = parseDataKey(op.path)\n      if (!isNsidString(collection)) return undefined\n      if (!isRecordKeyString(rkey)) return undefined\n\n      if (op.action === 'delete') {\n        return prepareDelete({ did, collection, rkey })\n      }\n      if (!op.cid) return undefined\n\n      const recordBytes = evtCar.blocks.get(op.cid)\n      if (!recordBytes) return undefined\n      const record = cborToLexRecord(recordBytes)\n\n      if (op.action === 'create') {\n        return prepareCreate({\n          did,\n          collection,\n          rkey,\n          record,\n          validate: false,\n        })\n      } else {\n        return prepareUpdate({\n          did,\n          collection,\n          rkey,\n          record,\n          validate: false,\n        })\n      }\n    }),\n  )\n\n  return {\n    writes: writesUnfiltered.filter((w) => w != null),\n    blocks: evtCar.blocks,\n  }\n}\n\nconst didFromEvt = (evt: SeqEvt): DidString | null => {\n  if (evt.type === 'account') {\n    return evt.evt.did\n  } else if (evt.type === 'commit') {\n    return evt.evt.repo\n  } else {\n    return null\n  }\n}\n"]}

package/dist/scripts/sequencer-recovery/recovery-db.d.ts

@@ -1,5 +1,5 @@
 import { DidString } from '@atproto/syntax';
-import { Database } from '../../db';
+import { Database } from '../../db/index.js';
 export interface NewAccount {
     did: DidString;
     published: 0 | 1;

package/dist/scripts/sequencer-recovery/recovery-db.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recovery-db.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recovery-db.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAY,MAAM,UAAU,CAAA;AAE7C,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;CACjB;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,SAAS,CAAA;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAA;CACb;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAA;AAEnD,eAAO,MAAM,6BAA6B,GACxC,cAAc,MAAM,KACnB,OAAO,CAAC,UAAU,CAGpB,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,UAAU,MAAM,EAChB,kCAAgC,KAC/B,OAAO,CAAC,UAAU,CAQpB,CAAA"}
+{"version":3,"file":"recovery-db.d.ts","sourceRoot":"","sources":["../../../src/scripts/sequencer-recovery/recovery-db.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAY,MAAM,mBAAmB,CAAA;AAEtD,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,SAAS,CAAA;IACd,SAAS,EAAE,CAAC,GAAG,CAAC,CAAA;CACjB;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,SAAS,CAAA;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAA;CACb;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,UAAU,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CAAC,CAAA;AAEnD,eAAO,MAAM,6BAA6B,GACxC,cAAc,MAAM,KACnB,OAAO,CAAC,UAAU,CAGpB,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,UAAU,MAAM,EAChB,kCAAgC,KAC/B,OAAO,CAAC,UAAU,CAQpB,CAAA"}

package/dist/scripts/sequencer-recovery/recovery-db.js

@@ -1,26 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+import path from 'node:path';
+import { Database, Migrator } from '../../db/index.js';
+export const getRecoveryDbFromSequencerLoc = (sequencerLoc) => {
+    const recoveryDbLoc = path.join(path.dirname(sequencerLoc), 'recovery.sqlite');
+    return getAndMigrateRecoveryDb(recoveryDbLoc);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAndMigrateRecoveryDb = exports.getRecoveryDbFromSequencerLoc = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const db_1 = require("../../db");
-const getRecoveryDbFromSequencerLoc = (sequencerLoc) => {
-    const recoveryDbLoc = node_path_1.default.join(node_path_1.default.dirname(sequencerLoc), 'recovery.sqlite');
-    return (0, exports.getAndMigrateRecoveryDb)(recoveryDbLoc);
-};
-exports.getRecoveryDbFromSequencerLoc = getRecoveryDbFromSequencerLoc;
-const getAndMigrateRecoveryDb = async (location, disableWalAutoCheckpoint = false) => {
+export const getAndMigrateRecoveryDb = async (location, disableWalAutoCheckpoint = false) => {
     const pragmas = disableWalAutoCheckpoint
         ? { wal_autocheckpoint: '0' }
         : {};
-    const db = db_1.Database.sqlite(location, pragmas);
-    const migrator = new db_1.Migrator(db.db, migrations);
+    const db = Database.sqlite(location, pragmas);
+    const migrator = new Migrator(db.db, migrations);
     await migrator.migrateToLatestOrThrow();
     return db;
 };
-exports.getAndMigrateRecoveryDb = getAndMigrateRecoveryDb;
 const migrations = {
     '001': {
         up: async (db) => {