@atproto/pds 0.4.223 → 0.4.224

package/dist/account-manager/helpers/authorization-request.js

@@ -1,67 +1,53 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.consumeByCodeQB = exports.removeByIdQB = exports.removeOldExpiredQB = exports.updateQB = exports.readQB = exports.createQB = exports.rowToFoundRequestResult = exports.rowToRequestData = void 0;
-const node_assert_1 = __importDefault(require("node:assert"));
-const db_1 = require("../../db");
-const rowToRequestData = (row) => ({
+import assert from 'node:assert';
+import { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js';
+export const rowToRequestData = (row) => ({
     clientId: row.clientId,
-    clientAuth: (0, db_1.fromJson)(row.clientAuth),
-    parameters: (0, db_1.fromJson)(row.parameters),
-    expiresAt: (0, db_1.fromDateISO)(row.expiresAt),
+    clientAuth: fromJson(row.clientAuth),
+    parameters: fromJson(row.parameters),
+    expiresAt: fromDateISO(row.expiresAt),
     deviceId: row.deviceId,
     sub: row.did,
     code: row.code,
 });
-exports.rowToRequestData = rowToRequestData;
-const rowToFoundRequestResult = (row) => ({
+export const rowToFoundRequestResult = (row) => ({
     requestId: row.id,
-    data: (0, exports.rowToRequestData)(row),
+    data: rowToRequestData(row),
 });
-exports.rowToFoundRequestResult = rowToFoundRequestResult;
 const requestDataToRow = (id, data) => ({
     id,
     did: data.sub,
     deviceId: data.deviceId,
     clientId: data.clientId,
-    clientAuth: (0, db_1.toJson)(data.clientAuth),
-    parameters: (0, db_1.toJson)(data.parameters),
-    expiresAt: (0, db_1.toDateISO)(data.expiresAt),
+    clientAuth: toJson(data.clientAuth),
+    parameters: toJson(data.parameters),
+    expiresAt: toDateISO(data.expiresAt),
     code: data.code,
 });
-const createQB = (db, id, data) => db.db.insertInto('authorization_request').values(requestDataToRow(id, data));
-exports.createQB = createQB;
-const readQB = (db, id) => db.db.selectFrom('authorization_request').where('id', '=', id).selectAll();
-exports.readQB = readQB;
-const updateQB = (db, id, { code, sub, deviceId, expiresAt, parameters, ...rest }) => {
-    (0, node_assert_1.default)(!Object.keys(rest).length, 'Unexpected fields in UpdateRequestData');
+export const createQB = (db, id, data) => db.db.insertInto('authorization_request').values(requestDataToRow(id, data));
+export const readQB = (db, id) => db.db.selectFrom('authorization_request').where('id', '=', id).selectAll();
+export const updateQB = (db, id, { code, sub, deviceId, expiresAt, parameters, ...rest }) => {
+    assert(!Object.keys(rest).length, 'Unexpected fields in UpdateRequestData');
     return db.db
         .updateTable('authorization_request')
         .if(code !== undefined, (qb) => qb.set({ code }))
         .if(sub !== undefined, (qb) => qb.set({ did: sub }))
         .if(deviceId !== undefined, (qb) => qb.set({ deviceId }))
-        .if(expiresAt != null, (qb) => qb.set({ expiresAt: (0, db_1.toDateISO)(expiresAt) }))
-        .if(parameters != null, (qb) => qb.set({ parameters: (0, db_1.toJson)(parameters) }))
+        .if(expiresAt != null, (qb) => qb.set({ expiresAt: toDateISO(expiresAt) }))
+        .if(parameters != null, (qb) => qb.set({ parameters: toJson(parameters) }))
         .where('id', '=', id);
 };
-exports.updateQB = updateQB;
-const removeOldExpiredQB = (db, delay = 600e3) => 
+export const removeOldExpiredQB = (db, delay = 600e3) => 
 // We allow some delay for the expiration time so that expired requests
 // can still be returned to the OAuthProvider library for error handling.
 db.db
     .deleteFrom('authorization_request')
     // uses "authorization_request_expires_at_idx" index
-    .where('expiresAt', '<', (0, db_1.toDateISO)(new Date(Date.now() - delay)));
-exports.removeOldExpiredQB = removeOldExpiredQB;
-const removeByIdQB = (db, id) => db.db.deleteFrom('authorization_request').where('id', '=', id);
-exports.removeByIdQB = removeByIdQB;
-const consumeByCodeQB = (db, code) => db.db
+    .where('expiresAt', '<', toDateISO(new Date(Date.now() - delay)));
+export const removeByIdQB = (db, id) => db.db.deleteFrom('authorization_request').where('id', '=', id);
+export const consumeByCodeQB = (db, code) => db.db
     .deleteFrom('authorization_request')
     // uses "authorization_request_code_idx" partial index (hence the null check)
     .where('code', '=', code)
     .where('code', 'is not', null)
     .returningAll();
-exports.consumeByCodeQB = consumeByCodeQB;
 //# sourceMappingURL=authorization-request.js.map

package/dist/account-manager/helpers/authorization-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"authorization-request.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorization-request.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { Insertable, Selectable } from 'kysely'\nimport {\n  Code,\n  FoundRequestResult,\n  RequestData,\n  RequestId,\n  UpdateRequestData,\n} from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db'\nimport { AccountDb, AuthorizationRequest } from '../db'\n\nexport const rowToRequestData = (\n  row: Selectable<AuthorizationRequest>,\n): RequestData => ({\n  clientId: row.clientId,\n  clientAuth: fromJson(row.clientAuth),\n  parameters: fromJson(row.parameters),\n  expiresAt: fromDateISO(row.expiresAt),\n  deviceId: row.deviceId,\n  sub: row.did,\n  code: row.code,\n})\n\nexport const rowToFoundRequestResult = (\n  row: Selectable<AuthorizationRequest>,\n): FoundRequestResult => ({\n  requestId: row.id,\n  data: rowToRequestData(row),\n})\n\nconst requestDataToRow = (\n  id: RequestId,\n  data: RequestData,\n): Insertable<AuthorizationRequest> => ({\n  id,\n  did: data.sub,\n  deviceId: data.deviceId,\n\n  clientId: data.clientId,\n  clientAuth: toJson(data.clientAuth),\n  parameters: toJson(data.parameters),\n  expiresAt: toDateISO(data.expiresAt),\n  code: data.code,\n})\n\nexport const createQB = (db: AccountDb, id: RequestId, data: RequestData) =>\n  db.db.insertInto('authorization_request').values(requestDataToRow(id, data))\n\nexport const readQB = (db: AccountDb, id: RequestId) =>\n  db.db.selectFrom('authorization_request').where('id', '=', id).selectAll()\n\nexport const updateQB = (\n  db: AccountDb,\n  id: RequestId,\n  { code, sub, deviceId, expiresAt, parameters, ...rest }: UpdateRequestData,\n) => {\n  assert(!Object.keys(rest).length, 'Unexpected fields in UpdateRequestData')\n  return db.db\n    .updateTable('authorization_request')\n    .if(code !== undefined, (qb) => qb.set({ code }))\n    .if(sub !== undefined, (qb) => qb.set({ did: sub }))\n    .if(deviceId !== undefined, (qb) => qb.set({ deviceId }))\n    .if(expiresAt != null, (qb) => qb.set({ expiresAt: toDateISO(expiresAt!) }))\n    .if(parameters != null, (qb) => qb.set({ parameters: toJson(parameters!) }))\n    .where('id', '=', id)\n}\n\nexport const removeOldExpiredQB = (db: AccountDb, delay = 600e3) =>\n  // We allow some delay for the expiration time so that expired requests\n  // can still be returned to the OAuthProvider library for error handling.\n  db.db\n    .deleteFrom('authorization_request')\n    // uses \"authorization_request_expires_at_idx\" index\n    .where('expiresAt', '<', toDateISO(new Date(Date.now() - delay)))\n\nexport const removeByIdQB = (db: AccountDb, id: RequestId) =>\n  db.db.deleteFrom('authorization_request').where('id', '=', id)\n\nexport const consumeByCodeQB = (db: AccountDb, code: Code) =>\n  db.db\n    .deleteFrom('authorization_request')\n    // uses \"authorization_request_code_idx\" partial index (hence the null check)\n    .where('code', '=', code)\n    .where('code', 'is not', null)\n    .returningAll()\n"]}
+{"version":3,"file":"authorization-request.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorization-request.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport { Insertable, Selectable } from 'kysely'\nimport {\n  Code,\n  FoundRequestResult,\n  RequestData,\n  RequestId,\n  UpdateRequestData,\n} from '@atproto/oauth-provider'\nimport { fromDateISO, fromJson, toDateISO, toJson } from '../../db/index.js'\nimport { AccountDb, AuthorizationRequest } from '../db/index.js'\n\nexport const rowToRequestData = (\n  row: Selectable<AuthorizationRequest>,\n): RequestData => ({\n  clientId: row.clientId,\n  clientAuth: fromJson(row.clientAuth),\n  parameters: fromJson(row.parameters),\n  expiresAt: fromDateISO(row.expiresAt),\n  deviceId: row.deviceId,\n  sub: row.did,\n  code: row.code,\n})\n\nexport const rowToFoundRequestResult = (\n  row: Selectable<AuthorizationRequest>,\n): FoundRequestResult => ({\n  requestId: row.id,\n  data: rowToRequestData(row),\n})\n\nconst requestDataToRow = (\n  id: RequestId,\n  data: RequestData,\n): Insertable<AuthorizationRequest> => ({\n  id,\n  did: data.sub,\n  deviceId: data.deviceId,\n\n  clientId: data.clientId,\n  clientAuth: toJson(data.clientAuth),\n  parameters: toJson(data.parameters),\n  expiresAt: toDateISO(data.expiresAt),\n  code: data.code,\n})\n\nexport const createQB = (db: AccountDb, id: RequestId, data: RequestData) =>\n  db.db.insertInto('authorization_request').values(requestDataToRow(id, data))\n\nexport const readQB = (db: AccountDb, id: RequestId) =>\n  db.db.selectFrom('authorization_request').where('id', '=', id).selectAll()\n\nexport const updateQB = (\n  db: AccountDb,\n  id: RequestId,\n  { code, sub, deviceId, expiresAt, parameters, ...rest }: UpdateRequestData,\n) => {\n  assert(!Object.keys(rest).length, 'Unexpected fields in UpdateRequestData')\n  return db.db\n    .updateTable('authorization_request')\n    .if(code !== undefined, (qb) => qb.set({ code }))\n    .if(sub !== undefined, (qb) => qb.set({ did: sub }))\n    .if(deviceId !== undefined, (qb) => qb.set({ deviceId }))\n    .if(expiresAt != null, (qb) => qb.set({ expiresAt: toDateISO(expiresAt!) }))\n    .if(parameters != null, (qb) => qb.set({ parameters: toJson(parameters!) }))\n    .where('id', '=', id)\n}\n\nexport const removeOldExpiredQB = (db: AccountDb, delay = 600e3) =>\n  // We allow some delay for the expiration time so that expired requests\n  // can still be returned to the OAuthProvider library for error handling.\n  db.db\n    .deleteFrom('authorization_request')\n    // uses \"authorization_request_expires_at_idx\" index\n    .where('expiresAt', '<', toDateISO(new Date(Date.now() - delay)))\n\nexport const removeByIdQB = (db: AccountDb, id: RequestId) =>\n  db.db.deleteFrom('authorization_request').where('id', '=', id)\n\nexport const consumeByCodeQB = (db: AccountDb, code: Code) =>\n  db.db\n    .deleteFrom('authorization_request')\n    // uses \"authorization_request_code_idx\" partial index (hence the null check)\n    .where('code', '=', code)\n    .where('code', 'is not', null)\n    .returningAll()\n"]}

package/dist/account-manager/helpers/authorized-client.d.ts

@@ -1,5 +1,5 @@
 import { AuthorizedClientData, AuthorizedClients, ClientId, Sub } from '@atproto/oauth-provider';
-import { AccountDb } from '../db';
+import { AccountDb } from '../db/index.js';
 export declare function upsert(db: AccountDb, did: string, clientId: ClientId, data: AuthorizedClientData): Promise<import("kysely").InsertResult>;
 export declare function getAuthorizedClients(db: AccountDb, did: string): Promise<AuthorizedClients>;
 export declare function getAuthorizedClientsMulti(db: AccountDb, dids: Iterable<string>): Promise<Map<Sub, AuthorizedClients>>;

package/dist/account-manager/helpers/authorized-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authorized-client.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorized-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,QAAQ,EACR,GAAG,EACJ,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAEjC,wBAAsB,MAAM,CAC1B,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,oBAAoB,0CAqB3B;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,SAAS,EACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GACrB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAsBtC"}
+{"version":3,"file":"authorized-client.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorized-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,QAAQ,EACR,GAAG,EACJ,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,wBAAsB,MAAM,CAC1B,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,oBAAoB,0CAqB3B;AAED,wBAAsB,oBAAoB,CACxC,EAAE,EAAE,SAAS,EACb,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,iBAAiB,CAAC,CAE5B;AAED,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,SAAS,EACb,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GACrB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC,CAsBtC"}

package/dist/account-manager/helpers/authorized-client.js

@@ -1,32 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.upsert = upsert;
-exports.getAuthorizedClients = getAuthorizedClients;
-exports.getAuthorizedClientsMulti = getAuthorizedClientsMulti;
-const db_1 = require("../../db");
-async function upsert(db, did, clientId, data) {
+import { fromJson, toDateISO, toJson } from '../../db/index.js';
+export async function upsert(db, did, clientId, data) {
     const now = new Date();
     return db.db
         .insertInto('authorized_client')
         .values({
         did,
         clientId,
-        createdAt: (0, db_1.toDateISO)(now),
-        updatedAt: (0, db_1.toDateISO)(now),
-        data: (0, db_1.toJson)(data),
+        createdAt: toDateISO(now),
+        updatedAt: toDateISO(now),
+        data: toJson(data),
     })
         .onConflict((oc) => 
     // uses "authorized_client_pk" idx
     oc.columns(['did', 'clientId']).doUpdateSet({
-        updatedAt: (0, db_1.toDateISO)(now),
-        data: (0, db_1.toJson)(data),
+        updatedAt: toDateISO(now),
+        data: toJson(data),
     }))
         .executeTakeFirst();
 }
-async function getAuthorizedClients(db, did) {
+export async function getAuthorizedClients(db, did) {
     return (await getAuthorizedClientsMulti(db, [did])).get(did);
 }
-async function getAuthorizedClientsMulti(db, dids) {
+export async function getAuthorizedClientsMulti(db, dids) {
     // Using a Map will ensure unicity of dids (through unicity of keys)
     const map = new Map(Array.from(dids, (did) => [did, new Map()]));
     if (map.size) {
@@ -39,7 +34,7 @@ async function getAuthorizedClientsMulti(db, dids) {
             .where('did', 'in', [...map.keys()])
             .execute();
         for (const { did, clientId, data } of found) {
-            map.get(did).set(clientId, (0, db_1.fromJson)(data));
+            map.get(did).set(clientId, fromJson(data));
         }
     }
     return map;

package/dist/account-manager/helpers/authorized-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"authorized-client.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorized-client.ts"],"names":[],"mappings":";;AASA,wBAyBC;AAED,oDAKC;AAED,8DAyBC;AA9DD,iCAAsD;AAG/C,KAAK,UAAU,MAAM,CAC1B,EAAa,EACb,GAAW,EACX,QAAkB,EAClB,IAA0B;IAE1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IAEtB,OAAO,EAAE,CAAC,EAAE;SACT,UAAU,CAAC,mBAAmB,CAAC;SAC/B,MAAM,CAAC;QACN,GAAG;QACH,QAAQ;QACR,SAAS,EAAE,IAAA,cAAS,EAAC,GAAG,CAAC;QACzB,SAAS,EAAE,IAAA,cAAS,EAAC,GAAG,CAAC;QACzB,IAAI,EAAE,IAAA,WAAM,EAAC,IAAI,CAAC;KACnB,CAAC;SACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE;IACjB,kCAAkC;IAClC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;QAC1C,SAAS,EAAE,IAAA,cAAS,EAAC,GAAG,CAAC;QACzB,IAAI,EAAE,IAAA,WAAM,EAAC,IAAI,CAAC;KACnB,CAAC,CACH;SACA,gBAAgB,EAAE,CAAA;AACvB,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAa,EACb,GAAW;IAEX,OAAO,CAAC,MAAM,yBAAyB,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;AAC/D,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,EAAa,EACb,IAAsB;IAEtB,oEAAoE;IACpE,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CAC5C,CAAA;IAED,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE;aACtB,UAAU,CAAC,mBAAmB,CAAC;aAC/B,MAAM,CAAC,KAAK,CAAC;aACb,MAAM,CAAC,UAAU,CAAC;aAClB,MAAM,CAAC,MAAM,CAAC;YACf,8BAA8B;aAC7B,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;aACnC,OAAO,EAAE,CAAA;QAEZ,KAAK,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YAC5C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC","sourcesContent":["import {\n  AuthorizedClientData,\n  AuthorizedClients,\n  ClientId,\n  Sub,\n} from '@atproto/oauth-provider'\nimport { fromJson, toDateISO, toJson } from '../../db'\nimport { AccountDb } from '../db'\n\nexport async function upsert(\n  db: AccountDb,\n  did: string,\n  clientId: ClientId,\n  data: AuthorizedClientData,\n) {\n  const now = new Date()\n\n  return db.db\n    .insertInto('authorized_client')\n    .values({\n      did,\n      clientId,\n      createdAt: toDateISO(now),\n      updatedAt: toDateISO(now),\n      data: toJson(data),\n    })\n    .onConflict((oc) =>\n      // uses \"authorized_client_pk\" idx\n      oc.columns(['did', 'clientId']).doUpdateSet({\n        updatedAt: toDateISO(now),\n        data: toJson(data),\n      }),\n    )\n    .executeTakeFirst()\n}\n\nexport async function getAuthorizedClients(\n  db: AccountDb,\n  did: string,\n): Promise<AuthorizedClients> {\n  return (await getAuthorizedClientsMulti(db, [did])).get(did)!\n}\n\nexport async function getAuthorizedClientsMulti(\n  db: AccountDb,\n  dids: Iterable<string>,\n): Promise<Map<Sub, AuthorizedClients>> {\n  // Using a Map will ensure unicity of dids (through unicity of keys)\n  const map = new Map<Sub, AuthorizedClients>(\n    Array.from(dids, (did) => [did, new Map()]),\n  )\n\n  if (map.size) {\n    const found = await db.db\n      .selectFrom('authorized_client')\n      .select('did')\n      .select('clientId')\n      .select('data')\n      // uses \"authorized_client_pk\"\n      .where('did', 'in', [...map.keys()])\n      .execute()\n\n    for (const { did, clientId, data } of found) {\n      map.get(did)!.set(clientId, fromJson(data))\n    }\n  }\n\n  return map\n}\n"]}
+{"version":3,"file":"authorized-client.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/authorized-client.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAG/D,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,EAAa,EACb,GAAW,EACX,QAAkB,EAClB,IAA0B;IAE1B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IAEtB,OAAO,EAAE,CAAC,EAAE;SACT,UAAU,CAAC,mBAAmB,CAAC;SAC/B,MAAM,CAAC;QACN,GAAG;QACH,QAAQ;QACR,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;QACzB,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;KACnB,CAAC;SACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE;IACjB,kCAAkC;IAClC,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;QAC1C,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC;KACnB,CAAC,CACH;SACA,gBAAgB,EAAE,CAAA;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,EAAa,EACb,GAAW;IAEX,OAAO,CAAC,MAAM,yBAAyB,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAE,CAAA;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,EAAa,EACb,IAAsB;IAEtB,oEAAoE;IACpE,MAAM,GAAG,GAAG,IAAI,GAAG,CACjB,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CAC5C,CAAA;IAED,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,EAAE;aACtB,UAAU,CAAC,mBAAmB,CAAC;aAC/B,MAAM,CAAC,KAAK,CAAC;aACb,MAAM,CAAC,UAAU,CAAC;aAClB,MAAM,CAAC,MAAM,CAAC;YACf,8BAA8B;aAC7B,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;aACnC,OAAO,EAAE,CAAA;QAEZ,KAAK,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,KAAK,EAAE,CAAC;YAC5C,GAAG,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC","sourcesContent":["import {\n  AuthorizedClientData,\n  AuthorizedClients,\n  ClientId,\n  Sub,\n} from '@atproto/oauth-provider'\nimport { fromJson, toDateISO, toJson } from '../../db/index.js'\nimport { AccountDb } from '../db/index.js'\n\nexport async function upsert(\n  db: AccountDb,\n  did: string,\n  clientId: ClientId,\n  data: AuthorizedClientData,\n) {\n  const now = new Date()\n\n  return db.db\n    .insertInto('authorized_client')\n    .values({\n      did,\n      clientId,\n      createdAt: toDateISO(now),\n      updatedAt: toDateISO(now),\n      data: toJson(data),\n    })\n    .onConflict((oc) =>\n      // uses \"authorized_client_pk\" idx\n      oc.columns(['did', 'clientId']).doUpdateSet({\n        updatedAt: toDateISO(now),\n        data: toJson(data),\n      }),\n    )\n    .executeTakeFirst()\n}\n\nexport async function getAuthorizedClients(\n  db: AccountDb,\n  did: string,\n): Promise<AuthorizedClients> {\n  return (await getAuthorizedClientsMulti(db, [did])).get(did)!\n}\n\nexport async function getAuthorizedClientsMulti(\n  db: AccountDb,\n  dids: Iterable<string>,\n): Promise<Map<Sub, AuthorizedClients>> {\n  // Using a Map will ensure unicity of dids (through unicity of keys)\n  const map = new Map<Sub, AuthorizedClients>(\n    Array.from(dids, (did) => [did, new Map()]),\n  )\n\n  if (map.size) {\n    const found = await db.db\n      .selectFrom('authorized_client')\n      .select('did')\n      .select('clientId')\n      .select('data')\n      // uses \"authorized_client_pk\"\n      .where('did', 'in', [...map.keys()])\n      .execute()\n\n    for (const { did, clientId, data } of found) {\n      map.get(did)!.set(clientId, fromJson(data))\n    }\n  }\n\n  return map\n}\n"]}

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

@@ -1,9 +1,9 @@
 import { Selectable } from 'kysely';
 import { DeviceData, DeviceId } from '@atproto/oauth-provider';
-import { AccountDb, Device } from '../db';
+import { AccountDb, Device } from '../db/index.js';
 export declare const rowToDeviceData: (row: Omit<Selectable<Device>, "id">) => DeviceData;
-export declare const createQB: (db: AccountDb, deviceId: DeviceId, { sessionId, userAgent, ipAddress, lastSeenAt }: DeviceData) => import("kysely").InsertQueryBuilder<import("../db").DatabaseSchema, "device", import("kysely").InsertResult>;
-export declare const readQB: (db: AccountDb, deviceId: DeviceId) => import("kysely/dist/cjs/parser/select-parser").SelectAllQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "device">, "device", {}, "device">;
-export declare const updateQB: (db: AccountDb, deviceId: DeviceId, { sessionId, userAgent, ipAddress, lastSeenAt }: Partial<DeviceData>) => import("kysely").UpdateQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "device">, "device", "device", import("kysely").UpdateResult>;
-export declare const removeQB: (db: AccountDb, deviceId: DeviceId) => import("kysely").DeleteQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "device">, "device", import("kysely").DeleteResult>;
+export declare const createQB: (db: AccountDb, deviceId: DeviceId, { sessionId, userAgent, ipAddress, lastSeenAt }: DeviceData) => import("kysely").InsertQueryBuilder<import("../db/index.js").DatabaseSchema, "device", import("kysely").InsertResult>;
+export declare const readQB: (db: AccountDb, deviceId: DeviceId) => import("kysely/dist/esm/parser/select-parser.js").SelectAllQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "device">, "device", {}, "device">;
+export declare const updateQB: (db: AccountDb, deviceId: DeviceId, { sessionId, userAgent, ipAddress, lastSeenAt }: Partial<DeviceData>) => import("kysely").UpdateQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "device">, "device", "device", import("kysely").UpdateResult>;
+export declare const removeQB: (db: AccountDb, deviceId: DeviceId) => import("kysely").DeleteQueryBuilder<import("kysely/dist/esm/parser/table-parser.js").From<import("../db/index.js").DatabaseSchema, "device">, "device", import("kysely").DeleteResult>;
 //# sourceMappingURL=device.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/device.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AAEzC,eAAO,MAAM,eAAe,GAC1B,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAClC,UAKD,CAAA;AAEF,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,UAAU,QAAQ,EAClB,iDAAiD,UAAU,iHAQzD,CAAA;AAEJ,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,EAAE,UAAU,QAAQ,+LACW,CAAA;AAEnE,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,UAAU,QAAQ,EAClB,iDAAiD,OAAO,CAAC,UAAU,CAAC,yLAUvC,CAAA;AAE/B,eAAO,MAAM,QAAQ,GAAI,IAAI,SAAS,EAAE,UAAU,QAAQ,+KACH,CAAA"}
+{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/device.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAE9D,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAElD,eAAO,MAAM,eAAe,GAC1B,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAClC,UAKD,CAAA;AAEF,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,UAAU,QAAQ,EAClB,iDAAiD,UAAU,0HAQzD,CAAA;AAEJ,eAAO,MAAM,MAAM,GAAI,IAAI,SAAS,EAAE,UAAU,QAAQ,8MACW,CAAA;AAEnE,eAAO,MAAM,QAAQ,GACnB,IAAI,SAAS,EACb,UAAU,QAAQ,EAClB,iDAAiD,OAAO,CAAC,UAAU,CAAC,qMAUvC,CAAA;AAE/B,eAAO,MAAM,QAAQ,GAAI,IAAI,SAAS,EAAE,UAAU,QAAQ,2LACH,CAAA"}

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

@@ -1,32 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeQB = exports.updateQB = exports.readQB = exports.createQB = exports.rowToDeviceData = void 0;
-const db_1 = require("../../db");
-const rowToDeviceData = (row) => ({
+import { fromDateISO, toDateISO } from '../../db/index.js';
+export const rowToDeviceData = (row) => ({
     sessionId: row.sessionId,
     userAgent: row.userAgent,
     ipAddress: row.ipAddress,
-    lastSeenAt: (0, db_1.fromDateISO)(row.lastSeenAt),
+    lastSeenAt: fromDateISO(row.lastSeenAt),
 });
-exports.rowToDeviceData = rowToDeviceData;
-const createQB = (db, deviceId, { sessionId, userAgent, ipAddress, lastSeenAt }) => db.db.insertInto('device').values({
+export const createQB = (db, deviceId, { sessionId, userAgent, ipAddress, lastSeenAt }) => db.db.insertInto('device').values({
     id: deviceId,
     sessionId,
     userAgent,
     ipAddress,
-    lastSeenAt: (0, db_1.toDateISO)(lastSeenAt),
+    lastSeenAt: toDateISO(lastSeenAt),
 });
-exports.createQB = createQB;
-const readQB = (db, deviceId) => db.db.selectFrom('device').where('id', '=', deviceId).selectAll();
-exports.readQB = readQB;
-const updateQB = (db, deviceId, { sessionId, userAgent, ipAddress, lastSeenAt }) => db.db
+export const readQB = (db, deviceId) => db.db.selectFrom('device').where('id', '=', deviceId).selectAll();
+export const updateQB = (db, deviceId, { sessionId, userAgent, ipAddress, lastSeenAt }) => db.db
     .updateTable('device')
     .if(sessionId != null, (qb) => qb.set({ sessionId }))
     .if(userAgent != null, (qb) => qb.set({ userAgent }))
     .if(ipAddress != null, (qb) => qb.set({ ipAddress }))
-    .if(lastSeenAt != null, (qb) => qb.set({ lastSeenAt: (0, db_1.toDateISO)(lastSeenAt) }))
+    .if(lastSeenAt != null, (qb) => qb.set({ lastSeenAt: toDateISO(lastSeenAt) }))
     .where('id', '=', deviceId);
-exports.updateQB = updateQB;
-const removeQB = (db, deviceId) => db.db.deleteFrom('device').where('id', '=', deviceId);
-exports.removeQB = removeQB;
+export const removeQB = (db, deviceId) => db.db.deleteFrom('device').where('id', '=', deviceId);
 //# sourceMappingURL=device.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/device.ts"],"names":[],"mappings":";;;AAEA,iCAAiD;AAG1C,MAAM,eAAe,GAAG,CAC7B,GAAmC,EACvB,EAAE,CAAC,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,UAAU,EAAE,IAAA,gBAAW,EAAC,GAAG,CAAC,UAAU,CAAC;CACxC,CAAC,CAAA;AAPW,QAAA,eAAe,mBAO1B;AAEK,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,QAAkB,EAClB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAc,EAC3D,EAAE,CACF,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAChC,EAAE,EAAE,QAAQ;IACZ,SAAS;IACT,SAAS;IACT,SAAS;IACT,UAAU,EAAE,IAAA,cAAS,EAAC,UAAU,CAAC;CAClC,CAAC,CAAA;AAXS,QAAA,QAAQ,YAWjB;AAEG,MAAM,MAAM,GAAG,CAAC,EAAa,EAAE,QAAkB,EAAE,EAAE,CAC1D,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAA;AADtD,QAAA,MAAM,UACgD;AAE5D,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,QAAkB,EAClB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAuB,EACpE,EAAE,CACF,EAAE,CAAC,EAAE;KACF,WAAW,CAAC,QAAQ,CAAC;KACrB,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAC7B,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,IAAA,cAAS,EAAC,UAAW,CAAC,EAAE,CAAC,CAC/C;KACA,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;AAblB,QAAA,QAAQ,YAaU;AAExB,MAAM,QAAQ,GAAG,CAAC,EAAa,EAAE,QAAkB,EAAE,EAAE,CAC5D,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;AAD1C,QAAA,QAAQ,YACkC","sourcesContent":["import { Selectable } from 'kysely'\nimport { DeviceData, DeviceId } from '@atproto/oauth-provider'\nimport { fromDateISO, toDateISO } from '../../db'\nimport { AccountDb, Device } from '../db'\n\nexport const rowToDeviceData = (\n  row: Omit<Selectable<Device>, 'id'>,\n): DeviceData => ({\n  sessionId: row.sessionId,\n  userAgent: row.userAgent,\n  ipAddress: row.ipAddress,\n  lastSeenAt: fromDateISO(row.lastSeenAt),\n})\n\nexport const createQB = (\n  db: AccountDb,\n  deviceId: DeviceId,\n  { sessionId, userAgent, ipAddress, lastSeenAt }: DeviceData,\n) =>\n  db.db.insertInto('device').values({\n    id: deviceId,\n    sessionId,\n    userAgent,\n    ipAddress,\n    lastSeenAt: toDateISO(lastSeenAt),\n  })\n\nexport const readQB = (db: AccountDb, deviceId: DeviceId) =>\n  db.db.selectFrom('device').where('id', '=', deviceId).selectAll()\n\nexport const updateQB = (\n  db: AccountDb,\n  deviceId: DeviceId,\n  { sessionId, userAgent, ipAddress, lastSeenAt }: Partial<DeviceData>,\n) =>\n  db.db\n    .updateTable('device')\n    .if(sessionId != null, (qb) => qb.set({ sessionId }))\n    .if(userAgent != null, (qb) => qb.set({ userAgent }))\n    .if(ipAddress != null, (qb) => qb.set({ ipAddress }))\n    .if(lastSeenAt != null, (qb) =>\n      qb.set({ lastSeenAt: toDateISO(lastSeenAt!) }),\n    )\n    .where('id', '=', deviceId)\n\nexport const removeQB = (db: AccountDb, deviceId: DeviceId) =>\n  db.db.deleteFrom('device').where('id', '=', deviceId)\n"]}
+{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/device.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAG1D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAAmC,EACvB,EAAE,CAAC,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,SAAS,EAAE,GAAG,CAAC,SAAS;IACxB,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;CACxC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,QAAkB,EAClB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAc,EAC3D,EAAE,CACF,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAChC,EAAE,EAAE,QAAQ;IACZ,SAAS;IACT,SAAS;IACT,SAAS;IACT,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC;CAClC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,EAAa,EAAE,QAAkB,EAAE,EAAE,CAC1D,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,SAAS,EAAE,CAAA;AAEnE,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,EAAa,EACb,QAAkB,EAClB,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAuB,EACpE,EAAE,CACF,EAAE,CAAC,EAAE;KACF,WAAW,CAAC,QAAQ,CAAC;KACrB,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;KACpD,EAAE,CAAC,UAAU,IAAI,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAC7B,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,SAAS,CAAC,UAAW,CAAC,EAAE,CAAC,CAC/C;KACA,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA;AAE/B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAa,EAAE,QAAkB,EAAE,EAAE,CAC5D,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAA","sourcesContent":["import { Selectable } from 'kysely'\nimport { DeviceData, DeviceId } from '@atproto/oauth-provider'\nimport { fromDateISO, toDateISO } from '../../db/index.js'\nimport { AccountDb, Device } from '../db/index.js'\n\nexport const rowToDeviceData = (\n  row: Omit<Selectable<Device>, 'id'>,\n): DeviceData => ({\n  sessionId: row.sessionId,\n  userAgent: row.userAgent,\n  ipAddress: row.ipAddress,\n  lastSeenAt: fromDateISO(row.lastSeenAt),\n})\n\nexport const createQB = (\n  db: AccountDb,\n  deviceId: DeviceId,\n  { sessionId, userAgent, ipAddress, lastSeenAt }: DeviceData,\n) =>\n  db.db.insertInto('device').values({\n    id: deviceId,\n    sessionId,\n    userAgent,\n    ipAddress,\n    lastSeenAt: toDateISO(lastSeenAt),\n  })\n\nexport const readQB = (db: AccountDb, deviceId: DeviceId) =>\n  db.db.selectFrom('device').where('id', '=', deviceId).selectAll()\n\nexport const updateQB = (\n  db: AccountDb,\n  deviceId: DeviceId,\n  { sessionId, userAgent, ipAddress, lastSeenAt }: Partial<DeviceData>,\n) =>\n  db.db\n    .updateTable('device')\n    .if(sessionId != null, (qb) => qb.set({ sessionId }))\n    .if(userAgent != null, (qb) => qb.set({ userAgent }))\n    .if(ipAddress != null, (qb) => qb.set({ ipAddress }))\n    .if(lastSeenAt != null, (qb) =>\n      qb.set({ lastSeenAt: toDateISO(lastSeenAt!) }),\n    )\n    .where('id', '=', deviceId)\n\nexport const removeQB = (db: AccountDb, deviceId: DeviceId) =>\n  db.db.deleteFrom('device').where('id', '=', deviceId)\n"]}

package/dist/account-manager/helpers/email-token.d.ts

@@ -1,5 +1,5 @@
 import { DidString } from '@atproto/lex';
-import { AccountDb, EmailTokenPurpose } from '../db';
+import { AccountDb, EmailTokenPurpose } from '../db/index.js';
 export declare const createEmailToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose) => Promise<string>;
 export declare const deleteEmailToken: (db: AccountDb, did: DidString, purpose: EmailTokenPurpose) => Promise<void>;
 export declare const deleteAllEmailTokens: (db: AccountDb, did: DidString) => Promise<void>;

package/dist/account-manager/helpers/email-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAA;AAG/D,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAEpD,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,KACzB,OAAO,CAAC,MAAM,CAYhB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,kBAQ3B,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,IAAI,SAAS,EAAE,KAAK,SAAS,kBAIvE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,EAC1B,OAAO,MAAM,EACb,sBAA2B,kBAgB5B,CAAA;AAED,eAAO,MAAM,0BAA0B,GACrC,IAAI,SAAS,EACb,SAAS,iBAAiB,EAC1B,OAAO,MAAM,EACb,sBAA2B,KAC1B,OAAO,CAAC,SAAS,CAenB,CAAA"}
+{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAyB,MAAM,cAAc,CAAA;AAG/D,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE7D,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,KACzB,OAAO,CAAC,MAAM,CAYhB,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,kBAQ3B,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,IAAI,SAAS,EAAE,KAAK,SAAS,kBAIvE,CAAA;AAED,eAAO,MAAM,gBAAgB,GAC3B,IAAI,SAAS,EACb,KAAK,SAAS,EACd,SAAS,iBAAiB,EAC1B,OAAO,MAAM,EACb,sBAA2B,kBAgB5B,CAAA;AAED,eAAO,MAAM,0BAA0B,GACrC,IAAI,SAAS,EACb,SAAS,iBAAiB,EAC1B,OAAO,MAAM,EACb,sBAA2B,KAC1B,OAAO,CAAC,SAAS,CAenB,CAAA"}

package/dist/account-manager/helpers/email-token.js

@@ -1,32 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertValidTokenAndFindDid = exports.assertValidToken = exports.deleteAllEmailTokens = exports.deleteEmailToken = exports.createEmailToken = void 0;
-const common_1 = require("@atproto/common");
-const lex_1 = require("@atproto/lex");
-const xrpc_server_1 = require("@atproto/xrpc-server");
-const util_1 = require("../../api/com/atproto/server/util");
-const createEmailToken = async (db, did, purpose) => {
-    const token = (0, util_1.getRandomToken)().toUpperCase();
-    const now = (0, lex_1.currentDatetimeString)();
+import { MINUTE, lessThanAgoMs } from '@atproto/common';
+import { currentDatetimeString } from '@atproto/lex';
+import { InvalidRequestError } from '@atproto/xrpc-server';
+import { getRandomToken } from '../../api/com/atproto/server/util.js';
+export const createEmailToken = async (db, did, purpose) => {
+    const token = getRandomToken().toUpperCase();
+    const now = currentDatetimeString();
     await db.executeWithRetry(db.db
         .insertInto('email_token')
         .values({ purpose, did, token, requestedAt: now })
         .onConflict((oc) => oc.columns(['purpose', 'did']).doUpdateSet({ token, requestedAt: now })));
     return token;
 };
-exports.createEmailToken = createEmailToken;
-const deleteEmailToken = async (db, did, purpose) => {
+export const deleteEmailToken = async (db, did, purpose) => {
     await db.executeWithRetry(db.db
         .deleteFrom('email_token')
         .where('did', '=', did)
         .where('purpose', '=', purpose));
 };
-exports.deleteEmailToken = deleteEmailToken;
-const deleteAllEmailTokens = async (db, did) => {
+export const deleteAllEmailTokens = async (db, did) => {
     await db.executeWithRetry(db.db.deleteFrom('email_token').where('did', '=', did));
 };
-exports.deleteAllEmailTokens = deleteAllEmailTokens;
-const assertValidToken = async (db, did, purpose, token, expirationLen = 15 * common_1.MINUTE) => {
+export const assertValidToken = async (db, did, purpose, token, expirationLen = 15 * MINUTE) => {
     const res = await db.db
         .selectFrom('email_token')
         .selectAll()
@@ -35,15 +29,14 @@ const assertValidToken = async (db, did, purpose, token, expirationLen = 15 * co
         .where('token', '=', token.toUpperCase())
         .executeTakeFirst();
     if (!res) {
-        throw new xrpc_server_1.InvalidRequestError('Token is invalid', 'InvalidToken');
+        throw new InvalidRequestError('Token is invalid', 'InvalidToken');
     }
-    const expired = !(0, common_1.lessThanAgoMs)(new Date(res.requestedAt), expirationLen);
+    const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen);
     if (expired) {
-        throw new xrpc_server_1.InvalidRequestError('Token is expired', 'ExpiredToken');
+        throw new InvalidRequestError('Token is expired', 'ExpiredToken');
     }
 };
-exports.assertValidToken = assertValidToken;
-const assertValidTokenAndFindDid = async (db, purpose, token, expirationLen = 15 * common_1.MINUTE) => {
+export const assertValidTokenAndFindDid = async (db, purpose, token, expirationLen = 15 * MINUTE) => {
     const res = await db.db
         .selectFrom('email_token')
         .select(['did', 'requestedAt'])
@@ -51,13 +44,12 @@ const assertValidTokenAndFindDid = async (db, purpose, token, expirationLen = 15
         .where('token', '=', token.toUpperCase())
         .executeTakeFirst();
     if (!res) {
-        throw new xrpc_server_1.InvalidRequestError('Token is invalid', 'InvalidToken');
+        throw new InvalidRequestError('Token is invalid', 'InvalidToken');
     }
-    const expired = !(0, common_1.lessThanAgoMs)(new Date(res.requestedAt), expirationLen);
+    const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen);
     if (expired) {
-        throw new xrpc_server_1.InvalidRequestError('Token is expired', 'ExpiredToken');
+        throw new InvalidRequestError('Token is expired', 'ExpiredToken');
     }
     return res.did;
 };
-exports.assertValidTokenAndFindDid = assertValidTokenAndFindDid;
 //# sourceMappingURL=email-token.js.map

package/dist/account-manager/helpers/email-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE, lessThanAgoMs } from '@atproto/common'\nimport { DidString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { getRandomToken } from '../../api/com/atproto/server/util'\nimport { AccountDb, EmailTokenPurpose } from '../db'\n\nexport const createEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n): Promise<string> => {\n  const token = getRandomToken().toUpperCase()\n  const now = currentDatetimeString()\n  await db.executeWithRetry(\n    db.db\n      .insertInto('email_token')\n      .values({ purpose, did, token, requestedAt: now })\n      .onConflict((oc) =>\n        oc.columns(['purpose', 'did']).doUpdateSet({ token, requestedAt: now }),\n      ),\n  )\n  return token\n}\n\nexport const deleteEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('email_token')\n      .where('did', '=', did)\n      .where('purpose', '=', purpose),\n  )\n}\n\nexport const deleteAllEmailTokens = async (db: AccountDb, did: DidString) => {\n  await db.executeWithRetry(\n    db.db.deleteFrom('email_token').where('did', '=', did),\n  )\n}\n\nexport const assertValidToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n) => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .selectAll()\n    .where('purpose', '=', purpose)\n    .where('did', '=', did)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n}\n\nexport const assertValidTokenAndFindDid = async (\n  db: AccountDb,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n): Promise<DidString> => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .select(['did', 'requestedAt'])\n    .where('purpose', '=', purpose)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n  return res.did\n}\n"]}
+{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/email-token.ts"],"names":[],"mappings":"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","sourcesContent":["import { MINUTE, lessThanAgoMs } from '@atproto/common'\nimport { DidString, currentDatetimeString } from '@atproto/lex'\nimport { InvalidRequestError } from '@atproto/xrpc-server'\nimport { getRandomToken } from '../../api/com/atproto/server/util.js'\nimport { AccountDb, EmailTokenPurpose } from '../db/index.js'\n\nexport const createEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n): Promise<string> => {\n  const token = getRandomToken().toUpperCase()\n  const now = currentDatetimeString()\n  await db.executeWithRetry(\n    db.db\n      .insertInto('email_token')\n      .values({ purpose, did, token, requestedAt: now })\n      .onConflict((oc) =>\n        oc.columns(['purpose', 'did']).doUpdateSet({ token, requestedAt: now }),\n      ),\n  )\n  return token\n}\n\nexport const deleteEmailToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n) => {\n  await db.executeWithRetry(\n    db.db\n      .deleteFrom('email_token')\n      .where('did', '=', did)\n      .where('purpose', '=', purpose),\n  )\n}\n\nexport const deleteAllEmailTokens = async (db: AccountDb, did: DidString) => {\n  await db.executeWithRetry(\n    db.db.deleteFrom('email_token').where('did', '=', did),\n  )\n}\n\nexport const assertValidToken = async (\n  db: AccountDb,\n  did: DidString,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n) => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .selectAll()\n    .where('purpose', '=', purpose)\n    .where('did', '=', did)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n}\n\nexport const assertValidTokenAndFindDid = async (\n  db: AccountDb,\n  purpose: EmailTokenPurpose,\n  token: string,\n  expirationLen = 15 * MINUTE,\n): Promise<DidString> => {\n  const res = await db.db\n    .selectFrom('email_token')\n    .select(['did', 'requestedAt'])\n    .where('purpose', '=', purpose)\n    .where('token', '=', token.toUpperCase())\n    .executeTakeFirst()\n  if (!res) {\n    throw new InvalidRequestError('Token is invalid', 'InvalidToken')\n  }\n  const expired = !lessThanAgoMs(new Date(res.requestedAt), expirationLen)\n  if (expired) {\n    throw new InvalidRequestError('Token is expired', 'ExpiredToken')\n  }\n  return res.did\n}\n"]}

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';
+import { AccountDb } 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,7 @@ 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/cjs/parser/select-parser").SelectAllQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, import("kysely").AliasedQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "invite_code">, "invite_code", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../db").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/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "invite_code_use">, "invite_code_use", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "invite_code_use">, "invite_code_use", import("kysely").AliasedRawBuilder<number, "count">>, "uses">>, "codes">>, "codes", {}, "codes">;
+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 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,OAAO,CAAA;AAE7C,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,yjCAkBhD,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,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"}