@atproto/ozone 0.1.174 → 0.1.175

package/dist/daemon/event-reverser.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-reverser.js","sourceRoot":"","sources":["../../src/daemon/event-reverser.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE } from '@atproto/common'\nimport { Database } from '../db'\nimport { dbLogger } from '../logger'\nimport { ModerationServiceCreator, ReversalSubject } from '../mod-service'\nimport {\n  deleteExpiringTagsByIds,\n  getExpiredTags,\n} from '../mod-service/expiring-tags'\nimport { subjectFromStatusRow } from '../mod-service/subject'\n\nexport class EventReverser {\n  destroyed = false\n  reversalPromise: Promise<void> = Promise.resolve()\n  timer?: NodeJS.Timeout\n\n  constructor(\n    private db: Database,\n    private modService: ModerationServiceCreator,\n  ) {}\n\n  start() {\n    this.poll()\n  }\n\n  poll() {\n    if (this.destroyed) return\n    this.reversalPromise = this.findAndRevertDueActions()\n      .catch((err) =>\n        dbLogger.error({ err }, 'moderation action reversal errored'),\n      )\n      .finally(() => {\n        this.timer = setTimeout(() => this.poll(), getInterval())\n      })\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.timer) {\n      clearTimeout(this.timer)\n      this.timer = undefined\n    }\n    await this.reversalPromise\n  }\n\n  async revertState(subject: ReversalSubject) {\n    await this.db.transaction(async (dbTxn) => {\n      const moderationTxn = this.modService(dbTxn)\n      const originalEvent =\n        await moderationTxn.getLastReversibleEventForSubject(subject)\n      if (originalEvent) {\n        await moderationTxn.revertState({\n          action: originalEvent.action,\n          createdBy: originalEvent.createdBy,\n          comment:\n            '[SCHEDULED_REVERSAL] Reverting action as originally scheduled',\n          subject: subject.subject,\n          createdAt: new Date(),\n        })\n      }\n    })\n  }\n\n  async findAndRevertDueActions() {\n    const moderationService = this.modService(this.db)\n    const subjectsDueForReversal =\n      await moderationService.getSubjectsDueForReversal()\n\n    // We shouldn't have too many actions due for reversal at any given time, so running in parallel is probably fine\n    // Internally, each reversal runs within its own transaction\n    await Promise.all([\n      ...subjectsDueForReversal.map(this.revertState.bind(this)),\n      this.findAndRevertExpiredTags(),\n    ])\n  }\n\n  async findAndRevertExpiredTags() {\n    const groups = await getExpiredTags(this.db)\n    if (!groups.length) return\n\n    for (const group of groups) {\n      await this.db.transaction(async (dbTxn) => {\n        // Check which tags are still present on the subject\n        const status = await dbTxn.db\n          .selectFrom('moderation_subject_status')\n          .where('did', '=', group.did)\n          .where('recordPath', '=', group.recordPath)\n          .selectAll()\n          .executeTakeFirst()\n\n        const currentTags: string[] = status?.tags ?? []\n        const tagsToRemove = group.tags.filter((t) => currentTags.includes(t))\n\n        // Delete the expiring_tag rows regardless\n        await deleteExpiringTagsByIds(dbTxn, group.ids)\n\n        // Only emit removal event if there are tags still present to remove\n        if (tagsToRemove.length > 0 && status) {\n          const subject = subjectFromStatusRow(status)\n          const moderationTxn = this.modService(dbTxn)\n          await moderationTxn.logEvent({\n            event: {\n              $type: 'tools.ozone.moderation.defs#modEventTag',\n              add: [],\n              remove: tagsToRemove,\n              comment:\n                '[SCHEDULED_REVERSAL] Reverting temporary tags as originally scheduled',\n            },\n            createdBy: group.createdBy,\n            subject,\n            createdAt: new Date(),\n          })\n        }\n      })\n    }\n  }\n}\n\nconst getInterval = (): number => {\n  // super basic synchronization by agreeing when the intervals land relative to unix timestamp\n  const now = Date.now()\n  const intervalMs = MINUTE\n  const nextIteration = Math.ceil(now / intervalMs)\n  return nextIteration * intervalMs - now\n}\n"]}
+{"version":3,"file":"event-reverser.js","sourceRoot":"","sources":["../../src/daemon/event-reverser.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE } from '@atproto/common'\nimport { Database } from '../db/index.js'\nimport { dbLogger } from '../logger.js'\nimport {\n  deleteExpiringTagsByIds,\n  getExpiredTags,\n} from '../mod-service/expiring-tags.js'\nimport {\n  ModerationServiceCreator,\n  ReversalSubject,\n} from '../mod-service/index.js'\nimport { subjectFromStatusRow } from '../mod-service/subject.js'\n\nexport class EventReverser {\n  destroyed = false\n  reversalPromise: Promise<void> = Promise.resolve()\n  timer?: NodeJS.Timeout\n\n  constructor(\n    private db: Database,\n    private modService: ModerationServiceCreator,\n  ) {}\n\n  start() {\n    this.poll()\n  }\n\n  poll() {\n    if (this.destroyed) return\n    this.reversalPromise = this.findAndRevertDueActions()\n      .catch((err) =>\n        dbLogger.error({ err }, 'moderation action reversal errored'),\n      )\n      .finally(() => {\n        this.timer = setTimeout(() => this.poll(), getInterval())\n      })\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.timer) {\n      clearTimeout(this.timer)\n      this.timer = undefined\n    }\n    await this.reversalPromise\n  }\n\n  async revertState(subject: ReversalSubject) {\n    await this.db.transaction(async (dbTxn) => {\n      const moderationTxn = this.modService(dbTxn)\n      const originalEvent =\n        await moderationTxn.getLastReversibleEventForSubject(subject)\n      if (originalEvent) {\n        await moderationTxn.revertState({\n          action: originalEvent.action,\n          createdBy: originalEvent.createdBy,\n          comment:\n            '[SCHEDULED_REVERSAL] Reverting action as originally scheduled',\n          subject: subject.subject,\n          createdAt: new Date(),\n        })\n      }\n    })\n  }\n\n  async findAndRevertDueActions() {\n    const moderationService = this.modService(this.db)\n    const subjectsDueForReversal =\n      await moderationService.getSubjectsDueForReversal()\n\n    // We shouldn't have too many actions due for reversal at any given time, so running in parallel is probably fine\n    // Internally, each reversal runs within its own transaction\n    await Promise.all([\n      ...subjectsDueForReversal.map(this.revertState.bind(this)),\n      this.findAndRevertExpiredTags(),\n    ])\n  }\n\n  async findAndRevertExpiredTags() {\n    const groups = await getExpiredTags(this.db)\n    if (!groups.length) return\n\n    for (const group of groups) {\n      await this.db.transaction(async (dbTxn) => {\n        // Check which tags are still present on the subject\n        const status = await dbTxn.db\n          .selectFrom('moderation_subject_status')\n          .where('did', '=', group.did)\n          .where('recordPath', '=', group.recordPath)\n          .selectAll()\n          .executeTakeFirst()\n\n        const currentTags: string[] = status?.tags ?? []\n        const tagsToRemove = group.tags.filter((t) => currentTags.includes(t))\n\n        // Delete the expiring_tag rows regardless\n        await deleteExpiringTagsByIds(dbTxn, group.ids)\n\n        // Only emit removal event if there are tags still present to remove\n        if (tagsToRemove.length > 0 && status) {\n          const subject = subjectFromStatusRow(status)\n          const moderationTxn = this.modService(dbTxn)\n          await moderationTxn.logEvent({\n            event: {\n              $type: 'tools.ozone.moderation.defs#modEventTag',\n              add: [],\n              remove: tagsToRemove,\n              comment:\n                '[SCHEDULED_REVERSAL] Reverting temporary tags as originally scheduled',\n            },\n            createdBy: group.createdBy,\n            subject,\n            createdAt: new Date(),\n          })\n        }\n      })\n    }\n  }\n}\n\nconst getInterval = (): number => {\n  // super basic synchronization by agreeing when the intervals land relative to unix timestamp\n  const now = Date.now()\n  const intervalMs = MINUTE\n  const nextIteration = Math.ceil(now / intervalMs)\n  return nextIteration * intervalMs - now\n}\n"]}

package/dist/daemon/index.d.ts

@@ -1,11 +1,11 @@
-import { OzoneConfig, OzoneSecrets } from '../config';
-import { AppContextOptions } from '../context';
-import { DaemonContext } from './context';
-export { EventPusher } from './event-pusher';
-export { BlobDiverter } from './blob-diverter';
-export { EventReverser } from './event-reverser';
-export { ScheduledActionProcessor } from './scheduled-action-processor';
-export { StrikeExpiryProcessor } from './strike-expiry-processor';
+import { OzoneConfig, OzoneSecrets } from '../config/index.js';
+import { AppContextOptions } from '../context.js';
+import { DaemonContext } from './context.js';
+export { EventPusher } from './event-pusher.js';
+export { BlobDiverter } from './blob-diverter.js';
+export { EventReverser } from './event-reverser.js';
+export { ScheduledActionProcessor } from './scheduled-action-processor.js';
+export { StrikeExpiryProcessor } from './strike-expiry-processor.js';
 export declare class OzoneDaemon {
     ctx: DaemonContext;
     constructor(ctx: DaemonContext);

package/dist/daemon/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAEjE,qBAAa,WAAW;IACH,GAAG,EAAE,aAAa;gBAAlB,GAAG,EAAE,aAAa;WACxB,MAAM,CACjB,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,YAAY,EACrB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,WAAW,CAAC;IAKjB,KAAK;IAIL,UAAU;IAIV,OAAO;CAGd"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEpE,qBAAa,WAAW;IACH,GAAG,EAAE,aAAa;gBAAlB,GAAG,EAAE,aAAa;WACxB,MAAM,CACjB,GAAG,EAAE,WAAW,EAChB,OAAO,EAAE,YAAY,EACrB,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GACrC,OAAO,CAAC,WAAW,CAAC;IAKjB,KAAK;IAIL,UAAU;IAIV,OAAO;CAGd"}

package/dist/daemon/index.js

@@ -1,28 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OzoneDaemon = exports.StrikeExpiryProcessor = exports.ScheduledActionProcessor = exports.EventReverser = exports.BlobDiverter = exports.EventPusher = void 0;
-const context_1 = require("./context");
-var event_pusher_1 = require("./event-pusher");
-Object.defineProperty(exports, "EventPusher", { enumerable: true, get: function () { return event_pusher_1.EventPusher; } });
-var blob_diverter_1 = require("./blob-diverter");
-Object.defineProperty(exports, "BlobDiverter", { enumerable: true, get: function () { return blob_diverter_1.BlobDiverter; } });
-var event_reverser_1 = require("./event-reverser");
-Object.defineProperty(exports, "EventReverser", { enumerable: true, get: function () { return event_reverser_1.EventReverser; } });
-var scheduled_action_processor_1 = require("./scheduled-action-processor");
-Object.defineProperty(exports, "ScheduledActionProcessor", { enumerable: true, get: function () { return scheduled_action_processor_1.ScheduledActionProcessor; } });
-var strike_expiry_processor_1 = require("./strike-expiry-processor");
-Object.defineProperty(exports, "StrikeExpiryProcessor", { enumerable: true, get: function () { return strike_expiry_processor_1.StrikeExpiryProcessor; } });
-class OzoneDaemon {
+import { DaemonContext } from './context.js';
+export { EventPusher } from './event-pusher.js';
+export { BlobDiverter } from './blob-diverter.js';
+export { EventReverser } from './event-reverser.js';
+export { ScheduledActionProcessor } from './scheduled-action-processor.js';
+export { StrikeExpiryProcessor } from './strike-expiry-processor.js';
+export class OzoneDaemon {
     constructor(ctx) {
-        Object.defineProperty(this, "ctx", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: ctx
-        });
+        this.ctx = ctx;
     }
     static async create(cfg, secrets, overrides) {
-        const ctx = await context_1.DaemonContext.fromConfig(cfg, secrets, overrides);
+        const ctx = await DaemonContext.fromConfig(cfg, secrets, overrides);
         return new OzoneDaemon(ctx);
     }
     async start() {
@@ -35,5 +22,4 @@ class OzoneDaemon {
         await this.ctx.destroy();
     }
 }
-exports.OzoneDaemon = OzoneDaemon;
 //# sourceMappingURL=index.js.map

package/dist/daemon/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":";;;AAEA,uCAAyC;AAEzC,+CAA4C;AAAnC,2GAAA,WAAW,OAAA;AACpB,iDAA8C;AAArC,6GAAA,YAAY,OAAA;AACrB,mDAAgD;AAAvC,+GAAA,aAAa,OAAA;AACtB,2EAAuE;AAA9D,sIAAA,wBAAwB,OAAA;AACjC,qEAAiE;AAAxD,gIAAA,qBAAqB,OAAA;AAE9B,MAAa,WAAW;IACtB,YAAmB,GAAkB;QAAzB;;;;mBAAO,GAAG;WAAe;IAAG,CAAC;IACzC,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,GAAgB,EAChB,OAAqB,EACrB,SAAsC;QAEtC,MAAM,GAAG,GAAG,MAAM,uBAAa,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QACnE,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF;AAtBD,kCAsBC","sourcesContent":["import { OzoneConfig, OzoneSecrets } from '../config'\nimport { AppContextOptions } from '../context'\nimport { DaemonContext } from './context'\n\nexport { EventPusher } from './event-pusher'\nexport { BlobDiverter } from './blob-diverter'\nexport { EventReverser } from './event-reverser'\nexport { ScheduledActionProcessor } from './scheduled-action-processor'\nexport { StrikeExpiryProcessor } from './strike-expiry-processor'\n\nexport class OzoneDaemon {\n  constructor(public ctx: DaemonContext) {}\n  static async create(\n    cfg: OzoneConfig,\n    secrets: OzoneSecrets,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<OzoneDaemon> {\n    const ctx = await DaemonContext.fromConfig(cfg, secrets, overrides)\n    return new OzoneDaemon(ctx)\n  }\n\n  async start() {\n    await this.ctx.start()\n  }\n\n  async processAll() {\n    await this.ctx.processAll()\n  }\n\n  async destroy() {\n    await this.ctx.destroy()\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEpE,MAAM,OAAO,WAAW;IACtB,YAAmB,GAAkB;QAAlB,QAAG,GAAH,GAAG,CAAe;IAAG,CAAC;IACzC,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,GAAgB,EAChB,OAAqB,EACrB,SAAsC;QAEtC,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QACnE,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;IAC1B,CAAC;CACF","sourcesContent":["import { OzoneConfig, OzoneSecrets } from '../config/index.js'\nimport { AppContextOptions } from '../context.js'\nimport { DaemonContext } from './context.js'\n\nexport { EventPusher } from './event-pusher.js'\nexport { BlobDiverter } from './blob-diverter.js'\nexport { EventReverser } from './event-reverser.js'\nexport { ScheduledActionProcessor } from './scheduled-action-processor.js'\nexport { StrikeExpiryProcessor } from './strike-expiry-processor.js'\n\nexport class OzoneDaemon {\n  constructor(public ctx: DaemonContext) {}\n  static async create(\n    cfg: OzoneConfig,\n    secrets: OzoneSecrets,\n    overrides?: Partial<AppContextOptions>,\n  ): Promise<OzoneDaemon> {\n    const ctx = await DaemonContext.fromConfig(cfg, secrets, overrides)\n    return new OzoneDaemon(ctx)\n  }\n\n  async start() {\n    await this.ctx.start()\n  }\n\n  async processAll() {\n    await this.ctx.processAll()\n  }\n\n  async destroy() {\n    await this.ctx.destroy()\n  }\n}\n"]}

package/dist/daemon/job-cursor.d.ts

@@ -1,4 +1,4 @@
-import { Database } from '../db';
+import { Database } from '../db/index.js';
 export declare function initJobCursor(db: Database, job: string): Promise<void>;
 export declare function getJobCursor(db: Database, job: string): Promise<string | null>;
 export declare function updateJobCursor(db: Database, job: string, cursor: string): Promise<void>;

package/dist/daemon/job-cursor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"job-cursor.d.ts","sourceRoot":"","sources":["../../src/daemon/job-cursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,wBAAsB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5E;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAOxB;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAMf"}
+{"version":3,"file":"job-cursor.d.ts","sourceRoot":"","sources":["../../src/daemon/job-cursor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,wBAAsB,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5E;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAOxB;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,QAAQ,EACZ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAMf"}

package/dist/daemon/job-cursor.js

@@ -1,16 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initJobCursor = initJobCursor;
-exports.getJobCursor = getJobCursor;
-exports.updateJobCursor = updateJobCursor;
-async function initJobCursor(db, job) {
+export async function initJobCursor(db, job) {
     await db.db
         .insertInto('job_cursor')
         .values({ job, cursor: null })
         .onConflict((oc) => oc.doNothing())
         .execute();
 }
-async function getJobCursor(db, job) {
+export async function getJobCursor(db, job) {
     const entry = await db.db
         .selectFrom('job_cursor')
         .select('cursor')
@@ -18,7 +13,7 @@ async function getJobCursor(db, job) {
         .executeTakeFirst();
     return entry?.cursor ?? null;
 }
-async function updateJobCursor(db, job, cursor) {
+export async function updateJobCursor(db, job, cursor) {
     await db.db
         .updateTable('job_cursor')
         .set({ cursor })

package/dist/daemon/job-cursor.js.map

@@ -1 +1 @@
-{"version":3,"file":"job-cursor.js","sourceRoot":"","sources":["../../src/daemon/job-cursor.ts"],"names":[],"mappings":";;AAEA,sCAMC;AAED,oCAUC;AAED,0CAUC;AA9BM,KAAK,UAAU,aAAa,CAAC,EAAY,EAAE,GAAW;IAC3D,MAAM,EAAE,CAAC,EAAE;SACR,UAAU,CAAC,YAAY,CAAC;SACxB,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC7B,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;SAClC,OAAO,EAAE,CAAA;AACd,CAAC;AAEM,KAAK,UAAU,YAAY,CAChC,EAAY,EACZ,GAAW;IAEX,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE;SACtB,UAAU,CAAC,YAAY,CAAC;SACxB,MAAM,CAAC,QAAQ,CAAC;SAChB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,gBAAgB,EAAE,CAAA;IACrB,OAAO,KAAK,EAAE,MAAM,IAAI,IAAI,CAAA;AAC9B,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,EAAY,EACZ,GAAW,EACX,MAAc;IAEd,MAAM,EAAE,CAAC,EAAE;SACR,WAAW,CAAC,YAAY,CAAC;SACzB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;SACf,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,OAAO,EAAE,CAAA;AACd,CAAC","sourcesContent":["import { Database } from '../db'\n\nexport async function initJobCursor(db: Database, job: string): Promise<void> {\n  await db.db\n    .insertInto('job_cursor')\n    .values({ job, cursor: null })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nexport async function getJobCursor(\n  db: Database,\n  job: string,\n): Promise<string | null> {\n  const entry = await db.db\n    .selectFrom('job_cursor')\n    .select('cursor')\n    .where('job', '=', job)\n    .executeTakeFirst()\n  return entry?.cursor ?? null\n}\n\nexport async function updateJobCursor(\n  db: Database,\n  job: string,\n  cursor: string,\n): Promise<void> {\n  await db.db\n    .updateTable('job_cursor')\n    .set({ cursor })\n    .where('job', '=', job)\n    .execute()\n}\n"]}
+{"version":3,"file":"job-cursor.js","sourceRoot":"","sources":["../../src/daemon/job-cursor.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAAY,EAAE,GAAW;IAC3D,MAAM,EAAE,CAAC,EAAE;SACR,UAAU,CAAC,YAAY,CAAC;SACxB,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAC7B,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC;SAClC,OAAO,EAAE,CAAA;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EAAY,EACZ,GAAW;IAEX,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE;SACtB,UAAU,CAAC,YAAY,CAAC;SACxB,MAAM,CAAC,QAAQ,CAAC;SAChB,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,gBAAgB,EAAE,CAAA;IACrB,OAAO,KAAK,EAAE,MAAM,IAAI,IAAI,CAAA;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAY,EACZ,GAAW,EACX,MAAc;IAEd,MAAM,EAAE,CAAC,EAAE;SACR,WAAW,CAAC,YAAY,CAAC;SACzB,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;SACf,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;SACtB,OAAO,EAAE,CAAA;AACd,CAAC","sourcesContent":["import { Database } from '../db/index.js'\n\nexport async function initJobCursor(db: Database, job: string): Promise<void> {\n  await db.db\n    .insertInto('job_cursor')\n    .values({ job, cursor: null })\n    .onConflict((oc) => oc.doNothing())\n    .execute()\n}\n\nexport async function getJobCursor(\n  db: Database,\n  job: string,\n): Promise<string | null> {\n  const entry = await db.db\n    .selectFrom('job_cursor')\n    .select('cursor')\n    .where('job', '=', job)\n    .executeTakeFirst()\n  return entry?.cursor ?? null\n}\n\nexport async function updateJobCursor(\n  db: Database,\n  job: string,\n  cursor: string,\n): Promise<void> {\n  await db.db\n    .updateTable('job_cursor')\n    .set({ cursor })\n    .where('job', '=', job)\n    .execute()\n}\n"]}

package/dist/daemon/materialized-view-refresher.d.ts

@@ -1,4 +1,4 @@
-import { BackgroundQueue, PeriodicBackgroundTask } from '../background';
+import { BackgroundQueue, PeriodicBackgroundTask } from '../background.js';
 export declare class MaterializedViewRefresher extends PeriodicBackgroundTask {
     constructor(backgroundQueue: BackgroundQueue, interval?: number);
 }

package/dist/daemon/materialized-view-refresher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materialized-view-refresher.d.ts","sourceRoot":"","sources":["../../src/daemon/materialized-view-refresher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAGvE,qBAAa,yBAA0B,SAAQ,sBAAsB;gBACvD,eAAe,EAAE,eAAe,EAAE,QAAQ,SAAc;CA0BrE"}
+{"version":3,"file":"materialized-view-refresher.d.ts","sourceRoot":"","sources":["../../src/daemon/materialized-view-refresher.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAG1E,qBAAa,yBAA0B,SAAQ,sBAAsB;gBACvD,eAAe,EAAE,eAAe,EAAE,QAAQ,SAAc;CA0BrE"}

package/dist/daemon/materialized-view-refresher.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MaterializedViewRefresher = void 0;
-const kysely_1 = require("kysely");
-const common_1 = require("@atproto/common");
-const background_1 = require("../background");
-const logger_1 = require("../logger");
-class MaterializedViewRefresher extends background_1.PeriodicBackgroundTask {
-    constructor(backgroundQueue, interval = 30 * common_1.MINUTE) {
+import { sql } from 'kysely';
+import { MINUTE } from '@atproto/common';
+import { PeriodicBackgroundTask } from '../background.js';
+import { dbLogger } from '../logger.js';
+export class MaterializedViewRefresher extends PeriodicBackgroundTask {
+    constructor(backgroundQueue, interval = 30 * MINUTE) {
         super(backgroundQueue, interval, async ({ db }, signal) => {
             for (const view of [
                 'account_events_stats',
@@ -22,15 +19,14 @@ class MaterializedViewRefresher extends background_1.PeriodicBackgroundTask {
                 // ideal, but it is the best we can do until Kysely provides a way to
                 // cancel a query.
                 try {
-                    await (0, kysely_1.sql) `REFRESH MATERIALIZED VIEW CONCURRENTLY ${kysely_1.sql.id(view)}`.execute(db);
-                    logger_1.dbLogger.info(`refreshed materialized view ${view}`);
+                    await sql `REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(db);
+                    dbLogger.info(`refreshed materialized view ${view}`);
                 }
                 catch (err) {
-                    logger_1.dbLogger.error({ err, view }, 'failed to refresh materialized view');
+                    dbLogger.error({ err, view }, 'failed to refresh materialized view');
                 }
             }
         });
     }
 }
-exports.MaterializedViewRefresher = MaterializedViewRefresher;
 //# sourceMappingURL=materialized-view-refresher.js.map

package/dist/daemon/materialized-view-refresher.js.map

@@ -1 +1 @@
-{"version":3,"file":"materialized-view-refresher.js","sourceRoot":"","sources":["../../src/daemon/materialized-view-refresher.ts"],"names":[],"mappings":";;;AAAA,mCAA4B;AAC5B,4CAAwC;AACxC,8CAAuE;AACvE,sCAAoC;AAEpC,MAAa,yBAA0B,SAAQ,mCAAsB;IACnE,YAAY,eAAgC,EAAE,QAAQ,GAAG,EAAE,GAAG,eAAM;QAClE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;YACxD,KAAK,MAAM,IAAI,IAAI;gBACjB,sBAAsB;gBACtB,qBAAqB;gBACrB,6BAA6B;gBAC7B,6BAA6B;aAC9B,EAAE,CAAC;gBACF,IAAI,MAAM,CAAC,OAAO;oBAAE,MAAK;gBAEzB,sEAAsE;gBACtE,uEAAuE;gBACvE,qEAAqE;gBACrE,qEAAqE;gBACrE,kBAAkB;gBAClB,IAAI,CAAC;oBACH,MAAM,IAAA,YAAG,EAAA,0CAA0C,YAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CACvE,EAAE,CACH,CAAA;oBACD,iBAAQ,CAAC,IAAI,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAA;gBACtD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,iBAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,qCAAqC,CAAC,CAAA;gBACtE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AA3BD,8DA2BC","sourcesContent":["import { sql } from 'kysely'\nimport { MINUTE } from '@atproto/common'\nimport { BackgroundQueue, PeriodicBackgroundTask } from '../background'\nimport { dbLogger } from '../logger'\n\nexport class MaterializedViewRefresher extends PeriodicBackgroundTask {\n  constructor(backgroundQueue: BackgroundQueue, interval = 30 * MINUTE) {\n    super(backgroundQueue, interval, async ({ db }, signal) => {\n      for (const view of [\n        'account_events_stats',\n        'record_events_stats',\n        'account_record_events_stats',\n        'account_record_status_stats',\n      ]) {\n        if (signal.aborted) break\n\n        // Kysely does not provide a way to cancel a running query. Because of\n        // this, killing the process during a refresh will cause the process to\n        // wait for the current refresh to finish before exiting. This is not\n        // ideal, but it is the best we can do until Kysely provides a way to\n        // cancel a query.\n        try {\n          await sql`REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(\n            db,\n          )\n          dbLogger.info(`refreshed materialized view ${view}`)\n        } catch (err) {\n          dbLogger.error({ err, view }, 'failed to refresh materialized view')\n        }\n      }\n    })\n  }\n}\n"]}
+{"version":3,"file":"materialized-view-refresher.js","sourceRoot":"","sources":["../../src/daemon/materialized-view-refresher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAmB,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,MAAM,OAAO,yBAA0B,SAAQ,sBAAsB;IACnE,YAAY,eAAgC,EAAE,QAAQ,GAAG,EAAE,GAAG,MAAM;QAClE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;YACxD,KAAK,MAAM,IAAI,IAAI;gBACjB,sBAAsB;gBACtB,qBAAqB;gBACrB,6BAA6B;gBAC7B,6BAA6B;aAC9B,EAAE,CAAC;gBACF,IAAI,MAAM,CAAC,OAAO;oBAAE,MAAK;gBAEzB,sEAAsE;gBACtE,uEAAuE;gBACvE,qEAAqE;gBACrE,qEAAqE;gBACrE,kBAAkB;gBAClB,IAAI,CAAC;oBACH,MAAM,GAAG,CAAA,0CAA0C,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CACvE,EAAE,CACH,CAAA;oBACD,QAAQ,CAAC,IAAI,CAAC,+BAA+B,IAAI,EAAE,CAAC,CAAA;gBACtD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,qCAAqC,CAAC,CAAA;gBACtE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF","sourcesContent":["import { sql } from 'kysely'\nimport { MINUTE } from '@atproto/common'\nimport { BackgroundQueue, PeriodicBackgroundTask } from '../background.js'\nimport { dbLogger } from '../logger.js'\n\nexport class MaterializedViewRefresher extends PeriodicBackgroundTask {\n  constructor(backgroundQueue: BackgroundQueue, interval = 30 * MINUTE) {\n    super(backgroundQueue, interval, async ({ db }, signal) => {\n      for (const view of [\n        'account_events_stats',\n        'record_events_stats',\n        'account_record_events_stats',\n        'account_record_status_stats',\n      ]) {\n        if (signal.aborted) break\n\n        // Kysely does not provide a way to cancel a running query. Because of\n        // this, killing the process during a refresh will cause the process to\n        // wait for the current refresh to finish before exiting. This is not\n        // ideal, but it is the best we can do until Kysely provides a way to\n        // cancel a query.\n        try {\n          await sql`REFRESH MATERIALIZED VIEW CONCURRENTLY ${sql.id(view)}`.execute(\n            db,\n          )\n          dbLogger.info(`refreshed materialized view ${view}`)\n        } catch (err) {\n          dbLogger.error({ err, view }, 'failed to refresh materialized view')\n        }\n      }\n    })\n  }\n}\n"]}

package/dist/daemon/queue-router.d.ts

@@ -1,5 +1,5 @@
-import { Database } from '../db';
-import { QueueServiceCreator } from '../queue/service';
+import { Database } from '../db/index.js';
+import { QueueServiceCreator } from '../queue/service.js';
 export declare class QueueRouter {
     private db;
     private queueServiceCreator;

package/dist/daemon/queue-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue-router.d.ts","sourceRoot":"","sources":["../../src/daemon/queue-router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAEhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAMtD,qBAAa,WAAW;IAMpB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,mBAAmB;IAN7B,SAAS,UAAQ;IACjB,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAoB;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGZ,EAAE,EAAE,QAAQ,EACZ,mBAAmB,EAAE,mBAAmB;IAGlD,KAAK;IAIL,IAAI;IASE,OAAO;IASP,gBAAgB;IAIhB,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IASnC,YAAY;CA2CnB"}
+{"version":3,"file":"queue-router.d.ts","sourceRoot":"","sources":["../../src/daemon/queue-router.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAMzD,qBAAa,WAAW;IAMpB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,mBAAmB;IAN7B,SAAS,UAAQ;IACjB,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAoB;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGZ,EAAE,EAAE,QAAQ,EACZ,mBAAmB,EAAE,mBAAmB;IAGlD,KAAK;IAIL,IAAI;IASE,OAAO;IASP,gBAAgB;IAIhB,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IASnC,YAAY;CA2CnB"}

package/dist/daemon/queue-router.js

@@ -1,43 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueueRouter = void 0;
-const common_1 = require("@atproto/common");
-const logger_1 = require("../logger");
-const job_cursor_1 = require("./job-cursor");
+import { MINUTE } from '@atproto/common';
+import { dbLogger } from '../logger.js';
+import { initJobCursor } from './job-cursor.js';
 const JOB_NAME = 'queue_router';
 const BATCH_SIZE = 100;
-class QueueRouter {
+export class QueueRouter {
     constructor(db, queueServiceCreator) {
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: db
-        });
-        Object.defineProperty(this, "queueServiceCreator", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: queueServiceCreator
-        });
-        Object.defineProperty(this, "destroyed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "processingPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: Promise.resolve()
-        });
-        Object.defineProperty(this, "timer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.db = db;
+        this.queueServiceCreator = queueServiceCreator;
+        this.destroyed = false;
+        this.processingPromise = Promise.resolve();
     }
     start() {
         this.initializeCursor().then(() => this.poll());
@@ -46,7 +17,7 @@ class QueueRouter {
         if (this.destroyed)
             return;
         this.processingPromise = this.routeReports()
-            .catch((err) => logger_1.dbLogger.error({ err }, 'queue routing errored'))
+            .catch((err) => dbLogger.error({ err }, 'queue routing errored'))
             .finally(() => {
             this.timer = setTimeout(() => this.poll(), getInterval());
         });
@@ -60,7 +31,7 @@ class QueueRouter {
         await this.processingPromise;
     }
     async initializeCursor() {
-        await (0, job_cursor_1.initJobCursor)(this.db, JOB_NAME);
+        await initJobCursor(this.db, JOB_NAME);
     }
     async getCursor() {
         const row = await this.db.db
@@ -91,7 +62,7 @@ class QueueRouter {
                 limit: BATCH_SIZE,
             });
             if (result.processed === 0) {
-                logger_1.dbLogger.info('no new report events to route');
+                dbLogger.info('no new report events to route');
                 return;
             }
             await txn.db
@@ -99,7 +70,7 @@ class QueueRouter {
                 .set({ cursor: String(result.maxEventId) })
                 .where('job', '=', JOB_NAME)
                 .execute();
-            logger_1.dbLogger.info({
+            dbLogger.info({
                 processed: result.processed,
                 assigned: result.assigned,
                 unmatched: result.unmatched,
@@ -108,7 +79,6 @@ class QueueRouter {
         });
     }
 }
-exports.QueueRouter = QueueRouter;
 // Poll every 1 minute
-const getInterval = () => 1 * common_1.MINUTE;
+const getInterval = () => 1 * MINUTE;
 //# sourceMappingURL=queue-router.js.map

package/dist/daemon/queue-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"queue-router.js","sourceRoot":"","sources":["../../src/daemon/queue-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE } from '@atproto/common'\nimport { Database } from '../db'\nimport { dbLogger } from '../logger'\nimport { QueueServiceCreator } from '../queue/service'\nimport { initJobCursor } from './job-cursor'\n\nconst JOB_NAME = 'queue_router'\nconst BATCH_SIZE = 100\n\nexport class QueueRouter {\n  destroyed = false\n  processingPromise: Promise<void> = Promise.resolve()\n  timer?: NodeJS.Timeout\n\n  constructor(\n    private db: Database,\n    private queueServiceCreator: QueueServiceCreator,\n  ) {}\n\n  start() {\n    this.initializeCursor().then(() => this.poll())\n  }\n\n  poll() {\n    if (this.destroyed) return\n    this.processingPromise = this.routeReports()\n      .catch((err) => dbLogger.error({ err }, 'queue routing errored'))\n      .finally(() => {\n        this.timer = setTimeout(() => this.poll(), getInterval())\n      })\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.timer) {\n      clearTimeout(this.timer)\n      this.timer = undefined\n    }\n    await this.processingPromise\n  }\n\n  async initializeCursor() {\n    await initJobCursor(this.db, JOB_NAME)\n  }\n\n  async getCursor(): Promise<number | null> {\n    const row = await this.db.db\n      .selectFrom('job_cursor')\n      .select('cursor')\n      .where('job', '=', JOB_NAME)\n      .executeTakeFirst()\n    return row?.cursor ? parseInt(row.cursor, 10) : null\n  }\n\n  async routeReports() {\n    await this.db.transaction(async (txn) => {\n      // Acquire row lock on the job_cursor row. A second daemon instance\n      // hitting this same query blocks here until the first transaction\n      // commits, then reads the now-advanced cursor and processes the next\n      // range. The lock is held for the whole batch (~50–200ms).\n      const row = await txn.db\n        .selectFrom('job_cursor')\n        .selectAll()\n        .where('job', '=', JOB_NAME)\n        .forUpdate()\n        .executeTakeFirst()\n      if (!row) return\n      const cursor = row.cursor ? parseInt(row.cursor, 10) : null\n\n      const queueService = this.queueServiceCreator(txn)\n      const result = await queueService.insertReportsFromEvents({\n        cursor,\n        limit: BATCH_SIZE,\n      })\n\n      if (result.processed === 0) {\n        dbLogger.info('no new report events to route')\n        return\n      }\n\n      await txn.db\n        .updateTable('job_cursor')\n        .set({ cursor: String(result.maxEventId) })\n        .where('job', '=', JOB_NAME)\n        .execute()\n\n      dbLogger.info(\n        {\n          processed: result.processed,\n          assigned: result.assigned,\n          unmatched: result.unmatched,\n          maxEventId: result.maxEventId,\n        },\n        'queue routing completed',\n      )\n    })\n  }\n}\n\n// Poll every 1 minute\nconst getInterval = (): number => 1 * MINUTE\n"]}
+{"version":3,"file":"queue-router.js","sourceRoot":"","sources":["../../src/daemon/queue-router.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE } from '@atproto/common'\nimport { Database } from '../db/index.js'\nimport { dbLogger } from '../logger.js'\nimport { QueueServiceCreator } from '../queue/service.js'\nimport { initJobCursor } from './job-cursor.js'\n\nconst JOB_NAME = 'queue_router'\nconst BATCH_SIZE = 100\n\nexport class QueueRouter {\n  destroyed = false\n  processingPromise: Promise<void> = Promise.resolve()\n  timer?: NodeJS.Timeout\n\n  constructor(\n    private db: Database,\n    private queueServiceCreator: QueueServiceCreator,\n  ) {}\n\n  start() {\n    this.initializeCursor().then(() => this.poll())\n  }\n\n  poll() {\n    if (this.destroyed) return\n    this.processingPromise = this.routeReports()\n      .catch((err) => dbLogger.error({ err }, 'queue routing errored'))\n      .finally(() => {\n        this.timer = setTimeout(() => this.poll(), getInterval())\n      })\n  }\n\n  async destroy() {\n    this.destroyed = true\n    if (this.timer) {\n      clearTimeout(this.timer)\n      this.timer = undefined\n    }\n    await this.processingPromise\n  }\n\n  async initializeCursor() {\n    await initJobCursor(this.db, JOB_NAME)\n  }\n\n  async getCursor(): Promise<number | null> {\n    const row = await this.db.db\n      .selectFrom('job_cursor')\n      .select('cursor')\n      .where('job', '=', JOB_NAME)\n      .executeTakeFirst()\n    return row?.cursor ? parseInt(row.cursor, 10) : null\n  }\n\n  async routeReports() {\n    await this.db.transaction(async (txn) => {\n      // Acquire row lock on the job_cursor row. A second daemon instance\n      // hitting this same query blocks here until the first transaction\n      // commits, then reads the now-advanced cursor and processes the next\n      // range. The lock is held for the whole batch (~50–200ms).\n      const row = await txn.db\n        .selectFrom('job_cursor')\n        .selectAll()\n        .where('job', '=', JOB_NAME)\n        .forUpdate()\n        .executeTakeFirst()\n      if (!row) return\n      const cursor = row.cursor ? parseInt(row.cursor, 10) : null\n\n      const queueService = this.queueServiceCreator(txn)\n      const result = await queueService.insertReportsFromEvents({\n        cursor,\n        limit: BATCH_SIZE,\n      })\n\n      if (result.processed === 0) {\n        dbLogger.info('no new report events to route')\n        return\n      }\n\n      await txn.db\n        .updateTable('job_cursor')\n        .set({ cursor: String(result.maxEventId) })\n        .where('job', '=', JOB_NAME)\n        .execute()\n\n      dbLogger.info(\n        {\n          processed: result.processed,\n          assigned: result.assigned,\n          unmatched: result.unmatched,\n          maxEventId: result.maxEventId,\n        },\n        'queue routing completed',\n      )\n    })\n  }\n}\n\n// Poll every 1 minute\nconst getInterval = (): number => 1 * MINUTE\n"]}

package/dist/daemon/scheduled-action-processor.d.ts

@@ -1,11 +1,11 @@
 import { Selectable } from 'kysely';
-import { Database } from '../db';
-import { ScheduledAction } from '../db/schema/scheduled-action';
-import { ModTool } from '../lexicon/types/tools/ozone/moderation/defs';
-import { ModerationService, ModerationServiceCreator } from '../mod-service';
-import { ModEventType } from '../mod-service/types';
-import { ScheduledActionServiceCreator } from '../scheduled-action/service';
-import { SettingService, SettingServiceCreator } from '../setting/service';
+import { Database } from '../db/index.js';
+import { ScheduledAction } from '../db/schema/scheduled-action.js';
+import { ModTool } from '../lexicon/types/tools/ozone/moderation/defs.js';
+import { ModerationService, ModerationServiceCreator } from '../mod-service/index.js';
+import { ModEventType } from '../mod-service/types.js';
+import { ScheduledActionServiceCreator } from '../scheduled-action/service.js';
+import { SettingService, SettingServiceCreator } from '../setting/service.js';
 export declare class ScheduledActionProcessor {
     private db;
     private serviceDid;
@@ -31,8 +31,8 @@ export declare class ScheduledActionProcessor {
         moderationTxn: ModerationService;
         settingService: SettingService;
     }): Promise<{
-        event: import("../mod-service/types").ModerationEventRow;
-        subjectStatus: import("../mod-service/types").ModerationSubjectStatusRow | null;
+        event: import("../mod-service/types.js").ModerationEventRow;
+        subjectStatus: import("../mod-service/types.js").ModerationSubjectStatusRow | null;
     }>;
     findAndExecuteScheduledActions(): Promise<void>;
 }

package/dist/daemon/scheduled-action-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduled-action-processor.d.ts","sourceRoot":"","sources":["../../src/daemon/scheduled-action-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAMnC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAC/D,OAAO,EAEL,OAAO,EACR,MAAM,8CAA8C,CAAA;AAErD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAA;AAC3E,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAG1E,qBAAa,wBAAwB;IAMjC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,sBAAsB;IAThC,SAAS,UAAQ;IACjB,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAoB;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGZ,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,wBAAwB,EACpC,sBAAsB,EAAE,6BAA6B;IAG/D,KAAK;IAIL,IAAI;IAWE,OAAO;IASP,sBAAsB,CAAC,QAAQ,EAAE,MAAM;IAqGvC,eAAe,CAAC,EACpB,KAAK,EACL,MAAM,EACN,KAAK,EACL,OAAO,EACP,aAAa,EACb,cAAc,GACf,EAAE;QACD,KAAK,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;QAC3C,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;QACnC,KAAK,EAAE,YAAY,CAAA;QACnB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;QAE5B,aAAa,EAAE,iBAAiB,CAAA;QAChC,cAAc,EAAE,cAAc,CAAA;KAC/B;;;;IAkFK,8BAA8B;CAqCrC"}
+{"version":3,"file":"scheduled-action-processor.d.ts","sourceRoot":"","sources":["../../src/daemon/scheduled-action-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAMnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAEL,OAAO,EACR,MAAM,iDAAiD,CAAA;AAExD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAG7E,qBAAa,wBAAwB;IAMjC,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,sBAAsB;IAThC,SAAS,UAAQ;IACjB,iBAAiB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAoB;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;gBAGZ,EAAE,EAAE,QAAQ,EACZ,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,qBAAqB,EACrC,UAAU,EAAE,wBAAwB,EACpC,sBAAsB,EAAE,6BAA6B;IAG/D,KAAK;IAIL,IAAI;IAWE,OAAO;IASP,sBAAsB,CAAC,QAAQ,EAAE,MAAM;IAqGvC,eAAe,CAAC,EACpB,KAAK,EACL,MAAM,EACN,KAAK,EACL,OAAO,EACP,aAAa,EACb,cAAc,GACf,EAAE;QACD,KAAK,EAAE;YAAE,OAAO,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE,CAAA;QAC3C,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;QACnC,KAAK,EAAE,YAAY,CAAA;QACnB,OAAO,EAAE,OAAO,GAAG,SAAS,CAAA;QAE5B,aAAa,EAAE,iBAAiB,CAAA;QAChC,cAAc,EAAE,cAAc,CAAA;KAC/B;;;;IAkFK,8BAA8B;CAqCrC"}

package/dist/daemon/scheduled-action-processor.js

@@ -1,61 +1,17 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduledActionProcessor = void 0;
-const common_1 = require("@atproto/common");
-const util_1 = require("../api/moderation/util");
-const logger_1 = require("../logger");
-const subject_1 = require("../mod-service/subject");
-const util_2 = require("../util");
-class ScheduledActionProcessor {
+import { MINUTE, SECOND } from '@atproto/common';
+import { assertProtectedTagAction, getProtectedTags, } from '../api/moderation/util.js';
+import { dbLogger } from '../logger.js';
+import { RepoSubject } from '../mod-service/subject.js';
+import { retryHttp } from '../util.js';
+export class ScheduledActionProcessor {
     constructor(db, serviceDid, settingService, modService, scheduledActionService) {
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: db
-        });
-        Object.defineProperty(this, "serviceDid", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: serviceDid
-        });
-        Object.defineProperty(this, "settingService", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: settingService
-        });
-        Object.defineProperty(this, "modService", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: modService
-        });
-        Object.defineProperty(this, "scheduledActionService", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: scheduledActionService
-        });
-        Object.defineProperty(this, "destroyed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "processingPromise", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: Promise.resolve()
-        });
-        Object.defineProperty(this, "timer", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.db = db;
+        this.serviceDid = serviceDid;
+        this.settingService = settingService;
+        this.modService = modService;
+        this.scheduledActionService = scheduledActionService;
+        this.destroyed = false;
+        this.processingPromise = Promise.resolve();
     }
     start() {
         this.poll();
@@ -64,7 +20,7 @@ class ScheduledActionProcessor {
         if (this.destroyed)
             return;
         this.processingPromise = this.findAndExecuteScheduledActions()
-            .catch((err) => logger_1.dbLogger.error({ err }, 'scheduled action processing errored'))
+            .catch((err) => dbLogger.error({ err }, 'scheduled action processing errored'))
             .finally(() => {
             this.timer = setTimeout(() => this.poll(), getInterval());
         });
@@ -134,7 +90,7 @@ class ScheduledActionProcessor {
                 });
                 // Mark the scheduled action as executed
                 await scheduledActionTxn.markActionAsExecuted(actionId, moderationEvent.event.id);
-                logger_1.dbLogger.info({
+                dbLogger.info({
                     did: action.did,
                     scheduledActionId: actionId,
                     moderationEventId: moderationEvent.event.id,
@@ -144,7 +100,7 @@ class ScheduledActionProcessor {
                 const errorMessage = error instanceof Error ? error.message : 'Unknown error';
                 // mark as failed
                 await scheduledActionTxn.markActionAsFailed(actionId, errorMessage);
-                logger_1.dbLogger.error({
+                dbLogger.error({
                     scheduledActionId: actionId,
                     error: errorMessage,
                 }, 'failed to execute scheduled action');
@@ -152,15 +108,15 @@ class ScheduledActionProcessor {
         });
     }
     async performTakedown({ email, action, event, modTool, moderationTxn, settingService, }) {
-        const subject = new subject_1.RepoSubject(action.did);
+        const subject = new RepoSubject(action.did);
         const status = await moderationTxn.getStatus(subject);
         if (status?.takendown) {
             throw new Error(`Account is already taken down`);
         }
         if (status?.tags?.length) {
-            const protectedTags = await (0, util_1.getProtectedTags)(settingService, this.serviceDid);
+            const protectedTags = await getProtectedTags(settingService, this.serviceDid);
             if (protectedTags) {
-                (0, util_1.assertProtectedTagAction)({
+                assertProtectedTagAction({
                     protectedTags,
                     subjectTags: status.tags,
                     actionAuthor: action.createdBy,
@@ -184,14 +140,14 @@ class ScheduledActionProcessor {
         if (email.content && email.subject) {
             let isDelivered = false;
             try {
-                await (0, util_2.retryHttp)(() => moderationTxn.sendEmail({
+                await retryHttp(() => moderationTxn.sendEmail({
                     ...email,
                     recipientDid: action.did,
                 }));
                 isDelivered = true;
             }
             catch (err) {
-                logger_1.dbLogger.error({ err, did: action.did }, 'failed to send takedown email');
+                dbLogger.error({ err, did: action.did }, 'failed to send takedown email');
             }
             await moderationTxn.logEvent({
                 event: {
@@ -222,7 +178,7 @@ class ScheduledActionProcessor {
                 // Default to a 30 second window for execution
                 const executeUntil = action.executeUntil
                     ? new Date(action.executeUntil)
-                    : new Date(executeAfter.getTime() + 30 * common_1.SECOND);
+                    : new Date(executeAfter.getTime() + 30 * SECOND);
                 // Only execute if we're past the earliest time
                 if (now < executeAfter) {
                     continue;
@@ -242,11 +198,10 @@ class ScheduledActionProcessor {
         }
     }
 }
-exports.ScheduledActionProcessor = ScheduledActionProcessor;
 const getInterval = () => {
     // Process scheduled actions every minute
     const now = Date.now();
-    const intervalMs = common_1.MINUTE;
+    const intervalMs = MINUTE;
     const nextIteration = Math.ceil(now / intervalMs);
     return nextIteration * intervalMs - now;
 };