@atproto/pds 0.4.216 → 0.4.217

package/dist/sequencer/sequencer.d.ts

@@ -1,4 +1,5 @@
 import TypedEmitter from 'typed-emitter';
+import { DidString, HandleString } from '@atproto/syntax';
 import { AccountStatus } from '../account-manager/helpers/account';
 import { Crawlers } from '../crawlers';
 import { CommitDataWithOps, SyncEvtData } from '../repo';
@@ -29,10 +30,10 @@ export declare class Sequencer extends Sequencer_base {
     private pollDb;
     private exponentialBackoff;
     sequenceEvt(evt: RepoSeqInsert): Promise<number>;
-    sequenceCommit(did: string, commitData: CommitDataWithOps): Promise<number>;
-    sequenceSyncEvt(did: string, data: SyncEvtData): Promise<number>;
-    sequenceIdentityEvt(did: string, handle?: string): Promise<number>;
-    sequenceAccountEvt(did: string, status: AccountStatus): Promise<number>;
+    sequenceCommit(did: DidString, commitData: CommitDataWithOps): Promise<number>;
+    sequenceSyncEvt(did: DidString, data: SyncEvtData): Promise<number>;
+    sequenceIdentityEvt(did: DidString, handle?: HandleString): Promise<number>;
+    sequenceAccountEvt(did: DidString, status: AccountStatus): Promise<number>;
     deleteAllForUser(did: string, excludingSeqs?: number[]): Promise<void>;
 }
 export declare const parseRepoSeqRows: (rows: RepoSeqEntry[]) => SeqEvt[];

package/dist/sequencer/sequencer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,eAAe,CAAA;AAExC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACxD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,WAAW,EAGZ,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,MAAM,EAMP,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;8BAEwB,UAAU,gBAAgB;AAA1E,qBAAa,SAAU,SAAQ,cAA4C;IAOhE,UAAU,EAAE,MAAM;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ;IARjB,EAAE,EAAE,WAAW,CAAA;IACf,SAAS,UAAQ;IACjB,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAO;IACxC,kBAAkB,SAAI;gBAGb,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,SAAI,EACnB,wBAAwB,UAAQ;IAQ5B,KAAK;IAWL,OAAO;IAQP,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAU9B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW5C,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAWvD,eAAe,CAAC,IAAI,EAAE;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YA6BP,MAAM;YAwBN,kBAAkB;IAM1B,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAQhD,cAAc,CAClB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,MAAM,CAAC;IAKZ,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW;IAK9C,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKlE,kBAAkB,CACtB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,CAAC;IAKZ,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,EAAO;CAUjE;AAED,eAAO,MAAM,gBAAgB,GAAI,MAAM,YAAY,EAAE,KAAG,MAAM,EAuC7D,CAAA;AAED,KAAK,MAAM,GAAG,YAAY,CAAA;AAE1B,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAChC,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAA;AAE5D,eAAe,SAAS,CAAA"}
+{"version":3,"file":"sequencer.d.ts","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,eAAe,CAAA;AAGxC,OAAO,EAAkB,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AACxD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,WAAW,EAGZ,MAAM,MAAM,CAAA;AACb,OAAO,EAIL,MAAM,EAMP,MAAM,UAAU,CAAA;AAEjB,cAAc,UAAU,CAAA;8BAEwB,UAAU,gBAAgB;AAA1E,qBAAa,SAAU,SAAQ,cAA4C;IAOhE,UAAU,EAAE,MAAM;IAClB,QAAQ,EAAE,QAAQ;IAClB,QAAQ;IARjB,EAAE,EAAE,WAAW,CAAA;IACf,SAAS,UAAQ;IACjB,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAO;IACxC,kBAAkB,SAAI;gBAGb,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,SAAI,EACnB,wBAAwB,UAAQ;IAQ5B,KAAK;IAWL,OAAO;IAQP,IAAI,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAU9B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAW5C,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAWvD,eAAe,CAAC,IAAI,EAAE;QAC1B,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,CAAA;QAClB,YAAY,CAAC,EAAE,MAAM,CAAA;QACrB,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YA6BP,MAAM;YAwBN,kBAAkB;IAM1B,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAQhD,cAAc,CAClB,GAAG,EAAE,SAAS,EACd,UAAU,EAAE,iBAAiB,GAC5B,OAAO,CAAC,MAAM,CAAC;IAKZ,eAAe,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW;IAKjD,mBAAmB,CACvB,GAAG,EAAE,SAAS,EACd,MAAM,CAAC,EAAE,YAAY,GACpB,OAAO,CAAC,MAAM,CAAC;IAKZ,kBAAkB,CACtB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,CAAC;IAKZ,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,EAAO;CAUjE;AAED,eAAO,MAAM,gBAAgB,GAAI,MAAM,YAAY,EAAE,KAAG,MAAM,EAuC7D,CAAA;AAED,KAAK,MAAM,GAAG,YAAY,CAAA;AAE1B,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAChC,KAAK,EAAE,MAAM,IAAI,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAA;AAE5D,eAAe,SAAS,CAAA"}

package/dist/sequencer/sequencer.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRepoSeqRows = exports.Sequencer = void 0;
 const node_events_1 = __importDefault(require("node:events"));
 const common_1 = require("@atproto/common");
+const lex_cbor_1 = require("@atproto/lex-cbor");
 const logger_1 = require("../logger");
 const db_1 = require("./db");
 const events_1 = require("./events");
