@atproto/pds 0.4.223 → 0.4.225

package/dist/db/pagination.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.paginate = exports.TimeCidKeyset = exports.GenericKeyset = void 0;
-const kysely_1 = require("kysely");
-const xrpc_server_1 = require("@atproto/xrpc-server");
+import { sql } from 'kysely';
+import { InvalidRequestError } from '@atproto/xrpc-server';
 /**
  * The GenericKeyset is an abstract class that sets-up the interface and partial implementation
  * of a keyset-paginated cursor with two parts. There are three types involved:
@@ -17,20 +14,10 @@ const xrpc_server_1 = require("@atproto/xrpc-server");
  *   Result -*-> LabeledResult <-*-> Cursor <--> packed/string cursor
  *                     ↳ SQL Condition
  */
-class GenericKeyset {
+export class GenericKeyset {
     constructor(primary, secondary) {
-        Object.defineProperty(this, "primary", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: primary
-        });
-        Object.defineProperty(this, "secondary", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: secondary
-        });
+        this.primary = primary;
+        this.secondary = secondary;
     }
     packFromResult(results) {
         const result = Array.isArray(results) ? results.at(-1) : results;
@@ -61,7 +48,7 @@ class GenericKeyset {
         const result = cursorStr.split('::');
         const [primary, secondary, ...others] = result;
         if (!primary || !secondary || others.length > 0) {
-            throw new xrpc_server_1.InvalidRequestError('Malformed cursor');
+            throw new InvalidRequestError('Malformed cursor');
         }
         return {
             primary,
@@ -74,25 +61,24 @@ class GenericKeyset {
         if (tryIndex) {
             // The tryIndex param will likely disappear and become the default implementation: here for now for gradual rollout query-by-query.
             if (direction === 'asc') {
-                return (0, kysely_1.sql) `((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`;
+                return sql `((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`;
             }
             else {
-                return (0, kysely_1.sql) `((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`;
+                return sql `((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`;
             }
         }
         else {
             // @NOTE this implementation can struggle to use an index on (primary, secondary) for pagination due to the "or" usage.
             if (direction === 'asc') {
-                return (0, kysely_1.sql) `((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`;
+                return sql `((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`;
             }
             else {
-                return (0, kysely_1.sql) `((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`;
+                return sql `((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`;
             }
         }
     }
 }
-exports.GenericKeyset = GenericKeyset;
-class TimeCidKeyset extends GenericKeyset {
+export class TimeCidKeyset extends GenericKeyset {
     labelResult(result) {
         return { primary: result.createdAt, secondary: result.cid };
     }
@@ -105,7 +91,7 @@ class TimeCidKeyset extends GenericKeyset {
     cursorToLabeledResult(cursor) {
         const primaryDate = new Date(parseInt(cursor.primary, 10));
         if (isNaN(primaryDate.getTime())) {
-            throw new xrpc_server_1.InvalidRequestError('Malformed cursor');
+            throw new InvalidRequestError('Malformed cursor');
         }
         return {
             primary: primaryDate.toISOString(),
@@ -113,8 +99,7 @@ class TimeCidKeyset extends GenericKeyset {
         };
     }
 }
-exports.TimeCidKeyset = TimeCidKeyset;
-const paginate = (qb, opts) => {
+export const paginate = (qb, opts) => {
     const { limit, cursor, keyset, direction = 'desc', tryIndex } = opts;
     const keysetSql = keyset.getSql(keyset.unpack(cursor), direction, tryIndex);
     return qb
@@ -123,5 +108,4 @@ const paginate = (qb, opts) => {
         .orderBy(keyset.secondary, direction)
         .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb));
 };
-exports.paginate = paginate;
 //# sourceMappingURL=pagination.js.map

package/dist/db/pagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../src/db/pagination.ts"],"names":[],"mappings":"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","sourcesContent":["import { sql } from 'kysely'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { AnyQb, DbRef } from './util'\n\nexport type Cursor = { primary: string; secondary: string }\nexport type LabeledResult = {\n  primary: string | number\n  secondary: string | number\n}\n\n/**\n * The GenericKeyset is an abstract class that sets-up the interface and partial implementation\n * of a keyset-paginated cursor with two parts. There are three types involved:\n *  - Result: a raw result (i.e. a row from the db) containing data that will make-up a cursor.\n *    - E.g. { createdAt: '2022-01-01T12:00:00Z', cid: 'bafyx' }\n *  - LabeledResult: a Result processed such that the \"primary\" and \"secondary\" parts of the cursor are labeled.\n *    - E.g. { primary: '2022-01-01T12:00:00Z', secondary: 'bafyx' }\n *  - Cursor: the two string parts that make-up the packed/string cursor.\n *    - E.g. packed cursor '1641038400000::bafyx' in parts { primary: '1641038400000', secondary: 'bafyx' }\n *\n * These types relate as such. Implementers define the relations marked with a *:\n *   Result -*-> LabeledResult <-*-> Cursor <--> packed/string cursor\n *                     ↳ SQL Condition\n */\nexport abstract class GenericKeyset<R, LR extends LabeledResult> {\n  constructor(\n    public primary: DbRef,\n    public secondary: DbRef,\n  ) {}\n  abstract labelResult(result: R): LR\n  abstract labeledResultToCursor(labeled: LR): Cursor\n  abstract cursorToLabeledResult(cursor: Cursor): LR\n  packFromResult(results: R | R[]): string | undefined {\n    const result = Array.isArray(results) ? results.at(-1) : results\n    if (!result) return\n    return this.pack(this.labelResult(result))\n  }\n  pack(labeled?: LR): string | undefined {\n    if (!labeled) return\n    const cursor = this.labeledResultToCursor(labeled)\n    return this.packCursor(cursor)\n  }\n  unpack(cursorStr?: string): LR | undefined {\n    const cursor = this.unpackCursor(cursorStr)\n    if (!cursor) return\n    return this.cursorToLabeledResult(cursor)\n  }\n  packCursor(cursor?: Cursor): string | undefined {\n    if (!cursor) return\n    return `${cursor.primary}::${cursor.secondary}`\n  }\n  unpackCursor(cursorStr?: string): Cursor | undefined {\n    if (!cursorStr) return\n    const result = cursorStr.split('::')\n    const [primary, secondary, ...others] = result\n    if (!primary || !secondary || others.length > 0) {\n      throw new InvalidRequestError('Malformed cursor')\n    }\n    return {\n      primary,\n      secondary,\n    }\n  }\n  getSql(labeled?: LR, direction?: 'asc' | 'desc', tryIndex?: boolean) {\n    if (labeled === undefined) return\n    if (tryIndex) {\n      // The tryIndex param will likely disappear and become the default implementation: here for now for gradual rollout query-by-query.\n      if (direction === 'asc') {\n        return sql`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`\n      } else {\n        return sql`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`\n      }\n    } else {\n      // @NOTE this implementation can struggle to use an index on (primary, secondary) for pagination due to the \"or\" usage.\n      if (direction === 'asc') {\n        return sql`((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`\n      } else {\n        return sql`((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`\n      }\n    }\n  }\n}\n\ntype CreatedAtCidResult = { createdAt: string; cid: string }\ntype TimeCidLabeledResult = Cursor\n\nexport class TimeCidKeyset<\n  TimeCidResult = CreatedAtCidResult,\n> extends GenericKeyset<TimeCidResult, TimeCidLabeledResult> {\n  labelResult(result: TimeCidResult): TimeCidLabeledResult\n  labelResult<TimeCidResult extends CreatedAtCidResult>(result: TimeCidResult) {\n    return { primary: result.createdAt, secondary: result.cid }\n  }\n  labeledResultToCursor(labeled: TimeCidLabeledResult) {\n    return {\n      primary: new Date(labeled.primary).getTime().toString(),\n      secondary: labeled.secondary,\n    }\n  }\n  cursorToLabeledResult(cursor: Cursor) {\n    const primaryDate = new Date(parseInt(cursor.primary, 10))\n    if (isNaN(primaryDate.getTime())) {\n      throw new InvalidRequestError('Malformed cursor')\n    }\n    return {\n      primary: primaryDate.toISOString(),\n      secondary: cursor.secondary,\n    }\n  }\n}\n\nexport const paginate = <\n  QB extends AnyQb,\n  K extends GenericKeyset<unknown, any>,\n>(\n  qb: QB,\n  opts: {\n    limit?: number\n    cursor?: string\n    direction?: 'asc' | 'desc'\n    keyset: K\n    tryIndex?: boolean\n  },\n): QB => {\n  const { limit, cursor, keyset, direction = 'desc', tryIndex } = opts\n  const keysetSql = keyset.getSql(keyset.unpack(cursor), direction, tryIndex)\n  return qb\n    .if(!!limit, (q) => q.limit(limit as number))\n    .orderBy(keyset.primary, direction)\n    .orderBy(keyset.secondary, direction)\n    .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB\n}\n"]}
+{"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../src/db/pagination.ts"],"names":[],"mappings":"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","sourcesContent":["import { sql } from 'kysely'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { AnyQb, DbRef } from './util.js'\n\nexport type Cursor = { primary: string; secondary: string }\nexport type LabeledResult = {\n  primary: string | number\n  secondary: string | number\n}\n\n/**\n * The GenericKeyset is an abstract class that sets-up the interface and partial implementation\n * of a keyset-paginated cursor with two parts. There are three types involved:\n *  - Result: a raw result (i.e. a row from the db) containing data that will make-up a cursor.\n *    - E.g. { createdAt: '2022-01-01T12:00:00Z', cid: 'bafyx' }\n *  - LabeledResult: a Result processed such that the \"primary\" and \"secondary\" parts of the cursor are labeled.\n *    - E.g. { primary: '2022-01-01T12:00:00Z', secondary: 'bafyx' }\n *  - Cursor: the two string parts that make-up the packed/string cursor.\n *    - E.g. packed cursor '1641038400000::bafyx' in parts { primary: '1641038400000', secondary: 'bafyx' }\n *\n * These types relate as such. Implementers define the relations marked with a *:\n *   Result -*-> LabeledResult <-*-> Cursor <--> packed/string cursor\n *                     ↳ SQL Condition\n */\nexport abstract class GenericKeyset<R, LR extends LabeledResult> {\n  constructor(\n    public primary: DbRef,\n    public secondary: DbRef,\n  ) {}\n  abstract labelResult(result: R): LR\n  abstract labeledResultToCursor(labeled: LR): Cursor\n  abstract cursorToLabeledResult(cursor: Cursor): LR\n  packFromResult(results: R | R[]): string | undefined {\n    const result = Array.isArray(results) ? results.at(-1) : results\n    if (!result) return\n    return this.pack(this.labelResult(result))\n  }\n  pack(labeled?: LR): string | undefined {\n    if (!labeled) return\n    const cursor = this.labeledResultToCursor(labeled)\n    return this.packCursor(cursor)\n  }\n  unpack(cursorStr?: string): LR | undefined {\n    const cursor = this.unpackCursor(cursorStr)\n    if (!cursor) return\n    return this.cursorToLabeledResult(cursor)\n  }\n  packCursor(cursor?: Cursor): string | undefined {\n    if (!cursor) return\n    return `${cursor.primary}::${cursor.secondary}`\n  }\n  unpackCursor(cursorStr?: string): Cursor | undefined {\n    if (!cursorStr) return\n    const result = cursorStr.split('::')\n    const [primary, secondary, ...others] = result\n    if (!primary || !secondary || others.length > 0) {\n      throw new InvalidRequestError('Malformed cursor')\n    }\n    return {\n      primary,\n      secondary,\n    }\n  }\n  getSql(labeled?: LR, direction?: 'asc' | 'desc', tryIndex?: boolean) {\n    if (labeled === undefined) return\n    if (tryIndex) {\n      // The tryIndex param will likely disappear and become the default implementation: here for now for gradual rollout query-by-query.\n      if (direction === 'asc') {\n        return sql`((${this.primary}, ${this.secondary}) > (${labeled.primary}, ${labeled.secondary}))`\n      } else {\n        return sql`((${this.primary}, ${this.secondary}) < (${labeled.primary}, ${labeled.secondary}))`\n      }\n    } else {\n      // @NOTE this implementation can struggle to use an index on (primary, secondary) for pagination due to the \"or\" usage.\n      if (direction === 'asc') {\n        return sql`((${this.primary} > ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} > ${labeled.secondary}))`\n      } else {\n        return sql`((${this.primary} < ${labeled.primary}) or (${this.primary} = ${labeled.primary} and ${this.secondary} < ${labeled.secondary}))`\n      }\n    }\n  }\n}\n\ntype CreatedAtCidResult = { createdAt: string; cid: string }\ntype TimeCidLabeledResult = Cursor\n\nexport class TimeCidKeyset<\n  TimeCidResult = CreatedAtCidResult,\n> extends GenericKeyset<TimeCidResult, TimeCidLabeledResult> {\n  labelResult(result: TimeCidResult): TimeCidLabeledResult\n  labelResult<TimeCidResult extends CreatedAtCidResult>(result: TimeCidResult) {\n    return { primary: result.createdAt, secondary: result.cid }\n  }\n  labeledResultToCursor(labeled: TimeCidLabeledResult) {\n    return {\n      primary: new Date(labeled.primary).getTime().toString(),\n      secondary: labeled.secondary,\n    }\n  }\n  cursorToLabeledResult(cursor: Cursor) {\n    const primaryDate = new Date(parseInt(cursor.primary, 10))\n    if (isNaN(primaryDate.getTime())) {\n      throw new InvalidRequestError('Malformed cursor')\n    }\n    return {\n      primary: primaryDate.toISOString(),\n      secondary: cursor.secondary,\n    }\n  }\n}\n\nexport const paginate = <\n  QB extends AnyQb,\n  K extends GenericKeyset<unknown, any>,\n>(\n  qb: QB,\n  opts: {\n    limit?: number\n    cursor?: string\n    direction?: 'asc' | 'desc'\n    keyset: K\n    tryIndex?: boolean\n  },\n): QB => {\n  const { limit, cursor, keyset, direction = 'desc', tryIndex } = opts\n  const keysetSql = keyset.getSql(keyset.unpack(cursor), direction, tryIndex)\n  return qb\n    .if(!!limit, (q) => q.limit(limit as number))\n    .orderBy(keyset.primary, direction)\n    .orderBy(keyset.secondary, direction)\n    .if(!!keysetSql, (qb) => (keysetSql ? qb.where(keysetSql) : qb)) as QB\n}\n"]}

package/dist/db/tables/moderation.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.reportResolutionTableName = exports.reportTableName = exports.actionSubjectBlobTableName = exports.actionTableName = void 0;
-exports.actionTableName = 'moderation_action';
-exports.actionSubjectBlobTableName = 'moderation_action_subject_blob';
-exports.reportTableName = 'moderation_report';
-exports.reportResolutionTableName = 'moderation_report_resolution';
+export const actionTableName = 'moderation_action';
+export const actionSubjectBlobTableName = 'moderation_action_subject_blob';
+export const reportTableName = 'moderation_report';
+export const reportResolutionTableName = 'moderation_report_resolution';
 //# sourceMappingURL=moderation.js.map

package/dist/db/tables/moderation.js.map

@@ -1 +1 @@
-{"version":3,"file":"moderation.js","sourceRoot":"","sources":["../../../src/db/tables/moderation.ts"],"names":[],"mappings":";;;AAGa,QAAA,eAAe,GAAG,mBAAmB,CAAA;AACrC,QAAA,0BAA0B,GAAG,gCAAgC,CAAA;AAC7D,QAAA,eAAe,GAAG,mBAAmB,CAAA;AACrC,QAAA,yBAAyB,GAAG,8BAA8B,CAAA","sourcesContent":["import { Generated } from 'kysely'\nimport { com } from '../../lexicons/index.js'\n\nexport const actionTableName = 'moderation_action'\nexport const actionSubjectBlobTableName = 'moderation_action_subject_blob'\nexport const reportTableName = 'moderation_report'\nexport const reportResolutionTableName = 'moderation_report_resolution'\n\nexport interface ModerationAction {\n  id: Generated<number>\n  action:\n    | 'tools.ozone.moderation.defs#modEventTakedown'\n    | 'tools.ozone.moderation.defs#modEventAcknowledge'\n    | 'tools.ozone.moderation.defs#modEventEscalate'\n    | 'tools.ozone.moderation.defs#modEventComment'\n    | 'tools.ozone.moderation.defs#modEventLabel'\n    | 'tools.ozone.moderation.defs#modEventReport'\n    | 'tools.ozone.moderation.defs#modEventMute'\n    | 'tools.ozone.moderation.defs#modEventUnmute'\n    | 'tools.ozone.moderation.defs#modEventMuteReporter'\n    | 'tools.ozone.moderation.defs#modEventUnmuteReporter'\n    | 'tools.ozone.moderation.defs#modEventReverseTakedown'\n    | 'tools.ozone.moderation.defs#modEventEmail'\n    | 'tools.ozone.moderation.defs#modEventResolveAppeal'\n    | 'tools.ozone.moderation.defs#modEventDivert'\n    | 'tools.ozone.moderation.defs#accountEvent'\n    | 'tools.ozone.moderation.defs#identityEvent'\n    | 'tools.ozone.moderation.defs#recordEvent'\n    | 'tools.ozone.moderation.defs#modEventPriorityScore'\n  subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'\n  subjectDid: string\n  subjectUri: string | null\n  subjectCid: string | null\n  createLabelVals: string | null\n  negateLabelVals: string | null\n  comment: string | null\n  createdAt: string\n  createdBy: string\n  durationInHours: number | null\n  expiresAt: string | null\n  meta: Record<string, string | boolean> | null\n}\n\nexport interface ModerationActionSubjectBlob {\n  actionId: number\n  cid: string\n  recordUri: string\n}\n\nexport interface ModerationReport {\n  id: Generated<number>\n  subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'\n  subjectDid: string\n  subjectUri: string | null\n  subjectCid: string | null\n  reasonType:\n    | com.atproto.moderation.defs.ReasonSpam\n    | com.atproto.moderation.defs.ReasonOther\n    | com.atproto.moderation.defs.ReasonMisleading\n    | com.atproto.moderation.defs.ReasonRude\n    | com.atproto.moderation.defs.ReasonSexual\n    | com.atproto.moderation.defs.ReasonViolation\n  reason: string | null\n  reportedByDid: string\n  createdAt: string\n}\n\nexport interface ModerationReportResolution {\n  reportId: number\n  actionId: number\n  createdAt: string\n  createdBy: string\n}\n\nexport type PartialDB = {\n  [actionTableName]: ModerationAction\n  [actionSubjectBlobTableName]: ModerationActionSubjectBlob\n  [reportTableName]: ModerationReport\n  [reportResolutionTableName]: ModerationReportResolution\n}\n"]}
+{"version":3,"file":"moderation.js","sourceRoot":"","sources":["../../../src/db/tables/moderation.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAA;AAClD,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAA;AAC1E,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAA;AAClD,MAAM,CAAC,MAAM,yBAAyB,GAAG,8BAA8B,CAAA","sourcesContent":["import { Generated } from 'kysely'\nimport { com } from '../../lexicons/index.js'\n\nexport const actionTableName = 'moderation_action'\nexport const actionSubjectBlobTableName = 'moderation_action_subject_blob'\nexport const reportTableName = 'moderation_report'\nexport const reportResolutionTableName = 'moderation_report_resolution'\n\nexport interface ModerationAction {\n  id: Generated<number>\n  action:\n    | 'tools.ozone.moderation.defs#modEventTakedown'\n    | 'tools.ozone.moderation.defs#modEventAcknowledge'\n    | 'tools.ozone.moderation.defs#modEventEscalate'\n    | 'tools.ozone.moderation.defs#modEventComment'\n    | 'tools.ozone.moderation.defs#modEventLabel'\n    | 'tools.ozone.moderation.defs#modEventReport'\n    | 'tools.ozone.moderation.defs#modEventMute'\n    | 'tools.ozone.moderation.defs#modEventUnmute'\n    | 'tools.ozone.moderation.defs#modEventMuteReporter'\n    | 'tools.ozone.moderation.defs#modEventUnmuteReporter'\n    | 'tools.ozone.moderation.defs#modEventReverseTakedown'\n    | 'tools.ozone.moderation.defs#modEventEmail'\n    | 'tools.ozone.moderation.defs#modEventResolveAppeal'\n    | 'tools.ozone.moderation.defs#modEventDivert'\n    | 'tools.ozone.moderation.defs#accountEvent'\n    | 'tools.ozone.moderation.defs#identityEvent'\n    | 'tools.ozone.moderation.defs#recordEvent'\n    | 'tools.ozone.moderation.defs#modEventPriorityScore'\n  subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'\n  subjectDid: string\n  subjectUri: string | null\n  subjectCid: string | null\n  createLabelVals: string | null\n  negateLabelVals: string | null\n  comment: string | null\n  createdAt: string\n  createdBy: string\n  durationInHours: number | null\n  expiresAt: string | null\n  meta: Record<string, string | boolean> | null\n}\n\nexport interface ModerationActionSubjectBlob {\n  actionId: number\n  cid: string\n  recordUri: string\n}\n\nexport interface ModerationReport {\n  id: Generated<number>\n  subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'\n  subjectDid: string\n  subjectUri: string | null\n  subjectCid: string | null\n  reasonType:\n    | com.atproto.moderation.defs.ReasonSpam\n    | com.atproto.moderation.defs.ReasonOther\n    | com.atproto.moderation.defs.ReasonMisleading\n    | com.atproto.moderation.defs.ReasonRude\n    | com.atproto.moderation.defs.ReasonSexual\n    | com.atproto.moderation.defs.ReasonViolation\n  reason: string | null\n  reportedByDid: string\n  createdAt: string\n}\n\nexport interface ModerationReportResolution {\n  reportId: number\n  actionId: number\n  createdAt: string\n  createdBy: string\n}\n\nexport type PartialDB = {\n  [actionTableName]: ModerationAction\n  [actionSubjectBlobTableName]: ModerationActionSubjectBlob\n  [reportTableName]: ModerationReport\n  [reportResolutionTableName]: ModerationReportResolution\n}\n"]}

package/dist/db/util.js

@@ -1,52 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isErrUniqueViolation = exports.retrySqlite = exports.dummyDialect = exports.valuesList = exports.excluded = exports.countDistinct = exports.countAll = exports.softDeleted = exports.notSoftDeletedClause = void 0;
-const kysely_1 = require("kysely");
-const common_1 = require("@atproto/common");
+import { DummyDriver, SqliteAdapter, SqliteIntrospector, SqliteQueryCompiler, sql, } from 'kysely';
+import { retry } from '@atproto/common';
 // Applies to repo_root or record table
-const notSoftDeletedClause = (alias) => {
-    return (0, kysely_1.sql) `${alias}."takedownRef" is null`;
+export const notSoftDeletedClause = (alias) => {
+    return sql `${alias}."takedownRef" is null`;
 };
-exports.notSoftDeletedClause = notSoftDeletedClause;
-const softDeleted = (repoOrRecord) => {
+export const softDeleted = (repoOrRecord) => {
     return repoOrRecord.takedownRef !== null;
 };
-exports.softDeleted = softDeleted;
-exports.countAll = (0, kysely_1.sql) `count(*)`;
-const countDistinct = (ref) => (0, kysely_1.sql) `count(distinct ${ref})`;
-exports.countDistinct = countDistinct;
+export const countAll = sql `count(*)`;
+export const countDistinct = (ref) => sql `count(distinct ${ref})`;
 // For use with doUpdateSet()
-const excluded = (db, col) => {
-    return (0, kysely_1.sql) `${db.dynamic.ref(`excluded.${col}`)}`;
+export const excluded = (db, col) => {
+    return sql `${db.dynamic.ref(`excluded.${col}`)}`;
 };
-exports.excluded = excluded;
 // Can be useful for large where-in clauses, to get the db to use a hash lookup on the list
-const valuesList = (vals) => {
-    return (0, kysely_1.sql) `(values (${kysely_1.sql.join(vals, (0, kysely_1.sql) `), (`)}))`;
+export const valuesList = (vals) => {
+    return sql `(values (${sql.join(vals, sql `), (`)}))`;
 };
-exports.valuesList = valuesList;
-exports.dummyDialect = {
+export const dummyDialect = {
     createAdapter() {
-        return new kysely_1.SqliteAdapter();
+        return new SqliteAdapter();
     },
     createDriver() {
-        return new kysely_1.DummyDriver();
+        return new DummyDriver();
     },
     createIntrospector(db) {
-        return new kysely_1.SqliteIntrospector(db);
+        return new SqliteIntrospector(db);
     },
     createQueryCompiler() {
-        return new kysely_1.SqliteQueryCompiler();
+        return new SqliteQueryCompiler();
     },
 };
-const retrySqlite = (fn) => {
-    return (0, common_1.retry)(fn, {
+export const retrySqlite = (fn) => {
+    return retry(fn, {
         retryable: retryableSqlite,
         getWaitMs: getWaitMsSqlite,
         maxRetries: 60, // a safety measure: getWaitMsSqlite() times out before this after 5000ms of waiting.
     });
 };
-exports.retrySqlite = retrySqlite;
 const retryableSqlite = (err) => {
     return typeof err?.['code'] === 'string' && RETRY_ERRORS.has(err['code']);
 };
@@ -80,11 +71,10 @@ const RETRY_ERRORS = new Set([
     'SQLITE_BUSY_RECOVERY',
     'SQLITE_BUSY_TIMEOUT',
 ]);
-const isErrUniqueViolation = (err) => {
+export const isErrUniqueViolation = (err) => {
     const code = err?.['code'];
     return (code === '23505' || // postgres, see https://www.postgresql.org/docs/current/errcodes-appendix.html
         code === 'SQLITE_CONSTRAINT_UNIQUE' // sqlite, see https://www.sqlite.org/rescode.html#constraint_unique
     );
 };
-exports.isErrUniqueViolation = isErrUniqueViolation;
 //# sourceMappingURL=util.js.map

package/dist/db/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/db/util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DummyDriver,\n  DynamicModule,\n  Kysely,\n  RawBuilder,\n  ReferenceExpression,\n  SelectQueryBuilder,\n  SqliteAdapter,\n  SqliteIntrospector,\n  SqliteQueryCompiler,\n  sql,\n} from 'kysely'\nimport { retry } from '@atproto/common'\n\n// Applies to repo_root or record table\nexport const notSoftDeletedClause = (alias: DbRef) => {\n  return sql`${alias}.\"takedownRef\" is null`\n}\n\nexport const softDeleted = (repoOrRecord: { takedownRef: string | null }) => {\n  return repoOrRecord.takedownRef !== null\n}\n\nexport const countAll = sql<number>`count(*)`\nexport const countDistinct = (ref: DbRef) => sql<number>`count(distinct ${ref})`\n\n// For use with doUpdateSet()\nexport const excluded = <T, S>(db: Kysely<S>, col) => {\n  return sql<T>`${db.dynamic.ref(`excluded.${col}`)}`\n}\n\n// Can be useful for large where-in clauses, to get the db to use a hash lookup on the list\nexport const valuesList = (vals: unknown[]) => {\n  return sql`(values (${sql.join(vals, sql`), (`)}))`\n}\n\nexport const dummyDialect = {\n  createAdapter() {\n    return new SqliteAdapter()\n  },\n  createDriver() {\n    return new DummyDriver()\n  },\n  createIntrospector(db) {\n    return new SqliteIntrospector(db)\n  },\n  createQueryCompiler() {\n    return new SqliteQueryCompiler()\n  },\n}\n\nexport const retrySqlite = <T>(fn: () => Promise<T>): Promise<T> => {\n  return retry(fn, {\n    retryable: retryableSqlite,\n    getWaitMs: getWaitMsSqlite,\n    maxRetries: 60, // a safety measure: getWaitMsSqlite() times out before this after 5000ms of waiting.\n  })\n}\n\nconst retryableSqlite = (err: unknown) => {\n  return typeof err?.['code'] === 'string' && RETRY_ERRORS.has(err['code'])\n}\n\n// based on sqlite's backoff strategy https://github.com/sqlite/sqlite/blob/91c8e65dd4bf17d21fbf8f7073565fe1a71c8948/src/main.c#L1704-L1713\nconst getWaitMsSqlite = (n: number, timeout = 5000) => {\n  if (n < 0) return null\n  let delay: number\n  let prior: number\n  if (n < DELAYS.length) {\n    delay = DELAYS[n]\n    prior = TOTALS[n]\n  } else {\n    delay = last(DELAYS)\n    prior = last(TOTALS) + delay * (n - (DELAYS.length - 1))\n  }\n  if (prior + delay > timeout) {\n    delay = timeout - prior\n    if (delay <= 0) return null\n  }\n  return delay\n}\n\nconst last = <T>(arr: T[]) => arr[arr.length - 1]\nconst DELAYS = [1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 100]\nconst TOTALS = [0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228]\nconst RETRY_ERRORS = new Set([\n  'SQLITE_BUSY',\n  'SQLITE_BUSY_SNAPSHOT',\n  'SQLITE_BUSY_RECOVERY',\n  'SQLITE_BUSY_TIMEOUT',\n])\n\nexport type Ref = ReferenceExpression<any, any>\n\nexport type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>\n\nexport type AnyQb = SelectQueryBuilder<any, any, any>\n\nexport const isErrUniqueViolation = (err: unknown) => {\n  const code = err?.['code']\n  return (\n    code === '23505' || // postgres, see https://www.postgresql.org/docs/current/errcodes-appendix.html\n    code === 'SQLITE_CONSTRAINT_UNIQUE' // sqlite, see https://www.sqlite.org/rescode.html#constraint_unique\n  )\n}\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/db/util.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  DummyDriver,\n  DynamicModule,\n  Kysely,\n  RawBuilder,\n  ReferenceExpression,\n  SelectQueryBuilder,\n  SqliteAdapter,\n  SqliteIntrospector,\n  SqliteQueryCompiler,\n  sql,\n} from 'kysely'\nimport { retry } from '@atproto/common'\n\n// Applies to repo_root or record table\nexport const notSoftDeletedClause = (alias: DbRef) => {\n  return sql`${alias}.\"takedownRef\" is null`\n}\n\nexport const softDeleted = (repoOrRecord: { takedownRef: string | null }) => {\n  return repoOrRecord.takedownRef !== null\n}\n\nexport const countAll = sql<number>`count(*)`\nexport const countDistinct = (ref: DbRef) => sql<number>`count(distinct ${ref})`\n\n// For use with doUpdateSet()\nexport const excluded = <T, S>(db: Kysely<S>, col) => {\n  return sql<T>`${db.dynamic.ref(`excluded.${col}`)}`\n}\n\n// Can be useful for large where-in clauses, to get the db to use a hash lookup on the list\nexport const valuesList = (vals: unknown[]) => {\n  return sql`(values (${sql.join(vals, sql`), (`)}))`\n}\n\nexport const dummyDialect = {\n  createAdapter() {\n    return new SqliteAdapter()\n  },\n  createDriver() {\n    return new DummyDriver()\n  },\n  createIntrospector(db) {\n    return new SqliteIntrospector(db)\n  },\n  createQueryCompiler() {\n    return new SqliteQueryCompiler()\n  },\n}\n\nexport const retrySqlite = <T>(fn: () => Promise<T>): Promise<T> => {\n  return retry(fn, {\n    retryable: retryableSqlite,\n    getWaitMs: getWaitMsSqlite,\n    maxRetries: 60, // a safety measure: getWaitMsSqlite() times out before this after 5000ms of waiting.\n  })\n}\n\nconst retryableSqlite = (err: unknown) => {\n  return typeof err?.['code'] === 'string' && RETRY_ERRORS.has(err['code'])\n}\n\n// based on sqlite's backoff strategy https://github.com/sqlite/sqlite/blob/91c8e65dd4bf17d21fbf8f7073565fe1a71c8948/src/main.c#L1704-L1713\nconst getWaitMsSqlite = (n: number, timeout = 5000) => {\n  if (n < 0) return null\n  let delay: number\n  let prior: number\n  if (n < DELAYS.length) {\n    delay = DELAYS[n]\n    prior = TOTALS[n]\n  } else {\n    delay = last(DELAYS)\n    prior = last(TOTALS) + delay * (n - (DELAYS.length - 1))\n  }\n  if (prior + delay > timeout) {\n    delay = timeout - prior\n    if (delay <= 0) return null\n  }\n  return delay\n}\n\nconst last = <T>(arr: T[]) => arr[arr.length - 1]\nconst DELAYS = [1, 2, 5, 10, 15, 20, 25, 25, 25, 50, 50, 100]\nconst TOTALS = [0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228]\nconst RETRY_ERRORS = new Set([\n  'SQLITE_BUSY',\n  'SQLITE_BUSY_SNAPSHOT',\n  'SQLITE_BUSY_RECOVERY',\n  'SQLITE_BUSY_TIMEOUT',\n])\n\nexport type Ref = ReferenceExpression<any, any>\n\nexport type DbRef = RawBuilder | ReturnType<DynamicModule['ref']>\n\nexport type AnyQb = SelectQueryBuilder<any, any, any>\n\nexport const isErrUniqueViolation = (err: unknown) => {\n  const code = err?.['code']\n  return (\n    code === '23505' || // postgres, see https://www.postgresql.org/docs/current/errcodes-appendix.html\n    code === 'SQLITE_CONSTRAINT_UNIQUE' // sqlite, see https://www.sqlite.org/rescode.html#constraint_unique\n  )\n}\n"]}

package/dist/did-cache/db/index.d.ts

@@ -1,6 +1,6 @@
-import { Database, Migrator } from '../../db';
-import { DidCacheSchema } from './schema';
-export * from './schema';
+import { Database, Migrator } from '../../db/index.js';
+import { DidCacheSchema } from './schema.js';
+export * from './schema.js';
 export type DidCacheDb = Database<DidCacheSchema>;
 export declare const getDb: (location: string, disableWalAutoCheckpoint?: boolean) => DidCacheDb;
 export declare const getMigrator: (db: DidCacheDb) => Migrator<DidCacheSchema>;

package/dist/did-cache/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/did-cache/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAEzC,cAAc,UAAU,CAAA;AAExB,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAA;AAEjD,eAAO,MAAM,KAAK,GAChB,UAAU,MAAM,EAChB,kCAAgC,KAC/B,UAKF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,IAAI,UAAU,6BAEzC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/did-cache/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAE5C,cAAc,aAAa,CAAA;AAE3B,MAAM,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAA;AAEjD,eAAO,MAAM,KAAK,GAChB,UAAU,MAAM,EAChB,kCAAgC,KAC/B,UAKF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,IAAI,UAAU,6BAEzC,CAAA"}

package/dist/did-cache/db/index.js

@@ -1,35 +1,13 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMigrator = exports.getDb = void 0;
-const db_1 = require("../../db");
-const migrations_1 = __importDefault(require("./migrations"));
-__exportStar(require("./schema"), exports);
-const getDb = (location, disableWalAutoCheckpoint = false) => {
+import { Database, Migrator } from '../../db/index.js';
+import migrations from './migrations.js';
+export * from './schema.js';
+export const getDb = (location, disableWalAutoCheckpoint = false) => {
     const pragmas = disableWalAutoCheckpoint
         ? { wal_autocheckpoint: '0', synchronous: 'NORMAL' }
         : { synchronous: 'NORMAL' };
-    return db_1.Database.sqlite(location, { pragmas });
+    return Database.sqlite(location, { pragmas });
 };
-exports.getDb = getDb;
-const getMigrator = (db) => {
-    return new db_1.Migrator(db.db, migrations_1.default);
+export const getMigrator = (db) => {
+    return new Migrator(db.db, migrations);
 };
-exports.getMigrator = getMigrator;
 //# sourceMappingURL=index.js.map

package/dist/did-cache/db/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/did-cache/db/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,iCAA6C;AAC7C,8DAAqC;AAGrC,2CAAwB;AAIjB,MAAM,KAAK,GAAG,CACnB,QAAgB,EAChB,wBAAwB,GAAG,KAAK,EACpB,EAAE;IACd,MAAM,OAAO,GAA2B,wBAAwB;QAC9D,CAAC,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE;QACpD,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;IAC7B,OAAO,aAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;AAC/C,CAAC,CAAA;AARY,QAAA,KAAK,SAQjB;AAEM,MAAM,WAAW,GAAG,CAAC,EAAc,EAAE,EAAE;IAC5C,OAAO,IAAI,aAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAU,CAAC,CAAA;AACxC,CAAC,CAAA;AAFY,QAAA,WAAW,eAEvB","sourcesContent":["import { Database, Migrator } from '../../db'\nimport migrations from './migrations'\nimport { DidCacheSchema } from './schema'\n\nexport * from './schema'\n\nexport type DidCacheDb = Database<DidCacheSchema>\n\nexport const getDb = (\n  location: string,\n  disableWalAutoCheckpoint = false,\n): DidCacheDb => {\n  const pragmas: Record<string, string> = disableWalAutoCheckpoint\n    ? { wal_autocheckpoint: '0', synchronous: 'NORMAL' }\n    : { synchronous: 'NORMAL' }\n  return Database.sqlite(location, { pragmas })\n}\n\nexport const getMigrator = (db: DidCacheDb) => {\n  return new Migrator(db.db, migrations)\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/did-cache/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,UAAU,MAAM,iBAAiB,CAAA;AAGxC,cAAc,aAAa,CAAA;AAI3B,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,QAAgB,EAChB,wBAAwB,GAAG,KAAK,EACpB,EAAE;IACd,MAAM,OAAO,GAA2B,wBAAwB;QAC9D,CAAC,CAAC,EAAE,kBAAkB,EAAE,GAAG,EAAE,WAAW,EAAE,QAAQ,EAAE;QACpD,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;IAC7B,OAAO,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAc,EAAE,EAAE;IAC5C,OAAO,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;AACxC,CAAC,CAAA","sourcesContent":["import { Database, Migrator } from '../../db/index.js'\nimport migrations from './migrations.js'\nimport { DidCacheSchema } from './schema.js'\n\nexport * from './schema.js'\n\nexport type DidCacheDb = Database<DidCacheSchema>\n\nexport const getDb = (\n  location: string,\n  disableWalAutoCheckpoint = false,\n): DidCacheDb => {\n  const pragmas: Record<string, string> = disableWalAutoCheckpoint\n    ? { wal_autocheckpoint: '0', synchronous: 'NORMAL' }\n    : { synchronous: 'NORMAL' }\n  return Database.sqlite(location, { pragmas })\n}\n\nexport const getMigrator = (db: DidCacheDb) => {\n  return new Migrator(db.db, migrations)\n}\n"]}

package/dist/did-cache/db/migrations.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
+export default {
     '001': {
         up: async (db) => {
             await db.schema

package/dist/did-cache/db/migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/did-cache/db/migrations.ts"],"names":[],"mappings":";;AAEA,kBAAe;IACb,KAAK,EAAE;QACL,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YAChC,MAAM,EAAE,CAAC,MAAM;iBACZ,WAAW,CAAC,SAAS,CAAC;iBACtB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;iBACtD,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;iBAChD,SAAS,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;iBACxD,OAAO,EAAE,CAAA;QACd,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YAClC,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAA;QAChD,CAAC;KACF;CACF,CAAA","sourcesContent":["import { Kysely } from 'kysely'\n\nexport default {\n  '001': {\n    up: async (db: Kysely<unknown>) => {\n      await db.schema\n        .createTable('did_doc')\n        .addColumn('did', 'varchar', (col) => col.primaryKey())\n        .addColumn('doc', 'text', (col) => col.notNull())\n        .addColumn('updatedAt', 'bigint', (col) => col.notNull())\n        .execute()\n    },\n    down: async (db: Kysely<unknown>) => {\n      await db.schema.dropTable('did_doc').execute()\n    },\n  },\n}\n"]}
+{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../src/did-cache/db/migrations.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,KAAK,EAAE;QACL,EAAE,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YAChC,MAAM,EAAE,CAAC,MAAM;iBACZ,WAAW,CAAC,SAAS,CAAC;iBACtB,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;iBACtD,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;iBAChD,SAAS,CAAC,WAAW,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;iBACxD,OAAO,EAAE,CAAA;QACd,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,EAAmB,EAAE,EAAE;YAClC,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAA;QAChD,CAAC;KACF;CACF,CAAA","sourcesContent":["import { Kysely } from 'kysely'\n\nexport default {\n  '001': {\n    up: async (db: Kysely<unknown>) => {\n      await db.schema\n        .createTable('did_doc')\n        .addColumn('did', 'varchar', (col) => col.primaryKey())\n        .addColumn('doc', 'text', (col) => col.notNull())\n        .addColumn('updatedAt', 'bigint', (col) => col.notNull())\n        .execute()\n    },\n    down: async (db: Kysely<unknown>) => {\n      await db.schema.dropTable('did_doc').execute()\n    },\n  },\n}\n"]}

package/dist/did-cache/db/schema.js

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=schema.js.map

package/dist/did-cache/index.d.ts

@@ -1,6 +1,6 @@
 import PQueue from 'p-queue';
 import { CacheResult, DidCache, DidDocument } from '@atproto/identity';
-import { DidCacheDb } from './db';
+import { DidCacheDb } from './db/index.js';
 export declare class DidSqliteCache implements DidCache {
     staleTTL: number;
     maxTTL: number;

package/dist/did-cache/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/did-cache/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,UAAU,EAAsB,MAAM,MAAM,CAAA;AAErD,qBAAa,cAAe,YAAW,QAAQ;IAMpC,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,MAAM;IANvB,EAAE,EAAE,UAAU,CAAA;IACP,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBAG1B,UAAU,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACrB,wBAAwB,UAAQ;IAM5B,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,WAAW,EAChB,UAAU,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC;IA4BV,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,EACzC,UAAU,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC;IAeV,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IASpD,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAoB5D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,UAAU;IAIV,cAAc;IAKd,OAAO;CAOd"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/did-cache/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAGtE,OAAO,EAAE,UAAU,EAAsB,MAAM,eAAe,CAAA;AAE9D,qBAAa,cAAe,YAAW,QAAQ;IAMpC,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,MAAM;IANvB,EAAE,EAAE,UAAU,CAAA;IACP,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;gBAG1B,UAAU,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACrB,wBAAwB,UAAQ;IAM5B,QAAQ,CACZ,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,WAAW,EAChB,UAAU,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC;IA4BV,YAAY,CAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,EACzC,UAAU,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,IAAI,CAAC;IAeV,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IASpD,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAoB5D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAItB,UAAU;IAIV,cAAc;IAKd,OAAO;CAOd"}

package/dist/did-cache/index.js

@@ -1,41 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DidSqliteCache = void 0;
-const p_queue_1 = __importDefault(require("p-queue"));
-const util_1 = require("../db/util");
-const logger_1 = require("../logger");
-const db_1 = require("./db");
-class DidSqliteCache {
+import PQueue from 'p-queue';
+import { excluded } from '../db/util.js';
+import { didCacheLogger } from '../logger.js';
+import { getDb, getMigrator } from './db/index.js';
+export class DidSqliteCache {
     constructor(dbLocation, staleTTL, maxTTL, disableWalAutoCheckpoint = false) {
-        Object.defineProperty(this, "staleTTL", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: staleTTL
-        });
-        Object.defineProperty(this, "maxTTL", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: maxTTL
-        });
-        Object.defineProperty(this, "db", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "pQueue", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        }); //null during teardown
-        this.db = (0, db_1.getDb)(dbLocation, disableWalAutoCheckpoint);
-        this.pQueue = new p_queue_1.default();
+        this.staleTTL = staleTTL;
+        this.maxTTL = maxTTL;
+        this.db = getDb(dbLocation, disableWalAutoCheckpoint);
+        this.pQueue = new PQueue();
     }
     async cacheDid(did, doc, prevResult) {
         try {
@@ -51,13 +23,13 @@ class DidSqliteCache {
                     .insertInto('did_doc')
                     .values({ did, doc: JSON.stringify(doc), updatedAt: Date.now() })
                     .onConflict((oc) => oc.column('did').doUpdateSet({
-                    doc: (0, util_1.excluded)(this.db.db, 'doc'),
-                    updatedAt: (0, util_1.excluded)(this.db.db, 'updatedAt'),
+                    doc: excluded(this.db.db, 'doc'),
+                    updatedAt: excluded(this.db.db, 'updatedAt'),
                 })));
             }
         }
         catch (err) {
-            logger_1.didCacheLogger.error({ did, doc, err }, 'failed to cache did');
+            didCacheLogger.error({ did, doc, err }, 'failed to cache did');
         }
     }
     async refreshCache(did, getDoc, prevResult) {
@@ -72,7 +44,7 @@ class DidSqliteCache {
                 }
             }
             catch (err) {
-                logger_1.didCacheLogger.error({ did, err }, 'refreshing did cache failed');
+                didCacheLogger.error({ did, err }, 'refreshing did cache failed');
             }
         });
     }
@@ -81,7 +53,7 @@ class DidSqliteCache {
             return await this.checkCacheInternal(did);
         }
         catch (err) {
-            logger_1.didCacheLogger.error({ did, err }, 'failed to check did cache');
+            didCacheLogger.error({ did, err }, 'failed to check did cache');
             return null;
         }
     }
@@ -110,7 +82,7 @@ class DidSqliteCache {
             await this.db.executeWithRetry(this.db.db.deleteFrom('did_doc').where('did', '=', did));
         }
         catch (err) {
-            logger_1.didCacheLogger.error({ did, err }, 'clearing did cache entry failed');
+            didCacheLogger.error({ did, err }, 'clearing did cache entry failed');
         }
     }
     async clear() {
@@ -121,7 +93,7 @@ class DidSqliteCache {
     }
     async migrateOrThrow() {
         await this.db.ensureWal();
-        await (0, db_1.getMigrator)(this.db).migrateToLatestOrThrow();
+        await getMigrator(this.db).migrateToLatestOrThrow();
     }
     async destroy() {
         const pQueue = this.pQueue;
@@ -131,5 +103,4 @@ class DidSqliteCache {
         await pQueue?.onIdle();
     }
 }
-exports.DidSqliteCache = DidSqliteCache;
 //# sourceMappingURL=index.js.map

package/dist/did-cache/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/did-cache/index.ts"],"names":[],"mappings":"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","sourcesContent":["import PQueue from 'p-queue'\nimport { CacheResult, DidCache, DidDocument } from '@atproto/identity'\nimport { excluded } from '../db/util'\nimport { didCacheLogger } from '../logger'\nimport { DidCacheDb, getDb, getMigrator } from './db'\n\nexport class DidSqliteCache implements DidCache {\n  db: DidCacheDb\n  public pQueue: PQueue | null //null during teardown\n\n  constructor(\n    dbLocation: string,\n    public staleTTL: number,\n    public maxTTL: number,\n    disableWalAutoCheckpoint = false,\n  ) {\n    this.db = getDb(dbLocation, disableWalAutoCheckpoint)\n    this.pQueue = new PQueue()\n  }\n\n  async cacheDid(\n    did: string,\n    doc: DidDocument,\n    prevResult?: CacheResult,\n  ): Promise<void> {\n    try {\n      if (prevResult) {\n        await this.db.executeWithRetry(\n          this.db.db\n            .updateTable('did_doc')\n            .set({ doc: JSON.stringify(doc), updatedAt: Date.now() })\n            .where('did', '=', did)\n            .where('updatedAt', '=', prevResult.updatedAt),\n        )\n      } else {\n        await this.db.executeWithRetry(\n          this.db.db\n            .insertInto('did_doc')\n            .values({ did, doc: JSON.stringify(doc), updatedAt: Date.now() })\n            .onConflict((oc) =>\n              oc.column('did').doUpdateSet({\n                doc: excluded(this.db.db, 'doc'),\n                updatedAt: excluded(this.db.db, 'updatedAt'),\n              }),\n            ),\n        )\n      }\n    } catch (err) {\n      didCacheLogger.error({ did, doc, err }, 'failed to cache did')\n    }\n  }\n\n  async refreshCache(\n    did: string,\n    getDoc: () => Promise<DidDocument | null>,\n    prevResult?: CacheResult,\n  ): Promise<void> {\n    this.pQueue?.add(async () => {\n      try {\n        const doc = await getDoc()\n        if (doc) {\n          await this.cacheDid(did, doc, prevResult)\n        } else {\n          await this.clearEntry(did)\n        }\n      } catch (err) {\n        didCacheLogger.error({ did, err }, 'refreshing did cache failed')\n      }\n    })\n  }\n\n  async checkCache(did: string): Promise<CacheResult | null> {\n    try {\n      return await this.checkCacheInternal(did)\n    } catch (err) {\n      didCacheLogger.error({ did, err }, 'failed to check did cache')\n      return null\n    }\n  }\n\n  async checkCacheInternal(did: string): Promise<CacheResult | null> {\n    const res = await this.db.db\n      .selectFrom('did_doc')\n      .where('did', '=', did)\n      .selectAll()\n      .executeTakeFirst()\n    if (!res) return null\n    const now = Date.now()\n    const updatedAt = new Date(res.updatedAt).getTime()\n    const expired = now > updatedAt + this.maxTTL\n    const stale = now > updatedAt + this.staleTTL\n    return {\n      doc: JSON.parse(res.doc) as DidDocument,\n      updatedAt,\n      did,\n      stale,\n      expired,\n    }\n  }\n\n  async clearEntry(did: string): Promise<void> {\n    try {\n      await this.db.executeWithRetry(\n        this.db.db.deleteFrom('did_doc').where('did', '=', did),\n      )\n    } catch (err) {\n      didCacheLogger.error({ did, err }, 'clearing did cache entry failed')\n    }\n  }\n\n  async clear(): Promise<void> {\n    await this.db.db.deleteFrom('did_doc').execute()\n  }\n\n  async processAll() {\n    await this.pQueue?.onIdle()\n  }\n\n  async migrateOrThrow() {\n    await this.db.ensureWal()\n    await getMigrator(this.db).migrateToLatestOrThrow()\n  }\n\n  async destroy() {\n    const pQueue = this.pQueue\n    this.pQueue = null\n    pQueue?.pause()\n    pQueue?.clear()\n    await pQueue?.onIdle()\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/did-cache/index.ts"],"names":[],"mappings":"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","sourcesContent":["import PQueue from 'p-queue'\nimport { CacheResult, DidCache, DidDocument } from '@atproto/identity'\nimport { excluded } from '../db/util.js'\nimport { didCacheLogger } from '../logger.js'\nimport { DidCacheDb, getDb, getMigrator } from './db/index.js'\n\nexport class DidSqliteCache implements DidCache {\n  db: DidCacheDb\n  public pQueue: PQueue | null //null during teardown\n\n  constructor(\n    dbLocation: string,\n    public staleTTL: number,\n    public maxTTL: number,\n    disableWalAutoCheckpoint = false,\n  ) {\n    this.db = getDb(dbLocation, disableWalAutoCheckpoint)\n    this.pQueue = new PQueue()\n  }\n\n  async cacheDid(\n    did: string,\n    doc: DidDocument,\n    prevResult?: CacheResult,\n  ): Promise<void> {\n    try {\n      if (prevResult) {\n        await this.db.executeWithRetry(\n          this.db.db\n            .updateTable('did_doc')\n            .set({ doc: JSON.stringify(doc), updatedAt: Date.now() })\n            .where('did', '=', did)\n            .where('updatedAt', '=', prevResult.updatedAt),\n        )\n      } else {\n        await this.db.executeWithRetry(\n          this.db.db\n            .insertInto('did_doc')\n            .values({ did, doc: JSON.stringify(doc), updatedAt: Date.now() })\n            .onConflict((oc) =>\n              oc.column('did').doUpdateSet({\n                doc: excluded(this.db.db, 'doc'),\n                updatedAt: excluded(this.db.db, 'updatedAt'),\n              }),\n            ),\n        )\n      }\n    } catch (err) {\n      didCacheLogger.error({ did, doc, err }, 'failed to cache did')\n    }\n  }\n\n  async refreshCache(\n    did: string,\n    getDoc: () => Promise<DidDocument | null>,\n    prevResult?: CacheResult,\n  ): Promise<void> {\n    this.pQueue?.add(async () => {\n      try {\n        const doc = await getDoc()\n        if (doc) {\n          await this.cacheDid(did, doc, prevResult)\n        } else {\n          await this.clearEntry(did)\n        }\n      } catch (err) {\n        didCacheLogger.error({ did, err }, 'refreshing did cache failed')\n      }\n    })\n  }\n\n  async checkCache(did: string): Promise<CacheResult | null> {\n    try {\n      return await this.checkCacheInternal(did)\n    } catch (err) {\n      didCacheLogger.error({ did, err }, 'failed to check did cache')\n      return null\n    }\n  }\n\n  async checkCacheInternal(did: string): Promise<CacheResult | null> {\n    const res = await this.db.db\n      .selectFrom('did_doc')\n      .where('did', '=', did)\n      .selectAll()\n      .executeTakeFirst()\n    if (!res) return null\n    const now = Date.now()\n    const updatedAt = new Date(res.updatedAt).getTime()\n    const expired = now > updatedAt + this.maxTTL\n    const stale = now > updatedAt + this.staleTTL\n    return {\n      doc: JSON.parse(res.doc) as DidDocument,\n      updatedAt,\n      did,\n      stale,\n      expired,\n    }\n  }\n\n  async clearEntry(did: string): Promise<void> {\n    try {\n      await this.db.executeWithRetry(\n        this.db.db.deleteFrom('did_doc').where('did', '=', did),\n      )\n    } catch (err) {\n      didCacheLogger.error({ did, err }, 'clearing did cache entry failed')\n    }\n  }\n\n  async clear(): Promise<void> {\n    await this.db.db.deleteFrom('did_doc').execute()\n  }\n\n  async processAll() {\n    await this.pQueue?.onIdle()\n  }\n\n  async migrateOrThrow() {\n    await this.db.ensureWal()\n    await getMigrator(this.db).migrateToLatestOrThrow()\n  }\n\n  async destroy() {\n    const pQueue = this.pQueue\n    this.pQueue = null\n    pQueue?.pause()\n    pQueue?.clear()\n    await pQueue?.onIdle()\n  }\n}\n"]}