@forestadmin/agent-bff 1.27.0 → 1.28.0
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/build-bff.d.ts +5 -0
- package/dist/build-bff.js +19 -8
- package/dist/permissions/permissions-cache.d.ts +12 -1
- package/dist/permissions/permissions-cache.js +18 -2
- package/dist/permissions/permissions-routes-middleware.js +3 -2
- package/dist/read-model/create-read-model.js +2 -2
- package/dist/read-model/read-model-store.d.ts +7 -0
- package/dist/read-model/read-model-store.js +12 -1
- package/dist/read-model/schema-cache.d.ts +26 -1
- package/dist/read-model/schema-cache.js +58 -10
- package/package.json +1 -1
package/dist/build-bff.d.ts
CHANGED
|
@@ -19,6 +19,11 @@ export interface BuildBffOptions {
|
|
|
19
19
|
}
|
|
20
20
|
export interface Bff {
|
|
21
21
|
callback: BffCallback;
|
|
22
|
+
/**
|
|
23
|
+
* Forget what was read from the SaaS. A host that knows the schema just moved — an agent
|
|
24
|
+
* restarting on a customization refresh — calls this instead of waiting out the 24h TTL.
|
|
25
|
+
*/
|
|
26
|
+
invalidate(): void;
|
|
22
27
|
}
|
|
23
28
|
interface ResolvedOAuthConfig {
|
|
24
29
|
forestServerUrl: string;
|
package/dist/build-bff.js
CHANGED
|
@@ -238,7 +238,7 @@ function resolveUnfoldSource(config, logger) {
|
|
|
238
238
|
return toUnfoldSource(resolveReadModelBundle(config, logger, UNMEASURED), config, logger);
|
|
239
239
|
}
|
|
240
240
|
// The data middleware falls through to the action middleware on a non-data path.
|
|
241
|
-
function buildAgentRouteMiddlewares(bundle, config, logger) {
|
|
241
|
+
function buildAgentRouteMiddlewares(bundle, config, logger, permissionsCache) {
|
|
242
242
|
if (!bundle) {
|
|
243
243
|
logger('Warn', 'Data, action and permissions endpoints disabled: FOREST_SERVER_URL, FOREST_ENV_SECRET or FOREST_AUTH_SECRET is missing');
|
|
244
244
|
return [(0, agent_stub_1.default)()];
|
|
@@ -251,7 +251,7 @@ function buildAgentRouteMiddlewares(bundle, config, logger) {
|
|
|
251
251
|
forestServerUrl: apiKeyConfig.forestServerUrl,
|
|
252
252
|
envSecret: apiKeyConfig.forestEnvSecret,
|
|
253
253
|
}),
|
|
254
|
-
cache:
|
|
254
|
+
cache: permissionsCache,
|
|
255
255
|
logger,
|
|
256
256
|
});
|
|
257
257
|
if (!agentUrl) {
|
|
@@ -289,13 +289,14 @@ function buildAgentMiddlewares(config, logger, oauth, aiMiddlewares, basePath) {
|
|
|
289
289
|
const { forestAuthSecret, defaultTimezone } = config;
|
|
290
290
|
if (!forestAuthSecret) {
|
|
291
291
|
logger('Warn', 'Agent edge disabled: FOREST_AUTH_SECRET is missing');
|
|
292
|
-
return [];
|
|
292
|
+
return { middlewares: [], invalidate: () => undefined };
|
|
293
293
|
}
|
|
294
294
|
const apiKeyStep = buildApiKeyMiddleware(config, logger) ?? createApiKeyUnavailableGuard(logger);
|
|
295
295
|
// One store for the whole edge. The document only unfolds when the agent is reachable too: with no
|
|
296
296
|
// AGENT_URL every data path answers 501, so concrete paths would advertise a dead surface.
|
|
297
297
|
const bundle = resolveReadModelBundle(config, logger);
|
|
298
298
|
const source = toUnfoldSource(bundle, config, logger);
|
|
299
|
+
const permissionsCache = new permissions_cache_1.default();
|
|
299
300
|
const chain = [
|
|
300
301
|
(0, auth_mode_middleware_1.default)({ authSecret: forestAuthSecret }),
|
|
301
302
|
apiKeyStep,
|
|
@@ -324,9 +325,18 @@ function buildAgentMiddlewares(config, logger, oauth, aiMiddlewares, basePath) {
|
|
|
324
325
|
: []),
|
|
325
326
|
...aiMiddlewares,
|
|
326
327
|
(0, timezone_middleware_1.default)({ defaultTimezone }),
|
|
327
|
-
...buildAgentRouteMiddlewares(bundle, config, logger),
|
|
328
|
+
...buildAgentRouteMiddlewares(bundle, config, logger, permissionsCache),
|
|
328
329
|
];
|
|
329
|
-
return
|
|
330
|
+
return {
|
|
331
|
+
middlewares: chain.map(agentScoped),
|
|
332
|
+
invalidate: () => {
|
|
333
|
+
// The one trace an invalidation leaves: the operator asked "the schema is wrong" needs to
|
|
334
|
+
// establish that one happened and when, and the age gauge cannot say it.
|
|
335
|
+
logger('Info', 'Dropping the SaaS read caches on host request');
|
|
336
|
+
bundle?.store.invalidate();
|
|
337
|
+
permissionsCache.clear();
|
|
338
|
+
},
|
|
339
|
+
};
|
|
330
340
|
}
|
|
331
341
|
/**
|
|
332
342
|
* Assemble the whole BFF — `/health`, the version header, and every middleware in the one order both
|
|
@@ -347,7 +357,8 @@ async function buildBff({ config, logger = (0, console_logger_1.default)(), base
|
|
|
347
357
|
(0, missing_config_warning_1.default)(config, logger);
|
|
348
358
|
const oauth = buildOAuthMiddlewares(config, logger);
|
|
349
359
|
const aiMiddlewares = buildAiMiddlewares(config, oauth, logger);
|
|
350
|
-
const
|
|
360
|
+
const agentEdge = buildAgentMiddlewares(config, logger, oauth, aiMiddlewares, mountPath);
|
|
361
|
+
const agentMiddlewares = agentEdge.middlewares;
|
|
351
362
|
const hasAgentEdge = agentMiddlewares.length > 0;
|
|
352
363
|
const agentErrorMiddleware = hasAgentEdge ? [agentScoped((0, error_middleware_1.default)({ logger }))] : [];
|
|
353
364
|
const agentJsonOnlyGuard = hasAgentEdge ? [agentScoped(createJsonOnlyGuard())] : [];
|
|
@@ -373,6 +384,6 @@ async function buildBff({ config, logger = (0, console_logger_1.default)(), base
|
|
|
373
384
|
const app = new koa_1.default();
|
|
374
385
|
for (const middleware of middlewares)
|
|
375
386
|
app.use(middleware);
|
|
376
|
-
return { callback: app.callback() };
|
|
387
|
+
return { callback: app.callback(), invalidate: agentEdge.invalidate };
|
|
377
388
|
}
|
|
378
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-bff.js","sourceRoot":"","sources":["../src/build-bff.ts"],"names":[],"mappings":"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"}
|
|
389
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-bff.js","sourceRoot":"","sources":["../src/build-bff.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,22 @@ export default class PermissionsCache {
|
|
|
12
12
|
private readonly now;
|
|
13
13
|
private readonly ttlMs;
|
|
14
14
|
private entry;
|
|
15
|
+
private generationValue;
|
|
15
16
|
constructor({ now, ttlMs }?: PermissionsCacheOptions);
|
|
16
17
|
wasRejectedByLatestFetch(userId: number): boolean;
|
|
17
18
|
rememberRejected(userId: number): void;
|
|
18
19
|
getFresh(): EvaluatedPermissions | undefined;
|
|
19
|
-
|
|
20
|
+
/**
|
|
21
|
+
* The generation a fetch must be started against. Read it before the fetch and hand it back to
|
|
22
|
+
* `set`, so a response that crossed a `clear()` cannot become the shared entry.
|
|
23
|
+
*/
|
|
24
|
+
get generation(): number;
|
|
25
|
+
/**
|
|
26
|
+
* Store a fetched payload, unless a `clear()` landed while the fetch was in flight: it read the
|
|
27
|
+
* permissions the invalidation declared stale, and with a single shared entry one late write would
|
|
28
|
+
* hand a revoked access to every caller for a full TTL.
|
|
29
|
+
*/
|
|
30
|
+
set(permissions: EvaluatedPermissions, generation: number): void;
|
|
20
31
|
get size(): number;
|
|
21
32
|
clear(): void;
|
|
22
33
|
private getFreshEntry;
|
|
@@ -10,6 +10,7 @@ function sameUsers(previous, next) {
|
|
|
10
10
|
}
|
|
11
11
|
class PermissionsCache {
|
|
12
12
|
constructor({ now = Date.now, ttlMs = exports.PERMISSIONS_CACHE_TTL_MS } = {}) {
|
|
13
|
+
this.generationValue = 0;
|
|
13
14
|
this.now = now;
|
|
14
15
|
this.ttlMs = ttlMs;
|
|
15
16
|
}
|
|
@@ -22,7 +23,21 @@ class PermissionsCache {
|
|
|
22
23
|
getFresh() {
|
|
23
24
|
return this.getFreshEntry()?.permissions;
|
|
24
25
|
}
|
|
25
|
-
|
|
26
|
+
/**
|
|
27
|
+
* The generation a fetch must be started against. Read it before the fetch and hand it back to
|
|
28
|
+
* `set`, so a response that crossed a `clear()` cannot become the shared entry.
|
|
29
|
+
*/
|
|
30
|
+
get generation() {
|
|
31
|
+
return this.generationValue;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Store a fetched payload, unless a `clear()` landed while the fetch was in flight: it read the
|
|
35
|
+
* permissions the invalidation declared stale, and with a single shared entry one late write would
|
|
36
|
+
* hand a revoked access to every caller for a full TTL.
|
|
37
|
+
*/
|
|
38
|
+
set(permissions, generation) {
|
|
39
|
+
if (generation !== this.generationValue)
|
|
40
|
+
return;
|
|
26
41
|
const previous = this.getFreshEntry();
|
|
27
42
|
const carriesTheSameUsers = previous !== undefined && sameUsers(previous.permissions.users, permissions.users);
|
|
28
43
|
this.entry = {
|
|
@@ -36,6 +51,7 @@ class PermissionsCache {
|
|
|
36
51
|
}
|
|
37
52
|
clear() {
|
|
38
53
|
this.entry = undefined;
|
|
54
|
+
this.generationValue += 1;
|
|
39
55
|
}
|
|
40
56
|
getFreshEntry() {
|
|
41
57
|
if (!this.entry)
|
|
@@ -48,4 +64,4 @@ class PermissionsCache {
|
|
|
48
64
|
}
|
|
49
65
|
}
|
|
50
66
|
exports.default = PermissionsCache;
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbnMtY2FjaGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcGVybWlzc2lvbnMvcGVybWlzc2lvbnMtY2FjaGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRWEsUUFBQSx3QkFBd0IsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQztBQWtCdkQsU0FBUyxTQUFTLENBQUMsUUFBNEIsRUFBRSxJQUF3QjtJQUN2RSxJQUFJLFFBQVEsQ0FBQyxNQUFNLEtBQUssSUFBSSxDQUFDLE1BQU07UUFBRSxPQUFPLEtBQUssQ0FBQztJQUVsRCxNQUFNLGdCQUFnQixHQUFHLElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUUvRSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxLQUFLLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUMzRSxDQUFDO0FBRUQsTUFBcUIsZ0JBQWdCO0lBT25DLFlBQVksRUFBRSxHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxLQUFLLEdBQUcsZ0NBQXdCLEtBQThCLEVBQUU7UUFGdEYsb0JBQWUsR0FBRyxDQUFDLENBQUM7UUFHMUIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUNyQixDQUFDO0lBRUQsd0JBQXdCLENBQUMsTUFBYztRQUNyQyxPQUFPLElBQUksQ0FBQyxhQUFhLEVBQUUsRUFBRSxlQUFlLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLEtBQUssQ0FBQztJQUNwRSxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsTUFBYztRQUM3QixJQUFJLENBQUMsYUFBYSxFQUFFLEVBQUUsZUFBZSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNwRCxDQUFDO0lBRUQsUUFBUTtRQUNOLE9BQU8sSUFBSSxDQUFDLGFBQWEsRUFBRSxFQUFFLFdBQVcsQ0FBQztJQUMzQyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsSUFBSSxVQUFVO1FBQ1osT0FBTyxJQUFJLENBQUMsZUFBZSxDQUFDO0lBQzlCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsR0FBRyxDQUFDLFdBQWlDLEVBQUUsVUFBa0I7UUFDdkQsSUFBSSxVQUFVLEtBQUssSUFBSSxDQUFDLGVBQWU7WUFBRSxPQUFPO1FBRWhELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUN0QyxNQUFNLG1CQUFtQixHQUN2QixRQUFRLEtBQUssU0FBUyxJQUFJLFNBQVMsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7UUFFckYsSUFBSSxDQUFDLEtBQUssR0FBRztZQUNYLFdBQVc7WUFDWCxRQUFRLEVBQUUsSUFBSSxDQUFDLEdBQUcsRUFBRTtZQUNwQixlQUFlLEVBQUUsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFVO1NBQ3BGLENBQUM7SUFDSixDQUFDO0lBRUQsSUFBSSxJQUFJO1FBQ04sT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1QixDQUFDO0lBRUQsS0FBSztRQUNILElBQUksQ0FBQyxLQUFLLEdBQUcsU0FBUyxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxlQUFlLElBQUksQ0FBQyxDQUFDO0lBQzVCLENBQUM7SUFFTyxhQUFhO1FBQ25CLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBRWxDLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNuRCxJQUFJLENBQUMsS0FBSyxHQUFHLFNBQVMsQ0FBQztZQUV2QixPQUFPLFNBQVMsQ0FBQztRQUNuQixDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDO0lBQ3BCLENBQUM7Q0FDRjtBQXZFRCxtQ0F1RUMifQ==
|
|
@@ -36,6 +36,7 @@ function findCallerRoleId(users, userId) {
|
|
|
36
36
|
}
|
|
37
37
|
async function resolvePermissions({ cache, client, logger, }) {
|
|
38
38
|
let resolved;
|
|
39
|
+
const { generation } = cache;
|
|
39
40
|
try {
|
|
40
41
|
resolved = await client.fetchPermissions();
|
|
41
42
|
}
|
|
@@ -52,7 +53,7 @@ async function resolvePermissions({ cache, client, logger, }) {
|
|
|
52
53
|
actionPermissions: (0, forestadmin_client_1.generateActionsFromPermissions)(resolved.environmentPermissions),
|
|
53
54
|
users: resolved.users,
|
|
54
55
|
};
|
|
55
|
-
cache.set(permissions);
|
|
56
|
+
cache.set(permissions, generation);
|
|
56
57
|
return { permissions, fromFreshFetch: true };
|
|
57
58
|
}
|
|
58
59
|
async function resolveCallerPermissions({ caller, cache, client, logger, }) {
|
|
@@ -96,4 +97,4 @@ function createPermissionsRoutesMiddleware({ store, client, cache, logger, }) {
|
|
|
96
97
|
});
|
|
97
98
|
};
|
|
98
99
|
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbnMtcm91dGVzLW1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcGVybWlzc2lvbnMvcGVybWlzc2lvbnMtcm91dGVzLW1pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFrSUEsb0RBZ0NDO0FBdkpELHdFQUFpRjtBQUVqRixzRkFBNEQ7QUFDNUQscUVBQStEO0FBQy9ELDJEQUFzRDtBQUN0RCwrREFBNEY7QUFFNUYsTUFBTSxpQkFBaUIsR0FBRyx1QkFBdUIsQ0FBQztBQUNsRCxNQUFNLCtCQUErQixHQUFHLENBQUMsQ0FBQztBQWExQyxTQUFTLGFBQWEsQ0FBQyxHQUFZO0lBQ2pDLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsU0FBOEMsQ0FBQztJQUUzRSxJQUFJLFNBQVM7UUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztJQUUvQyxNQUFNLFFBQVEsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLGNBQW9ELENBQUM7SUFFaEYsSUFBSSxRQUFRO1FBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsRUFBRSxDQUFDO0lBRWxELE1BQU0sSUFBQSw2QkFBWSxFQUFDLHFDQUFxQyxDQUFDLENBQUM7QUFDNUQsQ0FBQztBQUVELFNBQVMsMkJBQTJCLENBQUMsR0FBWSxFQUFFLFNBQW9CO0lBQ3JFLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDO0lBRWxDLElBQUksR0FBRyxLQUFLLFNBQVM7UUFBRSxPQUFPLFNBQVMsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO0lBRWhFLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxD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
|
|
@@ -15,10 +15,10 @@ function createReadModel({ forestServerUrl, envSecret, metrics, logger, now, })
|
|
|
15
15
|
// Wrap once so a throwing metrics backend can never break business logic anywhere in the bundle.
|
|
16
16
|
const resolvedMetrics = (0, safe_metrics_1.default)(metrics ?? (0, console_metrics_1.default)(logger));
|
|
17
17
|
const fetcher = new forest_schema_client_1.default({ forestServerUrl, envSecret });
|
|
18
|
-
const schemaCache = new schema_cache_1.default({ fetcher, metrics: resolvedMetrics, now });
|
|
18
|
+
const schemaCache = new schema_cache_1.default({ fetcher, metrics: resolvedMetrics, logger, now });
|
|
19
19
|
const capabilitiesCache = new capabilities_cache_1.default({ now });
|
|
20
20
|
const store = new read_model_store_1.default(schemaCache, capabilitiesCache);
|
|
21
21
|
const actionEndpointResolver = new action_endpoint_resolver_1.default(() => store.getReadModel(), resolvedMetrics);
|
|
22
22
|
return { store, actionEndpointResolver };
|
|
23
23
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLXJlYWQtbW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcmVhZC1tb2RlbC9jcmVhdGUtcmVhZC1tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQXdCQSxrQ0FtQkM7QUF4Q0QsMEZBQWdFO0FBQ2hFLDhFQUFxRDtBQUNyRCxrRkFBd0Q7QUFDeEQsMEVBQWdEO0FBQ2hELGtFQUF5QztBQUN6QyxrRkFBK0Q7QUFDL0QsNEVBQW1EO0FBZW5ELFNBQXdCLGVBQWUsQ0FBQyxFQUN0QyxlQUFlLEVBQ2YsU0FBUyxFQUNULE9BQU8sRUFDUCxNQUFNLEVBQ04sR0FBRyxHQUNvQjtJQUN2QixpR0FBaUc7SUFDakcsTUFBTSxlQUFlLEdBQUcsSUFBQSxzQkFBVyxFQUFDLE9BQU8sSUFBSSxJQUFBLHlCQUFvQixFQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDN0UsTUFBTSxPQUFPLEdBQUcsSUFBSSw4QkFBa0IsQ0FBQyxFQUFFLGVBQWUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sV0FBVyxHQUFHLElBQUksc0JBQVcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDO0lBQ3hGLE1BQU0saUJBQWlCLEdBQUcsSUFBSSw0QkFBaUIsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUM7SUFDekQsTUFBTSxLQUFLLEdBQUcsSUFBSSwwQkFBYyxDQUFDLFdBQVcsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2pFLE1BQU0sc0JBQXNCLEdBQUcsSUFBSSxrQ0FBc0IsQ0FDdkQsR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLFlBQVksRUFBRSxFQUMxQixlQUFlLENBQ2hCLENBQUM7SUFFRixPQUFPLEVBQUUsS0FBSyxFQUFFLHNCQUFzQixFQUFFLENBQUM7QUFDM0MsQ0FBQyJ9
|
|
@@ -20,6 +20,13 @@ export default class ReadModelStore {
|
|
|
20
20
|
private readModel;
|
|
21
21
|
constructor(schemaCache: SchemaCache, capabilitiesCache: CapabilitiesCache);
|
|
22
22
|
getReadModel(): Promise<ReadModel>;
|
|
23
|
+
/**
|
|
24
|
+
* Forget the cached schema and the capabilities that belong to it, then force the read-model to be
|
|
25
|
+
* rebuilt. The capabilities are dropped here rather than left to the next revision change: a
|
|
26
|
+
* `clear()` also drops a schema write that was in flight, and a dropped write moves nothing the
|
|
27
|
+
* snapshot can notice, so inferring the invalidation from the revision would miss it.
|
|
28
|
+
*/
|
|
29
|
+
invalidate(): void;
|
|
23
30
|
getSchemaSnapshot(): Promise<SchemaSnapshot>;
|
|
24
31
|
/**
|
|
25
32
|
* Returns the capabilities together with the read-model they belong to, so a caller cannot mix a
|
|
@@ -20,6 +20,17 @@ class ReadModelStore {
|
|
|
20
20
|
async getReadModel() {
|
|
21
21
|
return (await this.getSchemaSnapshot()).readModel;
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* Forget the cached schema and the capabilities that belong to it, then force the read-model to be
|
|
25
|
+
* rebuilt. The capabilities are dropped here rather than left to the next revision change: a
|
|
26
|
+
* `clear()` also drops a schema write that was in flight, and a dropped write moves nothing the
|
|
27
|
+
* snapshot can notice, so inferring the invalidation from the revision would miss it.
|
|
28
|
+
*/
|
|
29
|
+
invalidate() {
|
|
30
|
+
this.schemaCache.clear();
|
|
31
|
+
this.capabilitiesCache.clear();
|
|
32
|
+
this.builtRevision = -1;
|
|
33
|
+
}
|
|
23
34
|
async getSchemaSnapshot() {
|
|
24
35
|
const collections = await this.schemaCache.get();
|
|
25
36
|
const { revision } = this.schemaCache;
|
|
@@ -59,4 +70,4 @@ class ReadModelStore {
|
|
|
59
70
|
}
|
|
60
71
|
}
|
|
61
72
|
exports.default = ReadModelStore;
|
|
62
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVhZC1tb2RlbC1zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9yZWFkLW1vZGVsL3JlYWQtbW9kZWwtc3RvcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFLQSw4REFBcUM7QUFFckMsTUFBTSxzQkFBc0IsR0FBRyxDQUFDLENBQUM7QUFRakM7Ozs7R0FJRztBQUNILE1BQXFCLGNBQWM7SUFPakMsWUFBWSxXQUF3QixFQUFFLGlCQUFvQztRQUhsRSxrQkFBYSxHQUFHLENBQUMsQ0FBQyxDQUFDO1FBQ25CLGNBQVMsR0FBcUIsSUFBSSxDQUFDO1FBR3pDLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO1FBQy9CLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxpQkFBaUIsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVk7UUFDaEIsT0FBTyxDQUFDLE1BQU0sSUFBSSxDQUFDLGlCQUFpQixFQUFFLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFDcEQsQ0FBQztJQUVEOzs7OztPQUtHO0lBQ0gsVUFBVTtRQUNSLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDekIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUssRUFBRSxDQUFDO1FBQy9CLElBQUksQ0FBQyxhQUFhLEdBQUcsQ0FBQyxDQUFDLENBQUM7SUFDMUIsQ0FBQztJQUVELEtBQUssQ0FBQyxpQkFBaUI7UUFDckIsTUFBTSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ2pELE1BQU0sRUFBRSxRQUFRLEVBQUUsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDO1FBRXRDLElBQUksUUFBUSxLQUFLLElBQUksQ0FBQyxhQUFhLElBQUksQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDdkQsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLG9CQUFTLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDNUMsSUFBSSxDQUFDLGFBQWEsR0FBRyxRQUFRLENBQUM7WUFDOUIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ2pDLENBQUM7UUFFRCxPQUFPLEVBQUUsV0FBVyxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQzlELENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGVBQWUsQ0FDbkIsVUFBa0IsRUFDbEIsT0FBNEIsRUFDNUIsWUFBWSxHQUFHLHNCQUFzQjtRQUVyQyxJQUFJLFlBQVksSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUN0QixNQUFNLElBQUksS0FBSyxDQUNiLG1FQUFtRSxVQUFVLEdBQUcsQ0FDakYsQ0FBQztRQUNKLENBQUM7UUFFRCxvRkFBb0Y7UUFDcEYsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUM7UUFDNUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUM7UUFDdEMsTUFBTSxZQUFZLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUUzRSw2RkFBNkY7UUFDN0YsaUdBQWlHO1FBQ2pHLCtGQUErRjtRQUMvRiw4RkFBOEY7UUFDOUYsNkZBQTZGO1FBQzdGLHVEQUF1RDtRQUN2RCxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQzNDLE9BQU8sSUFBSSxDQUFDLGVBQWUsQ0FBQyxVQUFVLEVBQUUsT0FBTyxFQUFFLFlBQVksR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNyRSxDQUFDO1FBRUQsT0FBTyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsQ0FBQztJQUNyQyxDQUFDO0lBRUQsVUFBVTtRQUNSLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUN2QyxDQUFDO0NBQ0Y7QUE5RUQsaUNBOEVDIn0=
|
|
@@ -1,12 +1,23 @@
|
|
|
1
1
|
import type { SchemaFetcher } from './forest-schema-client';
|
|
2
|
+
import type { Logger } from '../ports/logger-port';
|
|
2
3
|
import type { Metrics } from '../ports/metrics-port';
|
|
3
4
|
import type { ForestSchemaCollection } from '@forestadmin/forestadmin-client';
|
|
4
5
|
export declare const ONE_DAY_MS: number;
|
|
6
|
+
/**
|
|
7
|
+
* How long after a `clear()` the cache keeps re-reading the schema, and how often. An invalidation
|
|
8
|
+
* says "the agent just changed its schema", but the SaaS the BFF reads from may not have finished
|
|
9
|
+
* recording it: caching whatever comes back on the very next read would pin the old schema for a
|
|
10
|
+
* full day. Within this window a read costs one request every few seconds, which is nothing next to
|
|
11
|
+
* serving a collection the agent exposes and the BFF 404s.
|
|
12
|
+
*/
|
|
13
|
+
export declare const REVALIDATION_WINDOW_MS: number;
|
|
14
|
+
export declare const REVALIDATION_TTL_MS: number;
|
|
5
15
|
export declare const SCHEMA_CACHE_REFRESH_ERROR = "schema_cache_refresh_error";
|
|
6
16
|
export declare const SCHEMA_CACHE_AGE_SECONDS = "schema_cache_age_seconds";
|
|
7
17
|
export interface SchemaCacheOptions {
|
|
8
18
|
fetcher: SchemaFetcher;
|
|
9
19
|
metrics: Metrics;
|
|
20
|
+
logger?: Logger;
|
|
10
21
|
now?: () => number;
|
|
11
22
|
ttlMs?: number;
|
|
12
23
|
}
|
|
@@ -19,17 +30,31 @@ export interface SchemaCacheOptions {
|
|
|
19
30
|
export default class SchemaCache {
|
|
20
31
|
private readonly fetcher;
|
|
21
32
|
private readonly metrics;
|
|
33
|
+
private readonly logger;
|
|
22
34
|
private readonly now;
|
|
23
35
|
private readonly ttlMs;
|
|
24
36
|
private entry;
|
|
25
37
|
private inFlight;
|
|
26
38
|
private revisionValue;
|
|
27
|
-
|
|
39
|
+
private generation;
|
|
40
|
+
private revalidatingUntil;
|
|
41
|
+
constructor({ fetcher, metrics, logger, now, ttlMs, }: SchemaCacheOptions);
|
|
28
42
|
get(): Promise<ForestSchemaCollection[]>;
|
|
43
|
+
/**
|
|
44
|
+
* Expire what is cached and re-read it eagerly for a while. Called when something outside knows
|
|
45
|
+
* the schema moved — an agent restarting on a customization refresh, say.
|
|
46
|
+
*
|
|
47
|
+
* The entry is expired, not dropped: every read now goes through a refresh, so nothing the host
|
|
48
|
+
* declared stale is served while the SaaS answers, but the class keeps its safety net — a refresh
|
|
49
|
+
* that fails still has a last good schema to fall back on. Dropping it would turn a restart
|
|
50
|
+
* during a SaaS blip into a `503 schema_unavailable` on every data route.
|
|
51
|
+
*/
|
|
52
|
+
clear(): void;
|
|
29
53
|
ageSeconds(): number | undefined;
|
|
30
54
|
get revision(): number;
|
|
31
55
|
private refresh;
|
|
32
56
|
private doRefresh;
|
|
57
|
+
private ttlFor;
|
|
33
58
|
private emitAge;
|
|
34
59
|
}
|
|
35
60
|
//# sourceMappingURL=schema-cache.d.ts.map
|
|
@@ -3,9 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.SCHEMA_CACHE_AGE_SECONDS = exports.SCHEMA_CACHE_REFRESH_ERROR = exports.ONE_DAY_MS = void 0;
|
|
6
|
+
exports.SCHEMA_CACHE_AGE_SECONDS = exports.SCHEMA_CACHE_REFRESH_ERROR = exports.REVALIDATION_TTL_MS = exports.REVALIDATION_WINDOW_MS = exports.ONE_DAY_MS = void 0;
|
|
7
7
|
const errors_1 = __importDefault(require("./errors"));
|
|
8
8
|
exports.ONE_DAY_MS = 24 * 60 * 60 * 1000;
|
|
9
|
+
/**
|
|
10
|
+
* How long after a `clear()` the cache keeps re-reading the schema, and how often. An invalidation
|
|
11
|
+
* says "the agent just changed its schema", but the SaaS the BFF reads from may not have finished
|
|
12
|
+
* recording it: caching whatever comes back on the very next read would pin the old schema for a
|
|
13
|
+
* full day. Within this window a read costs one request every few seconds, which is nothing next to
|
|
14
|
+
* serving a collection the agent exposes and the BFF 404s.
|
|
15
|
+
*/
|
|
16
|
+
exports.REVALIDATION_WINDOW_MS = 60 * 1000;
|
|
17
|
+
exports.REVALIDATION_TTL_MS = 5 * 1000;
|
|
9
18
|
exports.SCHEMA_CACHE_REFRESH_ERROR = 'schema_cache_refresh_error';
|
|
10
19
|
exports.SCHEMA_CACHE_AGE_SECONDS = 'schema_cache_age_seconds';
|
|
11
20
|
/**
|
|
@@ -15,22 +24,41 @@ exports.SCHEMA_CACHE_AGE_SECONDS = 'schema_cache_age_seconds';
|
|
|
15
24
|
* a consumer can detect a new schema generation explicitly.
|
|
16
25
|
*/
|
|
17
26
|
class SchemaCache {
|
|
18
|
-
constructor({ fetcher, metrics, now = Date.now, ttlMs = exports.ONE_DAY_MS }) {
|
|
27
|
+
constructor({ fetcher, metrics, logger = () => undefined, now = Date.now, ttlMs = exports.ONE_DAY_MS, }) {
|
|
19
28
|
this.entry = null;
|
|
20
29
|
this.inFlight = null;
|
|
21
30
|
this.revisionValue = 0;
|
|
31
|
+
this.generation = 0;
|
|
32
|
+
this.revalidatingUntil = 0;
|
|
22
33
|
this.fetcher = fetcher;
|
|
23
34
|
this.metrics = metrics;
|
|
35
|
+
this.logger = logger;
|
|
24
36
|
this.now = now;
|
|
25
37
|
this.ttlMs = ttlMs;
|
|
26
38
|
}
|
|
27
39
|
async get() {
|
|
28
|
-
if (this.entry && this.now()
|
|
40
|
+
if (this.entry && this.now() < this.entry.expiresAt) {
|
|
29
41
|
this.emitAge();
|
|
30
42
|
return this.entry.collections;
|
|
31
43
|
}
|
|
32
44
|
return this.refresh();
|
|
33
45
|
}
|
|
46
|
+
/**
|
|
47
|
+
* Expire what is cached and re-read it eagerly for a while. Called when something outside knows
|
|
48
|
+
* the schema moved — an agent restarting on a customization refresh, say.
|
|
49
|
+
*
|
|
50
|
+
* The entry is expired, not dropped: every read now goes through a refresh, so nothing the host
|
|
51
|
+
* declared stale is served while the SaaS answers, but the class keeps its safety net — a refresh
|
|
52
|
+
* that fails still has a last good schema to fall back on. Dropping it would turn a restart
|
|
53
|
+
* during a SaaS blip into a `503 schema_unavailable` on every data route.
|
|
54
|
+
*/
|
|
55
|
+
clear() {
|
|
56
|
+
this.generation += 1;
|
|
57
|
+
this.inFlight = null;
|
|
58
|
+
this.revalidatingUntil = this.now() + exports.REVALIDATION_WINDOW_MS;
|
|
59
|
+
if (this.entry)
|
|
60
|
+
this.entry = { ...this.entry, expiresAt: this.now() };
|
|
61
|
+
}
|
|
34
62
|
ageSeconds() {
|
|
35
63
|
if (!this.entry)
|
|
36
64
|
return undefined;
|
|
@@ -41,13 +69,18 @@ class SchemaCache {
|
|
|
41
69
|
}
|
|
42
70
|
async refresh() {
|
|
43
71
|
if (!this.inFlight) {
|
|
44
|
-
|
|
45
|
-
|
|
72
|
+
// Identity-guarded, because `clear()` detaches the in-flight fetch: a read that lands after an
|
|
73
|
+
// invalidation must start its own, not join the one that read the invalidated schema.
|
|
74
|
+
const pending = this.doRefresh().finally(() => {
|
|
75
|
+
if (this.inFlight === pending)
|
|
76
|
+
this.inFlight = null;
|
|
46
77
|
});
|
|
78
|
+
this.inFlight = pending;
|
|
47
79
|
}
|
|
48
80
|
return this.inFlight;
|
|
49
81
|
}
|
|
50
82
|
async doRefresh() {
|
|
83
|
+
const { generation } = this;
|
|
51
84
|
try {
|
|
52
85
|
const collections = await this.fetcher.fetchSchema();
|
|
53
86
|
// An agent always exposes collections, so an empty result is far likelier a broken response
|
|
@@ -55,15 +88,27 @@ class SchemaCache {
|
|
|
55
88
|
// failed fetch and fall through to the failure path below.
|
|
56
89
|
if (collections.length === 0)
|
|
57
90
|
throw new Error('Forest returned an empty schema');
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
this.
|
|
91
|
+
// Skip the write if a clear() happened while this fetch was in flight: it read the schema the
|
|
92
|
+
// invalidation declared stale, and caching it now would undo the invalidation.
|
|
93
|
+
if (this.generation === generation) {
|
|
94
|
+
const fetchedAt = this.now();
|
|
95
|
+
this.entry = { collections, fetchedAt, expiresAt: fetchedAt + this.ttlFor(fetchedAt) };
|
|
96
|
+
this.revisionValue += 1;
|
|
97
|
+
this.emitAge();
|
|
98
|
+
}
|
|
61
99
|
return collections;
|
|
62
100
|
}
|
|
63
101
|
catch (error) {
|
|
64
102
|
this.metrics.increment(exports.SCHEMA_CACHE_REFRESH_ERROR);
|
|
103
|
+
// The counter alone cannot tell "the SaaS returned an empty array" from "the SaaS is down"
|
|
104
|
+
// from "the env secret is wrong", and the cause is otherwise swallowed: it becomes the `cause`
|
|
105
|
+
// of a `SchemaUnavailableError` the error middleware serialises without logging.
|
|
106
|
+
this.logger('Warn', 'Schema refresh failed', {
|
|
107
|
+
cause: error instanceof Error ? `${error.name}: ${error.message}` : String(error),
|
|
108
|
+
servedStale: this.entry !== null,
|
|
109
|
+
});
|
|
65
110
|
// Warm cache: keep serving the last good schema (stale), do not poison — the next read
|
|
66
|
-
// re-attempts because `
|
|
111
|
+
// re-attempts because `expiresAt` is unchanged and the entry stays expired.
|
|
67
112
|
if (this.entry) {
|
|
68
113
|
this.emitAge();
|
|
69
114
|
return this.entry.collections;
|
|
@@ -72,6 +117,9 @@ class SchemaCache {
|
|
|
72
117
|
throw new errors_1.default(error);
|
|
73
118
|
}
|
|
74
119
|
}
|
|
120
|
+
ttlFor(fetchedAt) {
|
|
121
|
+
return fetchedAt < this.revalidatingUntil ? exports.REVALIDATION_TTL_MS : this.ttlMs;
|
|
122
|
+
}
|
|
75
123
|
emitAge() {
|
|
76
124
|
const age = this.ageSeconds();
|
|
77
125
|
if (age !== undefined)
|
|
@@ -79,4 +127,4 @@ class SchemaCache {
|
|
|
79
127
|
}
|
|
80
128
|
}
|
|
81
129
|
exports.default = SchemaCache;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLWNhY2hlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3JlYWQtbW9kZWwvc2NoZW1hLWNhY2hlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUtBLHNEQUE4QztBQUVqQyxRQUFBLFVBQVUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxJQUFJLENBQUM7QUFFOUM7Ozs7OztHQU1HO0FBQ1UsUUFBQSxzQkFBc0IsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDO0FBQ25DLFFBQUEsbUJBQW1CLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUUvQixRQUFBLDBCQUEwQixHQUFHLDRCQUE0QixDQUFDO0FBQzFELFFBQUEsd0JBQXdCLEdBQUcsMEJBQTBCLENBQUM7QUFxQm5FOzs7OztHQUtHO0FBQ0gsTUFBcUIsV0FBVztJQWE5QixZQUFZLEVBQ1YsT0FBTyxFQUNQLE9BQU8sRUFDUCxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUMsU0FBUyxFQUN4QixHQUFHLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFDZCxLQUFLLEdBQUcsa0JBQVUsR0FDQztRQVpiLFVBQUssR0FBc0IsSUFBSSxDQUFDO1FBQ2hDLGFBQVEsR0FBNkMsSUFBSSxDQUFDO1FBQzFELGtCQUFhLEdBQUcsQ0FBQyxDQUFDO1FBQ2xCLGVBQVUsR0FBRyxDQUFDLENBQUM7UUFDZixzQkFBaUIsR0FBRyxDQUFDLENBQUM7UUFTNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7UUFDckIsSUFBSSxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUM7UUFDZixJQUFJLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQztJQUNyQixDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQUc7UUFDUCxJQUFJLElBQUksQ0FBQyxLQUFL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
|