@atproto/pds 0.4.176 → 0.4.177

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atproto/pds
 
+## 0.4.177
+
+### Patch Changes
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove un-necessary concurrency when making sqlite DB updates
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Add logging on (some) blob store operation failures
+
+- [#3881](https://github.com/bluesky-social/atproto/pull/3881) [`a5b20f021`](https://github.com/bluesky-social/atproto/commit/a5b20f0218bd13e3c5d7681de2263dcc850b7523) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Add expanded moderation report reasons as outlined in
+  [RFC-0009](https://github.com/bluesky-social/proposals/tree/main/0009-mod-report-granularity)
+
+- [#4162](https://github.com/bluesky-social/atproto/pull/4162) [`6d7bf4bff`](https://github.com/bluesky-social/atproto/commit/6d7bf4bffc3fee7a1fca488e6b75699385a04f37) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove old, never resolved, lexicons from the database
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Use a dedicated logger (named `pds:blob-store`) for `BlobStore` operations
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Fully read CAR stream before starting transaction in `importRepo`, resulting in shorter transactions
+
+- Updated dependencies [[`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`a5b20f021`](https://github.com/bluesky-social/atproto/commit/a5b20f0218bd13e3c5d7681de2263dcc850b7523), [`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`8914f9abd`](https://github.com/bluesky-social/atproto/commit/8914f9abde2059c551d7e4c8d104227986098b82), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099)]:
+  - @atproto/oauth-scopes@0.2.0
+  - @atproto/aws@0.2.29
+  - @atproto/repo@0.8.9
+  - @atproto/oauth-provider@0.12.0
+  - @atproto/api@0.16.8
+  - @atproto-labs/simple-store-redis@0.0.1
+  - @atproto/lexicon-resolver@0.2.1
+  - @atproto/common@0.4.12
+  - @atproto/identity@0.4.9
+  - @atproto/lexicon@0.5.1
+  - @atproto/crypto@0.4.4
+  - @atproto/xrpc-server@0.9.5
+  - @atproto/xrpc@0.7.5
+  - @atproto-labs/xrpc-utils@0.0.22
+
 ## 0.4.176
 
 ### Patch Changes

package/dist/account-manager/db/migrations/007-lexicon-failures-index.d.ts

@@ -0,0 +1,4 @@
+import { Kysely } from 'kysely';
+export declare function up(db: Kysely<unknown>): Promise<void>;
+export declare function down(db: Kysely<unknown>): Promise<void>;
+//# sourceMappingURL=007-lexicon-failures-index.d.ts.map

package/dist/account-manager/db/migrations/007-lexicon-failures-index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"007-lexicon-failures-index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/007-lexicon-failures-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,QAAQ,CAAA;AAEpC,wBAAsB,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAO3D;AAED,wBAAsB,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7D"}

package/dist/account-manager/db/migrations/007-lexicon-failures-index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.up = up;
+exports.down = down;
+const kysely_1 = require("kysely");
+async function up(db) {
+    await db.schema
+        .createIndex('lexicon_failures_idx')
+        .on('lexicon')
+        // https://github.com/kysely-org/kysely/issues/302
+        .expression((0, kysely_1.sql) `"updatedAt" DESC) WHERE ("lexicon" is NULL`)
+        .execute();
+}
+async function down(db) {
+    await db.schema.dropIndex('lexicon_failures_idx').execute();
+}
+//# sourceMappingURL=007-lexicon-failures-index.js.map

package/dist/account-manager/db/migrations/007-lexicon-failures-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"007-lexicon-failures-index.js","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/007-lexicon-failures-index.ts"],"names":[],"mappings":";;AAEA,gBAOC;AAED,oBAEC;AAbD,mCAAoC;AAE7B,KAAK,UAAU,EAAE,CAAC,EAAmB;IAC1C,MAAM,EAAE,CAAC,MAAM;SACZ,WAAW,CAAC,sBAAsB,CAAC;SACnC,EAAE,CAAC,SAAS,CAAC;QACd,kDAAkD;SACjD,UAAU,CAAC,IAAA,YAAG,EAAA,4CAA4C,CAAC;SAC3D,OAAO,EAAE,CAAA;AACd,CAAC;AAEM,KAAK,UAAU,IAAI,CAAC,EAAmB;IAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,OAAO,EAAE,CAAA;AAC7D,CAAC"}

package/dist/account-manager/db/migrations/index.d.ts

@@ -4,6 +4,7 @@ import * as mig003 from './003-privileged-app-passwords';
 import * as mig004 from './004-oauth';
 import * as mig005 from './005-oauth-account-management';
 import * as mig006 from './006-oauth-permission-sets';
+import * as mig007 from './007-lexicon-failures-index';
 declare const _default: {
     '001': typeof mig001;
     '002': typeof mig002;
@@ -11,6 +12,7 @@ declare const _default: {
     '004': typeof mig004;
     '005': typeof mig005;
     '006': typeof mig006;
+    '007': typeof mig007;
 };
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/account-manager/db/migrations/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,YAAY,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAA;;;;;;;;;AAErD,wBAOC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,YAAY,CAAA;AACpC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,gCAAgC,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAA;;;;;;;;;;AAEtD,wBAQC"}

package/dist/account-manager/db/migrations/index.js

@@ -39,6 +39,7 @@ const mig003 = __importStar(require("./003-privileged-app-passwords"));
 const mig004 = __importStar(require("./004-oauth"));
 const mig005 = __importStar(require("./005-oauth-account-management"));
 const mig006 = __importStar(require("./006-oauth-permission-sets"));
+const mig007 = __importStar(require("./007-lexicon-failures-index"));
 exports.default = {
     '001': mig001,
     '002': mig002,
@@ -46,5 +47,6 @@ exports.default = {
     '004': mig004,
     '005': mig005,
     '006': mig006,
+    '007': mig007,
 };
 //# sourceMappingURL=index.js.map

package/dist/account-manager/db/migrations/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoC;AACpC,mEAAoD;AACpD,uEAAwD;AACxD,oDAAqC;AACrC,uEAAwD;AACxD,oEAAqD;AAErD,kBAAe;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/account-manager/db/migrations/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAoC;AACpC,mEAAoD;AACpD,uEAAwD;AACxD,oDAAqC;AACrC,uEAAwD;AACxD,oEAAqD;AACrD,qEAAsD;AAEtD,kBAAe;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,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,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAErD,OAAO,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAE1C,wBAAsB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,iBAiB1E;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":"AACA,OAAO,EAA6B,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAEhF,OAAO,EAAE,SAAS,EAAW,MAAM,OAAO,CAAA;AAE1C,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"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.upsert = upsert;
 exports.find = find;
 exports.remove = remove;
+const oauth_provider_1 = require("@atproto/oauth-provider");
 const db_1 = require("../../db");
 async function upsert(db, nsid, data) {
     const updates = {
@@ -18,6 +19,12 @@ async function upsert(db, nsid, data) {
         .insertInto('lexicon')
         .values({ ...updates, nsid })
         .onConflict((oc) => oc.column('nsid').doUpdateSet(updates)));
+    // Garbage collection: remove old, never resolved, lexicons.
+    // Uses "lexicon_failures_idx"
+    await db.executeWithRetry(db.db
+        .deleteFrom('lexicon')
+        .where('lexicon', 'is', null)
+        .where('updatedAt', '<', (0, db_1.toDateISO)(new Date(Date.now() - oauth_provider_1.LEXICON_REFRESH_FREQUENCY))));
 }
 async function find(db, nsid) {
     const row = await db.db

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":";;AAKA,wBAiBC;AAED,oBAoBC;AAED,wBAEC;AA9CD,iCAAmE;AAG5D,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY,EAAE,IAAiB;IACzE,MAAM,OAAO,GAAsC;QACjD,GAAG,IAAI;QACP,SAAS,EAAE,IAAA,cAAS,EAAC,IAAI,CAAC,SAAS,CAAC;QACpC,SAAS,EAAE,IAAA,cAAS,EAAC,IAAI,CAAC,SAAS,CAAC;QACpC,eAAe,EAAE,IAAI,CAAC,eAAe;YACnC,CAAC,CAAC,IAAA,cAAS,EAAC,IAAI,CAAC,eAAe,CAAC;YACjC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,WAAM,EAAC,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;AACH,CAAC;AAEM,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,IAAA,gBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;QACrC,SAAS,EAAE,IAAA,gBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;QACrC,eAAe,EAAE,GAAG,CAAC,eAAe;YAClC,CAAC,CAAC,IAAA,gBAAW,EAAC,GAAG,CAAC,eAAe,CAAC;YAClC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,aAAQ,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;AACH,CAAC;AAEM,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"}
+{"version":3,"file":"lexicon.js","sourceRoot":"","sources":["../../../src/account-manager/helpers/lexicon.ts"],"names":[],"mappings":";;AAKA,wBA8BC;AAED,oBAoBC;AAED,wBAEC;AA5DD,4DAAgF;AAChF,iCAAmE;AAG5D,KAAK,UAAU,MAAM,CAAC,EAAa,EAAE,IAAY,EAAE,IAAiB;IACzE,MAAM,OAAO,GAAsC;QACjD,GAAG,IAAI;QACP,SAAS,EAAE,IAAA,cAAS,EAAC,IAAI,CAAC,SAAS,CAAC;QACpC,SAAS,EAAE,IAAA,cAAS,EAAC,IAAI,CAAC,SAAS,CAAC;QACpC,eAAe,EAAE,IAAI,CAAC,eAAe;YACnC,CAAC,CAAC,IAAA,cAAS,EAAC,IAAI,CAAC,eAAe,CAAC;YACjC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,WAAM,EAAC,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,IAAA,cAAS,EAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,0CAAyB,CAAC,CAAC,CAC5D,CACJ,CAAA;AACH,CAAC;AAEM,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,IAAA,gBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;QACrC,SAAS,EAAE,IAAA,gBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;QACrC,eAAe,EAAE,GAAG,CAAC,eAAe;YAClC,CAAC,CAAC,IAAA,gBAAW,EAAC,GAAG,CAAC,eAAe,CAAC;YAClC,CAAC,CAAC,IAAI;QACR,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,aAAQ,EAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;KACpD,CAAA;AACH,CAAC;AAEM,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"}

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

@@ -58,7 +58,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -90,7 +90,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -122,7 +122,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -154,7 +154,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -186,7 +186,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -218,7 +218,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -250,7 +250,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -282,7 +282,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -314,7 +314,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -346,7 +346,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -378,7 +378,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -410,7 +410,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -442,7 +442,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -474,7 +474,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -506,7 +506,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -538,7 +538,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -570,7 +570,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -602,7 +602,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -634,7 +634,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -666,7 +666,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -698,7 +698,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -730,7 +730,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -762,7 +762,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -794,7 +794,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -826,7 +826,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -858,7 +858,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -890,7 +890,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -922,7 +922,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>, import("kysely/dist/cjs/util/type-utils").MergePartial<import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -954,7 +954,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -986,7 +986,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>, import("kysely/dist/cjs/util/type-utils").MergePartial<Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -1018,7 +1018,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">, Partial<Omit<{}, never>> & Partial<Omit<Partial<Omit<{}, never>>, never>> & import("kysely").Selection<{
     lexicon: import("../db").Lexicon;
     account: import("kysely/dist/cjs/util/type-utils").Nullable<import("../db").Account>;
     token: Token;
@@ -1050,7 +1050,7 @@ export declare const findByQB: (db: AccountDb, search: {
     used_refresh_token: import("../db").UsedRefreshToken;
     account_device: import("../db").AccountDevice;
     authorized_client: import("../db/schema/authorized-client").AuthorizedClient;
-}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.updatedAt" | "token.details" | "token.scope" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>>>>;
+}, "account" | "token" | "actor", "token.did" | "token.code" | "token.id" | "token.createdAt" | "token.expiresAt" | "token.scope" | "token.updatedAt" | "token.details" | "token.deviceId" | "token.clientId" | "token.clientAuth" | "token.parameters" | "token.tokenId" | "token.currentRefreshToken">>>>>>>;
 export declare const removeByDidQB: (db: AccountDb, did: string) => import("kysely").DeleteQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "token">, "token", import("kysely").DeleteResult>;
 export declare const rotateQB: (db: AccountDb, id: number, newTokenId: TokenId, newRefreshToken: RefreshToken, newData: NewTokenData) => import("kysely").UpdateQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "token">, "token", "token", import("kysely").UpdateResult>;
 export declare const removeQB: (db: AccountDb, tokenId: TokenId) => import("kysely").DeleteQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../db").DatabaseSchema, "token">, "token", import("kysely").DeleteResult>;

package/dist/account-manager/scope-reference-getter.d.ts

@@ -0,0 +1,14 @@
+import Redis from 'ioredis';
+import { Agent } from '@atproto/api';
+import { OAuthScope } from '@atproto/oauth-provider';
+import { CachedGetter, GetterOptions } from '@atproto-labs/simple-store';
+declare const PREFIX = "ref:";
+type ScopeReference = `${typeof PREFIX}${string}`;
+export declare class ScopeReferenceGetter extends CachedGetter<ScopeReference, OAuthScope> {
+    protected readonly entryway: Agent;
+    constructor(entryway: Agent, redis?: Redis);
+    protected fetchDereferencedScope(scope: ScopeReference, options?: GetterOptions): Promise<OAuthScope>;
+    dereference(scope?: OAuthScope): Promise<undefined | OAuthScope>;
+}
+export {};
+//# sourceMappingURL=scope-reference-getter.d.ts.map

package/dist/account-manager/scope-reference-getter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope-reference-getter.d.ts","sourceRoot":"","sources":["../../src/account-manager/scope-reference-getter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,EAAE,KAAK,EAAkC,MAAM,cAAc,CAAA;AAEpE,OAAO,EAAqB,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEvE,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAKxE,QAAA,MAAM,MAAM,SAAS,CAAA;AAErB,KAAK,cAAc,GAAG,GAAG,OAAO,MAAM,GAAG,MAAM,EAAE,CAAA;AAMjD,qBAAa,oBAAqB,SAAQ,YAAY,CACpD,cAAc,EACd,UAAU,CACX;IAEG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK;gBAAf,QAAQ,EAAE,KAAK,EAClC,KAAK,CAAC,EAAE,KAAK;cA0BC,sBAAsB,CACpC,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,UAAU,CAAC;IAiBhB,WAAW,CAAC,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,GAAG,UAAU,CAAC;CAKvE"}