@atproto/pds 0.5.4 → 0.5.6

package/dist/account-manager/helpers/invite.d.ts

@@ -1,6 +1,6 @@
 import { DatetimeString, DidString } from '@atproto/lex';
 import { com } from '../../lexicons/index.js';
-import { AccountDb } from '../db/index.js';
+import { AccountDb, InviteCode } from '../db/index.js';
 export type CodeDetail = com.atproto.server.defs.InviteCode;
 export type CodeUse = com.atproto.server.defs.InviteCodeUse;
 export declare const createInviteCodes: (db: AccountDb, toCreate: {
@@ -14,7 +14,40 @@ export declare const recordInviteUse: (db: AccountDb, opts: {
     now: DatetimeString;
 }) => Promise<void>;
 export declare const ensureInviteIsAvailable: (db: AccountDb, inviteCode: string) => Promise<void>;
-export declare const selectInviteCodesQb: (db: AccountDb) => import("kysely/dist/esm/parser/select-parser.js").SelectAllQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, import("kysely").AliasedQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "invite_code">, "invite_code", import("kysely").Selection<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "invite_code">, "invite_code", "invite_code.code as code" | "invite_code.availableUses as available" | "invite_code.disabled as disabled" | "invite_code.forAccount as forAccount" | "invite_code.createdBy as createdBy" | "invite_code.createdAt as createdAt" | import("kysely").AliasedQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "invite_code_use">, "invite_code_use", import("kysely").Selection<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "invite_code_use">, "invite_code_use", import("kysely").AliasedRawBuilder<number, "count">>, "uses">>, "codes">>, "codes", {}, "codes">;
+export declare const selectInviteCodesQb: (db: AccountDb) => import("kysely").SelectQueryBuilder<{
+    account: import("../db/index.js").Account;
+    account_device: import("../db/index.js").AccountDevice;
+    actor: import("../db/index.js").Actor;
+    app_password: import("../db/index.js").AppPassword;
+    authorization_request: import("../db/index.js").AuthorizationRequest;
+    authorized_client: import("../db/schema/authorized-client.js").AuthorizedClient;
+    codes: {
+        available: number;
+        code: string;
+        createdAt: DatetimeString;
+        createdBy: string;
+        disabled: 0 | 1;
+        forAccount: string;
+        uses: number | null;
+    };
+    device: import("../db/index.js").Device;
+    email_token: import("../db/index.js").EmailToken;
+    invite_code: InviteCode;
+    invite_code_use: import("../db/index.js").InviteCodeUse;
+    lexicon: import("../db/index.js").Lexicon;
+    refresh_token: import("../db/index.js").RefreshToken;
+    repo_root: import("../db/index.js").RepoRoot;
+    token: import("../db/index.js").Token;
+    used_refresh_token: import("../db/index.js").UsedRefreshToken;
+}, "codes", {
+    available: number;
+    code: string;
+    createdAt: DatetimeString;
+    createdBy: string;
+    disabled: 0 | 1;
+    forAccount: string;
+    uses: number | null;
+}>;
 export declare const getAccountsInviteCodes: (db: AccountDb, dids: string[]) => Promise<Map<string, CodeDetail[]>>;
 export declare const getInviteCodesUses: (db: AccountDb, codes: string[]) => Promise<Record<string, CodeUse[]>>;
 export declare const getInvitedByForAccounts: (db: AccountDb, dids: DidString[]) => Promise<Record<string, CodeDetail>>;

package/dist/account-manager/helpers/invite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invite.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/invite.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAA;AAG/E,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAc,MAAM,gBAAgB,CAAA;AAEtD,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAA;AAC3D,MAAM,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAA;AAE3D,eAAO,MAAM,iBAAiB,GAC5B,IAAI,SAAS,EACb,UAAU;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,EAAE,EAChD,UAAU,MAAM,kBAkBjB,CAAA;AAED,eAAO,MAAM,wBAAwB,GACnC,IAAI,SAAS,EACb,YAAY,MAAM,EAClB,OAAO,MAAM,EAAE,EACf,eAAe,MAAM,EACrB,UAAU,CAAC,GAAG,CAAC,KACd,OAAO,CAAC,UAAU,EAAE,CA+BtB,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,IAAI,SAAS,EACb,MAAM;IACJ,GAAG,EAAE,SAAS,CAAA;IACd,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,GAAG,EAAE,cAAc,CAAA;CACpB,kBAUF,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,IAAI,SAAS,EACb,YAAY,MAAM,KACjB,OAAO,CAAC,IAAI,CA4Bd,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,IAAI,SAAS,wnCAkBhD,CAAA;AAED,eAAO,MAAM,sBAAsB,GACjC,IAAI,SAAS,EACb,MAAM,MAAM,EAAE,KACb,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAqBnC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,IAAI,SAAS,EACb,OAAO,MAAM,EAAE,KACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAgBnC,CAAA;AAED,eAAO,MAAM,uBAAuB,GAClC,IAAI,SAAS,EACb,MAAM,SAAS,EAAE,KAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAiCpC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,IAAI,SAAS,EACb,MAAM;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,kBAmB9C,CAAA;AAED,eAAO,MAAM,yBAAyB,GACpC,IAAI,SAAS,EACb,KAAK,SAAS,EACd,UAAU,OAAO,kBAQlB,CAAA"}
+{"version":3,"file":"invite.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/invite.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAA;AAG/E,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAEtD,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAA;AAC3D,MAAM,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAA;AAE3D,eAAO,MAAM,iBAAiB,OACxB,SAAS,YACH;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,EAAE,YACtC,MAAM,kBAkBjB,CAAA;AAED,eAAO,MAAM,wBAAwB,OAC/B,SAAS,cACD,MAAM,SACX,MAAM,EAAE,iBACA,MAAM,YACX,CAAC,GAAG,CAAC,KACd,OAAO,CAAC,UAAU,EAAE,CA+BtB,CAAA;AAED,eAAO,MAAM,eAAe,OACtB,SAAS,QACP;IACJ,GAAG,EAAE,SAAS,CAAA;IACd,UAAU,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9B,GAAG,EAAE,cAAc,CAAA;CACpB,kBAUF,CAAA;AAED,eAAO,MAAM,uBAAuB,OAC9B,SAAS,cACD,MAAM,KACjB,OAAO,CAAC,IAAI,CA4Bd,CAAA;AAED,eAAO,MAAM,mBAAmB,OAAQ,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBhD,CAAA;AAED,eAAO,MAAM,sBAAsB,OAC7B,SAAS,QACP,MAAM,EAAE,KACb,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAqBnC,CAAA;AAED,eAAO,MAAM,kBAAkB,OACzB,SAAS,SACN,MAAM,EAAE,KACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAgBnC,CAAA;AAED,eAAO,MAAM,uBAAuB,OAC9B,SAAS,QACP,SAAS,EAAE,KAChB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAiCpC,CAAA;AAED,eAAO,MAAM,kBAAkB,OACzB,SAAS,QACP;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,kBAmB9C,CAAA;AAED,eAAO,MAAM,yBAAyB,OAChC,SAAS,OACR,SAAS,YACJ,OAAO,kBAQlB,CAAA"}

package/dist/account-manager/helpers/lexicon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lexicon.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/lexicon.ts"],"names":[],"mappings":"AACA,OAAO,EAA6B,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEhF,OAAO,EAAE,SAAS,EAAW,MAAM,gBAAgB,CAAA;AAEnD,wBAAsB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,iBA8B1E;AAED,wBAAsB,IAAI,CACxB,EAAE,EAAE,SAAS,EACb,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAiB7B;AAED,wBAAsB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,iBAEvD"}
+{"version":3,"file":"lexicon.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/lexicon.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEhF,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,wBAAsB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,iBAoC1E;AAED,wBAAsB,IAAI,CACxB,EAAE,EAAE,SAAS,EACb,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAiB7B;AAED,wBAAsB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,iBAEvD"}

package/dist/account-manager/helpers/lexicon.js

@@ -1,6 +1,12 @@
 import { LEXICON_REFRESH_FREQUENCY } from '@atproto/oauth-provider';
 import { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js';
 export async function upsert(db, nsid, data) {
+    // @TODO not annotated as `Omit<Insertable<Lexicon>, 'nsid'>`. Insertable's
+    // nullable/non-nullable key partition evaluates `IsNullable<InsertType<…>>`
+    // per column, which for the recursive `JsonEncoded<LexiconDocument>` column
+    // overflows the tsgo (TS7) checker's instantiation depth (TS2589). The older
+    // tsc handled it; the `.values()`/`.doUpdateSet()` calls below still
+    // type-check this object against the insert type regardless.
     const updates = {
         ...data,
         createdAt: toDateISO(data.createdAt),

package/dist/account-manager/helpers/lexicon.js.map

@@ -1 +1 @@
-{"version":3,"file":"lexicon.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/lexicon.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAe,MAAM,yBAAyB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG5E,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY,EAAE,IAAiB;IACzE,MAAM,OAAO,GAAsC;QACjD,GAAG,IAAI;QACP,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACpC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACpC,eAAe,EAAE,IAAI,CAAC,eAAe;YACnC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC;YACjC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;IAED,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,SAAS,CAAC;SACrB,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAC9D,CAAA;IAED,4DAA4D;IAC5D,8BAA8B;IAC9B,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,SAAS,CAAC;SACrB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;SAC5B,KAAK,CACJ,WAAW,EACX,GAAG,EACH,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,CAAC,CAAC,CAC5D,CACJ,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,EAAa,EACb,IAAY;IAEZ,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;SACpB,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC;SACxB,gBAAgB,EAAE,CAAA;IACrB,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAA;IAErB,OAAO;QACL,GAAG,GAAG;QACN,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QACrC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QACrC,eAAe,EAAE,GAAG,CAAC,eAAe;YAClC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC;YAClC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY;IACtD,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAA;AACtE,CAAC","sourcesContent":["import { Insertable } from 'kysely'\nimport { LEXICON_REFRESH_FREQUENCY, LexiconData } from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js'\nimport { AccountDb, Lexicon } from '../db/index.js'\n\nexport async function upsert(db: AccountDb, nsid: string, data: LexiconData) {\n  const updates: Omit<Insertable<Lexicon>, 'nsid'> = {\n    ...data,\n    createdAt: toDateISO(data.createdAt),\n    updatedAt: toDateISO(data.updatedAt),\n    lastSucceededAt: data.lastSucceededAt\n      ? toDateISO(data.lastSucceededAt)\n      : null,\n    lexicon: data.lexicon ? toJson(data.lexicon) : null,\n  }\n\n  await db.executeWithRetry(\n    db.db\n      .insertInto('lexicon')\n      .values({ ...updates, nsid })\n      .onConflict((oc) => oc.column('nsid').doUpdateSet(updates)),\n  )\n\n  // Garbage collection: remove old, never resolved, lexicons.\n  // Uses \"lexicon_failures_idx\"\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('lexicon')\n      .where('lexicon', 'is', null)\n      .where(\n        'updatedAt',\n        '<',\n        toDateISO(new Date(Date.now() - LEXICON_REFRESH_FREQUENCY)),\n      ),\n  )\n}\n\nexport async function find(\n  db: AccountDb,\n  nsid: string,\n): Promise<LexiconData | null> {\n  const row = await db.db\n    .selectFrom('lexicon')\n    .selectAll()\n    .where('nsid', '=', nsid)\n    .executeTakeFirst()\n  if (!row) return null\n\n  return {\n    ...row,\n    createdAt: fromDateISO(row.createdAt),\n    updatedAt: fromDateISO(row.updatedAt),\n    lastSucceededAt: row.lastSucceededAt\n      ? fromDateISO(row.lastSucceededAt)\n      : null,\n    lexicon: row.lexicon ? fromJson(row.lexicon) : null,\n  }\n}\n\nexport async function remove(db: AccountDb, nsid: string) {\n  await db.db.deleteFrom('lexicon').where('nsid', '=', nsid).execute()\n}\n"]}
+{"version":3,"file":"lexicon.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/lexicon.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAe,MAAM,yBAAyB,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG5E,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY,EAAE,IAAiB;IACzE,2EAA2E;IAC3E,4EAA4E;IAC5E,4EAA4E;IAC5E,6EAA6E;IAC7E,qEAAqE;IACrE,6DAA6D;IAC7D,MAAM,OAAO,GAAG;QACd,GAAG,IAAI;QACP,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACpC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;QACpC,eAAe,EAAE,IAAI,CAAC,eAAe;YACnC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC;YACjC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;IAED,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,SAAS,CAAC;SACrB,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC;SAC5B,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAC9D,CAAA;IAED,4DAA4D;IAC5D,8BAA8B;IAC9B,MAAM,EAAE,CAAC,gBAAgB,CACvB,EAAE,CAAC,EAAE;SACF,UAAU,CAAC,SAAS,CAAC;SACrB,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC;SAC5B,KAAK,CACJ,WAAW,EACX,GAAG,EACH,SAAS,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,yBAAyB,CAAC,CAAC,CAC5D,CACJ,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,EAAa,EACb,IAAY;IAEZ,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,EAAE;SACpB,UAAU,CAAC,SAAS,CAAC;SACrB,SAAS,EAAE;SACX,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC;SACxB,gBAAgB,EAAE,CAAA;IACrB,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAA;IAErB,OAAO;QACL,GAAG,GAAG;QACN,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QACrC,SAAS,EAAE,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QACrC,eAAe,EAAE,GAAG,CAAC,eAAe;YAClC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC;YAClC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY;IACtD,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAA;AACtE,CAAC","sourcesContent":["import { LEXICON_REFRESH_FREQUENCY, LexiconData } from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js'\nimport { AccountDb } from '../db/index.js'\n\nexport async function upsert(db: AccountDb, nsid: string, data: LexiconData) {\n  // @TODO not annotated as `Omit<Insertable<Lexicon>, 'nsid'>`. Insertable's\n  // nullable/non-nullable key partition evaluates `IsNullable<InsertType<…>>`\n  // per column, which for the recursive `JsonEncoded<LexiconDocument>` column\n  // overflows the tsgo (TS7) checker's instantiation depth (TS2589). The older\n  // tsc handled it; the `.values()`/`.doUpdateSet()` calls below still\n  // type-check this object against the insert type regardless.\n  const updates = {\n    ...data,\n    createdAt: toDateISO(data.createdAt),\n    updatedAt: toDateISO(data.updatedAt),\n    lastSucceededAt: data.lastSucceededAt\n      ? toDateISO(data.lastSucceededAt)\n      : null,\n    lexicon: data.lexicon ? toJson(data.lexicon) : null,\n  }\n\n  await db.executeWithRetry(\n    db.db\n      .insertInto('lexicon')\n      .values({ ...updates, nsid })\n      .onConflict((oc) => oc.column('nsid').doUpdateSet(updates)),\n  )\n\n  // Garbage collection: remove old, never resolved, lexicons.\n  // Uses \"lexicon_failures_idx\"\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('lexicon')\n      .where('lexicon', 'is', null)\n      .where(\n        'updatedAt',\n        '<',\n        toDateISO(new Date(Date.now() - LEXICON_REFRESH_FREQUENCY)),\n      ),\n  )\n}\n\nexport async function find(\n  db: AccountDb,\n  nsid: string,\n): Promise<LexiconData | null> {\n  const row = await db.db\n    .selectFrom('lexicon')\n    .selectAll()\n    .where('nsid', '=', nsid)\n    .executeTakeFirst()\n  if (!row) return null\n\n  return {\n    ...row,\n    createdAt: fromDateISO(row.createdAt),\n    updatedAt: fromDateISO(row.updatedAt),\n    lastSucceededAt: row.lastSucceededAt\n      ? fromDateISO(row.lastSucceededAt)\n      : null,\n    lexicon: row.lexicon ? fromJson(row.lexicon) : null,\n  }\n}\n\nexport async function remove(db: AccountDb, nsid: string) {\n  await db.db.deleteFrom('lexicon').where('nsid', '=', nsid).execute()\n}\n"]}

package/dist/account-manager/helpers/password.d.ts

@@ -18,4 +18,5 @@ export declare const listAppPasswords: (db: AccountDb, did: string) => Promise<{
     privileged: boolean;
 }[]>;
 export declare const deleteAppPassword: (db: AccountDb, did: string, name: string) => Promise<void>;
+export declare const deleteAllAppPasswords: (db: AccountDb, did: string) => Promise<void>;
 //# sourceMappingURL=password.d.ts.map

package/dist/account-manager/helpers/password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/password.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAyB,MAAM,cAAc,CAAA;AAEpE,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,GAChC,IAAI,SAAS,EACb,KAAK,MAAM,EACX,UAAU,MAAM,KACf,OAAO,CAAC,OAAO,CAOjB,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,IAAI,SAAS,EACb,KAAK,MAAM,EACX,UAAU,MAAM,KACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAahC,CAAA;AAED,eAAO,MAAM,kBAAkB,GAC7B,IAAI,SAAS,EACb,MAAM;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;CACvB,kBAQF,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,IAAI,SAAS,EACb,KAAK,MAAM,EACX,MAAM,MAAM,EACZ,YAAY,OAAO,KAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAiC1D,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,MAAM,KACV,OAAO,CACR;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,EAAE,CAanE,CAAA;AAED,eAAO,MAAM,iBAAiB,GAC5B,IAAI,SAAS,EACb,KAAK,MAAM,EACX,MAAM,MAAM,kBAQb,CAAA"}
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/password.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAyB,MAAM,cAAc,CAAA;AAEpE,OAAO,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAG1C,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,qBAAqB,OAC5B,SAAS,OACR,MAAM,YACD,MAAM,KACf,OAAO,CAAC,OAAO,CAOjB,CAAA;AAED,eAAO,MAAM,iBAAiB,OACxB,SAAS,OACR,MAAM,YACD,MAAM,KACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAahC,CAAA;AAED,eAAO,MAAM,kBAAkB,OACzB,SAAS,QACP;IACJ,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,EAAE,MAAM,CAAA;CACvB,kBAQF,CAAA;AAED,eAAO,MAAM,iBAAiB,OACxB,SAAS,OACR,MAAM,QACL,MAAM,cACA,OAAO,KAClB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAiC1D,CAAA;AAED,eAAO,MAAM,gBAAgB,OACvB,SAAS,OACR,MAAM,KACV,OAAO,CACR;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,EAAE,CAanE,CAAA;AAED,eAAO,MAAM,iBAAiB,OACxB,SAAS,OACR,MAAM,QACL,MAAM,kBAQb,CAAA;AAED,eAAO,MAAM,qBAAqB,OAAc,SAAS,OAAO,MAAM,kBAIrE,CAAA"}

package/dist/account-manager/helpers/password.js

@@ -82,4 +82,7 @@ export const deleteAppPassword = async (db, did, name) => {
         .where('did', '=', did)
         .where('name', '=', name));
 };
+export const deleteAllAppPasswords = async (db, did) => {
+    await db.executeWithRetry(db.db.deleteFrom('app_password').where('did', '=', did));
+};
 //# sourceMappingURL=password.js.map

package/dist/account-manager/helpers/password.js.map

@@ -1 +1 @@
-{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/password.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomStr } from '@atproto/crypto'\nimport { DatetimeString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { com } from '../../lexicons/index.js'\nimport { AccountDb } from '../db/index.js'\nimport * as scrypt from './scrypt.js'\n\nexport type AppPassDescript = {\n  name: string\n  privileged: boolean\n}\n\nexport const verifyAccountPassword = async (\n  db: AccountDb,\n  did: string,\n  password: string,\n): Promise<boolean> => {\n  const found = await db.db\n    .selectFrom('account')\n    .selectAll()\n    .where('did', '=', did)\n    .executeTakeFirst()\n  return found ? await scrypt.verify(password, found.passwordScrypt) : false\n}\n\nexport const verifyAppPassword = async (\n  db: AccountDb,\n  did: string,\n  password: string,\n): Promise<AppPassDescript | null> => {\n  const passwordScrypt = await scrypt.hashAppPassword(did, password)\n  const found = await db.db\n    .selectFrom('app_password')\n    .selectAll()\n    .where('did', '=', did)\n    .where('passwordScrypt', '=', passwordScrypt)\n    .executeTakeFirst()\n  if (!found) return null\n  return {\n    name: found.name,\n    privileged: found.privileged === 1 ? true : false,\n  }\n}\n\nexport const updateUserPassword = async (\n  db: AccountDb,\n  opts: {\n    did: string\n    passwordScrypt: string\n  },\n) => {\n  await db.executeWithRetry(\n    db.db\n      .updateTable('account')\n      .set({ passwordScrypt: opts.passwordScrypt })\n      .where('did', '=', opts.did),\n  )\n}\n\nexport const createAppPassword = async (\n  db: AccountDb,\n  did: string,\n  name: string,\n  privileged: boolean,\n): Promise<com.atproto.server.createAppPassword.AppPassword> => {\n  // create an app password with format:\n  // 1234-abcd-5678-efgh\n  const str = randomStr(16, 'base32').slice(0, 16)\n  const chunks = [\n    str.slice(0, 4),\n    str.slice(4, 8),\n    str.slice(8, 12),\n    str.slice(12, 16),\n  ]\n  const password = chunks.join('-')\n  const passwordScrypt = await scrypt.hashAppPassword(did, password)\n  const [got] = await db.executeWithRetry(\n    db.db\n      .insertInto('app_password')\n      .values({\n        did,\n        name,\n        passwordScrypt,\n        createdAt: currentDatetimeString(),\n        privileged: privileged ? 1 : 0,\n      })\n      .returningAll(),\n  )\n  if (!got) {\n    throw new InvalidRequestError('could not create app-specific password')\n  }\n  return {\n    name,\n    password,\n    createdAt: got.createdAt,\n    privileged,\n  }\n}\n\nexport const listAppPasswords = async (\n  db: AccountDb,\n  did: string,\n): Promise<\n  { name: string; createdAt: DatetimeString; privileged: boolean }[]\n> => {\n  const res = await db.db\n    .selectFrom('app_password')\n    .select(['name', 'createdAt', 'privileged'])\n    .where('did', '=', did)\n    .orderBy('createdAt', 'desc')\n    .execute()\n  return res.map((row) => ({\n    name: row.name,\n    createdAt: row.createdAt,\n    privileged: row.privileged === 1 ? true : false,\n  }))\n}\n\nexport const deleteAppPassword = async (\n  db: AccountDb,\n  did: string,\n  name: string,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('app_password')\n      .where('did', '=', did)\n      .where('name', '=', name),\n  )\n}\n"]}
+{"version":3,"file":"password.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/password.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomStr } from '@atproto/crypto'\nimport { DatetimeString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { com } from '../../lexicons/index.js'\nimport { AccountDb } from '../db/index.js'\nimport * as scrypt from './scrypt.js'\n\nexport type AppPassDescript = {\n  name: string\n  privileged: boolean\n}\n\nexport const verifyAccountPassword = async (\n  db: AccountDb,\n  did: string,\n  password: string,\n): Promise<boolean> => {\n  const found = await db.db\n    .selectFrom('account')\n    .selectAll()\n    .where('did', '=', did)\n    .executeTakeFirst()\n  return found ? await scrypt.verify(password, found.passwordScrypt) : false\n}\n\nexport const verifyAppPassword = async (\n  db: AccountDb,\n  did: string,\n  password: string,\n): Promise<AppPassDescript | null> => {\n  const passwordScrypt = await scrypt.hashAppPassword(did, password)\n  const found = await db.db\n    .selectFrom('app_password')\n    .selectAll()\n    .where('did', '=', did)\n    .where('passwordScrypt', '=', passwordScrypt)\n    .executeTakeFirst()\n  if (!found) return null\n  return {\n    name: found.name,\n    privileged: found.privileged === 1 ? true : false,\n  }\n}\n\nexport const updateUserPassword = async (\n  db: AccountDb,\n  opts: {\n    did: string\n    passwordScrypt: string\n  },\n) => {\n  await db.executeWithRetry(\n    db.db\n      .updateTable('account')\n      .set({ passwordScrypt: opts.passwordScrypt })\n      .where('did', '=', opts.did),\n  )\n}\n\nexport const createAppPassword = async (\n  db: AccountDb,\n  did: string,\n  name: string,\n  privileged: boolean,\n): Promise<com.atproto.server.createAppPassword.AppPassword> => {\n  // create an app password with format:\n  // 1234-abcd-5678-efgh\n  const str = randomStr(16, 'base32').slice(0, 16)\n  const chunks = [\n    str.slice(0, 4),\n    str.slice(4, 8),\n    str.slice(8, 12),\n    str.slice(12, 16),\n  ]\n  const password = chunks.join('-')\n  const passwordScrypt = await scrypt.hashAppPassword(did, password)\n  const [got] = await db.executeWithRetry(\n    db.db\n      .insertInto('app_password')\n      .values({\n        did,\n        name,\n        passwordScrypt,\n        createdAt: currentDatetimeString(),\n        privileged: privileged ? 1 : 0,\n      })\n      .returningAll(),\n  )\n  if (!got) {\n    throw new InvalidRequestError('could not create app-specific password')\n  }\n  return {\n    name,\n    password,\n    createdAt: got.createdAt,\n    privileged,\n  }\n}\n\nexport const listAppPasswords = async (\n  db: AccountDb,\n  did: string,\n): Promise<\n  { name: string; createdAt: DatetimeString; privileged: boolean }[]\n> => {\n  const res = await db.db\n    .selectFrom('app_password')\n    .select(['name', 'createdAt', 'privileged'])\n    .where('did', '=', did)\n    .orderBy('createdAt', 'desc')\n    .execute()\n  return res.map((row) => ({\n    name: row.name,\n    createdAt: row.createdAt,\n    privileged: row.privileged === 1 ? true : false,\n  }))\n}\n\nexport const deleteAppPassword = async (\n  db: AccountDb,\n  did: string,\n  name: string,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('app_password')\n      .where('did', '=', did)\n      .where('name', '=', name),\n  )\n}\n\nexport const deleteAllAppPasswords = async (db: AccountDb, did: string) => {\n  await db.executeWithRetry(\n    db.db.deleteFrom('app_password').where('did', '=', did),\n  )\n}\n"]}

package/dist/account-manager/helpers/repo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAyB,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,eAAO,MAAM,UAAU,GACrB,IAAI,SAAS,EACb,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,MAAM,kBAgBZ,CAAA"}
+{"version":3,"file":"repo.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/repo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAyB,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,eAAO,MAAM,UAAU,OACjB,SAAS,OACR,MAAM,OACN,GAAG,OACH,MAAM,kBAgBZ,CAAA"}

package/dist/account-manager/helpers/scrypt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrypt.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/scrypt.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAC1C,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAE1C,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAG/D,CAAA;AAED,eAAO,MAAM,YAAY,GACvB,UAAU,MAAM,EAChB,MAAM,MAAM,KACX,OAAO,CAAC,MAAM,CAOhB,CAAA;AAED,eAAO,MAAM,MAAM,GACjB,UAAU,MAAM,EAChB,YAAY,MAAM,KACjB,OAAO,CAAC,OAAO,CAIjB,CAAA;AAED,eAAO,MAAM,cAAc,GACzB,UAAU,MAAM,EAChB,MAAM,MAAM,KACX,OAAO,CAAC,MAAM,CAOhB,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,KAAK,MAAM,EACX,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,CAIhB,CAAA"}
+{"version":3,"file":"scrypt.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/scrypt.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAC1C,eAAO,MAAM,uBAAuB,MAAM,CAAA;AAE1C,eAAO,MAAM,cAAc,aAAc,MAAM,KAAG,OAAO,CAAC,MAAM,CAG/D,CAAA;AAED,eAAO,MAAM,YAAY,aACb,MAAM,QACV,MAAM,KACX,OAAO,CAAC,MAAM,CAOhB,CAAA;AAED,eAAO,MAAM,MAAM,aACP,MAAM,cACJ,MAAM,KACjB,OAAO,CAAC,OAAO,CAIjB,CAAA;AAED,eAAO,MAAM,cAAc,aACf,MAAM,QACV,MAAM,KACX,OAAO,CAAC,MAAM,CAOhB,CAAA;AAED,eAAO,MAAM,eAAe,QACrB,MAAM,YACD,MAAM,KACf,OAAO,CAAC,MAAM,CAIhB,CAAA"}