@1mcp/agent 0.35.0-beta.4 → 0.36.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/build/admin/assets/{admin-AboutRuntimeWorkspace-CM2ZafTJ.js → admin-AboutRuntimeWorkspace-DH2QC2nJ.js} +1 -1
- package/build/admin/assets/admin-BackendLogsWorkspace-BKavXT9B.js +1 -0
- package/build/admin/assets/admin-InstructionTemplatesWorkspace-CvG4EPdZ.js +1 -0
- package/build/admin/assets/admin-OAuthServicesWorkspace-BCGj2hP4.js +1 -0
- package/build/admin/assets/admin-PresetAuthoringWorkspace-BboJVBFl.js +1 -0
- package/build/admin/assets/admin-console-D6jyI73o.css +1 -0
- package/build/admin/assets/admin-console-xbgqUjbT.js +3 -0
- package/build/admin/assets/admin-icons-CYGTDZA5.js +1 -0
- package/build/admin/assets/admin-mantine-xwbfu5Gd.js +53 -0
- package/build/admin/index.html +4 -4
- package/build/auth/sdkOAuthClientProvider.d.ts +4 -0
- package/build/auth/sdkOAuthClientProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthClientProvider.js +29 -0
- package/build/auth/sdkOAuthClientProvider.js.map +1 -1
- package/build/commands/instructions/instructions.d.ts.map +1 -1
- package/build/commands/instructions/instructions.js +56 -1
- package/build/commands/instructions/instructions.js.map +1 -1
- package/build/commands/mcp/add.js +2 -2
- package/build/commands/mcp/add.js.map +1 -1
- package/build/commands/mcp/list.js +1 -1
- package/build/commands/mcp/list.js.map +1 -1
- package/build/commands/mcp/update.js +1 -1
- package/build/commands/mcp/update.js.map +1 -1
- package/build/commands/shared/serveTargetResolver.d.ts.map +1 -1
- package/build/commands/shared/serveTargetResolver.js +17 -22
- package/build/commands/shared/serveTargetResolver.js.map +1 -1
- package/build/config/configContext.d.ts +2 -0
- package/build/config/configContext.d.ts.map +1 -1
- package/build/config/configContext.js +5 -0
- package/build/config/configContext.js.map +1 -1
- package/build/config/configLoader.d.ts +8 -0
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +35 -11
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts +16 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +77 -0
- package/build/config/configManager.js.map +1 -1
- package/build/config/configWatcher.d.ts +2 -0
- package/build/config/configWatcher.d.ts.map +1 -1
- package/build/config/configWatcher.js +9 -4
- package/build/config/configWatcher.js.map +1 -1
- package/build/config/configuredServerTargets.d.ts +3 -0
- package/build/config/configuredServerTargets.d.ts.map +1 -0
- package/build/config/configuredServerTargets.js +8 -0
- package/build/config/configuredServerTargets.js.map +1 -0
- package/build/config/envProcessor.d.ts +2 -1
- package/build/config/envProcessor.d.ts.map +1 -1
- package/build/config/envProcessor.js +16 -9
- package/build/config/envProcessor.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts +3 -0
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +15 -0
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/runtimeScopeEnv.d.ts +15 -0
- package/build/config/runtimeScopeEnv.d.ts.map +1 -0
- package/build/config/runtimeScopeEnv.js +231 -0
- package/build/config/runtimeScopeEnv.js.map +1 -0
- package/build/config/runtimeTargetFingerprint.d.ts +3 -0
- package/build/config/runtimeTargetFingerprint.d.ts.map +1 -0
- package/build/config/runtimeTargetFingerprint.js +66 -0
- package/build/config/runtimeTargetFingerprint.js.map +1 -0
- package/build/config/types.d.ts +5 -0
- package/build/config/types.d.ts.map +1 -1
- package/build/config/types.js +1 -0
- package/build/config/types.js.map +1 -1
- package/build/constants/api.d.ts +1 -0
- package/build/constants/api.d.ts.map +1 -1
- package/build/constants/api.js +1 -0
- package/build/constants/api.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/core/capabilities/capabilityAggregator.d.ts.map +1 -1
- package/build/core/capabilities/capabilityAggregator.js +33 -14
- package/build/core/capabilities/capabilityAggregator.js.map +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts +1 -1
- package/build/core/capabilities/capabilityCatalog.d.ts.map +1 -1
- package/build/core/capabilities/capabilityCatalog.js +19 -7
- package/build/core/capabilities/capabilityCatalog.js.map +1 -1
- package/build/core/capabilities/capabilityPagination.d.ts.map +1 -1
- package/build/core/capabilities/capabilityPagination.js +7 -4
- package/build/core/capabilities/capabilityPagination.js.map +1 -1
- package/build/core/capabilities/configuredToolSnapshot.d.ts +34 -0
- package/build/core/capabilities/configuredToolSnapshot.d.ts.map +1 -0
- package/build/core/capabilities/configuredToolSnapshot.js +137 -0
- package/build/core/capabilities/configuredToolSnapshot.js.map +1 -0
- package/build/core/capabilities/lazyLoadingOrchestrator.d.ts.map +1 -1
- package/build/core/capabilities/lazyLoadingOrchestrator.js +8 -4
- package/build/core/capabilities/lazyLoadingOrchestrator.js.map +1 -1
- package/build/core/capabilities/metaToolProvider.js +3 -3
- package/build/core/capabilities/metaToolProvider.js.map +1 -1
- package/build/core/client/clientManager.d.ts.map +1 -1
- package/build/core/client/clientManager.js +31 -19
- package/build/core/client/clientManager.js.map +1 -1
- package/build/core/client/connectionHandler.d.ts.map +1 -1
- package/build/core/client/connectionHandler.js +9 -6
- package/build/core/client/connectionHandler.js.map +1 -1
- package/build/core/client/postAuthOAuthRecovery.d.ts +6 -0
- package/build/core/client/postAuthOAuthRecovery.d.ts.map +1 -0
- package/build/core/client/postAuthOAuthRecovery.js +74 -0
- package/build/core/client/postAuthOAuthRecovery.js.map +1 -0
- package/build/core/configChangeHandler.d.ts +5 -0
- package/build/core/configChangeHandler.d.ts.map +1 -1
- package/build/core/configChangeHandler.js +58 -14
- package/build/core/configChangeHandler.js.map +1 -1
- package/build/core/instructions/effectiveServerInstructions.d.ts +17 -0
- package/build/core/instructions/effectiveServerInstructions.d.ts.map +1 -0
- package/build/core/instructions/effectiveServerInstructions.js +12 -0
- package/build/core/instructions/effectiveServerInstructions.js.map +1 -0
- package/build/core/instructions/instructionAggregator.d.ts +51 -2
- package/build/core/instructions/instructionAggregator.d.ts.map +1 -1
- package/build/core/instructions/instructionAggregator.js +191 -30
- package/build/core/instructions/instructionAggregator.js.map +1 -1
- package/build/core/instructions/instructionsDistribution.d.ts +53 -0
- package/build/core/instructions/instructionsDistribution.d.ts.map +1 -1
- package/build/core/instructions/instructionsDistribution.js +25 -0
- package/build/core/instructions/instructionsDistribution.js.map +1 -1
- package/build/core/instructions/templateTypes.d.ts +25 -3
- package/build/core/instructions/templateTypes.d.ts.map +1 -1
- package/build/core/instructions/templateTypes.js +45 -0
- package/build/core/instructions/templateTypes.js.map +1 -1
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +5 -3
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/protocol/requestHandlerUtils.d.ts.map +1 -1
- package/build/core/protocol/requestHandlerUtils.js +3 -3
- package/build/core/protocol/requestHandlerUtils.js.map +1 -1
- package/build/core/protocol/toolRequestHandlers.d.ts.map +1 -1
- package/build/core/protocol/toolRequestHandlers.js +18 -5
- package/build/core/protocol/toolRequestHandlers.js.map +1 -1
- package/build/core/server/backendStdioSupervisor.d.ts.map +1 -1
- package/build/core/server/backendStdioSupervisor.js +2 -1
- package/build/core/server/backendStdioSupervisor.js.map +1 -1
- package/build/core/server/clientInstanceFactory.d.ts +2 -1
- package/build/core/server/clientInstanceFactory.d.ts.map +1 -1
- package/build/core/server/clientInstanceFactory.js +9 -2
- package/build/core/server/clientInstanceFactory.js.map +1 -1
- package/build/core/server/clientInstancePool.d.ts +1 -0
- package/build/core/server/clientInstancePool.d.ts.map +1 -1
- package/build/core/server/clientInstancePool.js +92 -55
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/clientInstancePoolTypes.d.ts +2 -0
- package/build/core/server/clientInstancePoolTypes.d.ts.map +1 -1
- package/build/core/server/disabledTools.d.ts +2 -0
- package/build/core/server/disabledTools.d.ts.map +1 -1
- package/build/core/server/disabledTools.js +7 -4
- package/build/core/server/disabledTools.js.map +1 -1
- package/build/core/server/mcpServerLifecycleManager.d.ts +0 -4
- package/build/core/server/mcpServerLifecycleManager.d.ts.map +1 -1
- package/build/core/server/mcpServerLifecycleManager.js +18 -40
- package/build/core/server/mcpServerLifecycleManager.js.map +1 -1
- package/build/core/server/serverManager.d.ts +1 -0
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +32 -0
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateIdentity.d.ts +1 -0
- package/build/core/server/templateIdentity.d.ts.map +1 -1
- package/build/core/server/templateIdentity.js +11 -1
- package/build/core/server/templateIdentity.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts +13 -1
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +68 -13
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/server/toolDescriptionOverrides.d.ts +9 -0
- package/build/core/server/toolDescriptionOverrides.d.ts.map +1 -0
- package/build/core/server/toolDescriptionOverrides.js +44 -0
- package/build/core/server/toolDescriptionOverrides.js.map +1 -0
- package/build/core/tools/handlers/serverManagementHandler.d.ts +22 -8
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +3 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts.map +1 -1
- package/build/core/tools/internal/schemas/discovery.d.ts +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +3 -3
- package/build/core/tools/internal/schemas/management.d.ts +2 -2
- package/build/core/types/transport.d.ts +39 -6
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +61 -2
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.d.ts +65 -4
- package/build/domains/admin/adminConfiguredServerService.d.ts.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.js +292 -49
- package/build/domains/admin/adminConfiguredServerService.js.map +1 -1
- package/build/domains/admin/adminDomain.d.ts +19 -0
- package/build/domains/admin/adminDomain.d.ts.map +1 -1
- package/build/domains/admin/adminDomain.js +17 -0
- package/build/domains/admin/adminDomain.js.map +1 -1
- package/build/domains/admin/adminInstructionPreviewRuntime.d.ts +7 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.d.ts.map +1 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.js +154 -0
- package/build/domains/admin/adminInstructionPreviewRuntime.js.map +1 -0
- package/build/domains/admin/adminInstructionTemplateService.d.ts +169 -0
- package/build/domains/admin/adminInstructionTemplateService.d.ts.map +1 -0
- package/build/domains/admin/adminInstructionTemplateService.js +181 -0
- package/build/domains/admin/adminInstructionTemplateService.js.map +1 -0
- package/build/domains/admin/configuredToolInventory.d.ts +64 -0
- package/build/domains/admin/configuredToolInventory.d.ts.map +1 -0
- package/build/domains/admin/configuredToolInventory.js +182 -0
- package/build/domains/admin/configuredToolInventory.js.map +1 -0
- package/build/domains/admin/runtimeConfiguredToolInspectionService.d.ts +21 -0
- package/build/domains/admin/runtimeConfiguredToolInspectionService.d.ts.map +1 -0
- package/build/domains/admin/runtimeConfiguredToolInspectionService.js +255 -0
- package/build/domains/admin/runtimeConfiguredToolInspectionService.js.map +1 -0
- package/build/domains/config-change/configChange.d.ts +1 -1
- package/build/domains/config-change/configChange.d.ts.map +1 -1
- package/build/domains/config-change/configChange.js +153 -13
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/config-change/types.d.ts +30 -2
- package/build/domains/config-change/types.d.ts.map +1 -1
- package/build/domains/instruction-template/instructionTemplateManager.d.ts +58 -0
- package/build/domains/instruction-template/instructionTemplateManager.d.ts.map +1 -0
- package/build/domains/instruction-template/instructionTemplateManager.js +167 -0
- package/build/domains/instruction-template/instructionTemplateManager.js.map +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts +1 -0
- package/build/domains/runtime-targets/runtimeIdentityVerification.d.ts.map +1 -1
- package/build/domains/runtime-targets/runtimeIdentityVerification.js +6 -5
- package/build/domains/runtime-targets/runtimeIdentityVerification.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +2 -0
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +345 -9
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/apiRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/apiRoutes.js +2 -0
- package/build/transport/http/routes/apiRoutes.js.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.d.ts +2 -0
- package/build/transport/http/routes/inspectRequestContext.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRequestContext.js +2 -2
- package/build/transport/http/routes/inspectRequestContext.js.map +1 -1
- package/build/transport/http/routes/inspectRoutes.d.ts +9 -0
- package/build/transport/http/routes/inspectRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/inspectRoutes.js +15 -10
- package/build/transport/http/routes/inspectRoutes.js.map +1 -1
- package/build/transport/http/routes/instructionsRoutes.d.ts +4 -0
- package/build/transport/http/routes/instructionsRoutes.d.ts.map +1 -0
- package/build/transport/http/routes/instructionsRoutes.js +147 -0
- package/build/transport/http/routes/instructionsRoutes.js.map +1 -0
- package/build/transport/http/routes/toolRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/toolRoutes.js +5 -4
- package/build/transport/http/routes/toolRoutes.js.map +1 -1
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +16 -0
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/transportFactory.d.ts.map +1 -1
- package/build/transport/transportFactory.js +34 -12
- package/build/transport/transportFactory.js.map +1 -1
- package/build/utils/validation/discoveredServer.d.ts +15 -0
- package/build/utils/validation/discoveredServer.d.ts.map +1 -0
- package/build/utils/validation/discoveredServer.js +2 -0
- package/build/utils/validation/discoveredServer.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts +4 -5
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +94 -25
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +7 -2
- package/build/admin/assets/admin-BackendLogsWorkspace-CvJs1npx.js +0 -1
- package/build/admin/assets/admin-OAuthServicesWorkspace-BswG57Gm.js +0 -1
- package/build/admin/assets/admin-PresetAuthoringWorkspace-BIIRs_EN.js +0 -1
- package/build/admin/assets/admin-console-Brz9bnhv.css +0 -1
- package/build/admin/assets/admin-console-MT8QZmIC.js +0 -3
- package/build/admin/assets/admin-icons-D-JtMXSq.js +0 -1
- package/build/admin/assets/admin-mantine-DSFdoMaN.js +0 -53
|
@@ -1,9 +1,14 @@
|
|
|
1
|
+
import { getRuntimeScopeEnvironment, sanitizeRuntimeScopeError } from '../../config/runtimeScopeEnv.js';
|
|
2
|
+
import { createRuntimeTargetFingerprint } from '../../config/runtimeTargetFingerprint.js';
|
|
3
|
+
import { AgentConfigManager } from '../../core/server/agentConfig.js';
|
|
1
4
|
import { BackendStdioSupervisor } from '../../core/server/backendStdioSupervisor.js';
|
|
2
|
-
import { createTemplateInstanceId, resolveTemplateInstanceId, serializePoolIdentity,
|
|
5
|
+
import { createTemplateInstanceId, resolveTemplateInstanceId, serializePoolIdentity, templateRuntimeHash, } from '../../core/server/templateIdentity.js';
|
|
3
6
|
import logger, { debugIf, infoIf } from '../../logger/logger.js';
|
|
4
7
|
import { HandlebarsTemplateRenderer } from '../../template/handlebarsTemplateRenderer.js';
|
|
5
8
|
import { createPooledClientInstance } from './clientInstanceFactory.js';
|
|
6
9
|
import { DEFAULT_POOL_OPTIONS } from './clientInstancePoolTypes.js';
|
|
10
|
+
class StaleRuntimeEnvironmentError extends Error {
|
|
11
|
+
}
|
|
7
12
|
/**
|
|
8
13
|
* Manages a pool of MCP client instances created from templates
|
|
9
14
|
*
|
|
@@ -42,7 +47,7 @@ export class ClientInstancePool {
|
|
|
42
47
|
// Render template with context data
|
|
43
48
|
const renderer = new HandlebarsTemplateRenderer();
|
|
44
49
|
const renderedConfig = renderer.renderTemplate(templateConfig, context);
|
|
45
|
-
const renderedHash =
|
|
50
|
+
const renderedHash = templateRuntimeHash(renderedConfig);
|
|
46
51
|
// Debug logging to verify template rendering
|
|
47
52
|
debugIf(() => ({
|
|
48
53
|
message: 'Template rendering details',
|
|
@@ -68,60 +73,88 @@ export class ClientInstancePool {
|
|
|
68
73
|
const templateSettings = this.getTemplateSettings(templateConfig, options);
|
|
69
74
|
const instanceKey = this.createInstanceKey(templateName, renderedHash, templateSettings.perClient || !templateSettings.shareable ? clientId : undefined);
|
|
70
75
|
logger.info(`Template ${templateName}, renderedHash: ${renderedHash}, Instance key: ${instanceKey}`);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
if (instance.status !== 'terminating') {
|
|
83
|
-
return this.addClientToInstance(instance, clientId);
|
|
76
|
+
while (true) {
|
|
77
|
+
const runtimeFingerprint = this.createRuntimeFingerprint(renderedConfig);
|
|
78
|
+
const existingInstance = this.instances.get(instanceKey);
|
|
79
|
+
if (existingInstance && existingInstance.status !== 'terminating') {
|
|
80
|
+
if (existingInstance.runtimeFingerprint !== runtimeFingerprint) {
|
|
81
|
+
await this.removeInstance(instanceKey);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
if (templateSettings.shareable || existingInstance.clientIds.has(clientId)) {
|
|
85
|
+
return this.addClientToInstance(existingInstance, clientId);
|
|
86
|
+
}
|
|
84
87
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
88
|
+
const pendingCreation = this.pendingCreations.get(instanceKey);
|
|
89
|
+
if (pendingCreation) {
|
|
90
|
+
try {
|
|
91
|
+
const instance = await pendingCreation.promise;
|
|
92
|
+
const currentFingerprint = this.createRuntimeFingerprint(renderedConfig);
|
|
93
|
+
if (pendingCreation.runtimeFingerprint === currentFingerprint &&
|
|
94
|
+
instance.runtimeFingerprint === currentFingerprint &&
|
|
95
|
+
instance.status !== 'terminating') {
|
|
96
|
+
return this.addClientToInstance(instance, clientId);
|
|
97
|
+
}
|
|
98
|
+
if (this.instances.get(instanceKey) === instance) {
|
|
99
|
+
await this.removeInstance(instanceKey);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
if (!(error instanceof StaleRuntimeEnvironmentError) &&
|
|
104
|
+
pendingCreation.runtimeFingerprint === this.createRuntimeFingerprint(renderedConfig)) {
|
|
105
|
+
throw error;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
continue;
|
|
102
109
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
meta: {
|
|
109
|
-
instanceId: instance.id,
|
|
110
|
+
const instancePromise = (async () => {
|
|
111
|
+
this.checkInstanceLimits(templateName);
|
|
112
|
+
const instance = await createPooledClientInstance({
|
|
113
|
+
instanceId: createTemplateInstanceId(),
|
|
114
|
+
instanceKey,
|
|
110
115
|
templateName,
|
|
111
|
-
|
|
116
|
+
processedConfig: renderedConfig,
|
|
117
|
+
renderedHash,
|
|
118
|
+
runtimeFingerprint,
|
|
112
119
|
clientId,
|
|
113
|
-
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
this.
|
|
120
|
+
idleTimeout: templateSettings.idleTimeout,
|
|
121
|
+
});
|
|
122
|
+
if (this.isShuttingDown) {
|
|
123
|
+
await this.disposeInstance(instance);
|
|
124
|
+
throw new Error('ClientInstancePool is shutting down');
|
|
125
|
+
}
|
|
126
|
+
if (this.createRuntimeFingerprint(renderedConfig) !== runtimeFingerprint) {
|
|
127
|
+
await this.disposeInstance(instance);
|
|
128
|
+
throw new StaleRuntimeEnvironmentError();
|
|
129
|
+
}
|
|
130
|
+
this.configureInstanceSupervision(instance);
|
|
131
|
+
this.instances.set(instanceKey, instance);
|
|
132
|
+
this.addToTemplateIndex(templateName, instanceKey);
|
|
133
|
+
infoIf(() => ({
|
|
134
|
+
message: 'Created new client instance from template',
|
|
135
|
+
meta: {
|
|
136
|
+
instanceId: instance.id,
|
|
137
|
+
templateName,
|
|
138
|
+
renderedHash: renderedHash.substring(0, 8) + '...',
|
|
139
|
+
clientId,
|
|
140
|
+
shareable: templateSettings.shareable,
|
|
141
|
+
},
|
|
142
|
+
}));
|
|
143
|
+
return instance;
|
|
144
|
+
})();
|
|
145
|
+
const pending = { runtimeFingerprint, promise: instancePromise };
|
|
146
|
+
this.pendingCreations.set(instanceKey, pending);
|
|
147
|
+
try {
|
|
148
|
+
return await instancePromise;
|
|
149
|
+
}
|
|
150
|
+
catch (error) {
|
|
151
|
+
if (!(error instanceof StaleRuntimeEnvironmentError))
|
|
152
|
+
throw error;
|
|
153
|
+
}
|
|
154
|
+
finally {
|
|
155
|
+
if (this.pendingCreations.get(instanceKey) === pending) {
|
|
156
|
+
this.pendingCreations.delete(instanceKey);
|
|
157
|
+
}
|
|
125
158
|
}
|
|
126
159
|
}
|
|
127
160
|
}
|
|
@@ -327,7 +360,7 @@ export class ClientInstancePool {
|
|
|
327
360
|
clearInterval(this.cleanupTimer);
|
|
328
361
|
this.cleanupTimer = undefined;
|
|
329
362
|
}
|
|
330
|
-
await Promise.allSettled(Array.from(this.pendingCreations.values()));
|
|
363
|
+
await Promise.allSettled(Array.from(this.pendingCreations.values(), ({ promise }) => promise));
|
|
331
364
|
const instanceCount = this.instances.size;
|
|
332
365
|
await Promise.allSettled(Array.from(this.instances, ([instanceKey, instance]) => this.scheduleRemoval(instanceKey, instance)));
|
|
333
366
|
await Promise.allSettled(Array.from(this.removalOperations.values()));
|
|
@@ -347,18 +380,21 @@ export class ClientInstancePool {
|
|
|
347
380
|
throw new Error('ClientInstancePool is shutting down');
|
|
348
381
|
}
|
|
349
382
|
}
|
|
383
|
+
createRuntimeFingerprint(config) {
|
|
384
|
+
return createRuntimeTargetFingerprint(config, getRuntimeScopeEnvironment(), AgentConfigManager.getInstance().isEnvSubstitutionEnabled());
|
|
385
|
+
}
|
|
350
386
|
async disposeInstance(instance) {
|
|
351
387
|
try {
|
|
352
388
|
await instance.client.close();
|
|
353
389
|
}
|
|
354
390
|
catch (error) {
|
|
355
|
-
logger.warn(`Error closing client for instance ${instance.id}:`, error);
|
|
391
|
+
logger.warn(`Error closing client for instance ${instance.id}:`, sanitizeRuntimeScopeError(error));
|
|
356
392
|
}
|
|
357
393
|
try {
|
|
358
394
|
await instance.transport.close();
|
|
359
395
|
}
|
|
360
396
|
catch (error) {
|
|
361
|
-
logger.warn(`Error closing transport for instance ${instance.id}:`, error);
|
|
397
|
+
logger.warn(`Error closing transport for instance ${instance.id}:`, sanitizeRuntimeScopeError(error));
|
|
362
398
|
}
|
|
363
399
|
}
|
|
364
400
|
async restartInstance(instance) {
|
|
@@ -399,6 +435,7 @@ export class ClientInstancePool {
|
|
|
399
435
|
templateName: instance.templateName,
|
|
400
436
|
processedConfig: instance.processedConfig,
|
|
401
437
|
renderedHash: instance.renderedHash,
|
|
438
|
+
runtimeFingerprint: instance.runtimeFingerprint,
|
|
402
439
|
clientId,
|
|
403
440
|
idleTimeout: instance.idleTimeout,
|
|
404
441
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientInstancePool.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"clientInstancePool.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AACvG,OAAO,EAAE,8BAA8B,EAAE,MAAM,yCAAyC,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAmC,MAAM,4CAA4C,CAAC;AACrH,OAAO,EACL,wBAAwB,EACxB,yBAAyB,EACzB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,sCAAsC,CAAC;AAG9C,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC;AAGzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAqB,oBAAoB,EAAwB,MAAM,8BAA8B,CAAC;AAS7G,MAAM,4BAA6B,SAAQ,KAAK;CAAG;AAEnD;;;;;;;;GAQG;AACH,MAAM,OAAO,kBAAkB;IACrB,SAAS,GAAG,IAAI,GAAG,EAAgC,CAAC;IACpD,mBAAmB,GAAG,IAAI,GAAG,EAAuB,CAAC;IACrD,OAAO,CAAoB;IAC3B,YAAY,CAAkC;IAC9C,gBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;IACtD,iBAAiB,GAAG,IAAI,GAAG,EAAyB,CAAC;IACrD,oBAAoB,CAAkF;IACtG,cAAc,GAAG,KAAK,CAAC;IACvB,eAAe,CAAiB;IAExC,YAAY,UAAsC,EAAE;QAClD,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,oBAAoB,EAAE,GAAG,OAAO,EAAE,CAAC;QACvD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,gCAAgC;YACzC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;SAChC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,uBAAuB,CACrB,SAAyF;QAEzF,IAAI,CAAC,oBAAoB,GAAG,SAAS,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,yBAAyB,CAC7B,YAAoB,EACpB,cAA+B,EAC/B,OAAoB,EACpB,QAAgB,EAChB,OAIC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,oCAAoC;QACpC,MAAM,QAAQ,GAAG,IAAI,0BAA0B,EAAE,CAAC;QAClD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CAAC,CAAC;QAEzD,6CAA6C;QAC7C,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,4BAA4B;YACrC,IAAI,EAAE;gBACJ,YAAY;gBACZ,QAAQ;gBACR,WAAW,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,WAAW;gBACjD,cAAc;gBACd,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK;gBAClD,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;aACtF;SACF,CAAC,CAAC,CAAC;QAEJ,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;YACZ,OAAO,EAAE,yCAAyC;YAClD,IAAI,EAAE;gBACJ,YAAY;gBACZ,QAAQ;gBACR,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK;gBAClD,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,SAAS,KAAK,KAAK;aAC/D;SACF,CAAC,CAAC,CAAC;QAEJ,kDAAkD;QAClD,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC3E,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CACxC,YAAY,EACZ,YAAY,EACZ,gBAAgB,CAAC,SAAS,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CACjF,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,YAAY,YAAY,mBAAmB,YAAY,mBAAmB,WAAW,EAAE,CAAC,CAAC;QAErG,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,kBAAkB,GAAG,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;YACzE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzD,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;gBAClE,IAAI,gBAAgB,CAAC,kBAAkB,KAAK,kBAAkB,EAAE,CAAC;oBAC/D,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;oBACvC,SAAS;gBACX,CAAC;gBACD,IAAI,gBAAgB,CAAC,SAAS,IAAI,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC3E,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC/D,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;oBAC/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;oBACzE,IACE,eAAe,CAAC,kBAAkB,KAAK,kBAAkB;wBACzD,QAAQ,CAAC,kBAAkB,KAAK,kBAAkB;wBAClD,QAAQ,CAAC,MAAM,KAAK,aAAa,EACjC,CAAC;wBACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBACtD,CAAC;oBACD,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ,EAAE,CAAC;wBACjD,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;oBACzC,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IACE,CAAC,CAAC,KAAK,YAAY,4BAA4B,CAAC;wBAChD,eAAe,CAAC,kBAAkB,KAAK,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,EACpF,CAAC;wBACD,MAAM,KAAK,CAAC;oBACd,CAAC;gBACH,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,eAAe,GAAG,CAAC,KAAK,IAAmC,EAAE;gBACjE,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAAC;oBAChD,UAAU,EAAE,wBAAwB,EAAE;oBACtC,WAAW;oBACX,YAAY;oBACZ,eAAe,EAAE,cAAc;oBAC/B,YAAY;oBACZ,kBAAkB;oBAClB,QAAQ;oBACR,WAAW,EAAE,gBAAgB,CAAC,WAAW;iBAC1C,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACxB,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBACrC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBACzD,CAAC;gBACD,IAAI,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,KAAK,kBAAkB,EAAE,CAAC;oBACzE,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBACrC,MAAM,IAAI,4BAA4B,EAAE,CAAC;gBAC3C,CAAC;gBACD,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;gBAC1C,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBAEnD,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;oBACZ,OAAO,EAAE,2CAA2C;oBACpD,IAAI,EAAE;wBACJ,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,YAAY;wBACZ,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK;wBAClD,QAAQ;wBACR,SAAS,EAAE,gBAAgB,CAAC,SAAS;qBACtC;iBACF,CAAC,CAAC,CAAC;gBACJ,OAAO,QAAQ,CAAC;YAClB,CAAC,CAAC,EAAE,CAAC;YAEL,MAAM,OAAO,GAAG,EAAE,kBAAkB,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;YACjE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAChD,IAAI,CAAC;gBACH,OAAO,MAAM,eAAe,CAAC;YAC/B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,CAAC,KAAK,YAAY,4BAA4B,CAAC;oBAAE,MAAM,KAAK,CAAC;YACpE,CAAC;oBAAS,CAAC;gBACT,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,OAAO,EAAE,CAAC;oBACvD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,QAA8B,EAAE,QAAgB;QAClE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjC,QAAQ,CAAC,cAAc,EAAE,CAAC;YAC1B,QAAQ,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YACjC,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC;YAE3B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACb,OAAO,EAAE,0CAA0C;gBACnD,IAAI,EAAE;oBACJ,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,QAAQ;oBACR,WAAW,EAAE,QAAQ,CAAC,cAAc;iBACrC;aACF,CAAC,CAAC,CAAC;QACN,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,wBAAwB,CAAC,WAAmB,EAAE,QAAgB,EAAE,YAAkB,IAAI,IAAI,EAAE;QAC1F,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACpC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;QAEnE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,qCAAqC;YAC9C,IAAI,EAAE;gBACJ,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,QAAQ;gBACR,WAAW,EAAE,QAAQ,CAAC,cAAc;aACrC;SACF,CAAC,CAAC,CAAC;QAEJ,kCAAkC;QAClC,IAAI,QAAQ,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC;YAC/D,IAAI,gBAAgB,KAAK,YAAY,IAAI,gBAAgB,KAAK,YAAY,EAAE,CAAC;gBAC3E,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;gBAChC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAC/C,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;YACzB,QAAQ,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC,wCAAwC;YAEzE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACZ,OAAO,EAAE,gCAAgC;gBACzC,IAAI,EAAE;oBACJ,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,YAAY,EAAE,QAAQ,CAAC,YAAY;iBACpC;aACF,CAAC,CAAC,CAAC;QACN,CAAC;IACH,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,WAAmB;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACH,kBAAkB,CAAC,UAAkB;QACnC,MAAM,UAAU,GAAG,yBAAyB,CAC1C,UAAU,EACV,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAC/D,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,KAAK,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrD,IAAI,QAAQ,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;gBAC/B,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,YAAoB;QACvC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;aAC5B,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aACrC,MAAM,CAAC,CAAC,QAAQ,EAAoC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED;;OAEG;IACH,uBAAuB,CAAC,YAAoB,EAAE,kBAA0B;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG,yBAAyB,CAC1C,kBAAkB,EAClB,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CACzC,CAAC;QACF,OAAO,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAC,WAAmB;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,wEAAwE;QACxE,sEAAsE;QACtE,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;QAChC,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEO,eAAe,CAAC,WAAmB,EAAE,QAA8B;QACzE,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACrF,MAAM,OAAO,GAAG,eAAe;aAC5B,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;aACtB,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACjD,KAAK,OAAO,CAAC,IAAI,CACf,GAAG,EAAE;YACH,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,OAAO,EAAE,CAAC;gBACxD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,EACD,GAAG,EAAE;YACH,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,OAAO,EAAE,CAAC;gBACxD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC,CACF,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,WAAmB,EAAE,QAA8B;QACtF,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjD,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;QAChC,MAAM,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QAElC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,QAAQ,EAAE,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;YACZ,OAAO,EAAE,mCAAmC;YAC5C,IAAI,EAAE;gBACJ,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,YAAY,EAAE,QAAQ,CAAC,YAAY;gBACnC,WAAW,EAAE,QAAQ,CAAC,cAAc;aACrC;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,oBAAoB;QACxB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,iBAAiB,GAAa,EAAE,CAAC;QAEvC,KAAK,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAE/D,8EAA8E;YAC9E,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC;YAE3E,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,IAAI,QAAQ,GAAG,gBAAgB,EAAE,CAAC;gBAC9D,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBACZ,OAAO,EAAE,mCAAmC;gBAC5C,IAAI,EAAE;oBACJ,KAAK,EAAE,iBAAiB,CAAC,MAAM;oBAC/B,SAAS,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;wBACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACzC,OAAO;4BACL,UAAU,EAAE,QAAQ,EAAE,EAAE;4BACxB,YAAY,EAAE,QAAQ,EAAE,YAAY;4BACpC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;yBACvE,CAAC;oBACJ,CAAC,CAAC;iBACH;aACF,CAAC,CAAC,CAAC;YAEJ,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ;QACZ,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,eAAe,CAAC;QAC9B,CAAC;QAED,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAChC,CAAC;QAED,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;QAE/F,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAE1C,MAAM,OAAO,CAAC,UAAU,CACtB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CACrG,CAAC;QACF,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEtE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QACjC,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAE/B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YACb,OAAO,EAAE,sCAAsC;YAC/C,IAAI,EAAE;gBACJ,gBAAgB,EAAE,aAAa;aAChC;SACF,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,YAAY;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAEO,wBAAwB,CAAC,MAAuB;QACtD,OAAO,8BAA8B,CACnC,MAAM,EACN,0BAA0B,EAAE,EAC5B,kBAAkB,CAAC,WAAW,EAAE,CAAC,wBAAwB,EAAE,CAC5D,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,QAA8B;QAC1D,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,qCAAqC,QAAQ,CAAC,EAAE,GAAG,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QACrG,CAAC;QACD,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,IAAI,CAAC,wCAAwC,QAAQ,CAAC,EAAE,GAAG,EAAE,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;QACxG,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAA8B;QAClD,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,EAAE,0CAA0C,CAAC,CAAC;QAC9F,CAAC;QACD,MAAM,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACvC,OAAO,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAEO,4BAA4B,CAAC,QAA8B;QACjE,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC;QACrD,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,UAAU,GACd,QAAQ,CAAC,UAAU;YACnB,IAAI,sBAAsB,CAAC;gBACzB,SAAS,EAAE,YAAY,QAAQ,CAAC,YAAY,IAAI,QAAQ,CAAC,EAAE,EAAE;gBAC7D,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,UAAU,EAAG,QAAQ,CAAC,SAAsD,CAAC,GAAG,IAAI,IAAI;gBACxF,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;oBACxB,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC;oBACtC,aAAa,CAAC,OAAO,GAAG,SAAS,CAAC;oBAClC,IAAI,CAAC;wBACH,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC;oBAC9B,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,qCAAqC,QAAQ,CAAC,EAAE,KAAK,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;oBAC7F,CAAC;oBACD,IAAI,MAAM,CAAC,OAAO,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBACxD,MAAM,IAAI,KAAK,CAAC,mCAAmC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;oBACpE,CAAC;oBAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAA2B,CAAC;oBAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACd,MAAM,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,EAAE,4BAA4B,CAAC,CAAC;oBAChF,CAAC;oBACD,MAAM,SAAS,GAAG,MAAM,0BAA0B,CAAC;wBACjD,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,WAAW,EAAE,QAAQ,CAAC,WAAW;wBACjC,YAAY,EAAE,QAAQ,CAAC,YAAY;wBACnC,eAAe,EAAE,QAAQ,CAAC,eAAe;wBACzC,YAAY,EAAE,QAAQ,CAAC,YAAY;wBACnC,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;wBAC/C,QAAQ;wBACR,WAAW,EAAE,QAAQ,CAAC,WAAW;qBAClC,CAAC,CAAC;oBACH,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;wBACxC,SAAS,CAAC,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;wBACrC,MAAM,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;oBACjG,CAAC,CAAC;oBACF,OAAO;wBACL,GAAG,EAAG,SAAS,CAAC,SAA6D,CAAC,GAAG,IAAI,IAAI;wBACzF,QAAQ,EAAE,GAAG,EAAE;4BACb,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;4BACnC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;4BACzC,IAAI,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;wBAC9C,CAAC;wBACD,OAAO;qBACR,CAAC;gBACJ,CAAC;gBACD,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE;oBAC1B,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC;oBAChC,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY;wBAAE,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC;oBACpE,IAAI,QAAQ,CAAC,KAAK,KAAK,YAAY;wBAAE,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC;oBACpE,IAAI,QAAQ,CAAC,KAAK,KAAK,WAAW;wBAAE,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC;oBACtG,IAAI,QAAQ,CAAC,KAAK,KAAK,SAAS;wBAAE,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;oBAClE,MAAM,CAAC,IAAI,CAAC,wDAAwD,QAAQ,CAAC,YAAY,EAAE,EAAE;wBAC3F,UAAU,EAAE,QAAQ,CAAC,EAAE;wBACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,OAAO,EAAE,QAAQ,CAAC,OAAO;wBACzB,KAAK,EAAE,QAAQ,CAAC,KAAK;wBACrB,WAAW,EAAE,QAAQ,CAAC,WAAW;wBACjC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;wBAC3B,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,KAAK,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO;qBACnC,CAAC,CAAC;oBACH,IAAI,CAAC,oBAAoB,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAClD,CAAC;aACF,CAAC,CAAC;QACL,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;QACjC,QAAQ,CAAC,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QAE7C,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE;YACpB,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa;gBAAE,OAAO;YAC5E,IAAI,QAAQ,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;gBAClC,QAAQ,CAAC,MAAM,GAAG,aAAa,CAAC;gBAChC,KAAK,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC7D,MAAM,CAAC,IAAI,CAAC,2CAA2C,QAAQ,CAAC,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;gBACjG,CAAC,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,UAAU,CAAC,oBAAoB,CAC7B,QAAQ,CAAC,SAAS,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI;gBACpD,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,IAAI;gBACZ,GAAG,EAAG,QAAQ,CAAC,SAA6D,CAAC,GAAG,IAAI,IAAI;gBACxF,EAAE,EAAE,IAAI,IAAI,EAAE;aACf,CACF,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,QAAQ;QAON,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,MAAM,CAAC;QAC1E,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;QACtE,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAE7E,OAAO;YACL,cAAc,EAAE,SAAS,CAAC,MAAM;YAChC,eAAe,EAAE,WAAW;YAC5B,aAAa,EAAE,SAAS;YACxB,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI;YAC5C,YAAY;SACb,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,mBAAmB,CACzB,cAA+B,EAC/B,OAIC;QAOD,wDAAwD;QACxD,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,OAAO;gBACL,SAAS,EAAE,OAAO,EAAE,SAAS,KAAK,KAAK,EAAE,kBAAkB;gBAC3D,SAAS,EAAE,OAAO,EAAE,SAAS,KAAK,IAAI,EAAE,mBAAmB;gBAC3D,WAAW,EAAE,OAAO,EAAE,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,WAAY;gBAC9D,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAa;aACzC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,SAAS,EAAE,cAAc,CAAC,QAAQ,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB;YAC1E,SAAS,EAAE,cAAc,CAAC,QAAQ,CAAC,SAAS,KAAK,IAAI,EAAE,mBAAmB;YAC1E,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,WAAY;YAC7E,YAAY,EAAE,cAAc,CAAC,QAAQ,CAAC,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,YAAa;SACjF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,YAAoB,EAAE,YAAoB,EAAE,QAAiB;QACrF,OAAO,qBAAqB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC;IAClG,CAAC;IAED;;OAEG;IACK,mBAAmB,CAAC,YAAoB;QAC9C,2BAA2B;QAC3B,IAAI,IAAI,CAAC,OAAO,CAAC,YAAa,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YAClE,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,MAAM,CAAC;YAErG,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,YAAa,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,sBAAsB,IAAI,CAAC,OAAO,CAAC,YAAY,2BAA2B,YAAY,GAAG,CAAC,CAAC;YAC7G,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC;YACzE,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAC5D,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,KAAK,aAAa,CAChD,CAAC,MAAM,CAAC;YAET,IAAI,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAClD,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,CAAC,iBAAiB,WAAW,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,kBAAkB,CAAC,YAAoB,EAAE,WAAmB;QAClE,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YAChD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAED;;OAEG;IACK,uBAAuB,CAAC,YAAoB,EAAE,WAAmB;QACvE,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAChE,IAAI,YAAY,EAAE,CAAC;YACjB,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACjC,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC5B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,iBAAiB;QACvB,IAAI,IAAI,CAAC,OAAO,CAAC,eAAgB,GAAG,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC1C,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE,KAAK,CAAC,CAAC;gBAC/D,CAAC,CAAC,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,eAAgB,CAAC,CAAC;YAElC,gDAAgD;YAChD,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
|
|
@@ -35,6 +35,8 @@ export interface PooledClientInstance {
|
|
|
35
35
|
transport: AuthProviderTransport;
|
|
36
36
|
/** Hash of the rendered configuration used to create this instance */
|
|
37
37
|
renderedHash: string;
|
|
38
|
+
/** Keyed fingerprint of the effective configuration after Runtime Scope substitution. */
|
|
39
|
+
runtimeFingerprint: string;
|
|
38
40
|
/** Processed server configuration */
|
|
39
41
|
processedConfig: MCPServerParams;
|
|
40
42
|
/** Number of clients currently connected to this instance */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientInstancePoolTypes.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePoolTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACrH,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mEAAmE;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,iBAKlC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,SAAS,EAAE,qBAAqB,CAAC;IACjC,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,qCAAqC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,SAAS,EAAE,IAAI,CAAC;IAChB,wCAAwC;IACxC,UAAU,EAAE,IAAI,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;IACxE,uEAAuE;IACvE,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IACzC,mFAAmF;IACnF,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,mDAAmD;IACnD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,qCAAqC;IACrC,WAAW,EAAE,MAAM,CAAC;CACrB"}
|
|
1
|
+
{"version":3,"file":"clientInstancePoolTypes.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePoolTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AACrH,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,+DAA+D;IAC/D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mEAAmE;IACnE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,iBAKlC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,sDAAsD;IACtD,WAAW,EAAE,MAAM,CAAC;IACpB,0DAA0D;IAC1D,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,SAAS,EAAE,qBAAqB,CAAC;IACjC,sEAAsE;IACtE,YAAY,EAAE,MAAM,CAAC;IACrB,yFAAyF;IACzF,kBAAkB,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,eAAe,EAAE,eAAe,CAAC;IACjC,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;IACvB,+CAA+C;IAC/C,SAAS,EAAE,IAAI,CAAC;IAChB,wCAAwC;IACxC,UAAU,EAAE,IAAI,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,QAAQ,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;IACxE,uEAAuE;IACvE,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IACzC,mFAAmF;IACnF,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1B,mDAAmD;IACnD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,qCAAqC;IACrC,WAAW,EAAE,MAAM,CAAC;CACrB"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import type { Tool } from '@modelcontextprotocol/sdk/types.js';
|
|
2
2
|
import type { MCPServerParams } from '../../core/types/index.js';
|
|
3
|
+
export declare function getLogicalToolName(logicalServerName: string, toolName: string): string;
|
|
3
4
|
export declare function getDisabledToolMessage(logicalServerName: string, toolName: string): string;
|
|
4
5
|
export declare function getDisabledTools(serverConfig?: Pick<MCPServerParams, 'disabledTools'>): string[];
|
|
6
|
+
export declare function normalizeDisabledToolsForServer(logicalServerName: string, toolNames: readonly string[]): string[];
|
|
5
7
|
export declare function getDisabledToolsForServer(serverConfigs: Record<string, MCPServerParams>, logicalServerName: string): string[];
|
|
6
8
|
export declare function isToolDisabled(serverConfigs: Record<string, MCPServerParams>, logicalServerName: string, toolName: string): boolean;
|
|
7
9
|
export declare function getDisabledToolError(serverConfigs: Record<string, MCPServerParams>, logicalServerName: string, toolName: string): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disabledTools.d.ts","sourceRoot":"","sources":["../../../src/core/server/disabledTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"disabledTools.d.ts","sourceRoot":"","sources":["../../../src/core/server/disabledTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAMhE,wBAAgB,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAStF;AAkBD,wBAAgB,sBAAsB,CAAC,iBAAiB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAG1F;AAED,wBAAgB,gBAAgB,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,eAAe,CAAC,GAAG,MAAM,EAAE,CAmBhG;AAED,wBAAgB,+BAA+B,CAAC,iBAAiB,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAIjH;AAED,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC9C,iBAAiB,EAAE,MAAM,GACxB,MAAM,EAAE,CAEV;AAED,wBAAgB,cAAc,CAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC9C,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,GACf,OAAO,CAUT;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC9C,iBAAiB,EAAE,MAAM,EACzB,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CASpD;AAED,wBAAgB,mBAAmB,CAAC,CAAC,SAAS,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,EAC9D,KAAK,EAAE,CAAC,EAAE,EACV,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAC9C,iBAAiB,EAAE,MAAM,GACxB,CAAC,EAAE,CAML;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,eAAe,EAC7B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,OAAO,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,eAAe,CA2BjB"}
|
|
@@ -2,7 +2,7 @@ import { MCP_URI_SEPARATOR } from '../../constants.js';
|
|
|
2
2
|
function normalizeToolName(toolName) {
|
|
3
3
|
return toolName.trim();
|
|
4
4
|
}
|
|
5
|
-
function
|
|
5
|
+
export function getLogicalToolName(logicalServerName, toolName) {
|
|
6
6
|
const normalizedToolName = normalizeToolName(toolName);
|
|
7
7
|
const qualifiedPrefix = `${logicalServerName}${MCP_URI_SEPARATOR}`;
|
|
8
8
|
if (normalizedToolName.startsWith(qualifiedPrefix)) {
|
|
@@ -16,7 +16,7 @@ function getComparableToolNames(logicalServerName, toolName) {
|
|
|
16
16
|
return [];
|
|
17
17
|
}
|
|
18
18
|
const names = new Set([normalizedToolName]);
|
|
19
|
-
const rawToolName =
|
|
19
|
+
const rawToolName = getLogicalToolName(logicalServerName, normalizedToolName);
|
|
20
20
|
if (rawToolName) {
|
|
21
21
|
names.add(rawToolName);
|
|
22
22
|
names.add(`${logicalServerName}${MCP_URI_SEPARATOR}${rawToolName}`);
|
|
@@ -24,7 +24,7 @@ function getComparableToolNames(logicalServerName, toolName) {
|
|
|
24
24
|
return Array.from(names);
|
|
25
25
|
}
|
|
26
26
|
export function getDisabledToolMessage(logicalServerName, toolName) {
|
|
27
|
-
const displayToolName =
|
|
27
|
+
const displayToolName = getLogicalToolName(logicalServerName, toolName);
|
|
28
28
|
return `Tool is disabled: ${logicalServerName}:${displayToolName}. Use '1mcp mcp tools enable ${logicalServerName} ${displayToolName}' to re-enable it.`;
|
|
29
29
|
}
|
|
30
30
|
export function getDisabledTools(serverConfig) {
|
|
@@ -43,6 +43,9 @@ export function getDisabledTools(serverConfig) {
|
|
|
43
43
|
}
|
|
44
44
|
return disabledTools;
|
|
45
45
|
}
|
|
46
|
+
export function normalizeDisabledToolsForServer(logicalServerName, toolNames) {
|
|
47
|
+
return Array.from(new Set(toolNames.map((toolName) => getLogicalToolName(logicalServerName, toolName)).filter(Boolean))).sort((left, right) => left.localeCompare(right));
|
|
48
|
+
}
|
|
46
49
|
export function getDisabledToolsForServer(serverConfigs, logicalServerName) {
|
|
47
50
|
return getDisabledTools(serverConfigs[logicalServerName]);
|
|
48
51
|
}
|
|
@@ -76,7 +79,7 @@ export function withToolDisabledState(serverConfig, toolName, disabled, logicalS
|
|
|
76
79
|
: new Set([normalizedToolName]);
|
|
77
80
|
const disabledTools = new Set(getDisabledTools(serverConfig).filter((disabledTool) => !comparableNames.has(disabledTool)));
|
|
78
81
|
if (disabled && normalizedToolName) {
|
|
79
|
-
disabledTools.add(logicalServerName ?
|
|
82
|
+
disabledTools.add(logicalServerName ? getLogicalToolName(logicalServerName, normalizedToolName) : normalizedToolName);
|
|
80
83
|
}
|
|
81
84
|
const nextDisabledTools = Array.from(disabledTools).sort((left, right) => left.localeCompare(right));
|
|
82
85
|
const nextConfig = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disabledTools.js","sourceRoot":"","sources":["../../../src/core/server/disabledTools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD,SAAS,iBAAiB,CAAC,QAAgB;IACzC,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"disabledTools.js","sourceRoot":"","sources":["../../../src/core/server/disabledTools.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,10 +43,6 @@ export declare class MCPServerLifecycleManager {
|
|
|
43
43
|
* Update metadata for a running server without restarting it
|
|
44
44
|
*/
|
|
45
45
|
updateServerMetadata(serverName: string, newConfig: MCPServerParams, outboundConns: OutboundConnections): Promise<void>;
|
|
46
|
-
/**
|
|
47
|
-
* Process server configuration to handle environment variables
|
|
48
|
-
*/
|
|
49
|
-
private processServerConfig;
|
|
50
46
|
/**
|
|
51
47
|
* Create a transport for the given server configuration
|
|
52
48
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpServerLifecycleManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAK1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIlF;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,UAAU,CAAyF;IAC3G,OAAO,CAAC,aAAa,CAAC,CAAgB;;IAMtC;;OAEG;IACU,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"mcpServerLifecycleManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAK1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIlF;;GAEG;AACH,qBAAa,yBAAyB;IACpC,OAAO,CAAC,UAAU,CAAyF;IAC3G,OAAO,CAAC,aAAa,CAAC,CAAgB;;IAMtC;;OAEG;IACU,WAAW,CACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAuChB;;OAEG;IACU,UAAU,CACrB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAmChB;;OAEG;IACU,aAAa,CACxB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,OAAO,CAAC,IAAI,CAAC;IAsBhB;;OAEG;IACI,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,eAAe,CAAA;KAAE,CAAC;IAavF;;OAEG;IACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAItD;;OAEG;IACI,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,qBAAqB,GAAG,IAAI;IAavG;;OAEG;IACI,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAM9C;;OAEG;IACU,oBAAoB,CAC/B,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,eAAe,EAC1B,aAAa,EAAE,mBAAmB,GACjC,OAAO,CAAC,IAAI,CAAC;IA6ChB;;OAEG;YACW,qBAAqB;IAiCnC;;OAEG;YACW,eAAe;IAiC7B;;OAEG;YACW,oBAAoB;CA0BnC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { sanitizeRuntimeScopeError } from '../../config/runtimeScopeEnv.js';
|
|
2
2
|
import { ClientManager } from '../../core/client/clientManager.js';
|
|
3
3
|
import { getGlobalContextManager } from '../../core/context/globalContextManager.js';
|
|
4
4
|
import logger, { debugIf } from '../../logger/logger.js';
|
|
@@ -28,10 +28,8 @@ export class MCPServerLifecycleManager {
|
|
|
28
28
|
logger.info(`Server ${serverName} is disabled, skipping start`);
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
|
-
// Process environment variables in config
|
|
32
|
-
const processedConfig = this.processServerConfig(config);
|
|
33
31
|
// Infer transport type if not specified
|
|
34
|
-
const configWithType = inferTransportType(
|
|
32
|
+
const configWithType = inferTransportType(config, serverName);
|
|
35
33
|
// Create transport for the server
|
|
36
34
|
const transport = await this.createServerTransport(serverName, configWithType);
|
|
37
35
|
// Store server info
|
|
@@ -44,8 +42,9 @@ export class MCPServerLifecycleManager {
|
|
|
44
42
|
logger.info(`Successfully started MCP server: ${serverName}`);
|
|
45
43
|
}
|
|
46
44
|
catch (error) {
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
const safeError = sanitizeRuntimeScopeError(error);
|
|
46
|
+
logger.error(`Failed to start MCP server ${serverName}:`, safeError);
|
|
47
|
+
throw safeError;
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
/**
|
|
@@ -70,15 +69,16 @@ export class MCPServerLifecycleManager {
|
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
catch (error) {
|
|
73
|
-
logger.warn(`Error closing transport for server ${serverName}:`, error);
|
|
72
|
+
logger.warn(`Error closing transport for server ${serverName}:`, sanitizeRuntimeScopeError(error));
|
|
74
73
|
}
|
|
75
74
|
// Remove from tracking
|
|
76
75
|
this.mcpServers.delete(serverName);
|
|
77
76
|
logger.info(`Successfully stopped MCP server: ${serverName}`);
|
|
78
77
|
}
|
|
79
78
|
catch (error) {
|
|
80
|
-
|
|
81
|
-
|
|
79
|
+
const safeError = sanitizeRuntimeScopeError(error);
|
|
80
|
+
logger.error(`Failed to stop MCP server ${serverName}:`, safeError);
|
|
81
|
+
throw safeError;
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
84
|
/**
|
|
@@ -98,8 +98,9 @@ export class MCPServerLifecycleManager {
|
|
|
98
98
|
logger.info(`Successfully restarted MCP server: ${serverName}`);
|
|
99
99
|
}
|
|
100
100
|
catch (error) {
|
|
101
|
-
|
|
102
|
-
|
|
101
|
+
const safeError = sanitizeRuntimeScopeError(error);
|
|
102
|
+
logger.error(`Failed to restart MCP server ${serverName}:`, safeError);
|
|
103
|
+
throw safeError;
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
106
|
/**
|
|
@@ -186,31 +187,6 @@ export class MCPServerLifecycleManager {
|
|
|
186
187
|
throw error;
|
|
187
188
|
}
|
|
188
189
|
}
|
|
189
|
-
/**
|
|
190
|
-
* Process server configuration to handle environment variables
|
|
191
|
-
*/
|
|
192
|
-
processServerConfig(config) {
|
|
193
|
-
try {
|
|
194
|
-
// Create a mutable copy for processing
|
|
195
|
-
const processedConfig = { ...config };
|
|
196
|
-
// Process environment variables if enabled - only pass env-related fields
|
|
197
|
-
const envConfig = {
|
|
198
|
-
inheritParentEnv: config.inheritParentEnv,
|
|
199
|
-
envFilter: config.envFilter,
|
|
200
|
-
env: config.env,
|
|
201
|
-
};
|
|
202
|
-
const processedEnv = processEnvironment(envConfig);
|
|
203
|
-
// Replace environment variables in the config while preserving all other fields
|
|
204
|
-
if (processedEnv.processedEnv && Object.keys(processedEnv.processedEnv).length > 0) {
|
|
205
|
-
processedConfig.env = processedEnv.processedEnv;
|
|
206
|
-
}
|
|
207
|
-
return processedConfig;
|
|
208
|
-
}
|
|
209
|
-
catch (error) {
|
|
210
|
-
logger.warn(`Failed to process environment variables for server config:`, error);
|
|
211
|
-
return config;
|
|
212
|
-
}
|
|
213
|
-
}
|
|
214
190
|
/**
|
|
215
191
|
* Create a transport for the given server configuration
|
|
216
192
|
*/
|
|
@@ -237,8 +213,9 @@ export class MCPServerLifecycleManager {
|
|
|
237
213
|
return transport;
|
|
238
214
|
}
|
|
239
215
|
catch (error) {
|
|
240
|
-
|
|
241
|
-
|
|
216
|
+
const safeError = sanitizeRuntimeScopeError(error);
|
|
217
|
+
logger.error(`Failed to create transport for server ${serverName}:`, safeError);
|
|
218
|
+
throw safeError;
|
|
242
219
|
}
|
|
243
220
|
}
|
|
244
221
|
/**
|
|
@@ -263,8 +240,9 @@ export class MCPServerLifecycleManager {
|
|
|
263
240
|
}));
|
|
264
241
|
}
|
|
265
242
|
catch (error) {
|
|
266
|
-
|
|
267
|
-
|
|
243
|
+
const safeError = sanitizeRuntimeScopeError(error);
|
|
244
|
+
logger.error(`Failed to connect to server ${serverName}:`, safeError);
|
|
245
|
+
throw safeError;
|
|
268
246
|
}
|
|
269
247
|
}
|
|
270
248
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpServerLifecycleManager.js","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mcpServerLifecycleManager.js","sourceRoot":"","sources":["../../../src/core/server/mcpServerLifecycleManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,7 @@ export declare class ServerManager {
|
|
|
85
85
|
getServer(sessionId: string): InboundConnection | undefined;
|
|
86
86
|
getInboundConnections(): Map<string, InboundConnection>;
|
|
87
87
|
getTemplateServerManager(): TemplateServerManager;
|
|
88
|
+
reloadTemplatesForRuntimeEnvironment(templateNames: readonly string[]): Promise<void>;
|
|
88
89
|
getServerRegistry(): ServerRegistry;
|
|
89
90
|
/** Notify attached callers that backend capability lists may have changed. */
|
|
90
91
|
notifyBackendCapabilityListsChanged(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAG1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAE5F,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAkB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AACjH,OAAO,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAGxF,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAI7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAElF,OAAO,KAAK,EAEV,iBAAiB,EACjB,uBAAuB,EACvB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,UAAU,EAAE,WAAW,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAED;;;;;;;;GAQG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA4B;IACnD,OAAO,CAAC,YAAY,CAAoC;IACxD,OAAO,CAAC,kBAAkB,CAA4C;IACtE,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,UAAU,CAA4B;IAC9C,OAAO,CAAC,gBAAgB,CAAuC;IAC/D,OAAO,CAAC,qBAAqB,CAAC,CAAwB;IACtD,OAAO,CAAC,uBAAuB,CAAC,CAA0B;IAG1D,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,yBAAyB,CAA4B;IAC7D,OAAO,CAAC,4BAA4B,CAA+B;IACnE,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,WAAW,CAAoB;IAEvC,OAAO;WAmBO,mBAAmB,CAC/B,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EACzC,YAAY,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EACvD,aAAa,EAAE,mBAAmB,EAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,aAAa;IAOhB,WAAkB,OAAO,IAAI,aAAa,CAKzC;WAGmB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAOlD;;OAEG;IACI,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAkBxE;;OAEG;IACI,0BAA0B,CAAC,YAAY,EAAE,uBAAuB,GAAG,IAAI;IAS9E;;OAEG;IACI,0BAA0B,IAAI,uBAAuB,GAAG,SAAS;IAIxE;;OAEG;IACI,wBAAwB,IAAI,qBAAqB,GAAG,SAAS;IAIpE;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAkClC;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAW/B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAgBnB,gBAAgB,CAC3B,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,uBAAuB,EAC7B,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"serverManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/serverManager.ts"],"names":[],"mappings":"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"}
|