@@ -182,19 +183,19 @@ class Sequencer extends node_events_1.default {
     }
     async sequenceCommit(did, commitData) {
         const evt = await (0, events_1.formatSeqCommit)(did, commitData);
-        return await this.sequenceEvt(evt);
+        return this.sequenceEvt(evt);
     }
     async sequenceSyncEvt(did, data) {
         const evt = await (0, events_1.formatSeqSyncEvt)(did, data);
-        return await this.sequenceEvt(evt);
+        return this.sequenceEvt(evt);
     }
     async sequenceIdentityEvt(did, handle) {
         const evt = await (0, events_1.formatSeqIdentityEvt)(did, handle);
-        return await this.sequenceEvt(evt);
+        return this.sequenceEvt(evt);
     }
     async sequenceAccountEvt(did, status) {
         const evt = await (0, events_1.formatSeqAccountEvt)(did, status);
-        return await this.sequenceEvt(evt);
+        return this.sequenceEvt(evt);
     }
     async deleteAllForUser(did, excludingSeqs = []) {
         await this.db.executeWithRetry(this.db.db
@@ -211,7 +212,7 @@ const parseRepoSeqRows = (rows) => {
         if (row.seq === null) {
             continue;
         }
-        const evt = (0, common_1.cborDecode)(row.event);
+        const evt = (0, lex_cbor_1.decode)(row.event);
         if (row.eventType === 'append') {
             seqEvts.push({
                 type: 'commit',

package/dist/sequencer/sequencer.js.map

@@ -1 +1 @@
-{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'node:events'\nimport TypedEmitter from 'typed-emitter'\nimport { SECOND, cborDecode, wait } from '@atproto/common'\nimport { AccountStatus } from '../account-manager/helpers/account'\nimport { Crawlers } from '../crawlers'\nimport { seqLogger as log } from '../logger'\nimport { CommitDataWithOps, SyncEvtData } from '../repo'\nimport {\n  RepoSeqEntry,\n  RepoSeqInsert,\n  SequencerDb,\n  getDb,\n  getMigrator,\n} from './db'\nimport {\n  AccountEvt,\n  CommitEvt,\n  IdentityEvt,\n  SeqEvt,\n  SyncEvt,\n  formatSeqAccountEvt,\n  formatSeqCommit,\n  formatSeqIdentityEvt,\n  formatSeqSyncEvt,\n} from './events'\n\nexport * from './events'\n\nexport class Sequencer extends (EventEmitter as new () => SequencerEmitter) {\n  db: SequencerDb\n  destroyed = false\n  pollPromise: Promise<void> | null = null\n  triesWithNoResults = 0\n\n  constructor(\n    public dbLocation: string,\n    public crawlers: Crawlers,\n    public lastSeen = 0,\n    disableWalAutoCheckpoint = false,\n  ) {\n    super()\n    // note: this does not err when surpassed, just prints a warning to stderr\n    this.setMaxListeners(100)\n    this.db = getDb(dbLocation, disableWalAutoCheckpoint)\n  }\n\n  async start() {\n    await this.db.ensureWal()\n    const migrator = getMigrator(this.db)\n    await migrator.migrateToLatestOrThrow()\n    const curr = await this.curr()\n    this.lastSeen = curr ?? 0\n    if (this.pollPromise === null) {\n      this.pollPromise = this.pollDb()\n    }\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.pollPromise) {\n      await this.pollPromise\n    }\n    this.emit('close')\n  }\n\n  async curr(): Promise<number | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .orderBy('seq', 'desc')\n      .limit(1)\n      .executeTakeFirst()\n    return got?.seq ?? null\n  }\n\n  async next(cursor: number): Promise<SeqRow | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .where('seq', '>', cursor)\n      .limit(1)\n      .orderBy('seq', 'asc')\n      .executeTakeFirst()\n    return got || null\n  }\n\n  async earliestAfterTime(time: string): Promise<SeqRow | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .where('sequencedAt', '>=', time)\n      .orderBy('sequencedAt', 'asc')\n      .limit(1)\n      .executeTakeFirst()\n    return got || null\n  }\n\n  async requestSeqRange(opts: {\n    earliestSeq?: number\n    latestSeq?: number\n    earliestTime?: string\n    limit?: number\n  }): Promise<SeqEvt[]> {\n    const { earliestSeq, latestSeq, earliestTime, limit } = opts\n\n    let seqQb = this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .orderBy('seq', 'asc')\n      .where('invalidated', '=', 0)\n    if (earliestSeq !== undefined) {\n      seqQb = seqQb.where('seq', '>', earliestSeq)\n    }\n    if (latestSeq !== undefined) {\n      seqQb = seqQb.where('seq', '<=', latestSeq)\n    }\n    if (earliestTime !== undefined) {\n      seqQb = seqQb.where('sequencedAt', '>=', earliestTime)\n    }\n    if (limit !== undefined) {\n      seqQb = seqQb.limit(limit)\n    }\n\n    const rows = await seqQb.execute()\n    if (rows.length < 1) {\n      return []\n    }\n\n    return parseRepoSeqRows(rows)\n  }\n\n  private async pollDb(): Promise<void> {\n    if (this.destroyed) return\n    // if already polling, do not start another poll\n    try {\n      const evts = await this.requestSeqRange({\n        earliestSeq: this.lastSeen,\n        limit: 1000,\n      })\n      if (evts.length > 0) {\n        this.triesWithNoResults = 0\n        this.emit('events', evts)\n        this.lastSeen = evts.at(-1)?.seq ?? this.lastSeen\n      } else {\n        await this.exponentialBackoff()\n      }\n      this.pollPromise = this.pollDb()\n    } catch (err) {\n      log.error({ err, lastSeen: this.lastSeen }, 'sequencer failed to poll db')\n      await this.exponentialBackoff()\n      this.pollPromise = this.pollDb()\n    }\n  }\n\n  // when no results, exponential backoff on pulling, with a max of a second wait\n  private async exponentialBackoff(): Promise<void> {\n    this.triesWithNoResults++\n    const waitTime = Math.min(Math.pow(2, this.triesWithNoResults), SECOND)\n    await wait(waitTime)\n  }\n\n  async sequenceEvt(evt: RepoSeqInsert): Promise<number> {\n    const [{ seq }] = await this.db.executeWithRetry(\n      this.db.db.insertInto('repo_seq').values(evt).returning('seq'),\n    )\n    this.crawlers.notifyOfUpdate()\n    return seq\n  }\n\n  async sequenceCommit(\n    did: string,\n    commitData: CommitDataWithOps,\n  ): Promise<number> {\n    const evt = await formatSeqCommit(did, commitData)\n    return await this.sequenceEvt(evt)\n  }\n\n  async sequenceSyncEvt(did: string, data: SyncEvtData) {\n    const evt = await formatSeqSyncEvt(did, data)\n    return await this.sequenceEvt(evt)\n  }\n\n  async sequenceIdentityEvt(did: string, handle?: string): Promise<number> {\n    const evt = await formatSeqIdentityEvt(did, handle)\n    return await this.sequenceEvt(evt)\n  }\n\n  async sequenceAccountEvt(\n    did: string,\n    status: AccountStatus,\n  ): Promise<number> {\n    const evt = await formatSeqAccountEvt(did, status)\n    return await this.sequenceEvt(evt)\n  }\n\n  async deleteAllForUser(did: string, excludingSeqs: number[] = []) {\n    await this.db.executeWithRetry(\n      this.db.db\n        .deleteFrom('repo_seq')\n        .where('did', '=', did)\n        .if(excludingSeqs.length > 0, (qb) =>\n          qb.where('seq', 'not in', excludingSeqs),\n        ),\n    )\n  }\n}\n\nexport const parseRepoSeqRows = (rows: RepoSeqEntry[]): SeqEvt[] => {\n  const seqEvts: SeqEvt[] = []\n  for (const row of rows) {\n    // should never hit this because of WHERE clause\n    if (row.seq === null) {\n      continue\n    }\n    const evt = cborDecode(row.event)\n    if (row.eventType === 'append') {\n      seqEvts.push({\n        type: 'commit',\n        seq: row.seq,\n        time: row.sequencedAt,\n        evt: evt as CommitEvt,\n      })\n    } else if (row.eventType === 'sync') {\n      seqEvts.push({\n        type: 'sync',\n        seq: row.seq,\n        time: row.sequencedAt,\n        evt: evt as SyncEvt,\n      })\n    } else if (row.eventType === 'identity') {\n      seqEvts.push({\n        type: 'identity',\n        seq: row.seq,\n        time: row.sequencedAt,\n        evt: evt as IdentityEvt,\n      })\n    } else if (row.eventType === 'account') {\n      seqEvts.push({\n        type: 'account',\n        seq: row.seq,\n        time: row.sequencedAt,\n        evt: evt as AccountEvt,\n      })\n    }\n  }\n  return seqEvts\n}\n\ntype SeqRow = RepoSeqEntry\n\ntype SequencerEvents = {\n  events: (evts: SeqEvt[]) => void\n  close: () => void\n}\n\nexport type SequencerEmitter = TypedEmitter<SequencerEvents>\n\nexport default Sequencer\n"]}
+{"version":3,"file":"sequencer.js","sourceRoot":"","sources":["../../src/sequencer/sequencer.ts"],"names":[],"mappings":"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","sourcesContent":["import EventEmitter from 'node:events'\nimport TypedEmitter from 'typed-emitter'\nimport { SECOND, wait } from '@atproto/common'\nimport { decode as cborDecode } from '@atproto/lex-cbor'\nimport { DatetimeString, DidString, HandleString } from '@atproto/syntax'\nimport { AccountStatus } from '../account-manager/helpers/account'\nimport { Crawlers } from '../crawlers'\nimport { seqLogger as log } from '../logger'\nimport { CommitDataWithOps, SyncEvtData } from '../repo'\nimport {\n  RepoSeqEntry,\n  RepoSeqInsert,\n  SequencerDb,\n  getDb,\n  getMigrator,\n} from './db'\nimport {\n  AccountEvt,\n  CommitEvt,\n  IdentityEvt,\n  SeqEvt,\n  SyncEvt,\n  formatSeqAccountEvt,\n  formatSeqCommit,\n  formatSeqIdentityEvt,\n  formatSeqSyncEvt,\n} from './events'\n\nexport * from './events'\n\nexport class Sequencer extends (EventEmitter as new () => SequencerEmitter) {\n  db: SequencerDb\n  destroyed = false\n  pollPromise: Promise<void> | null = null\n  triesWithNoResults = 0\n\n  constructor(\n    public dbLocation: string,\n    public crawlers: Crawlers,\n    public lastSeen = 0,\n    disableWalAutoCheckpoint = false,\n  ) {\n    super()\n    // note: this does not err when surpassed, just prints a warning to stderr\n    this.setMaxListeners(100)\n    this.db = getDb(dbLocation, disableWalAutoCheckpoint)\n  }\n\n  async start() {\n    await this.db.ensureWal()\n    const migrator = getMigrator(this.db)\n    await migrator.migrateToLatestOrThrow()\n    const curr = await this.curr()\n    this.lastSeen = curr ?? 0\n    if (this.pollPromise === null) {\n      this.pollPromise = this.pollDb()\n    }\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.pollPromise) {\n      await this.pollPromise\n    }\n    this.emit('close')\n  }\n\n  async curr(): Promise<number | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .orderBy('seq', 'desc')\n      .limit(1)\n      .executeTakeFirst()\n    return got?.seq ?? null\n  }\n\n  async next(cursor: number): Promise<SeqRow | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .where('seq', '>', cursor)\n      .limit(1)\n      .orderBy('seq', 'asc')\n      .executeTakeFirst()\n    return got || null\n  }\n\n  async earliestAfterTime(time: string): Promise<SeqRow | null> {\n    const got = await this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .where('sequencedAt', '>=', time)\n      .orderBy('sequencedAt', 'asc')\n      .limit(1)\n      .executeTakeFirst()\n    return got || null\n  }\n\n  async requestSeqRange(opts: {\n    earliestSeq?: number\n    latestSeq?: number\n    earliestTime?: string\n    limit?: number\n  }): Promise<SeqEvt[]> {\n    const { earliestSeq, latestSeq, earliestTime, limit } = opts\n\n    let seqQb = this.db.db\n      .selectFrom('repo_seq')\n      .selectAll()\n      .orderBy('seq', 'asc')\n      .where('invalidated', '=', 0)\n    if (earliestSeq !== undefined) {\n      seqQb = seqQb.where('seq', '>', earliestSeq)\n    }\n    if (latestSeq !== undefined) {\n      seqQb = seqQb.where('seq', '<=', latestSeq)\n    }\n    if (earliestTime !== undefined) {\n      seqQb = seqQb.where('sequencedAt', '>=', earliestTime)\n    }\n    if (limit !== undefined) {\n      seqQb = seqQb.limit(limit)\n    }\n\n    const rows = await seqQb.execute()\n    if (rows.length < 1) {\n      return []\n    }\n\n    return parseRepoSeqRows(rows)\n  }\n\n  private async pollDb(): Promise<void> {\n    if (this.destroyed) return\n    // if already polling, do not start another poll\n    try {\n      const evts = await this.requestSeqRange({\n        earliestSeq: this.lastSeen,\n        limit: 1000,\n      })\n      if (evts.length > 0) {\n        this.triesWithNoResults = 0\n        this.emit('events', evts)\n        this.lastSeen = evts.at(-1)?.seq ?? this.lastSeen\n      } else {\n        await this.exponentialBackoff()\n      }\n      this.pollPromise = this.pollDb()\n    } catch (err) {\n      log.error({ err, lastSeen: this.lastSeen }, 'sequencer failed to poll db')\n      await this.exponentialBackoff()\n      this.pollPromise = this.pollDb()\n    }\n  }\n\n  // when no results, exponential backoff on pulling, with a max of a second wait\n  private async exponentialBackoff(): Promise<void> {\n    this.triesWithNoResults++\n    const waitTime = Math.min(Math.pow(2, this.triesWithNoResults), SECOND)\n    await wait(waitTime)\n  }\n\n  async sequenceEvt(evt: RepoSeqInsert): Promise<number> {\n    const [{ seq }] = await this.db.executeWithRetry(\n      this.db.db.insertInto('repo_seq').values(evt).returning('seq'),\n    )\n    this.crawlers.notifyOfUpdate()\n    return seq\n  }\n\n  async sequenceCommit(\n    did: DidString,\n    commitData: CommitDataWithOps,\n  ): Promise<number> {\n    const evt = await formatSeqCommit(did, commitData)\n    return this.sequenceEvt(evt)\n  }\n\n  async sequenceSyncEvt(did: DidString, data: SyncEvtData) {\n    const evt = await formatSeqSyncEvt(did, data)\n    return this.sequenceEvt(evt)\n  }\n\n  async sequenceIdentityEvt(\n    did: DidString,\n    handle?: HandleString,\n  ): Promise<number> {\n    const evt = await formatSeqIdentityEvt(did, handle)\n    return this.sequenceEvt(evt)\n  }\n\n  async sequenceAccountEvt(\n    did: DidString,\n    status: AccountStatus,\n  ): Promise<number> {\n    const evt = await formatSeqAccountEvt(did, status)\n    return this.sequenceEvt(evt)\n  }\n\n  async deleteAllForUser(did: string, excludingSeqs: number[] = []) {\n    await this.db.executeWithRetry(\n      this.db.db\n        .deleteFrom('repo_seq')\n        .where('did', '=', did)\n        .if(excludingSeqs.length > 0, (qb) =>\n          qb.where('seq', 'not in', excludingSeqs),\n        ),\n    )\n  }\n}\n\nexport const parseRepoSeqRows = (rows: RepoSeqEntry[]): SeqEvt[] => {\n  const seqEvts: SeqEvt[] = []\n  for (const row of rows) {\n    // should never hit this because of WHERE clause\n    if (row.seq === null) {\n      continue\n    }\n    const evt = cborDecode(row.event)\n    if (row.eventType === 'append') {\n      seqEvts.push({\n        type: 'commit',\n        seq: row.seq,\n        time: row.sequencedAt as DatetimeString,\n        evt: evt as CommitEvt,\n      })\n    } else if (row.eventType === 'sync') {\n      seqEvts.push({\n        type: 'sync',\n        seq: row.seq,\n        time: row.sequencedAt as DatetimeString,\n        evt: evt as SyncEvt,\n      })\n    } else if (row.eventType === 'identity') {\n      seqEvts.push({\n        type: 'identity',\n        seq: row.seq,\n        time: row.sequencedAt as DatetimeString,\n        evt: evt as IdentityEvt,\n      })\n    } else if (row.eventType === 'account') {\n      seqEvts.push({\n        type: 'account',\n        seq: row.seq,\n        time: row.sequencedAt as DatetimeString,\n        evt: evt as AccountEvt,\n      })\n    }\n  }\n  return seqEvts\n}\n\ntype SeqRow = RepoSeqEntry\n\ntype SequencerEvents = {\n  events: (evts: SeqEvt[]) => void\n  close: () => void\n}\n\nexport type SequencerEmitter = TypedEmitter<SequencerEvents>\n\nexport default Sequencer\n"]}

package/dist/well-known.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"well-known.d.ts","sourceRoot":"","sources":["../src/well-known.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,eAAO,MAAM,YAAY,GAAI,KAAK,UAAU,KAAG,MAyB9C,CAAA"}
+{"version":3,"file":"well-known.d.ts","sourceRoot":"","sources":["../src/well-known.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,eAAO,MAAM,YAAY,GAAI,KAAK,UAAU,KAAG,MAyB9C,CAAA"}

package/dist/well-known.js.map

@@ -1 +1 @@
-{"version":3,"file":"well-known.js","sourceRoot":"","sources":["../src/well-known.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAGzB,MAAM,YAAY,GAAG,CAAC,GAAe,EAAU,EAAE;IACtD,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAA;IAEvB,MAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,KAAK,WAAW,GAAG,EAAE,GAAG;QAC7D,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAA;QAC3B,MAAM,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAChE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5D,CAAA;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/C,CAAC;QACD,IAAI,GAAuB,CAAA;QAC3B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YACxD,GAAG,GAAG,IAAI,EAAE,GAAG,CAAA;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QACtD,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/C,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAzBY,QAAA,YAAY,gBAyBxB","sourcesContent":["import { Router } from 'express'\nimport { AppContext } from './context'\n\nexport const createRouter = (ctx: AppContext): Router => {\n  const router = Router()\n\n  router.get('/.well-known/atproto-did', async function (req, res) {\n    const handle = req.hostname\n    const supportedHandle = ctx.cfg.identity.serviceHandleDomains.some(\n      (host) => handle.endsWith(host) || handle === host.slice(1),\n    )\n    if (!supportedHandle) {\n      return res.status(404).send('User not found')\n    }\n    let did: string | undefined\n    try {\n      const user = await ctx.accountManager.getAccount(handle)\n      did = user?.did\n    } catch (err) {\n      return res.status(500).send('Internal Server Error')\n    }\n    if (!did) {\n      return res.status(404).send('User not found')\n    }\n    res.type('text/plain').send(did)\n  })\n\n  return router\n}\n"]}
+{"version":3,"file":"well-known.js","sourceRoot":"","sources":["../src/well-known.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAIzB,MAAM,YAAY,GAAG,CAAC,GAAe,EAAU,EAAE;IACtD,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAA;IAEvB,MAAM,CAAC,GAAG,CAAC,0BAA0B,EAAE,KAAK,WAAW,GAAG,EAAE,GAAG;QAC7D,MAAM,MAAM,GAAG,GAAG,CAAC,QAAwB,CAAA;QAC3C,MAAM,eAAe,GAAG,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAChE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAC5D,CAAA;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/C,CAAC;QACD,IAAI,GAAuB,CAAA;QAC3B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;YACxD,GAAG,GAAG,IAAI,EAAE,GAAG,CAAA;QACjB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QACtD,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC/C,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAzBY,QAAA,YAAY,gBAyBxB","sourcesContent":["import { Router } from 'express'\nimport { HandleString } from '@atproto/syntax'\nimport { AppContext } from './context'\n\nexport const createRouter = (ctx: AppContext): Router => {\n  const router = Router()\n\n  router.get('/.well-known/atproto-did', async function (req, res) {\n    const handle = req.hostname as HandleString\n    const supportedHandle = ctx.cfg.identity.serviceHandleDomains.some(\n      (host) => handle.endsWith(host) || handle === host.slice(1),\n    )\n    if (!supportedHandle) {\n      return res.status(404).send('User not found')\n    }\n    let did: string | undefined\n    try {\n      const user = await ctx.accountManager.getAccount(handle)\n      did = user?.did\n    } catch (err) {\n      return res.status(500).send('Internal Server Error')\n    }\n    if (!did) {\n      return res.status(404).send('User not found')\n    }\n    res.type('text/plain').send(did)\n  })\n\n  return router\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.216",
+  "version": "0.4.217",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -22,7 +22,6 @@
     "@did-plc/lib": "^0.0.4",
     "@hapi/address": "^5.1.1",
     "better-sqlite3": "^10.0.0",
-    "bytes": "^3.1.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "disposable-email-domains-js": "^1.5.0",
@@ -36,7 +35,6 @@
     "jose": "^5.0.1",
     "key-encoder": "^2.0.3",
     "kysely": "^0.22.0",
-    "multiformats": "^9.9.0",
     "nodemailer": "^6.8.0",
     "nodemailer-html-to-text": "^3.2.0",
     "p-queue": "^6.6.2",
@@ -51,20 +49,20 @@
     "@atproto-labs/simple-store-memory": "^0.1.4",
     "@atproto-labs/simple-store-redis": "^0.0.1",
     "@atproto-labs/xrpc-utils": "^0.0.24",
-    "@atproto/api": "^0.19.4",
-    "@atproto/aws": "^0.2.31",
+    "@atproto/aws": "^0.2.32",
     "@atproto/common": "^0.5.15",
     "@atproto/crypto": "^0.4.5",
     "@atproto/identity": "^0.4.12",
+    "@atproto/lex": "^0.0.23",
     "@atproto/lex-cbor": "^0.0.15",
     "@atproto/lex-data": "^0.0.14",
-    "@atproto/lexicon": "^0.6.2",
-    "@atproto/oauth-provider": "^0.15.14",
+    "@atproto/lex-json": "^0.0.14",
+    "@atproto/oauth-provider": "^0.15.15",
     "@atproto/oauth-scopes": "^0.3.2",
-    "@atproto/repo": "^0.8.13",
-    "@atproto/syntax": "^0.5.1",
+    "@atproto/repo": "^0.9.0",
+    "@atproto/syntax": "^0.5.2",
     "@atproto/xrpc": "^0.7.7",
-    "@atproto/xrpc-server": "^0.10.17"
+    "@atproto/xrpc-server": "^0.10.18"
   },
   "devDependencies": {
     "@atproto/pds-entryway": "npm:@atproto/pds@0.3.0-entryway.3",
@@ -82,13 +80,14 @@
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.19.4",
-    "@atproto/bsky": "^0.0.221",
-    "@atproto/lex-cli": "^0.9.9",
+    "@atproto/api": "^0.19.5",
+    "@atproto/bsky": "^0.0.222",
+    "@atproto/lex-document": "^0.0.18",
     "@atproto/oauth-client-browser-example": "^0.0.10"
   },
   "scripts": {
-    "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
+    "codegen": "lex build --override --indexFile --lexicons ../../lexicons",
+    "prebuild": "pnpm run codegen",
     "build": "tsc --build tsconfig.build.json",
     "postbuild": "node ./build.templates.js",
     "dev": "node ./build.templates.js --watch",

package/src/account-manager/account-manager.ts

@@ -1,8 +1,14 @@
 import { KeyObject } from 'node:crypto'
-import { CID } from 'multiformats/cid'
 import { HOUR, wait } from '@atproto/common'
 import { IdResolver } from '@atproto/identity'
-import { isValidTld } from '@atproto/syntax'
+import {
+  AtIdentifierString,
+  DidString,
+  HandleString,
+  isAtIdentifierString,
+} from '@atproto/lex'
+import { Cid } from '@atproto/lex-data'
+import { currentDatetimeString, isValidTld } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
 import { AuthScope } from '../auth-scope'
 import { softDeleted } from '../db'
@@ -12,7 +18,7 @@ import {
   ensureHandleServiceConstraints,
   isServiceDomain,
 } from '../handle/index'
-import { StatusAttr } from '../lexicon/types/com/atproto/admin/defs'
+import { com } from '../lexicons/index.js'
 import { AccountDb, EmailTokenPurpose, getDb, getMigrator } from './db'
 import * as account from './helpers/account'
 import { AccountStatus, ActorAccount } from './helpers/account'
@@ -57,14 +63,14 @@ export class AccountManager {
   // ----------
 
   async getAccount(
-    handleOrDid: string,
+    handleOrDid: AtIdentifierString,
     flags?: account.AvailabilityFlags,
   ): Promise<ActorAccount | null> {
     return account.getAccount(this.db, handleOrDid, flags)
   }
 
   async getAccounts(
-    dids: string[],
+    dids: DidString[],
     flags?: account.AvailabilityFlags,
   ): Promise<Map<string, ActorAccount>> {
     return account.getAccounts(this.db, dids, flags)
@@ -77,21 +83,23 @@ export class AccountManager {
     return account.getAccountByEmail(this.db, email, flags)
   }
 
-  async isAccountActivated(did: string): Promise<boolean> {
+  async isAccountActivated(did: DidString): Promise<boolean> {
     const account = await this.getAccount(did, { includeDeactivated: true })
     if (!account) return false
     return !account.deactivatedAt
   }
 
   async getDidForActor(
-    handleOrDid: string,
+    handleOrDid: AtIdentifierString,
     flags?: account.AvailabilityFlags,
   ): Promise<string | null> {
     const got = await this.getAccount(handleOrDid, flags)
     return got?.did ?? null
   }
 
-  async getAccountStatus(handleOrDid: string): Promise<AccountStatus> {
+  async getAccountStatus(
+    handleOrDid: AtIdentifierString,
+  ): Promise<AccountStatus> {
     const got = await this.getAccount(handleOrDid, {
       includeDeactivated: true,
       includeTakenDown: true,
@@ -110,7 +118,7 @@ export class AccountManager {
       did?: string
       allowAnyValid?: boolean
     } = {},
-  ): Promise<string> {
+  ): Promise<HandleString> {
     const normalized = baseNormalizeAndValidate(handle)
 
     // tld validation
@@ -162,11 +170,11 @@ export class AccountManager {
     deactivated,
     refreshJwt,
   }: {
-    did: string
-    handle: string
+    did: DidString
+    handle: HandleString
     email?: string
     password?: string
-    repoCid: CID
+    repoCid: Cid
     repoRev: string
     inviteCode?: string
     deactivated?: boolean
@@ -180,7 +188,7 @@ export class AccountManager {
       ? await scrypt.genSaltAndHash(password)
       : undefined
 
-    const now = new Date().toISOString()
+    const now = currentDatetimeString()
     await this.db.transaction(async (dbTxn) => {
       if (inviteCode) {
         await invite.ensureInviteIsAvailable(dbTxn, inviteCode)
@@ -207,11 +215,11 @@ export class AccountManager {
   }
 
   async createAccountAndSession(opts: {
-    did: string
-    handle: string
+    did: DidString
+    handle: HandleString
     email?: string
     password?: string
-    repoCid: CID
+    repoCid: Cid
     repoRev: string
     inviteCode?: string
     deactivated?: boolean
@@ -230,15 +238,18 @@ export class AccountManager {
 
   // @NOTE should always be paired with a sequenceHandle().
   // the token output from this method should be passed to sequenceHandle().
-  async updateHandle(did: string, handle: string) {
+  async updateHandle(did: DidString, handle: HandleString) {
     return account.updateHandle(this.db, did, handle)
   }
 
-  async deleteAccount(did: string) {
+  async deleteAccount(did: DidString) {
     return account.deleteAccount(this.db, did)
   }
 
-  async takedownAccount(did: string, takedown: StatusAttr) {
+  async takedownAccount(
+    did: DidString,
+    takedown: com.atproto.admin.defs.StatusAttr,
+  ) {
     await this.db.transaction(async (dbTxn) =>
       Promise.all([
         account.updateAccountTakedownStatus(dbTxn, did, takedown),
@@ -248,19 +259,19 @@ export class AccountManager {
     )
   }
 
-  async getAccountAdminStatus(did: string) {
+  async getAccountAdminStatus(did: DidString) {
     return account.getAccountAdminStatus(this.db, did)
   }
 
-  async updateRepoRoot(did: string, cid: CID, rev: string) {
+  async updateRepoRoot(did: DidString, cid: Cid, rev: string) {
     return repo.updateRoot(this.db, did, cid, rev)
   }
 
-  async deactivateAccount(did: string, deleteAfter: string | null) {
+  async deactivateAccount(did: DidString, deleteAfter: string | null) {
     return account.deactivateAccount(this.db, did, deleteAfter)
   }
 
-  async activateAccount(did: string) {
+  async activateAccount(did: DidString) {
     return account.activateAccount(this.db, did)
   }
 
@@ -268,7 +279,7 @@ export class AccountManager {
   // ----------
 
   async createSession(
-    did: string,
+    did: DidString,
     appPassword: password.AppPassDescript | null,
     isSoftDeleted = false,
   ) {
@@ -369,10 +380,12 @@ export class AccountManager {
             includeDeactivated: true,
             includeTakenDown: true,
           })
-        : await this.getAccount(identifierNormalized, {
-            includeDeactivated: true,
-            includeTakenDown: true,
-          })
+        : isAtIdentifierString(identifierNormalized)
+          ? await this.getAccount(identifierNormalized, {
+              includeDeactivated: true,
+              includeTakenDown: true,
+            })
+          : null
 
       if (!user) {
         throw new AuthRequiredError('Invalid identifier or password')
@@ -405,29 +418,29 @@ export class AccountManager {
   // Passwords
   // ----------
 
-  async createAppPassword(did: string, name: string, privileged: boolean) {
+  async createAppPassword(did: DidString, name: string, privileged: boolean) {
     return password.createAppPassword(this.db, did, name, privileged)
   }
 
-  async listAppPasswords(did: string) {
+  async listAppPasswords(did: DidString) {
     return password.listAppPasswords(this.db, did)
   }
 
   async verifyAccountPassword(
-    did: string,
+    did: DidString,
     passwordStr: string,
   ): Promise<boolean> {
     return password.verifyAccountPassword(this.db, did, passwordStr)
   }
 
   async verifyAppPassword(
-    did: string,
+    did: DidString,
     passwordStr: string,
   ): Promise<password.AppPassDescript | null> {
     return password.verifyAppPassword(this.db, did, passwordStr)
   }
 
-  async revokeAppPassword(did: string, name: string) {
+  async revokeAppPassword(did: DidString, name: string) {
     await this.db.transaction(async (dbTxn) =>
       Promise.all([
         password.deleteAppPassword(dbTxn, did, name),
@@ -465,16 +478,16 @@ export class AccountManager {
     )
   }
 
-  async getAccountInvitesCodes(did: string) {
+  async getAccountInvitesCodes(did: DidString) {
     const inviteCodes = await invite.getAccountsInviteCodes(this.db, [did])
     return inviteCodes.get(did) ?? []
   }
 
-  async getAccountsInvitesCodes(dids: string[]) {
+  async getAccountsInvitesCodes(dids: DidString[]) {
     return invite.getAccountsInviteCodes(this.db, dids)
   }
 
-  async getInvitedByForAccounts(dids: string[]) {
+  async getInvitedByForAccounts(dids: DidString[]) {
     return invite.getInvitedByForAccounts(this.db, dids)
   }
 
@@ -482,7 +495,7 @@ export class AccountManager {
     return invite.getInviteCodesUses(this.db, codes)
   }
 
-  async setAccountInvitesDisabled(did: string, disabled: boolean) {
+  async setAccountInvitesDisabled(did: DidString, disabled: boolean) {
     return invite.setAccountInvitesDisabled(this.db, did, disabled)
   }
 
@@ -493,12 +506,12 @@ export class AccountManager {
   // Email Tokens
   // ----------
 
-  async createEmailToken(did: string, purpose: EmailTokenPurpose) {
+  async createEmailToken(did: DidString, purpose: EmailTokenPurpose) {
     return emailToken.createEmailToken(this.db, did, purpose)
   }
 
   async assertValidEmailToken(
-    did: string,
+    did: DidString,
     purpose: EmailTokenPurpose,
     token: string,
   ) {
@@ -506,7 +519,7 @@ export class AccountManager {
   }
 
   async assertValidEmailTokenAndCleanup(
-    did: string,
+    did: DidString,
     purpose: EmailTokenPurpose,
     token: string,
   ) {
@@ -514,10 +527,10 @@ export class AccountManager {
     await emailToken.deleteEmailToken(this.db, did, purpose)
   }
 
-  async confirmEmail(opts: { did: string; token: string }) {
+  async confirmEmail(opts: { did: DidString; token: string }) {
     const { did, token } = opts
     await emailToken.assertValidToken(this.db, did, 'confirm_email', token)
-    const now = new Date().toISOString()
+    const now = currentDatetimeString()
     await this.db.transaction((dbTxn) =>
       Promise.all([
         emailToken.deleteEmailToken(dbTxn, did, 'confirm_email'),
@@ -526,7 +539,7 @@ export class AccountManager {
     )
   }
 
-  async updateEmail(opts: { did: string; email: string }) {
+  async updateEmail(opts: { did: DidString; email: string }) {
     const { did, email } = opts
     await this.db.transaction((dbTxn) =>
       Promise.all([
@@ -547,7 +560,7 @@ export class AccountManager {
     return did
   }
 
-  async updateAccountPassword(opts: { did: string; password: string }) {
+  async updateAccountPassword(opts: { did: DidString; password: string }) {
     const { did } = opts
     const passwordScrypt = await scrypt.genSaltAndHash(opts.password)
     await this.db.transaction(async (dbTxn) =>

package/src/account-manager/db/schema/account.ts

@@ -1,10 +1,11 @@
 import { Generated, Selectable } from 'kysely'
+import { DatetimeString } from '@atproto/lex'
 
 export interface Account {
   did: string
   email: string
   passwordScrypt: string
-  emailConfirmedAt: string | null
+  emailConfirmedAt: DatetimeString | null
   invitesDisabled: Generated<0 | 1>
 }
 

package/src/account-manager/db/schema/actor.ts

@@ -1,8 +1,9 @@
 import { Selectable } from 'kysely'
+import { DidString, HandleString } from '@atproto/syntax'
 
 export interface Actor {
-  did: string
-  handle: string | null
+  did: DidString
+  handle: HandleString | null
   createdAt: string
   takedownRef: string | null
   deactivatedAt: string | null

package/src/account-manager/db/schema/app-password.ts

@@ -1,8 +1,10 @@
+import { DatetimeString } from '@atproto/lex'
+
 export interface AppPassword {
   did: string
   name: string
   passwordScrypt: string
-  createdAt: string
+  createdAt: DatetimeString
   privileged: 0 | 1
 }
 

package/src/account-manager/db/schema/email-token.ts

@@ -1,3 +1,5 @@
+import { DidString } from '@atproto/syntax'
+
 export type EmailTokenPurpose =
   | 'confirm_email'
   | 'update_email'
@@ -7,7 +9,7 @@ export type EmailTokenPurpose =
 
 export interface EmailToken {
   purpose: EmailTokenPurpose
-  did: string
+  did: DidString
   token: string
   requestedAt: string
 }

package/src/account-manager/db/schema/invite-code.ts

@@ -1,16 +1,18 @@
+import { DatetimeString, DidString } from '@atproto/lex'
+
 export interface InviteCode {
   code: string
   availableUses: number
   disabled: 0 | 1
   forAccount: string
   createdBy: string
-  createdAt: string
+  createdAt: DatetimeString
 }
 
 export interface InviteCodeUse {
   code: string
-  usedBy: string
-  usedAt: string
+  usedBy: DidString
+  usedAt: DatetimeString
 }
 
 export const tableName = 'invite_code'

package/src/account-manager/db/schema/repo-root.ts

@@ -1,8 +1,10 @@
+import { DatetimeString } from '@atproto/lex'
+
 export interface RepoRoot {
   did: string
   cid: string
   rev: string
-  indexedAt: string
+  indexedAt: DatetimeString
 }
 
 export const tableName = 'repo_root'

package/src/account-manager/helpers/account-device.ts

@@ -1,5 +1,6 @@
 import assert from 'node:assert'
 import { DeviceId } from '@atproto/oauth-provider'
+import { DidString } from '@atproto/syntax'
 import { toDateISO } from '../../db'
 import { AccountDb } from '../db'
 import { selectAccountQB } from './account'
@@ -51,7 +52,9 @@ export function selectQB(
         'device.ipAddress',
         'device.lastSeenAt',
       ])
-      .if(filter.sub != null, (qb) => qb.where('actor.did', '=', filter.sub!))
+      .if(filter.sub != null, (qb) =>
+        qb.where('actor.did', '=', filter.sub! as DidString),
+      )
       .if(filter.deviceId != null, (qb) =>
         qb.where('account_device.deviceId', '=', filter.deviceId!),
       )