@forestadmin/agent 1.108.2 → 1.109.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/agent.d.ts +14 -9
- package/dist/agent.js +129 -6
- package/dist/bff-routes.d.ts +6 -0
- package/dist/bff-routes.js +51 -2
- package/dist/embedded-bff.d.ts +23 -6
- package/dist/embedded-bff.js +70 -32
- package/dist/framework-mounter.d.ts +2 -1
- package/dist/framework-mounter.js +4 -1
- package/dist/gateway.d.ts +19 -0
- package/dist/gateway.js +96 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/types.d.ts +14 -0
- package/dist/types.js +1 -1
- package/dist/utils/express-to-koa.js +3 -1
- package/package.json +7 -7
package/dist/agent.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import type { ForestAdminHttpDriverServices } from './services';
|
|
2
|
-
import type { AgentOptions, AgentOptionsWithDefaults, BffEmbedOptions, WorkflowExecutorEmbedOptions } from './types';
|
|
2
|
+
import type { AgentOptions, AgentOptionsWithDefaults, BffEmbedOptions, GatewayOptions, McpEmbedOptions, WorkflowExecutorEmbedOptions } from './types';
|
|
3
3
|
import type { CollectionCustomizer, DataSourceChartDefinition, DataSourceOptions, Plugin, TCollectionName, TSchema } from '@forestadmin/datasource-customizer';
|
|
4
4
|
import type { DataSource, DataSourceFactory } from '@forestadmin/datasource-toolkit';
|
|
5
|
-
import type { FileUploadsOptions, TokenTtlOptions, ToolName } from '@forestadmin/mcp-server';
|
|
6
5
|
import { DataSourceCustomizer } from '@forestadmin/datasource-customizer';
|
|
7
6
|
import FrameworkMounter from './framework-mounter';
|
|
8
7
|
import CustomizationService from './services/model-customizations/customization';
|
|
@@ -34,7 +33,9 @@ export default class Agent<S extends TSchema = TSchema> extends FrameworkMounter
|
|
|
34
33
|
private embeddedExecutor;
|
|
35
34
|
/** In-process BFF, created only when addBff() is called. */
|
|
36
35
|
private embeddedBff;
|
|
36
|
+
private gateway;
|
|
37
37
|
private isRestarting;
|
|
38
|
+
private isStopped;
|
|
38
39
|
/**
|
|
39
40
|
* Set as soon as start() begins, not once it finishes: mount() drains the `onFirstStart` hooks
|
|
40
41
|
* partway through, so a builder call landing mid-startup is already too late. Cleared again when
|
|
@@ -126,7 +127,10 @@ export default class Agent<S extends TSchema = TSchema> extends FrameworkMounter
|
|
|
126
127
|
* agent.use(advancedExportPlugin, { format: 'xlsx' });
|
|
127
128
|
*/
|
|
128
129
|
use<Options>(plugin: Plugin<Options>, options?: Options): this;
|
|
130
|
+
addGateway(options: GatewayOptions): this;
|
|
129
131
|
/**
|
|
132
|
+
* @deprecated Use `addGateway({ mcp })`. Keeps its current paths and semantics.
|
|
133
|
+
*
|
|
130
134
|
* Enable MCP (Model Context Protocol) server support.
|
|
131
135
|
* This allows AI assistants to interact with your Forest Admin data.
|
|
132
136
|
*
|
|
@@ -156,13 +160,7 @@ export default class Agent<S extends TSchema = TSchema> extends FrameworkMounter
|
|
|
156
160
|
* agent.mountAiMcpServer({ fileUploads: { storage } });
|
|
157
161
|
* agent.mountAiMcpServer({ fileUploads: false });
|
|
158
162
|
*/
|
|
159
|
-
mountAiMcpServer(options?:
|
|
160
|
-
enabledTools?: ToolName[];
|
|
161
|
-
basePath?: string;
|
|
162
|
-
tokenTtl?: TokenTtlOptions;
|
|
163
|
-
allowedOAuthClients?: string[];
|
|
164
|
-
fileUploads?: false | FileUploadsOptions;
|
|
165
|
-
}): this;
|
|
163
|
+
mountAiMcpServer(options?: McpEmbedOptions): this;
|
|
166
164
|
/**
|
|
167
165
|
* Run a workflow executor in-process, alongside the agent. The agent boots it on start(),
|
|
168
166
|
* stops it on stop(), and proxies `/_internal/executor/*` to it — no separate deployment.
|
|
@@ -188,6 +186,8 @@ export default class Agent<S extends TSchema = TSchema> extends FrameworkMounter
|
|
|
188
186
|
*/
|
|
189
187
|
addWorkflowExecutor(options?: WorkflowExecutorEmbedOptions): this;
|
|
190
188
|
/**
|
|
189
|
+
* @deprecated Use `addGateway({ api })`. Keeps serving on `/bff`.
|
|
190
|
+
*
|
|
191
191
|
* Serve a BFF in-process, alongside the agent, at `/bff` — no second deployment, no second port.
|
|
192
192
|
* The agent builds it on start(), stops it on stop(), and hands it a dispatcher that reaches its
|
|
193
193
|
* own stack without a socket, so this works the same on every mount target.
|
|
@@ -216,6 +216,11 @@ export default class Agent<S extends TSchema = TSchema> extends FrameworkMounter
|
|
|
216
216
|
* .start();
|
|
217
217
|
*/
|
|
218
218
|
addBff(options?: BffEmbedOptions): this;
|
|
219
|
+
private prepareGateway;
|
|
220
|
+
private gatewayApi;
|
|
221
|
+
private warnIfMcpAliasUsed;
|
|
222
|
+
private setRootHandlers;
|
|
223
|
+
private logGatewayRoutes;
|
|
219
224
|
protected getRoutes(dataSource: DataSource, services: ForestAdminHttpDriverServices): import("./routes/base-route").default[];
|
|
220
225
|
/**
|
|
221
226
|
* Create an http handler which can respond to all queries which are expected from an agent.
|
package/dist/agent.js
CHANGED
|
@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
const datasource_customizer_1 = require("@forestadmin/datasource-customizer");
|
|
40
|
+
const forestadmin_client_1 = require("@forestadmin/forestadmin-client");
|
|
40
41
|
const bodyparser_1 = __importDefault(require("@koa/bodyparser"));
|
|
41
42
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
42
43
|
const router_1 = __importDefault(require("@koa/router"));
|
|
@@ -47,6 +48,7 @@ const bff_routes_1 = require("./bff-routes");
|
|
|
47
48
|
const embedded_bff_1 = __importDefault(require("./embedded-bff"));
|
|
48
49
|
const embedded_workflow_executor_1 = __importDefault(require("./embedded-workflow-executor"));
|
|
49
50
|
const framework_mounter_1 = __importDefault(require("./framework-mounter"));
|
|
51
|
+
const gateway_1 = require("./gateway");
|
|
50
52
|
const routes_1 = __importDefault(require("./routes"));
|
|
51
53
|
const services_1 = __importDefault(require("./services"));
|
|
52
54
|
const customization_1 = __importDefault(require("./services/model-customizations/customization"));
|
|
@@ -60,6 +62,8 @@ const normalizeMcpBasePath = (basePath) => `/${(basePath ?? '').trim()}`.replace
|
|
|
60
62
|
const bffMcpCollision = (mcpBasePath) => `Cannot use addBff together with mountAiMcpServer({ basePath: '${mcpBasePath}' }): the MCP ` +
|
|
61
63
|
`server would claim ${bff_routes_1.BFF_PREFIX} paths the embedded BFF answers on (${bff_routes_1.BFF_PREFIX}/oauth, ` +
|
|
62
64
|
`${bff_routes_1.BFF_PREFIX}/mcp). Mount the MCP server elsewhere.`;
|
|
65
|
+
const GATEWAY_MIXING = 'addGateway() cannot be combined with mountAiMcpServer() or addBff(): configure every ' +
|
|
66
|
+
'service through addGateway({ mcp, api }), or keep both aliases.';
|
|
63
67
|
/**
|
|
64
68
|
* Allow to create a new Forest Admin agent from scratch.
|
|
65
69
|
* Builds the application by composing and configuring all the collection decorators.
|
|
@@ -96,7 +100,9 @@ class Agent extends framework_mounter_1.default {
|
|
|
96
100
|
this.embeddedExecutor = null;
|
|
97
101
|
/** In-process BFF, created only when addBff() is called. */
|
|
98
102
|
this.embeddedBff = null;
|
|
103
|
+
this.gateway = null;
|
|
99
104
|
this.isRestarting = false;
|
|
105
|
+
this.isStopped = false;
|
|
100
106
|
/**
|
|
101
107
|
* Set as soon as start() begins, not once it finishes: mount() drains the `onFirstStart` hooks
|
|
102
108
|
* partway through, so a builder call landing mid-startup is already too late. Cleared again when
|
|
@@ -116,22 +122,36 @@ class Agent extends framework_mounter_1.default {
|
|
|
116
122
|
async start() {
|
|
117
123
|
let mounted = false;
|
|
118
124
|
this.startupBegun = true;
|
|
125
|
+
this.isStopped = false;
|
|
119
126
|
try {
|
|
120
127
|
// First, before anything is mounted or subscribed: everything it validates is what the caller
|
|
121
128
|
// handed to addBff(), so a mistyped key must fail on that line rather than leave the host
|
|
122
129
|
// serving /forest with a permanently bricked /bff.
|
|
130
|
+
await this.prepareGateway();
|
|
123
131
|
await this.embeddedBff?.prepare();
|
|
132
|
+
if (this.isStopped)
|
|
133
|
+
await this.embeddedBff?.stop();
|
|
134
|
+
if (this.gateway)
|
|
135
|
+
this.setRootHandlers();
|
|
136
|
+
if (this.isStopped)
|
|
137
|
+
return;
|
|
138
|
+
this.warnIfMcpAliasUsed();
|
|
124
139
|
const { router, mcp } = await this.buildRouterAndSendSchema();
|
|
140
|
+
if (this.isStopped)
|
|
141
|
+
return;
|
|
125
142
|
await this.options.forestAdminClient.subscribeToServerEvents();
|
|
126
143
|
this.options.forestAdminClient.onRefreshCustomizations(this.restart.bind(this));
|
|
127
|
-
this.
|
|
144
|
+
this.setRootHandlers(mcp);
|
|
128
145
|
await this.mount(router);
|
|
129
146
|
mounted = true;
|
|
130
147
|
// Boot after mount(): the embedded executor reaches the agent over HTTP, and the
|
|
131
148
|
// standalone server's host/port (used to derive that URL) are only known once mounted.
|
|
132
149
|
await this.embeddedExecutor?.start(this.standaloneServerHost, this.standaloneServerPort);
|
|
150
|
+
if (this.isStopped)
|
|
151
|
+
return;
|
|
133
152
|
// Same reason, without the socket: the dispatcher injects into the stack mount() just built.
|
|
134
153
|
await this.embeddedBff?.start(this.getInProcessDispatcher());
|
|
154
|
+
this.logGatewayRoutes();
|
|
135
155
|
// Here rather than in initializeMcpServer(): that one reruns on every restart() and each run
|
|
136
156
|
// would cost a SaaS round-trip for a warning already given.
|
|
137
157
|
if (this.mcpEnabled)
|
|
@@ -167,6 +187,9 @@ class Agent extends framework_mounter_1.default {
|
|
|
167
187
|
* Stop the agent.
|
|
168
188
|
*/
|
|
169
189
|
async stop() {
|
|
190
|
+
this.isStopped = true;
|
|
191
|
+
if (this.gateway?.build)
|
|
192
|
+
this.setRootHandlers();
|
|
170
193
|
// Stop answering before the stack it dispatches into goes away: the host application keeps
|
|
171
194
|
// whatever middleware it registered, so a stopped agent would otherwise still serve BFF data.
|
|
172
195
|
await this.embeddedBff?.stop();
|
|
@@ -201,7 +224,9 @@ class Agent extends framework_mounter_1.default {
|
|
|
201
224
|
try {
|
|
202
225
|
// We force sending schema when restarting
|
|
203
226
|
const { router, mcp } = await this.buildRouterAndSendSchema();
|
|
204
|
-
this.
|
|
227
|
+
if (this.isStopped)
|
|
228
|
+
return;
|
|
229
|
+
this.setRootHandlers(mcp);
|
|
205
230
|
await this.remount(router);
|
|
206
231
|
// A restart means the customizations changed, so the schema the BFF read is stale.
|
|
207
232
|
this.embeddedBff?.invalidate();
|
|
@@ -285,7 +310,34 @@ class Agent extends framework_mounter_1.default {
|
|
|
285
310
|
this.customizer.use(plugin, options);
|
|
286
311
|
return this;
|
|
287
312
|
}
|
|
313
|
+
addGateway(options) {
|
|
314
|
+
if (this.gateway)
|
|
315
|
+
throw new Error('addGateway can only be called once.');
|
|
316
|
+
if (this.startupBegun) {
|
|
317
|
+
throw new Error('addGateway must be called before start(): the agent is already starting.');
|
|
318
|
+
}
|
|
319
|
+
if (this.mcpEnabled || this.embeddedBff)
|
|
320
|
+
throw new Error(GATEWAY_MIXING);
|
|
321
|
+
const services = (0, gateway_1.resolveGatewayServices)(options);
|
|
322
|
+
this.gateway = {
|
|
323
|
+
basePath: options.basePath ?? '',
|
|
324
|
+
services,
|
|
325
|
+
allowedOAuthClients: options.allowedOAuthClients,
|
|
326
|
+
};
|
|
327
|
+
if (services.mcp) {
|
|
328
|
+
this.mcpEnabled = true;
|
|
329
|
+
this.mcpEnabledTools = services.mcp.enabledTools;
|
|
330
|
+
this.mcpTokenTtl = services.mcp.tokenTtl;
|
|
331
|
+
this.mcpAllowedOAuthClients = options.allowedOAuthClients;
|
|
332
|
+
this.mcpFileUploads = services.mcp.fileUploads;
|
|
333
|
+
}
|
|
334
|
+
if (services.api)
|
|
335
|
+
this.getInProcessDispatcher();
|
|
336
|
+
return this;
|
|
337
|
+
}
|
|
288
338
|
/**
|
|
339
|
+
* @deprecated Use `addGateway({ mcp })`. Keeps its current paths and semantics.
|
|
340
|
+
*
|
|
289
341
|
* Enable MCP (Model Context Protocol) server support.
|
|
290
342
|
* This allows AI assistants to interact with your Forest Admin data.
|
|
291
343
|
*
|
|
@@ -316,6 +368,8 @@ class Agent extends framework_mounter_1.default {
|
|
|
316
368
|
* agent.mountAiMcpServer({ fileUploads: false });
|
|
317
369
|
*/
|
|
318
370
|
mountAiMcpServer(options) {
|
|
371
|
+
if (this.gateway)
|
|
372
|
+
throw new Error(GATEWAY_MIXING);
|
|
319
373
|
if (this.embeddedBff && (0, bff_routes_1.collidesWithBff)(options?.basePath)) {
|
|
320
374
|
throw new Error(bffMcpCollision(options?.basePath));
|
|
321
375
|
}
|
|
@@ -363,6 +417,8 @@ class Agent extends framework_mounter_1.default {
|
|
|
363
417
|
return this;
|
|
364
418
|
}
|
|
365
419
|
/**
|
|
420
|
+
* @deprecated Use `addGateway({ api })`. Keeps serving on `/bff`.
|
|
421
|
+
*
|
|
366
422
|
* Serve a BFF in-process, alongside the agent, at `/bff` — no second deployment, no second port.
|
|
367
423
|
* The agent builds it on start(), stops it on stop(), and hands it a dispatcher that reaches its
|
|
368
424
|
* own stack without a socket, so this works the same on every mount target.
|
|
@@ -391,6 +447,8 @@ class Agent extends framework_mounter_1.default {
|
|
|
391
447
|
* .start();
|
|
392
448
|
*/
|
|
393
449
|
addBff(options = {}) {
|
|
450
|
+
if (this.gateway)
|
|
451
|
+
throw new Error(GATEWAY_MIXING);
|
|
394
452
|
if (this.embeddedBff) {
|
|
395
453
|
throw new Error('addBff can only be called once.');
|
|
396
454
|
}
|
|
@@ -405,15 +463,75 @@ class Agent extends framework_mounter_1.default {
|
|
|
405
463
|
if ((0, bff_routes_1.collidesWithBff)(this.mcpBasePath)) {
|
|
406
464
|
throw new Error(bffMcpCollision(this.mcpBasePath));
|
|
407
465
|
}
|
|
408
|
-
const bff = new embedded_bff_1.default(this.options, options);
|
|
466
|
+
const bff = new embedded_bff_1.default(this.options, options, { prefix: bff_routes_1.BFF_PREFIX });
|
|
409
467
|
this.embeddedBff = bff;
|
|
410
468
|
// Registered now rather than at start(): getInProcessDispatcher() pushes its hook the first
|
|
411
469
|
// time it is called, and mount() only runs the hooks registered before it — asked for later,
|
|
412
470
|
// the dispatcher would have no handler until the first restart.
|
|
413
471
|
this.getInProcessDispatcher();
|
|
414
|
-
this.setBffCallback(bff.handle);
|
|
472
|
+
this.setBffCallback((0, bff_routes_1.createBffAliasCallback)(bff.handle, this.options.logger));
|
|
415
473
|
return this;
|
|
416
474
|
}
|
|
475
|
+
async prepareGateway() {
|
|
476
|
+
if (!this.gateway)
|
|
477
|
+
return;
|
|
478
|
+
const { services } = this.gateway;
|
|
479
|
+
if (!services.mcp && !services.api) {
|
|
480
|
+
throw new Error('addGateway() enables no service: pass mcp, api, or both, e.g. addGateway({ mcp: true }).');
|
|
481
|
+
}
|
|
482
|
+
(0, forestadmin_client_1.normalizeDomainList)(this.gateway.allowedOAuthClients);
|
|
483
|
+
const { createGatewaySwitch, makeIsMcpRoute, normalizeMountPath } = await Promise.resolve().then(() => __importStar(require('@forestadmin/mcp-server')));
|
|
484
|
+
const basePath = normalizeMountPath(this.gateway.basePath, 'basePath');
|
|
485
|
+
(0, gateway_1.assertNoGatewayOverlap)(basePath, this.completeMountPrefix, services);
|
|
486
|
+
this.gateway.basePath = basePath;
|
|
487
|
+
if (services.mcp)
|
|
488
|
+
this.mcpBasePath = basePath || undefined;
|
|
489
|
+
const bff = services.api ? this.gatewayApi(basePath, services.api) : null;
|
|
490
|
+
const api = bff ? { matches: (path) => bff.claims(path), callback: bff.handle } : null;
|
|
491
|
+
const isMcpRoute = makeIsMcpRoute(basePath);
|
|
492
|
+
const mcpStarting = services.mcp ? (0, gateway_1.mcpUnavailable)(isMcpRoute, 'starting') : null;
|
|
493
|
+
if (services.mcp)
|
|
494
|
+
this.gateway.mcpStopped = (0, gateway_1.mcpUnavailable)(isMcpRoute, 'stopped');
|
|
495
|
+
this.gateway.build = mcp => createGatewaySwitch({
|
|
496
|
+
basePath,
|
|
497
|
+
mcp: mcp ?? mcpStarting ?? undefined,
|
|
498
|
+
api: api ?? undefined,
|
|
499
|
+
});
|
|
500
|
+
}
|
|
501
|
+
gatewayApi(basePath, options) {
|
|
502
|
+
this.embeddedBff ?? (this.embeddedBff = new embedded_bff_1.default(this.options, options, {
|
|
503
|
+
prefix: `${basePath}/api`,
|
|
504
|
+
name: 'The Gateway API',
|
|
505
|
+
requiredVersion: gateway_1.AGENT_BFF_PEER_VERSION,
|
|
506
|
+
skipIpWhitelistWarning: Boolean(this.gateway?.services.mcp),
|
|
507
|
+
allowedOAuthClients: this.gateway?.allowedOAuthClients,
|
|
508
|
+
gateway: true,
|
|
509
|
+
}));
|
|
510
|
+
return this.embeddedBff;
|
|
511
|
+
}
|
|
512
|
+
warnIfMcpAliasUsed() {
|
|
513
|
+
if (!this.mcpEnabled || this.gateway)
|
|
514
|
+
return;
|
|
515
|
+
this.options.logger('Warn', '[MCP] mountAiMcpServer() is deprecated: use addGateway({ mcp }) instead. ' +
|
|
516
|
+
'It keeps serving on its current paths.');
|
|
517
|
+
}
|
|
518
|
+
setRootHandlers(mcp) {
|
|
519
|
+
if (!this.gateway?.build) {
|
|
520
|
+
this.setMcpCallback(mcp ?? null);
|
|
521
|
+
return;
|
|
522
|
+
}
|
|
523
|
+
const stopped = this.isStopped ? this.gateway.mcpStopped : undefined;
|
|
524
|
+
this.setGatewayCallback(this.gateway.build(stopped ?? mcp));
|
|
525
|
+
}
|
|
526
|
+
logGatewayRoutes() {
|
|
527
|
+
if (!this.gateway)
|
|
528
|
+
return;
|
|
529
|
+
const { basePath, services, allowedOAuthClients } = this.gateway;
|
|
530
|
+
(0, gateway_1.describeGatewayRoutes)(basePath, services).forEach(line => this.options.logger('Info', line));
|
|
531
|
+
if (allowedOAuthClients && !(0, gateway_1.servesOAuth)(services)) {
|
|
532
|
+
this.options.logger('Warn', '[Gateway] allowedOAuthClients is set but no OAuth route is served (MCP off, API OAuth off).');
|
|
533
|
+
}
|
|
534
|
+
}
|
|
417
535
|
getRoutes(dataSource, services) {
|
|
418
536
|
return (0, routes_1.default)(dataSource, this.options, services);
|
|
419
537
|
}
|
|
@@ -455,12 +573,17 @@ class Agent extends framework_mounter_1.default {
|
|
|
455
573
|
if (!isFeatureEnabled)
|
|
456
574
|
return;
|
|
457
575
|
const base = normalizeMcpBasePath(this.mcpBasePath);
|
|
576
|
+
const apiNote = this.gateway?.services.api
|
|
577
|
+
? ` The Gateway API on ${base}/api/* escapes it too: it reaches the agent in-process, ` +
|
|
578
|
+
'which the whitelist exempts as a trusted loopback caller. API calls still require an ' +
|
|
579
|
+
'API key or an OAuth session.'
|
|
580
|
+
: '';
|
|
458
581
|
this.options.logger('Warn', '[MCP] The IP whitelist is enabled for this environment, but it filters none of the MCP ' +
|
|
459
582
|
`routes (${base}/mcp, ${base}/mcp/uploads, ${base}/oauth/*, ` +
|
|
460
583
|
`/.well-known/oauth-authorization-server${base}, ` +
|
|
461
584
|
`/.well-known/oauth-protected-resource${base}/mcp): its middleware is mounted on the ` +
|
|
462
585
|
`/forest router only, so these routes escape it for any caller. Tool calls on ${base}/mcp ` +
|
|
463
|
-
|
|
586
|
+
`still require a valid MCP OAuth token.${apiNote}`);
|
|
464
587
|
}
|
|
465
588
|
catch (error) {
|
|
466
589
|
this.options.logger('Debug', `[MCP] Could not read the IP whitelist configuration: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -616,4 +739,4 @@ class Agent extends framework_mounter_1.default {
|
|
|
616
739
|
}
|
|
617
740
|
}
|
|
618
741
|
exports.default = Agent;
|
|
619
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
|
|
742
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"agent.js","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/bff-routes.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { HttpCallback } from './types';
|
|
2
|
+
import type { Logger } from '@forestadmin/datasource-toolkit';
|
|
1
3
|
/**
|
|
2
4
|
* Where an embedded BFF answers, at the root of the host application. Fixed: the BFF serves its own
|
|
3
5
|
* `/oauth/*` and `/docs`, which would otherwise collide with the MCP server's root paths and with
|
|
@@ -14,6 +16,10 @@ export declare function isBffRoute(url: string): boolean;
|
|
|
14
16
|
* as a malformed request rather than as the root.
|
|
15
17
|
*/
|
|
16
18
|
export declare function stripBffPrefix(url: string): string;
|
|
19
|
+
export declare const BFF_DEPRECATION_TIMESTAMP: number;
|
|
20
|
+
export declare const BFF_DEPRECATION_LINK = "https://docs.forestadmin.com/product/embed/bff";
|
|
21
|
+
export declare const BFF_DEPRECATION_LOG_INTERVAL_MS: number;
|
|
22
|
+
export declare function createBffAliasCallback(handle: HttpCallback, logger: Logger): HttpCallback;
|
|
17
23
|
/**
|
|
18
24
|
* Whether an MCP mount path would land inside `/bff`. The MCP server normalizes its `basePath`
|
|
19
25
|
* (trim, leading slash, collapsed and stripped trailing slashes) before deriving
|
package/dist/bff-routes.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BFF_PREFIX = void 0;
|
|
3
|
+
exports.BFF_DEPRECATION_LOG_INTERVAL_MS = exports.BFF_DEPRECATION_LINK = exports.BFF_DEPRECATION_TIMESTAMP = exports.BFF_PREFIX = void 0;
|
|
4
4
|
exports.isBffRoute = isBffRoute;
|
|
5
5
|
exports.stripBffPrefix = stripBffPrefix;
|
|
6
|
+
exports.createBffAliasCallback = createBffAliasCallback;
|
|
6
7
|
exports.collidesWithBff = collidesWithBff;
|
|
7
8
|
/**
|
|
8
9
|
* Where an embedded BFF answers, at the root of the host application. Fixed: the BFF serves its own
|
|
@@ -23,11 +24,59 @@ function isBffRoute(url) {
|
|
|
23
24
|
* as a malformed request rather than as the root.
|
|
24
25
|
*/
|
|
25
26
|
function stripBffPrefix(url) {
|
|
27
|
+
if (!isBffRoute(url))
|
|
28
|
+
return url;
|
|
26
29
|
const remainder = url.slice(exports.BFF_PREFIX.length);
|
|
27
30
|
if (remainder === '')
|
|
28
31
|
return '/';
|
|
29
32
|
return remainder.startsWith('/') ? remainder : `/${remainder}`;
|
|
30
33
|
}
|
|
34
|
+
exports.BFF_DEPRECATION_TIMESTAMP = Date.UTC(2026, 9, 5) / 1000;
|
|
35
|
+
exports.BFF_DEPRECATION_LINK = 'https://docs.forestadmin.com/product/embed/bff';
|
|
36
|
+
exports.BFF_DEPRECATION_LOG_INTERVAL_MS = 60 * 60 * 1000;
|
|
37
|
+
const EXPOSE_HEADERS = 'Access-Control-Expose-Headers';
|
|
38
|
+
const DEPRECATION_HEADERS = ['Deprecation', 'Link'];
|
|
39
|
+
const DEPRECATION_LINK = `<${exports.BFF_DEPRECATION_LINK}>; rel="deprecation"`;
|
|
40
|
+
function headerValues(res, name) {
|
|
41
|
+
const value = res.getHeader(name);
|
|
42
|
+
return value === undefined ? [] : [value].flat().map(String);
|
|
43
|
+
}
|
|
44
|
+
function markDeprecated(res) {
|
|
45
|
+
const exposed = headerValues(res, EXPOSE_HEADERS)
|
|
46
|
+
.flatMap(value => value.split(','))
|
|
47
|
+
.map(name => name.trim())
|
|
48
|
+
.filter(Boolean);
|
|
49
|
+
const links = headerValues(res, 'Link');
|
|
50
|
+
res.setHeader('Deprecation', `@${exports.BFF_DEPRECATION_TIMESTAMP}`);
|
|
51
|
+
if (!links.includes(DEPRECATION_LINK)) {
|
|
52
|
+
res.setHeader('Link', [...links, DEPRECATION_LINK].join(', '));
|
|
53
|
+
}
|
|
54
|
+
res.setHeader(EXPOSE_HEADERS, [...new Set([...exposed, ...DEPRECATION_HEADERS])].join(', '));
|
|
55
|
+
}
|
|
56
|
+
function markDeprecatedOnWriteHead(res) {
|
|
57
|
+
const { writeHead } = res;
|
|
58
|
+
res.writeHead = ((...args) => {
|
|
59
|
+
markDeprecated(res);
|
|
60
|
+
return writeHead.apply(res, args);
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
function createBffAliasCallback(handle, logger) {
|
|
64
|
+
let lastWarnedAt = null;
|
|
65
|
+
return (req, res, next) => {
|
|
66
|
+
const now = Date.now();
|
|
67
|
+
if (lastWarnedAt === null || now - lastWarnedAt >= exports.BFF_DEPRECATION_LOG_INTERVAL_MS) {
|
|
68
|
+
lastWarnedAt = now;
|
|
69
|
+
logger('Warn', `[BFF] ${exports.BFF_PREFIX}/* is deprecated and was called: use addGateway({ api }), ` +
|
|
70
|
+
`which serves the same routes under <basePath>/api (/api by default). ` +
|
|
71
|
+
`See ${exports.BFF_DEPRECATION_LINK}`);
|
|
72
|
+
}
|
|
73
|
+
const aliasReq = req;
|
|
74
|
+
aliasReq.originalUrl ?? (aliasReq.originalUrl = req.url);
|
|
75
|
+
req.url = stripBffPrefix(req.url ?? exports.BFF_PREFIX);
|
|
76
|
+
markDeprecatedOnWriteHead(res);
|
|
77
|
+
handle(req, res, next);
|
|
78
|
+
};
|
|
79
|
+
}
|
|
31
80
|
/**
|
|
32
81
|
* Whether an MCP mount path would land inside `/bff`. The MCP server normalizes its `basePath`
|
|
33
82
|
* (trim, leading slash, collapsed and stripped trailing slashes) before deriving
|
|
@@ -46,4 +95,4 @@ function collidesWithBff(mcpBasePath) {
|
|
|
46
95
|
.replace(/\/+$/, '');
|
|
47
96
|
return isBffRoute(`${normalized}/mcp`);
|
|
48
97
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
98
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmZmLXJvdXRlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9iZmYtcm91dGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQWNBLGdDQUlDO0FBT0Qsd0NBUUM7QUEwQ0Qsd0RBc0JDO0FBU0QsMENBWUM7QUFsSEQ7Ozs7R0FJRztBQUNVLFFBQUEsVUFBVSxHQUFHLE1BQU0sQ0FBQztBQUVqQzs7R0FFRztBQUNILFNBQWdCLFVBQVUsQ0FBQyxHQUFXO0lBQ3BDLE1BQU0sQ0FBQyxRQUFRLENBQUMsR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsQ0FBQztJQUV4QyxPQUFPLFFBQVEsS0FBSyxrQkFBVSxJQUFJLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxrQkFBVSxHQUFHLENBQUMsQ0FBQztBQUMxRSxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILFNBQWdCLGNBQWMsQ0FBQyxHQUFXO0lBQ3hDLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDO1FBQUUsT0FBTyxHQUFHLENBQUM7SUFFakMsTUFBTSxTQUFTLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxrQkFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRS9DLElBQUksU0FBUyxLQUFLLEVBQUU7UUFBRSxPQUFPLEdBQUcsQ0FBQztJQUVqQyxPQUFPLFNBQVMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsSUFBSSxTQUFTLEVBQUUsQ0FBQztBQUNqRSxDQUFDO0FBRVksUUFBQSx5QkFBeUIsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDO0FBQ3hELFFBQUEsb0JBQW9CLEdBQUcsZ0RBQWdELENBQUM7QUFDeEUsUUFBQSwrQkFBK0IsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQztBQUU5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
|
package/dist/embedded-bff.d.ts
CHANGED
|
@@ -1,19 +1,32 @@
|
|
|
1
1
|
import type { AgentOptionsWithDefaults, BffEmbedOptions, HttpCallback } from './types';
|
|
2
|
-
import type { AgentDispatcher } from '@forestadmin/agent-bff';
|
|
2
|
+
import type { AgentDispatcher, ConfigLabels } from '@forestadmin/agent-bff';
|
|
3
|
+
export declare const GATEWAY_API_CONFIG_LABELS: ConfigLabels;
|
|
4
|
+
export type EmbeddedBffMount = {
|
|
5
|
+
prefix: string;
|
|
6
|
+
name?: string;
|
|
7
|
+
requiredVersion?: string;
|
|
8
|
+
skipIpWhitelistWarning?: boolean;
|
|
9
|
+
allowedOAuthClients?: string[];
|
|
10
|
+
gateway?: boolean;
|
|
11
|
+
};
|
|
3
12
|
/** How long `stop()` waits for the activity-log writes no connection holds. */
|
|
4
13
|
export declare const SHUTDOWN_TIMEOUT_MS = 10000;
|
|
5
14
|
/**
|
|
6
15
|
* Owns the lifecycle of a BFF embedded in the agent process: configuration, dynamic loading of the
|
|
7
|
-
* optional package, build, and the request handler the agent mounts
|
|
8
|
-
* the callback and delegates start/stop.
|
|
16
|
+
* optional package, build, and the request handler the agent mounts under its prefix. The agent
|
|
17
|
+
* only wires the callback and delegates start/stop.
|
|
9
18
|
*/
|
|
10
19
|
export default class EmbeddedBff {
|
|
11
20
|
private readonly options;
|
|
12
21
|
private readonly embedOptions;
|
|
22
|
+
private readonly mount;
|
|
13
23
|
private config;
|
|
14
24
|
private bff;
|
|
15
25
|
private stopped;
|
|
16
|
-
|
|
26
|
+
private claimsBffPath;
|
|
27
|
+
constructor(options: AgentOptionsWithDefaults, embedOptions: BffEmbedOptions, mount: EmbeddedBffMount);
|
|
28
|
+
private get name();
|
|
29
|
+
private log;
|
|
17
30
|
/**
|
|
18
31
|
* Load the package and validate the options the caller handed to `addBff()`. Called before the
|
|
19
32
|
* agent mounts anything: everything checked here is caller input, and `parseConfig` throws on a
|
|
@@ -21,6 +34,8 @@ export default class EmbeddedBff {
|
|
|
21
34
|
* where failing after mount() would leave the host with a live `/forest` and a bricked `/bff`.
|
|
22
35
|
*/
|
|
23
36
|
prepare(): Promise<void>;
|
|
37
|
+
private assertRequiredVersion;
|
|
38
|
+
claims(pathname: string): boolean;
|
|
24
39
|
/**
|
|
25
40
|
* Build the BFF. Called from agent.start() after mount(), because the dispatcher only reaches the
|
|
26
41
|
* agent's own stack once that stack is mounted.
|
|
@@ -56,8 +71,10 @@ export default class EmbeddedBff {
|
|
|
56
71
|
*/
|
|
57
72
|
stop(): Promise<void>;
|
|
58
73
|
/**
|
|
59
|
-
* The callback the agent registers
|
|
60
|
-
*
|
|
74
|
+
* The callback the agent registers under the mount prefix, handed requests already stripped of
|
|
75
|
+
* it: terminal, it never strips nor calls `next`. Answers 503 rather than falling through while
|
|
76
|
+
* the BFF is not serving: a 404 from the host would read as "wrong url" instead of "not
|
|
77
|
+
* available".
|
|
61
78
|
* Boot and shutdown are told apart, because a probe should wait on the first and drain on the
|
|
62
79
|
* second.
|
|
63
80
|
*/
|
package/dist/embedded-bff.js
CHANGED
|
@@ -33,8 +33,21 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.SHUTDOWN_TIMEOUT_MS = void 0;
|
|
37
|
-
const
|
|
36
|
+
exports.SHUTDOWN_TIMEOUT_MS = exports.GATEWAY_API_CONFIG_LABELS = void 0;
|
|
37
|
+
const gateway_1 = require("./gateway");
|
|
38
|
+
const BFF_PACKAGE = '@forestadmin/agent-bff';
|
|
39
|
+
exports.GATEWAY_API_CONFIG_LABELS = {
|
|
40
|
+
FOREST_AUTH_SECRET: 'authSecret',
|
|
41
|
+
FOREST_ENV_SECRET: 'envSecret',
|
|
42
|
+
FOREST_SERVER_URL: 'forestServerUrl',
|
|
43
|
+
FOREST_APP_URL: 'forestAppUrl',
|
|
44
|
+
BFF_TOKEN_ENCRYPTION_KEY: 'api.tokenEncryptionKey',
|
|
45
|
+
BFF_ALLOWED_ORIGINS: 'api.allowedOrigins',
|
|
46
|
+
BFF_DEFAULT_TIMEZONE: 'api.defaultTimezone',
|
|
47
|
+
BFF_AGENT_TIMEOUT_MS: 'api.agentTimeoutMs',
|
|
48
|
+
BFF_AI_TIMEOUT_MS: 'api.aiTimeoutMs',
|
|
49
|
+
BFF_OPENAPI_ENABLED: 'api.openapiEnabled',
|
|
50
|
+
};
|
|
38
51
|
/** How long `stop()` waits for the activity-log writes no connection holds. */
|
|
39
52
|
exports.SHUTDOWN_TIMEOUT_MS = 10000;
|
|
40
53
|
/**
|
|
@@ -43,34 +56,38 @@ exports.SHUTDOWN_TIMEOUT_MS = 10000;
|
|
|
43
56
|
* hand — their `message` and `stack` are not enumerable, so `JSON.stringify` alone turns the one
|
|
44
57
|
* value worth logging into `{}`. Never throws — logging must not break a request.
|
|
45
58
|
*/
|
|
46
|
-
function formatLog(message, context) {
|
|
59
|
+
function formatLog(tag, message, context) {
|
|
47
60
|
if (!context || Object.keys(context).length === 0)
|
|
48
|
-
return
|
|
61
|
+
return `${tag} ${message}`;
|
|
49
62
|
try {
|
|
50
63
|
const serialized = JSON.stringify(context, (_key, value) => value instanceof Error
|
|
51
64
|
? { name: value.name, message: value.message, stack: value.stack }
|
|
52
65
|
: value);
|
|
53
|
-
return
|
|
66
|
+
return `${tag} ${message} ${serialized}`;
|
|
54
67
|
}
|
|
55
68
|
catch {
|
|
56
|
-
return
|
|
69
|
+
return `${tag} ${message} [unserializable context]`;
|
|
57
70
|
}
|
|
58
71
|
}
|
|
59
72
|
/**
|
|
60
73
|
* Owns the lifecycle of a BFF embedded in the agent process: configuration, dynamic loading of the
|
|
61
|
-
* optional package, build, and the request handler the agent mounts
|
|
62
|
-
* the callback and delegates start/stop.
|
|
74
|
+
* optional package, build, and the request handler the agent mounts under its prefix. The agent
|
|
75
|
+
* only wires the callback and delegates start/stop.
|
|
63
76
|
*/
|
|
64
77
|
class EmbeddedBff {
|
|
65
|
-
constructor(options, embedOptions) {
|
|
78
|
+
constructor(options, embedOptions, mount) {
|
|
66
79
|
this.options = options;
|
|
67
80
|
this.embedOptions = embedOptions;
|
|
81
|
+
this.mount = mount;
|
|
68
82
|
this.config = null;
|
|
69
83
|
this.bff = null;
|
|
70
84
|
this.stopped = false;
|
|
85
|
+
this.claimsBffPath = null;
|
|
71
86
|
/**
|
|
72
|
-
* The callback the agent registers
|
|
73
|
-
*
|
|
87
|
+
* The callback the agent registers under the mount prefix, handed requests already stripped of
|
|
88
|
+
* it: terminal, it never strips nor calls `next`. Answers 503 rather than falling through while
|
|
89
|
+
* the BFF is not serving: a 404 from the host would read as "wrong url" instead of "not
|
|
90
|
+
* available".
|
|
74
91
|
* Boot and shutdown are told apart, because a probe should wait on the first and drain on the
|
|
75
92
|
* second.
|
|
76
93
|
*/
|
|
@@ -78,21 +95,22 @@ class EmbeddedBff {
|
|
|
78
95
|
if (!this.bff) {
|
|
79
96
|
const type = this.stopped ? 'bff_stopped' : 'bff_not_started';
|
|
80
97
|
const message = this.stopped
|
|
81
|
-
?
|
|
82
|
-
:
|
|
98
|
+
? `${this.name} was stopped with the agent.`
|
|
99
|
+
: `${this.name} is not started yet.`;
|
|
83
100
|
res.statusCode = 503;
|
|
84
101
|
res.setHeader('Content-Type', 'application/json');
|
|
85
102
|
res.end(JSON.stringify({ error: { type, status: 503, message } }));
|
|
86
103
|
return;
|
|
87
104
|
}
|
|
88
|
-
// The BFF knows nothing of the prefix it is served under. `originalUrl` is claimed before the
|
|
89
|
-
// rewrite so a host logger reading it still reports the url the client asked for.
|
|
90
|
-
const bffReq = req;
|
|
91
|
-
bffReq.originalUrl ?? (bffReq.originalUrl = bffReq.url);
|
|
92
|
-
req.url = (0, bff_routes_1.stripBffPrefix)(req.url ?? bff_routes_1.BFF_PREFIX);
|
|
93
105
|
this.bff.callback(req, res);
|
|
94
106
|
};
|
|
95
107
|
}
|
|
108
|
+
get name() {
|
|
109
|
+
return this.mount.name ?? 'The embedded BFF';
|
|
110
|
+
}
|
|
111
|
+
log(message, context) {
|
|
112
|
+
return formatLog(this.mount.gateway ? '[Gateway API]' : '[BFF]', message, context);
|
|
113
|
+
}
|
|
96
114
|
/**
|
|
97
115
|
* Load the package and validate the options the caller handed to `addBff()`. Called before the
|
|
98
116
|
* agent mounts anything: everything checked here is caller input, and `parseConfig` throws on a
|
|
@@ -100,9 +118,12 @@ class EmbeddedBff {
|
|
|
100
118
|
* where failing after mount() would leave the host with a live `/forest` and a bricked `/bff`.
|
|
101
119
|
*/
|
|
102
120
|
async prepare() {
|
|
103
|
-
const
|
|
121
|
+
const bffPackage = await this.importPackage();
|
|
122
|
+
const { parseConfig, IN_PROCESS_AGENT_URL } = bffPackage;
|
|
104
123
|
const { embedOptions } = this;
|
|
105
|
-
this.
|
|
124
|
+
this.assertRequiredVersion(bffPackage.version);
|
|
125
|
+
this.claimsBffPath = bffPackage.claimsBffPath;
|
|
126
|
+
const env = {
|
|
106
127
|
FOREST_AUTH_SECRET: this.options.authSecret,
|
|
107
128
|
FOREST_ENV_SECRET: this.options.envSecret,
|
|
108
129
|
FOREST_SERVER_URL: this.options.forestServerUrl,
|
|
@@ -117,7 +138,20 @@ class EmbeddedBff {
|
|
|
117
138
|
// Off unless asked for: the document is not filtered per caller, so mounting a BFF must not
|
|
118
139
|
// publish the name of every exposed collection and field on an already-open port.
|
|
119
140
|
BFF_OPENAPI_ENABLED: String(embedOptions.openapiEnabled ?? false),
|
|
120
|
-
}
|
|
141
|
+
};
|
|
142
|
+
this.config = parseConfig(env, this.mount.gateway ? exports.GATEWAY_API_CONFIG_LABELS : undefined);
|
|
143
|
+
}
|
|
144
|
+
assertRequiredVersion(installed) {
|
|
145
|
+
const { requiredVersion } = this.mount;
|
|
146
|
+
if (!requiredVersion || installed === requiredVersion)
|
|
147
|
+
return;
|
|
148
|
+
throw new Error(`addGateway({ api }) requires ${BFF_PACKAGE} ${requiredVersion}, found ${installed}. ` +
|
|
149
|
+
`Install it with \`npm install ${BFF_PACKAGE}@${requiredVersion}\`.`);
|
|
150
|
+
}
|
|
151
|
+
claims(pathname) {
|
|
152
|
+
if (!this.claimsBffPath)
|
|
153
|
+
return false;
|
|
154
|
+
return this.claimsBffPath(pathname, { docs: this.embedOptions.openapiEnabled ?? false });
|
|
121
155
|
}
|
|
122
156
|
/**
|
|
123
157
|
* Build the BFF. Called from agent.start() after mount(), because the dispatcher only reaches the
|
|
@@ -133,7 +167,10 @@ class EmbeddedBff {
|
|
|
133
167
|
const bff = await buildBff({
|
|
134
168
|
config: this.config,
|
|
135
169
|
dispatcher,
|
|
136
|
-
basePath:
|
|
170
|
+
basePath: this.mount.prefix,
|
|
171
|
+
allowedOAuthClients: this.mount.allowedOAuthClients,
|
|
172
|
+
gatewayVersion: gateway_1.AGENT_VERSION,
|
|
173
|
+
...(this.mount.gateway ? { labels: exports.GATEWAY_API_CONFIG_LABELS, name: 'Gateway API' } : {}),
|
|
137
174
|
// Counters are the schema cache's and the action-endpoint resolver's only channel — they take
|
|
138
175
|
// no logger — and every one of them reports a failure, so they go to the host's logs. Gauges
|
|
139
176
|
// do not: they are periodic cache sizes, and the default console sink reports them at Info,
|
|
@@ -142,18 +179,19 @@ class EmbeddedBff {
|
|
|
142
179
|
// Tags carried through: `action_endpoint_error` and `action_endpoint_miss` name the
|
|
143
180
|
// rendering, collection and action that failed, which is the whole of what makes the line
|
|
144
181
|
// actionable — the metric name alone says only that something, somewhere, did not resolve.
|
|
145
|
-
increment: (name, tags) => this.options.logger('Warn',
|
|
182
|
+
increment: (name, tags) => this.options.logger('Warn', this.log(`metric ${name}`, tags)),
|
|
146
183
|
gauge: () => undefined,
|
|
147
184
|
},
|
|
148
|
-
logger: (level, message, context) => this.options.logger(level,
|
|
185
|
+
logger: (level, message, context) => this.options.logger(level, this.log(message, context)),
|
|
149
186
|
});
|
|
150
187
|
// stop() may have landed while buildBff() was in flight. Assigning anyway would resurrect a
|
|
151
188
|
// stopped agent's /bff — dispatching into the stack it just tore down instead of answering 503.
|
|
152
189
|
if (this.stopped)
|
|
153
190
|
return;
|
|
154
191
|
this.bff = bff;
|
|
155
|
-
this.options.logger('Info',
|
|
156
|
-
|
|
192
|
+
this.options.logger('Info', this.log(`${this.mount.name ?? 'Embedded BFF'} mounted on ${this.mount.prefix}`));
|
|
193
|
+
if (!this.mount.skipIpWhitelistWarning)
|
|
194
|
+
await this.warnIfExemptFromIpWhitelist();
|
|
157
195
|
}
|
|
158
196
|
/**
|
|
159
197
|
* The whitelist exempts a caller arriving over a loopback socket with no proxy hop, which is
|
|
@@ -173,13 +211,13 @@ class EmbeddedBff {
|
|
|
173
211
|
const { isFeatureEnabled } = await this.options.forestAdminClient.getIpWhitelistConfiguration();
|
|
174
212
|
if (!isFeatureEnabled)
|
|
175
213
|
return;
|
|
176
|
-
this.options.logger('Warn',
|
|
177
|
-
`${
|
|
214
|
+
this.options.logger('Warn', this.log(`The IP whitelist is enabled for this environment, but requests served under ` +
|
|
215
|
+
`${this.mount.prefix} are not subject to it: they reach the agent in-process, which the ` +
|
|
178
216
|
`whitelist exempts as a trusted loopback caller. A resolved API key or a valid OAuth ` +
|
|
179
217
|
`session is still required.`));
|
|
180
218
|
}
|
|
181
219
|
catch (error) {
|
|
182
|
-
this.options.logger('Debug',
|
|
220
|
+
this.options.logger('Debug', this.log('Could not read the IP whitelist configuration', {
|
|
183
221
|
cause: error instanceof Error ? error.message : String(error),
|
|
184
222
|
}));
|
|
185
223
|
}
|
|
@@ -210,7 +248,7 @@ class EmbeddedBff {
|
|
|
210
248
|
const unfinished = await bff.drainActivityLogs(timeoutMs);
|
|
211
249
|
if (unfinished.length === 0)
|
|
212
250
|
return;
|
|
213
|
-
this.options.logger('Warn',
|
|
251
|
+
this.options.logger('Warn', this.log(`Stopped ${this.mount.gateway ? 'the Gateway API' : 'the embedded BFF'} with activity logs still in flight`, {
|
|
214
252
|
timeoutMs,
|
|
215
253
|
unfinished,
|
|
216
254
|
}));
|
|
@@ -228,7 +266,7 @@ class EmbeddedBff {
|
|
|
228
266
|
// also fires on a broken transitive dependency, a SyntaxError from a partial install, or a
|
|
229
267
|
// throw during the package's own evaluation — none of which "install it" would fix.
|
|
230
268
|
const { message } = error;
|
|
231
|
-
const wrapped = new Error(
|
|
269
|
+
const wrapped = new Error(`${this.name} requires the \`@forestadmin/agent-bff\` package, which failed to ` +
|
|
232
270
|
`load: ${message}. Install it with \`npm install @forestadmin/agent-bff\`.`);
|
|
233
271
|
// Assigned rather than passed to the constructor: the repo targets ES2020, whose lib types no
|
|
234
272
|
// options bag on Error. A plain assignment carries the cause on every runtime, and the reason
|
|
@@ -239,4 +277,4 @@ class EmbeddedBff {
|
|
|
239
277
|
}
|
|
240
278
|
}
|
|
241
279
|
exports.default = EmbeddedBff;
|
|
242
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
280
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"embedded-bff.js","sourceRoot":"","sources":["../src/embedded-bff.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export default class FrameworkMounter {
|
|
|
15
15
|
private readonly inProcessDispatcher;
|
|
16
16
|
private inProcessHookRegistered;
|
|
17
17
|
/** Compute the prefix that the main router should be mounted at in the client's application */
|
|
18
|
-
|
|
18
|
+
protected get completeMountPrefix(): string;
|
|
19
19
|
constructor(prefix: string, logger: Logger);
|
|
20
20
|
/**
|
|
21
21
|
* Register the MCP server at the root of the host application, or `null` to unregister it. The
|
|
@@ -24,6 +24,7 @@ export default class FrameworkMounter {
|
|
|
24
24
|
*/
|
|
25
25
|
protected setMcpCallback(handler: RootHandler | null): void;
|
|
26
26
|
/** Serve an embedded BFF at `/bff`. Pass null to stop answering there. */
|
|
27
|
+
protected setGatewayCallback(handler: RootHandler): void;
|
|
27
28
|
protected setBffCallback(callback: HttpCallback | null): void;
|
|
28
29
|
/**
|
|
29
30
|
* Dispatcher that runs agent-client requests against the agent's own `/forest` stack in-memory.
|
|
@@ -36,6 +36,9 @@ class FrameworkMounter {
|
|
|
36
36
|
this.rootMiddleware.set('mcp', handler);
|
|
37
37
|
}
|
|
38
38
|
/** Serve an embedded BFF at `/bff`. Pass null to stop answering there. */
|
|
39
|
+
setGatewayCallback(handler) {
|
|
40
|
+
this.rootMiddleware.set('gateway', handler);
|
|
41
|
+
}
|
|
39
42
|
setBffCallback(callback) {
|
|
40
43
|
this.rootMiddleware.set('bff', callback && { callback, matches: bff_routes_1.isBffRoute });
|
|
41
44
|
}
|
|
@@ -208,4 +211,4 @@ class FrameworkMounter {
|
|
|
208
211
|
}
|
|
209
212
|
}
|
|
210
213
|
exports.default = FrameworkMounter;
|
|
211
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
214
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"framework-mounter.js","sourceRoot":"","sources":["../src/framework-mounter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { BffEmbedOptions, GatewayOptions, McpEmbedOptions, RootHandler } from './types';
|
|
2
|
+
export declare const AGENT_BFF_PEER_VERSION: string;
|
|
3
|
+
export declare const AGENT_VERSION: string;
|
|
4
|
+
declare const MCP_UNAVAILABLE: {
|
|
5
|
+
starting: string;
|
|
6
|
+
stopped: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function mcpUnavailable(isMcpRoute: (url: string) => boolean, state: keyof typeof MCP_UNAVAILABLE): RootHandler;
|
|
9
|
+
export type GatewayMcpOptions = Omit<McpEmbedOptions, 'basePath' | 'allowedOAuthClients'>;
|
|
10
|
+
export type GatewayServices = {
|
|
11
|
+
mcp: GatewayMcpOptions | null;
|
|
12
|
+
api: BffEmbedOptions | null;
|
|
13
|
+
};
|
|
14
|
+
export declare function resolveGatewayServices({ mcp, api }: GatewayOptions): GatewayServices;
|
|
15
|
+
export declare function assertNoGatewayOverlap(basePath: string, forestPath: string, { mcp, api }: GatewayServices): void;
|
|
16
|
+
export declare function servesOAuth({ mcp, api }: GatewayServices): boolean;
|
|
17
|
+
export declare function describeGatewayRoutes(basePath: string, { mcp, api }: GatewayServices): string[];
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=gateway.d.ts.map
|
package/dist/gateway.js
ADDED
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AGENT_VERSION = exports.AGENT_BFF_PEER_VERSION = void 0;
|
|
4
|
+
exports.mcpUnavailable = mcpUnavailable;
|
|
5
|
+
exports.resolveGatewayServices = resolveGatewayServices;
|
|
6
|
+
exports.assertNoGatewayOverlap = assertNoGatewayOverlap;
|
|
7
|
+
exports.servesOAuth = servesOAuth;
|
|
8
|
+
exports.describeGatewayRoutes = describeGatewayRoutes;
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require, global-require
|
|
10
|
+
const { peerDependencies, version } = require('../package.json');
|
|
11
|
+
exports.AGENT_BFF_PEER_VERSION = peerDependencies['@forestadmin/agent-bff'];
|
|
12
|
+
exports.AGENT_VERSION = version;
|
|
13
|
+
const isWithin = (path, root) => path === root || path.startsWith(`${root}/`);
|
|
14
|
+
const HTTP_SERVICE_UNAVAILABLE = 503;
|
|
15
|
+
const MCP_UNAVAILABLE = {
|
|
16
|
+
starting: 'The MCP server is not started yet.',
|
|
17
|
+
stopped: 'The MCP server was stopped with the agent.',
|
|
18
|
+
};
|
|
19
|
+
function mcpUnavailable(isMcpRoute, state) {
|
|
20
|
+
return {
|
|
21
|
+
matches: isMcpRoute,
|
|
22
|
+
callback: (_req, res) => {
|
|
23
|
+
res.statusCode = HTTP_SERVICE_UNAVAILABLE;
|
|
24
|
+
res.setHeader('Content-Type', 'application/json');
|
|
25
|
+
res.end(JSON.stringify({
|
|
26
|
+
error: 'temporarily_unavailable',
|
|
27
|
+
error_description: MCP_UNAVAILABLE[state],
|
|
28
|
+
}));
|
|
29
|
+
},
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
const TOP_LEVEL_OPTIONS = ['basePath', 'allowedOAuthClients'];
|
|
33
|
+
function resolveService(service) {
|
|
34
|
+
if (service === true)
|
|
35
|
+
return {};
|
|
36
|
+
return service || null;
|
|
37
|
+
}
|
|
38
|
+
function resolveGatewayServices({ mcp, api }) {
|
|
39
|
+
const mcpOptions = resolveService(mcp);
|
|
40
|
+
const nested = TOP_LEVEL_OPTIONS.find(option => mcpOptions && option in mcpOptions);
|
|
41
|
+
if (nested) {
|
|
42
|
+
throw new Error(`addGateway({ mcp: { ${nested} } }) is not supported: ${nested} covers every Gateway ` +
|
|
43
|
+
`service, set it as addGateway({ ${nested} }).`);
|
|
44
|
+
}
|
|
45
|
+
return { mcp: mcpOptions, api: resolveService(api) };
|
|
46
|
+
}
|
|
47
|
+
function assertNoGatewayOverlap(basePath, forestPath, { mcp, api }) {
|
|
48
|
+
if (basePath && isWithin(basePath, forestPath)) {
|
|
49
|
+
throw new Error(`basePath "${basePath}" overlaps the agent routes on ${forestPath}: ` +
|
|
50
|
+
'change the Gateway basePath or the agent prefix.');
|
|
51
|
+
}
|
|
52
|
+
const claimed = [
|
|
53
|
+
...(mcp ? [{ path: `${basePath}/mcp`, service: 'MCP' }] : []),
|
|
54
|
+
...(mcp || api ? [{ path: `${basePath}/oauth`, service: mcp ? 'MCP' : 'API' }] : []),
|
|
55
|
+
...(api ? [{ path: `${basePath}/api/agent`, service: 'API' }] : []),
|
|
56
|
+
];
|
|
57
|
+
const overlap = claimed.find(({ path }) => isWithin(forestPath, path));
|
|
58
|
+
if (overlap) {
|
|
59
|
+
throw new Error(`The agent routes on ${forestPath} overlap ${overlap.path}, claimed by the Gateway ` +
|
|
60
|
+
`${overlap.service}: change the agent prefix or the Gateway basePath.`);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function servesInMemoryUploads({ fileUploads, enabledTools }) {
|
|
64
|
+
if (fileUploads === false || fileUploads?.storage)
|
|
65
|
+
return false;
|
|
66
|
+
return !enabledTools || enabledTools.includes('requestActionFileUpload');
|
|
67
|
+
}
|
|
68
|
+
function servesOAuth({ mcp, api }) {
|
|
69
|
+
return Boolean(mcp || api?.tokenEncryptionKey);
|
|
70
|
+
}
|
|
71
|
+
function describeGatewayRoutes(basePath, { mcp, api }) {
|
|
72
|
+
const lines = [];
|
|
73
|
+
if (mcp) {
|
|
74
|
+
const routes = [
|
|
75
|
+
`${basePath}/mcp`,
|
|
76
|
+
...(servesInMemoryUploads(mcp) ? [`${basePath}/mcp/uploads`] : []),
|
|
77
|
+
`${basePath}/oauth/*`,
|
|
78
|
+
`/.well-known/oauth-authorization-server${basePath}`,
|
|
79
|
+
`/.well-known/oauth-protected-resource${basePath}/mcp`,
|
|
80
|
+
];
|
|
81
|
+
lines.push(`[Gateway] MCP: ${routes.join(', ')}`);
|
|
82
|
+
}
|
|
83
|
+
if (api) {
|
|
84
|
+
const routes = [
|
|
85
|
+
`${basePath}/api/agent/*`,
|
|
86
|
+
`${basePath}/api/health`,
|
|
87
|
+
...(api.openapiEnabled ? [`${basePath}/api/docs`] : []),
|
|
88
|
+
];
|
|
89
|
+
const oauth = api.tokenEncryptionKey
|
|
90
|
+
? `, ${basePath}/oauth/*?service=api`
|
|
91
|
+
: ' (API OAuth off: no tokenEncryptionKey)';
|
|
92
|
+
lines.push(`[Gateway] API: ${routes.join(', ')}${oauth}`);
|
|
93
|
+
}
|
|
94
|
+
return lines;
|
|
95
|
+
}
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2F0ZXdheS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9nYXRld2F5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQXFCQSx3Q0FpQkM7QUFjRCx3REFZQztBQUVELHdEQXlCQztBQVFELGtDQUVDO0FBRUQsc0RBNkJDO0FBbElELHlHQUF5RztBQUN6RyxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUc5RCxDQUFDO0FBRVcsUUFBQSxzQkFBc0IsR0FBRyxnQkFBZ0IsQ0FBQyx3QkFBd0IsQ0FBQyxDQUFDO0FBRXBFLFFBQUEsYUFBYSxHQUFHLE9BQU8sQ0FBQztBQUVyQyxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQVksRUFBRSxJQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxJQUFJLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLENBQUM7QUFFOUYsTUFBTSx3QkFBd0IsR0FBRyxHQUFHLENBQUM7QUFFckMsTUFBTSxlQUFlLEdBQUc7SUFDdEIsUUFBUSxFQUFFLG9DQUFvQztJQUM5QyxPQUFPLEVBQUUsNENBQTRDO0NBQ3RELENBQUM7QUFFRixTQUFnQixjQUFjLENBQzVCLFVBQW9DLEVBQ3BDLEtBQW1DO0lBRW5DLE9BQU87UUFDTCxPQUFPLEVBQUUsVUFBVTtRQUNuQixRQUFRLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7WUFDdEIsR0FBRyxDQUFDLFVBQVUsR0FBRyx3QkFBd0IsQ0FBQztZQUMxQyxHQUFHLENBQUMsU0FBUyxDQUFDLGNBQWMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDO1lBQ2xELEdBQUcsQ0FBQyxHQUFHLENBQ0wsSUFBSSxDQUFDLFNBQVMsQ0FBQztnQkFDYixLQUFLLEVBQUUseUJBQXlCO2dCQUNoQyxpQkFBaUIsRUFBRSxlQUFlLENBQUMsS0FBSyxDQUFDO2FBQzFDLENBQUMsQ0FDSCxDQUFD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
|
package/dist/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { TSchema } from '@forestadmin/datasource-customizer';
|
|
|
3
3
|
import Agent from './agent';
|
|
4
4
|
export declare function createAgent<S extends TSchema = TSchema>(options: AgentOptions): Agent<S>;
|
|
5
5
|
export { Agent };
|
|
6
|
-
export { AgentOptions, BffEmbedOptions, WorkflowExecutorEmbedOptions } from './types';
|
|
6
|
+
export { AgentOptions, BffEmbedOptions, GatewayOptions, McpEmbedOptions, WorkflowExecutorEmbedOptions, } from './types';
|
|
7
7
|
export * from '@forestadmin/datasource-customizer';
|
|
8
8
|
export { default as SchemaGenerator } from './utils/forest-schema/generator';
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.js
CHANGED
|
@@ -28,4 +28,4 @@ __exportStar(require("@forestadmin/datasource-customizer"), exports);
|
|
|
28
28
|
// export is necessary for the agent-generator package
|
|
29
29
|
var generator_1 = require("./utils/forest-schema/generator");
|
|
30
30
|
Object.defineProperty(exports, "SchemaGenerator", { enumerable: true, get: function () { return __importDefault(generator_1).default; } });
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFLQSxrQ0FFQztBQUpELG9EQUE0QjtBQU1uQixnQkFORixlQUFLLENBTUU7QUFKZCxTQUFnQixXQUFXLENBQThCLE9BQXFCO0lBQzVFLE9BQU8sSUFBSSxlQUFLLENBQUksT0FBTyxDQUFDLENBQUM7QUFDL0IsQ0FBQztBQVVELHFFQUFtRDtBQUVuRCxzREFBc0Q7QUFDdEQsNkRBQTZFO0FBQXBFLDZIQUFBLE9BQU8sT0FBbUIifQ==
|
package/dist/types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { AuditStore } from './audit-trail/types';
|
|
2
2
|
import type { CompositeId, Logger, LoggerLevel } from '@forestadmin/datasource-toolkit';
|
|
3
3
|
import type { ForestAdminClient } from '@forestadmin/forestadmin-client';
|
|
4
|
+
import type { FileUploadsOptions, TokenTtlOptions, ToolName } from '@forestadmin/mcp-server';
|
|
4
5
|
import type { WorkflowExecutorTuningOptions } from '@forestadmin/workflow-executor';
|
|
5
6
|
import type { IncomingMessage, ServerResponse } from 'http';
|
|
6
7
|
export type AuditTrailConfig = {
|
|
@@ -212,6 +213,19 @@ export type BffEmbedOptions = {
|
|
|
212
213
|
*/
|
|
213
214
|
shutdownTimeoutMs?: number;
|
|
214
215
|
};
|
|
216
|
+
export type McpEmbedOptions = {
|
|
217
|
+
enabledTools?: ToolName[];
|
|
218
|
+
basePath?: string;
|
|
219
|
+
tokenTtl?: TokenTtlOptions;
|
|
220
|
+
allowedOAuthClients?: string[];
|
|
221
|
+
fileUploads?: false | FileUploadsOptions;
|
|
222
|
+
};
|
|
223
|
+
export type GatewayOptions = {
|
|
224
|
+
basePath?: string;
|
|
225
|
+
allowedOAuthClients?: string[];
|
|
226
|
+
mcp?: Omit<McpEmbedOptions, 'basePath' | 'allowedOAuthClients'> | boolean;
|
|
227
|
+
api?: BffEmbedOptions | boolean;
|
|
228
|
+
};
|
|
215
229
|
export type AuditTrailRuntime = AuditTrailConfig & {
|
|
216
230
|
store: AuditStore;
|
|
217
231
|
close: () => Promise<void>;
|
package/dist/types.js
CHANGED
|
@@ -22,4 +22,4 @@ var RouteType;
|
|
|
22
22
|
RouteType[RouteType["Authentication"] = 3] = "Authentication";
|
|
23
23
|
RouteType[RouteType["PrivateRoute"] = 4] = "PrivateRoute";
|
|
24
24
|
})(RouteType || (exports.RouteType = RouteType = {}));
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBcVBBLElBQVksUUFVWDtBQVZELFdBQVksUUFBUTtJQUNsQixxREFBZ0IsQ0FBQTtJQUNoQix5REFBa0IsQ0FBQTtJQUNsQixtREFBZSxDQUFBO0lBQ2YsaURBQWMsQ0FBQTtJQUNkLDJEQUFtQixDQUFBO0lBQ25CLCtEQUFxQixDQUFBO0lBQ3JCLHVFQUF5QixDQUFBO0lBQ3pCLG1EQUFlLENBQUE7SUFDZixxQ0FBUSxDQUFBO0FBQ1YsQ0FBQyxFQVZXLFFBQVEsd0JBQVIsUUFBUSxRQVVuQjtBQUVELElBQVksU0FPWDtBQVBELFdBQVksU0FBUztJQUNuQixpR0FBaUc7SUFDakcsMkRBQWlCLENBQUE7SUFDakIseURBQWdCLENBQUE7SUFDaEIsdURBQWUsQ0FBQTtJQUNmLDZEQUFrQixDQUFBO0lBQ2xCLHlEQUFnQixDQUFBO0FBQ2xCLENBQUMsRUFQVyxTQUFTLHlCQUFULFNBQVMsUUFPcEIifQ==
|
|
@@ -20,12 +20,14 @@ exports.default = expressToKoa;
|
|
|
20
20
|
*/
|
|
21
21
|
function expressToKoa(expressApp, shouldHandle) {
|
|
22
22
|
return async (ctx, next) => {
|
|
23
|
+
var _a;
|
|
23
24
|
const url = ctx.url || '/';
|
|
24
25
|
// Skip if shouldHandle returns false
|
|
25
26
|
if (shouldHandle && !shouldHandle(url)) {
|
|
26
27
|
await next();
|
|
27
28
|
return;
|
|
28
29
|
}
|
|
30
|
+
(_a = ctx.req).originalUrl ?? (_a.originalUrl = ctx.originalUrl);
|
|
29
31
|
// Let Express handle the request
|
|
30
32
|
const handled = await new Promise(resolve => {
|
|
31
33
|
// Tell Koa not to respond - Express will handle it
|
|
@@ -46,4 +48,4 @@ function expressToKoa(expressApp, shouldHandle) {
|
|
|
46
48
|
}
|
|
47
49
|
};
|
|
48
50
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhwcmVzcy10by1rb2EuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvZXhwcmVzcy10by1rb2EudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUEwQkEsK0JBc0NDO0FBdkREOzs7Ozs7Ozs7Ozs7Ozs7O0dBZ0JHO0FBQ0gsU0FBd0IsWUFBWSxDQUNsQyxVQUFrQyxFQUNsQyxZQUF1QztJQUV2QyxPQUFPLEtBQUssRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEVBQUU7O1FBQ3pCLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDO1FBRTNCLHFDQUFxQztRQUNyQyxJQUFJLFlBQVksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3ZDLE1BQU0sSUFBSSxFQUFFLENBQUM7WUFFYixPQUFPO1FBQ1QsQ0FBQztRQUVELE1BQUMsR0FBRyxDQUFDLEdBQWlELEVBQUMsV0FBVyxRQUFYLFdBQVcsR0FBSyxHQUFHLENBQUMsV0FBVyxFQUFDO1FBRXZGLGlDQUFpQztRQUNqQyxNQUFNLE9BQU8sR0FBRyxNQUFNLElBQUksT0FBTyxDQUFVLE9BQU8sQ0FBQyxFQUFFO1lBQ25ELG1EQUFtRDtZQUNuRCxHQUFHLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQztZQUVwQixNQUFNLFFBQVEsR0FBRyxVQUEwQixDQUFDO1lBQzVDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFO2dCQUM5Qix1REFBdUQ7Z0JBQ3ZELEdBQUcsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDO2dCQUNuQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDakIsQ0FBQyxDQUFDLENBQUM7WUFFSCwyQ0FBMkM7WUFDM0MsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsRUFBRSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQzVDLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztRQUM3QyxDQUFDLENBQUMsQ0FBQztRQUVILGlEQUFpRDtRQUNqRCxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDYixNQUFNLElBQUksRUFBRSxDQUFDO1FBQ2YsQ0FBQztJQUNILENBQUMsQ0FBQztBQUNKLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/agent",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.109.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@forestadmin/agent-toolkit": "1.2.1",
|
|
17
17
|
"@forestadmin/datasource-customizer": "1.73.1",
|
|
18
18
|
"@forestadmin/datasource-toolkit": "1.56.1",
|
|
19
|
-
"@forestadmin/forestadmin-client": "1.
|
|
20
|
-
"@forestadmin/mcp-server": "1.
|
|
19
|
+
"@forestadmin/forestadmin-client": "1.44.0",
|
|
20
|
+
"@forestadmin/mcp-server": "1.29.0",
|
|
21
21
|
"@koa/bodyparser": "^6.0.0",
|
|
22
22
|
"@koa/cors": "^5.0.0",
|
|
23
23
|
"@koa/router": "^13.1.0",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@fastify/express": "^1.1.0",
|
|
52
|
-
"@forestadmin/agent-bff": "1.
|
|
52
|
+
"@forestadmin/agent-bff": "1.41.0",
|
|
53
53
|
"@forestadmin/datasource-sql": "1.17.16",
|
|
54
|
-
"@forestadmin/workflow-executor": "1.33.
|
|
54
|
+
"@forestadmin/workflow-executor": "1.33.1",
|
|
55
55
|
"@nestjs/common": "^11.1.24",
|
|
56
56
|
"@nestjs/core": "^11.1.24",
|
|
57
57
|
"@nestjs/platform-express": "^11.1.24",
|
|
@@ -75,8 +75,8 @@
|
|
|
75
75
|
},
|
|
76
76
|
"peerDependencies": {
|
|
77
77
|
"@fastify/express": "^1.1.0 || ^2.0.0 || ^3.0.0 || ^4.0.0",
|
|
78
|
-
"@forestadmin/agent-bff": "1.
|
|
79
|
-
"@forestadmin/workflow-executor": "1.33.
|
|
78
|
+
"@forestadmin/agent-bff": "1.41.0",
|
|
79
|
+
"@forestadmin/workflow-executor": "1.33.1"
|
|
80
80
|
},
|
|
81
81
|
"peerDependenciesMeta": {
|
|
82
82
|
"@fastify/express": {
|