@cat-factory/worker 0.225.2 → 0.226.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/infrastructure/repositories/D1DirectoryRepository.d.ts +2 -0
- package/dist/infrastructure/repositories/D1DirectoryRepository.d.ts.map +1 -1
- package/dist/infrastructure/repositories/D1DirectoryRepository.js +25 -12
- package/dist/infrastructure/repositories/D1DirectoryRepository.js.map +1 -1
- package/dist/infrastructure/repositories/D1UserRepository.d.ts +1 -1
- package/dist/infrastructure/repositories/D1UserRepository.d.ts.map +1 -1
- package/dist/infrastructure/repositories/D1UserRepository.js +16 -4
- package/dist/infrastructure/repositories/D1UserRepository.js.map +1 -1
- package/dist/infrastructure/repositories/directoryFeed.d.ts +5 -0
- package/dist/infrastructure/repositories/directoryFeed.d.ts.map +1 -1
- package/dist/infrastructure/repositories/directoryFeed.js +12 -0
- package/dist/infrastructure/repositories/directoryFeed.js.map +1 -1
- package/package.json +19 -19
|
@@ -13,6 +13,8 @@ export declare class D1DirectoryRepository implements DirectoryRepository {
|
|
|
13
13
|
pruneChanges(before: number): Promise<number>;
|
|
14
14
|
listWorkspaces(accountId: string, after: string | null, limit: number, workspaceIds: string[] | null): Promise<DirectoryWorkspace[]>;
|
|
15
15
|
listUsers(accountId: string, after: string | null, limit: number): Promise<DirectoryUser[]>;
|
|
16
|
+
/** The host-account identities of these users, every `IN` chunk in one round trip. */
|
|
17
|
+
private hostIdentitiesOf;
|
|
16
18
|
listAccountMemberships(accountId: string, after: string | null, limit: number): Promise<DirectoryAccountMembership[]>;
|
|
17
19
|
listWorkspaceMemberships(accountId: string, after: WorkspaceMembershipKey | null, limit: number, workspaceIds: string[] | null): Promise<DirectoryWorkspaceMembership[]>;
|
|
18
20
|
listRepos(accountId: string, after: DirectoryRepoKey | null, limit: number, workspaceIds: string[] | null): Promise<DirectoryRepo[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1DirectoryRepository.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1DirectoryRepository.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"D1DirectoryRepository.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1DirectoryRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { directoryChangeFromRow, WORKSPACE_DIRECTORY_ENTITY_TYPES, } from '@cat-factory/kernel';
|
|
1
|
+
import { DIRECTORY_ACCOUNT_PROVIDERS, directoryChangeFromRow, WORKSPACE_DIRECTORY_ENTITY_TYPES, withDirectoryAccounts, } from '@cat-factory/kernel';
|
|
2
2
|
import {} from '@cat-factory/contracts';
|
|
3
3
|
import { chunkForIn } from './chunk';
|
|
4
4
|
import { parseRoles } from './D1MembershipRepository';
|
|
@@ -134,7 +134,19 @@ export class D1DirectoryRepository {
|
|
|
134
134
|
ORDER BY u.id ASC LIMIT ?`)
|
|
135
135
|
.bind(accountId, after ?? '', limit)
|
|
136
136
|
.all();
|
|
137
|
-
|
|
137
|
+
const users = results.map(toUser);
|
|
138
|
+
return withDirectoryAccounts(users, await this.hostIdentitiesOf(users.map((user) => user.id)));
|
|
139
|
+
}
|
|
140
|
+
/** The host-account identities of these users, every `IN` chunk in one round trip. */
|
|
141
|
+
async hostIdentitiesOf(userIds) {
|
|
142
|
+
if (userIds.length === 0)
|
|
143
|
+
return [];
|
|
144
|
+
const providers = DIRECTORY_ACCOUNT_PROVIDERS.map(() => '?').join(', ');
|
|
145
|
+
const reads = await this.db.batch(chunkForIn(userIds).map((chunk) => this.db
|
|
146
|
+
.prepare(`SELECT user_id, provider, subject, metadata FROM user_identities
|
|
147
|
+
WHERE user_id IN (${chunk.map(() => '?').join(', ')}) AND provider IN (${providers})`)
|
|
148
|
+
.bind(...chunk, ...DIRECTORY_ACCOUNT_PROVIDERS)));
|
|
149
|
+
return reads.flatMap(({ results }) => results);
|
|
138
150
|
}
|
|
139
151
|
async listAccountMemberships(accountId, after, limit) {
|
|
140
152
|
const { results } = await this.db
|
|
@@ -183,17 +195,18 @@ export class D1DirectoryRepository {
|
|
|
183
195
|
return out;
|
|
184
196
|
}
|
|
185
197
|
async getUsers(accountId, ids) {
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
198
|
+
if (ids.length === 0)
|
|
199
|
+
return [];
|
|
200
|
+
// The ids are known up front, so the identities are read beside the users rather than after.
|
|
201
|
+
const [reads, identities] = await Promise.all([
|
|
202
|
+
this.db.batch(chunkForIn(ids).map((chunk) => this.db
|
|
189
203
|
.prepare(`SELECT u.id, u.name, u.email, u.avatar_url FROM users u
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
.bind(accountId, ...chunk)
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
}
|
|
196
|
-
return out;
|
|
204
|
+
JOIN memberships m ON m.user_id = u.id
|
|
205
|
+
WHERE m.account_id = ? AND u.id IN (${chunk.map(() => '?').join(', ')})`)
|
|
206
|
+
.bind(accountId, ...chunk))),
|
|
207
|
+
this.hostIdentitiesOf(ids),
|
|
208
|
+
]);
|
|
209
|
+
return withDirectoryAccounts(reads.flatMap(({ results }) => results.map(toUser)), identities);
|
|
197
210
|
}
|
|
198
211
|
async getAccountMemberships(accountId, userIds) {
|
|
199
212
|
const out = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1DirectoryRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1DirectoryRepository.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"D1DirectoryRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1DirectoryRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type IdentityProvider, type UserIdentityRecord, type UserRecord, type UserRepository } from '@cat-factory/kernel';
|
|
2
2
|
import type { D1Database } from '@cloudflare/workers-types';
|
|
3
3
|
/** D1-backed store of canonical users + their linked login identities. */
|
|
4
4
|
export declare class D1UserRepository implements UserRepository {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1UserRepository.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"D1UserRepository.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1UserRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EAErB,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAyC3D,0EAA0E;AAC1E,qBAAa,gBAAiB,YAAW,cAAc;IACrD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;IAE/B,YAAY,EAAE,EAAE,EAAE,EAAE;QAAE,EAAE,EAAE,UAAU,CAAA;KAAE,EAErC;IAEK,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAGhD;IAEK,MAAM,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAK5C;IAEK,MAAM,CACV,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC,CAAC,GAC/D,OAAO,CAAC,IAAI,CAAC,CAoBf;IAEK,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAU5F;IAEK,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAM3D;IAEK,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAQpD;IAEK,WAAW,CACf,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAMpC;IAEK,YAAY,CAAC,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC9D;IAEK,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAMlE;IAEK,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAS9D;IAEK,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiB3D;CACF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isDirectoryAccountProvider, } from '@cat-factory/kernel';
|
|
2
|
+
import { appendDirectoryChanges, identityOwnerSource, userSource } from './directoryFeed';
|
|
2
3
|
function rowToUser(row) {
|
|
3
4
|
return {
|
|
4
5
|
id: row.id,
|
|
@@ -90,13 +91,24 @@ export class D1UserRepository {
|
|
|
90
91
|
return row ? rowToIdentity(row) : null;
|
|
91
92
|
}
|
|
92
93
|
async linkIdentity(identity) {
|
|
93
|
-
|
|
94
|
+
const upsert = this.db
|
|
94
95
|
.prepare(`INSERT INTO user_identities (user_id, provider, subject, secret, metadata, created_at)
|
|
95
96
|
VALUES (?, ?, ?, ?, ?, ?)
|
|
96
97
|
ON CONFLICT (provider, subject) DO UPDATE SET
|
|
97
98
|
user_id = excluded.user_id, secret = excluded.secret, metadata = excluded.metadata`)
|
|
98
|
-
.bind(identity.userId, identity.provider, identity.subject, identity.secret, identity.metadata, identity.createdAt)
|
|
99
|
-
|
|
99
|
+
.bind(identity.userId, identity.provider, identity.subject, identity.secret, identity.metadata, identity.createdAt);
|
|
100
|
+
if (!isDirectoryAccountProvider(identity.provider)) {
|
|
101
|
+
await upsert.run();
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
// A host identity is one of the user's directory accounts, so linking it changes the `user`
|
|
105
|
+
// entity of the new owner and, when it moves, of the user it is taken from.
|
|
106
|
+
const now = Date.now();
|
|
107
|
+
await this.db.batch([
|
|
108
|
+
appendDirectoryChanges(this.db, identityOwnerSource(identity.provider, identity.subject, identity.userId), now),
|
|
109
|
+
upsert,
|
|
110
|
+
appendDirectoryChanges(this.db, userSource(identity.userId), now),
|
|
111
|
+
]);
|
|
100
112
|
}
|
|
101
113
|
async listIdentities(userId) {
|
|
102
114
|
const { results } = await this.db
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1UserRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1UserRepository.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"D1UserRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/D1UserRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,11 @@ export interface DirectorySource {
|
|
|
7
7
|
export declare function appendDirectoryChanges(db: D1Database, source: DirectorySource, at: number): D1PreparedStatement;
|
|
8
8
|
/** A user's profile, once per account they belong to. */
|
|
9
9
|
export declare function userSource(userId: string): DirectorySource;
|
|
10
|
+
/**
|
|
11
|
+
* The user a login identity belongs to now, once per account, unless that is `exceptUserId`.
|
|
12
|
+
* Placed before a re-link so the user losing the account is recorded while the row still names them.
|
|
13
|
+
*/
|
|
14
|
+
export declare function identityOwnerSource(provider: string, subject: string, exceptUserId: string): DirectorySource;
|
|
10
15
|
/** An account membership, plus the member's `user` entity whose visibility it decides. */
|
|
11
16
|
export declare function accountMembershipSource(accountId: string, userId: string): DirectorySource;
|
|
12
17
|
/** One workspace membership, attributed to the account that owns the workspace. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directoryFeed.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/directoryFeed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAYhF,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,EAAE,CAAA;CACjB;AAED,yDAAyD;AACzD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,eAAe,EACvB,EAAE,EAAE,MAAM,GACT,mBAAmB,CAerB;AAED,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAM1D;AAED,0FAA0F;AAC1F,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAQ1F;AAED,mFAAmF;AACnF,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAO9F;AAED,uEAAuE;AACvE,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,eAAe,CAQjB;AAED,kCAAkC;AAClC,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAMpE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAcxE;AAED,uHAAuH;AACvH,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,eAAe,CAQ9F;AAED,wGAAwG;AACxG,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAC/B,eAAe,CAWjB"}
|
|
1
|
+
{"version":3,"file":"directoryFeed.d.ts","sourceRoot":"","sources":["../../../src/infrastructure/repositories/directoryFeed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AAYhF,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,EAAE,CAAA;CACjB;AAED,yDAAyD;AACzD,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,eAAe,EACvB,EAAE,EAAE,MAAM,GACT,mBAAmB,CAerB;AAED,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAM1D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,eAAe,CAOjB;AAED,0FAA0F;AAC1F,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAQ1F;AAED,mFAAmF;AACnF,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAO9F;AAED,uEAAuE;AACvE,wBAAgB,iCAAiC,CAC/C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,eAAe,CAQjB;AAED,kCAAkC;AAClC,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAMpE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,eAAe,CAcxE;AAED,uHAAuH;AACvH,wBAAgB,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,eAAe,CAQ9F;AAED,wGAAwG;AACxG,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,SAAS,MAAM,EAAE,GAC/B,eAAe,CAWjB"}
|
|
@@ -21,6 +21,18 @@ export function userSource(userId) {
|
|
|
21
21
|
binds: [userId],
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* The user a login identity belongs to now, once per account, unless that is `exceptUserId`.
|
|
26
|
+
* Placed before a re-link so the user losing the account is recorded while the row still names them.
|
|
27
|
+
*/
|
|
28
|
+
export function identityOwnerSource(provider, subject, exceptUserId) {
|
|
29
|
+
return {
|
|
30
|
+
sql: `SELECT m.account_id, 'user' AS entity_type, NULL AS workspace_id, m.user_id AS entity_id
|
|
31
|
+
FROM memberships m JOIN user_identities i ON i.user_id = m.user_id
|
|
32
|
+
WHERE i.provider = ? AND i.subject = ? AND i.user_id <> ?`,
|
|
33
|
+
binds: [provider, subject, exceptUserId],
|
|
34
|
+
};
|
|
35
|
+
}
|
|
24
36
|
/** An account membership, plus the member's `user` entity whose visibility it decides. */
|
|
25
37
|
export function accountMembershipSource(accountId, userId) {
|
|
26
38
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directoryFeed.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/directoryFeed.ts"],"names":[],"mappings":"AAiBA,yDAAyD;AACzD,MAAM,UAAU,sBAAsB,CACpC,EAAc,EACd,MAAuB,EACvB,EAAU;IAEV,gGAAgG;IAChG,gFAAgF;IAChF,OAAO,EAAE;SACN,OAAO,CACN;;;;;;iBAMW,MAAM,CAAC,GAAG;yCACc,CACpC;SACA,IAAI,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;AAC9B,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO;QACL,GAAG,EAAE;+CACsC;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;KAChB,CAAA;AACH,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,uBAAuB,CAAC,SAAiB,EAAE,MAAc;IACvE,OAAO;QACL,GAAG,EAAE;;;oCAG2B;QAChC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC;KAC9C,CAAA;AACH,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,yBAAyB,CAAC,WAAmB,EAAE,MAAc;IAC3E,OAAO;QACL,GAAG,EAAE;;yCAEgC;QACrC,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC;KAC7B,CAAA;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,iCAAiC,CAC/C,SAAiB,EACjB,MAAc;IAEd,OAAO;QACL,GAAG,EAAE;;;oDAG2C;QAChD,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC3B,CAAA;AACH,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,eAAe,CAAC,WAAmB;IACjD,OAAO;QACL,GAAG,EAAE;yCACgC;QACrC,KAAK,EAAE,CAAC,WAAW,CAAC;KACrB,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;IAC9C,OAAO;QACL,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG;;;;;;;;6DAQoC;QACzD,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC;KACtD,CAAA;AACH,CAAC;AAED,uHAAuH;AACvH,MAAM,UAAU,WAAW,CAAC,WAAmB,EAAE,SAA4B;IAC3E,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxD,OAAO;QACL,GAAG,EAAE;;0DAEiD,YAAY,GAAG;QACrE,KAAK,EAAE,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC;KACnC,CAAA;AACH,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,sBAAsB,CACpC,WAAmB,EACnB,cAAsB,EACtB,aAAgC;IAEhC,MAAM,OAAO,GACX,aAAa,CAAC,MAAM,KAAK,CAAC;QACxB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,4BAA4B,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;IAC5E,OAAO;QACL,GAAG,EAAE;;wFAE+E,OAAO,EAAE;QAC7F,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC;KACvD,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"directoryFeed.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/directoryFeed.ts"],"names":[],"mappings":"AAiBA,yDAAyD;AACzD,MAAM,UAAU,sBAAsB,CACpC,EAAc,EACd,MAAuB,EACvB,EAAU;IAEV,gGAAgG;IAChG,gFAAgF;IAChF,OAAO,EAAE;SACN,OAAO,CACN;;;;;;iBAMW,MAAM,CAAC,GAAG;yCACc,CACpC;SACA,IAAI,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;AAC9B,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO;QACL,GAAG,EAAE;+CACsC;QAC3C,KAAK,EAAE,CAAC,MAAM,CAAC;KAChB,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAgB,EAChB,OAAe,EACf,YAAoB;IAEpB,OAAO;QACL,GAAG,EAAE;;qEAE4D;QACjE,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC;KACzC,CAAA;AACH,CAAC;AAED,0FAA0F;AAC1F,MAAM,UAAU,uBAAuB,CAAC,SAAiB,EAAE,MAAc;IACvE,OAAO;QACL,GAAG,EAAE;;;oCAG2B;QAChC,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC;KAC9C,CAAA;AACH,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,yBAAyB,CAAC,WAAmB,EAAE,MAAc;IAC3E,OAAO;QACL,GAAG,EAAE;;yCAEgC;QACrC,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC;KAC7B,CAAA;AACH,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,iCAAiC,CAC/C,SAAiB,EACjB,MAAc;IAEd,OAAO;QACL,GAAG,EAAE;;;oDAG2C;QAChD,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC;KAC3B,CAAA;AACH,CAAC;AAED,kCAAkC;AAClC,MAAM,UAAU,eAAe,CAAC,WAAmB;IACjD,OAAO;QACL,GAAG,EAAE;yCACgC;QACrC,KAAK,EAAE,CAAC,WAAW,CAAC;KACrB,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,CAAA;IAC9C,OAAO;QACL,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG;;;;;;;;6DAQoC;QACzD,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,WAAW,CAAC;KACtD,CAAA;AACH,CAAC;AAED,uHAAuH;AACvH,MAAM,UAAU,WAAW,CAAC,WAAmB,EAAE,SAA4B;IAC3E,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACxD,OAAO;QACL,GAAG,EAAE;;0DAEiD,YAAY,GAAG;QACrE,KAAK,EAAE,CAAC,WAAW,EAAE,GAAG,SAAS,CAAC;KACnC,CAAA;AACH,CAAC;AAED,wGAAwG;AACxG,MAAM,UAAU,sBAAsB,CACpC,WAAmB,EACnB,cAAsB,EACtB,aAAgC;IAEhC,MAAM,OAAO,GACX,aAAa,CAAC,MAAM,KAAK,CAAC;QACxB,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,4BAA4B,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;IAC5E,OAAO;QACL,GAAG,EAAE;;wFAE+E,OAAO,EAAE;QAC7F,KAAK,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC;KACvD,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cat-factory/worker",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.226.1",
|
|
4
4
|
"description": "Reusable Cloudflare Worker library (Hono + D1) exposing the Agent Architecture Board core: the `createApp()` Hono factory, the default fetch/scheduled/queue handler, and the Durable Object + Workflow classes. Deployments (see deploy/backend) supply the wrangler.toml + config and re-export these.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -36,23 +36,23 @@
|
|
|
36
36
|
"@ai-sdk/anthropic": "^4.0.75",
|
|
37
37
|
"@ai-sdk/openai": "^4.0.87",
|
|
38
38
|
"@ai-sdk/openai-compatible": "^3.0.65",
|
|
39
|
-
"@cat-factory/agents": "0.172.
|
|
40
|
-
"@cat-factory/binary-generators": "0.3.
|
|
41
|
-
"@cat-factory/caching": "0.20.
|
|
42
|
-
"@cat-factory/consensus": "0.19.
|
|
43
|
-
"@cat-factory/contracts": "0.
|
|
44
|
-
"@cat-factory/eks": "0.1.
|
|
45
|
-
"@cat-factory/gates": "0.12.
|
|
46
|
-
"@cat-factory/gitlab": "0.24.
|
|
47
|
-
"@cat-factory/integrations": "0.176.
|
|
48
|
-
"@cat-factory/kernel": "0.
|
|
49
|
-
"@cat-factory/observability-langfuse": "0.11.
|
|
50
|
-
"@cat-factory/observability-otel": "0.23.
|
|
51
|
-
"@cat-factory/orchestration": "0.322.
|
|
52
|
-
"@cat-factory/prompt-fragments": "1.1.
|
|
53
|
-
"@cat-factory/provider-cloudflare": "0.7.
|
|
54
|
-
"@cat-factory/server": "0.
|
|
55
|
-
"@cat-factory/spend": "0.23.
|
|
39
|
+
"@cat-factory/agents": "0.172.2",
|
|
40
|
+
"@cat-factory/binary-generators": "0.3.71",
|
|
41
|
+
"@cat-factory/caching": "0.20.105",
|
|
42
|
+
"@cat-factory/consensus": "0.19.19",
|
|
43
|
+
"@cat-factory/contracts": "0.369.0",
|
|
44
|
+
"@cat-factory/eks": "0.1.410",
|
|
45
|
+
"@cat-factory/gates": "0.12.7",
|
|
46
|
+
"@cat-factory/gitlab": "0.24.7",
|
|
47
|
+
"@cat-factory/integrations": "0.176.3",
|
|
48
|
+
"@cat-factory/kernel": "0.360.1",
|
|
49
|
+
"@cat-factory/observability-langfuse": "0.11.71",
|
|
50
|
+
"@cat-factory/observability-otel": "0.23.64",
|
|
51
|
+
"@cat-factory/orchestration": "0.322.2",
|
|
52
|
+
"@cat-factory/prompt-fragments": "1.1.67",
|
|
53
|
+
"@cat-factory/provider-cloudflare": "0.7.565",
|
|
54
|
+
"@cat-factory/server": "0.336.1",
|
|
55
|
+
"@cat-factory/spend": "0.23.16",
|
|
56
56
|
"@cloudflare/containers": "^0.3.7",
|
|
57
57
|
"@hono/valibot-validator": "^0.6.1",
|
|
58
58
|
"ai": "^7.0.131",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"workers-ai-provider": "^4.0.0"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@cat-factory/conformance": "0.64.
|
|
65
|
+
"@cat-factory/conformance": "0.64.9",
|
|
66
66
|
"@cloudflare/vitest-plugin": "^1.3.7",
|
|
67
67
|
"@cloudflare/workers-types": "5.20261006.1",
|
|
68
68
|
"typescript": "7.0.2",
|