@1mcp/agent 0.28.0 → 0.29.0-beta1

package/build/core/server/clientInstancePool.js

@@ -0,0 +1,407 @@
+import logger, { debugIf, infoIf } from '../../logger/logger.js';
+import { HandlebarsTemplateRenderer } from '../../template/handlebarsTemplateRenderer.js';
+import { createTransportsWithContext } from '../../transport/transportFactory.js';
+import { createHash } from '../../utils/crypto.js';
+/**
+ * Default pool configuration
+ */
+const DEFAULT_POOL_OPTIONS = {
+    maxInstances: 10,
+    idleTimeout: 5 * 60 * 1000, // 5 minutes
+    cleanupInterval: 60 * 1000, // 1 minute
+    maxTotalInstances: 100,
+};
+/**
+ * Manages a pool of MCP client instances created from templates
+ *
+ * This class handles:
+ * - Creating new client instances from templates with specific variables
+ * - Reusing existing instances when template variables match
+ * - Managing client connections per instance
+ * - Cleaning up idle instances to free resources
+ */
+export class ClientInstancePool {
+    instances = new Map();
+    templateToInstances = new Map();
+    options;
+    cleanupTimer;
+    instanceCounter = 0;
+    constructor(options = {}) {
+        this.options = { ...DEFAULT_POOL_OPTIONS, ...options };
+        this.startCleanupTimer();
+        debugIf(() => ({
+            message: 'ClientInstancePool initialized',
+            meta: { options: this.options },
+        }));
+    }
+    /**
+     * Creates or retrieves a client instance for the given template and variables
+     */
+    async getOrCreateClientInstance(templateName, templateConfig, context, clientId, options) {
+        // Render template with context data
+        const renderer = new HandlebarsTemplateRenderer();
+        const renderedConfig = renderer.renderTemplate(templateConfig, context);
+        const renderedHash = createHash(JSON.stringify(renderedConfig));
+        // Debug logging to verify template rendering
+        debugIf(() => ({
+            message: 'Template rendering details',
+            meta: {
+                templateName,
+                clientId,
+                projectPath: context.project?.path || 'undefined',
+                renderedConfig,
+                renderedHash: renderedHash.substring(0, 8) + '...',
+                hasRenderedChanges: JSON.stringify(renderedConfig) !== JSON.stringify(templateConfig),
+            },
+        }));
+        infoIf(() => ({
+            message: 'Processing template for client instance',
+            meta: {
+                templateName,
+                clientId,
+                renderedHash: renderedHash.substring(0, 8) + '...',
+                shareable: !options?.perClient && options?.shareable !== false,
+            },
+        }));
+        // Get template configuration with proper defaults
+        const templateSettings = this.getTemplateSettings(templateConfig, options);
+        const instanceKey = this.createInstanceKey(templateName, renderedHash, templateSettings.perClient ? clientId : undefined);
+        logger.info(`Template ${templateName}, renderedHash: ${renderedHash}, Instance key: ${instanceKey}`);
+        // Check for existing instance
+        const existingInstance = this.instances.get(instanceKey);
+        if (existingInstance && existingInstance.status !== 'terminating') {
+            // Check if this template is shareable
+            if (templateSettings.shareable) {
+                return this.addClientToInstance(existingInstance, clientId);
+            }
+        }
+        // Check instance limits before creating new
+        this.checkInstanceLimits(templateName);
+        // Create new client instance
+        const instance = await this.createNewInstance(templateName, templateConfig, renderedConfig, // Use rendered config directly
+        renderedHash, // Use rendered hash
+        clientId, templateSettings.idleTimeout);
+        this.instances.set(instanceKey, instance);
+        this.addToTemplateIndex(templateName, instanceKey);
+        infoIf(() => ({
+            message: 'Created new client instance from template',
+            meta: {
+                instanceId: instance.id,
+                templateName,
+                renderedHash: renderedHash.substring(0, 8) + '...',
+                clientId,
+                shareable: templateSettings.shareable,
+            },
+        }));
+        return instance;
+    }
+    /**
+     * Adds a client to an existing instance
+     */
+    addClientToInstance(instance, clientId) {
+        if (!instance.clientIds.has(clientId)) {
+            instance.clientIds.add(clientId);
+            instance.referenceCount++;
+            instance.lastUsedAt = new Date();
+            instance.status = 'active';
+            debugIf(() => ({
+                message: 'Added client to existing client instance',
+                meta: {
+                    instanceId: instance.id,
+                    clientId,
+                    clientCount: instance.referenceCount,
+                },
+            }));
+        }
+        return instance;
+    }
+    /**
+     * Removes a client from an instance
+     */
+    removeClientFromInstance(instanceKey, clientId) {
+        const instance = this.instances.get(instanceKey);
+        if (!instance) {
+            return;
+        }
+        instance.clientIds.delete(clientId);
+        instance.referenceCount = Math.max(0, instance.referenceCount - 1);
+        debugIf(() => ({
+            message: 'Removed client from client instance',
+            meta: {
+                instanceId: instance.id,
+                clientId,
+                clientCount: instance.referenceCount,
+            },
+        }));
+        // Mark as idle if no more clients
+        if (instance.referenceCount === 0) {
+            instance.status = 'idle';
+            instance.lastUsedAt = new Date(); // Set lastUsedAt to when it became idle
+            infoIf(() => ({
+                message: 'Client instance marked as idle',
+                meta: {
+                    instanceId: instance.id,
+                    templateName: instance.templateName,
+                },
+            }));
+        }
+    }
+    /**
+     * Gets an instance by its key
+     */
+    getInstance(instanceKey) {
+        return this.instances.get(instanceKey);
+    }
+    /**
+     * Gets all instances for a specific template
+     */
+    getTemplateInstances(templateName) {
+        const instanceKeys = this.templateToInstances.get(templateName);
+        if (!instanceKeys) {
+            return [];
+        }
+        return Array.from(instanceKeys)
+            .map((key) => this.instances.get(key))
+            .filter((instance) => !!instance);
+    }
+    /**
+     * Gets all active instances in the pool
+     */
+    getAllInstances() {
+        return Array.from(this.instances.values());
+    }
+    /**
+     * Manually removes an instance from the pool
+     */
+    async removeInstance(instanceKey) {
+        const instance = this.instances.get(instanceKey);
+        if (!instance) {
+            return;
+        }
+        instance.status = 'terminating';
+        try {
+            // Close transport and client connection
+            await instance.client.close();
+            await instance.transport.close();
+        }
+        catch (error) {
+            logger.warn(`Error closing client instance ${instance.id}:`, error);
+        }
+        this.instances.delete(instanceKey);
+        this.removeFromTemplateIndex(instance.templateName, instanceKey);
+        infoIf(() => ({
+            message: 'Removed client instance from pool',
+            meta: {
+                instanceId: instance.id,
+                templateName: instance.templateName,
+                clientCount: instance.referenceCount,
+            },
+        }));
+    }
+    /**
+     * Forces cleanup of idle instances
+     */
+    async cleanupIdleInstances() {
+        const now = new Date();
+        const instancesToRemove = [];
+        for (const [instanceKey, instance] of this.instances) {
+            const idleTime = now.getTime() - instance.lastUsedAt.getTime();
+            // Use instance-specific timeout if available, otherwise use pool-wide timeout
+            const timeoutThreshold = instance.idleTimeout || this.options.idleTimeout;
+            if (instance.status === 'idle' && idleTime > timeoutThreshold) {
+                instancesToRemove.push(instanceKey);
+            }
+        }
+        if (instancesToRemove.length > 0) {
+            infoIf(() => ({
+                message: 'Cleaning up idle client instances',
+                meta: {
+                    count: instancesToRemove.length,
+                    instances: instancesToRemove.map((key) => {
+                        const instance = this.instances.get(key);
+                        return {
+                            instanceId: instance?.id,
+                            templateName: instance?.templateName,
+                            idleTime: instance ? now.getTime() - instance.lastUsedAt.getTime() : 0,
+                        };
+                    }),
+                },
+            }));
+            await Promise.all(instancesToRemove.map((key) => this.removeInstance(key)));
+        }
+    }
+    /**
+     * Shuts down the instance pool and cleans up all resources
+     */
+    async shutdown() {
+        if (this.cleanupTimer) {
+            clearInterval(this.cleanupTimer);
+            this.cleanupTimer = undefined;
+        }
+        // Mark all instances as terminating
+        for (const instance of this.instances.values()) {
+            instance.status = 'terminating';
+        }
+        const instanceCount = this.instances.size;
+        // Close all client connections and transports
+        await Promise.all(Array.from(this.instances.values()).map(async (instance) => {
+            try {
+                await instance.client.close();
+                await instance.transport.close();
+            }
+            catch (error) {
+                logger.warn(`Error shutting down client instance ${instance.id}:`, error);
+            }
+        }));
+        this.instances.clear();
+        this.templateToInstances.clear();
+        debugIf(() => ({
+            message: 'ClientInstancePool shutdown complete',
+            meta: {
+                instancesRemoved: instanceCount,
+            },
+        }));
+    }
+    /**
+     * Gets pool statistics for monitoring
+     */
+    getStats() {
+        const instances = Array.from(this.instances.values());
+        const activeCount = instances.filter((i) => i.status === 'active').length;
+        const idleCount = instances.filter((i) => i.status === 'idle').length;
+        const totalClients = instances.reduce((sum, i) => sum + i.referenceCount, 0);
+        return {
+            totalInstances: instances.length,
+            activeInstances: activeCount,
+            idleInstances: idleCount,
+            templateCount: this.templateToInstances.size,
+            totalClients,
+        };
+    }
+    /**
+     * Creates a new client instance and connects to upstream server
+     */
+    async createNewInstance(templateName, templateConfig, processedConfig, renderedHash, clientId, idleTimeout) {
+        // Create transport for the upstream server
+        const transports = await createTransportsWithContext({
+            [templateName]: processedConfig,
+        }, undefined);
+        const transport = transports[templateName];
+        if (!transport) {
+            throw new Error(`Failed to create transport for template ${templateName}`);
+        }
+        // Create client instance
+        const { ClientManager } = await import('../../core/client/clientManager.js');
+        const clientManager = ClientManager.getOrCreateInstance();
+        const client = clientManager.createPooledClientInstance();
+        // Connect client to the upstream server
+        await client.connect(transport);
+        return {
+            id: this.generateInstanceId(),
+            templateName,
+            client,
+            transport,
+            renderedHash,
+            processedConfig,
+            referenceCount: 1,
+            createdAt: new Date(),
+            lastUsedAt: new Date(),
+            status: 'active',
+            clientIds: new Set([clientId]),
+            idleTimeout,
+        };
+    }
+    /**
+     * Gets template configuration with proper defaults
+     */
+    getTemplateSettings(templateConfig, options) {
+        // Apply defaults if template configuration is undefined
+        if (!templateConfig.template) {
+            return {
+                shareable: options?.shareable !== false, // Default to true
+                perClient: options?.perClient === true, // Default to false
+                idleTimeout: options?.idleTimeout || this.options.idleTimeout,
+                maxInstances: this.options.maxInstances,
+            };
+        }
+        return {
+            shareable: templateConfig.template.shareable !== false, // Default to true
+            perClient: templateConfig.template.perClient === true, // Default to false
+            idleTimeout: templateConfig.template.idleTimeout || this.options.idleTimeout,
+            maxInstances: templateConfig.template.maxInstances || this.options.maxInstances,
+        };
+    }
+    /**
+     * Creates a unique instance key from template name and variable hash
+     */
+    createInstanceKey(templateName, variableHash, clientId) {
+        if (clientId) {
+            return `${templateName}:${variableHash}:${clientId}`;
+        }
+        return `${templateName}:${variableHash}`;
+    }
+    /**
+     * Generates a unique instance ID
+     */
+    generateInstanceId() {
+        return `client-instance-${++this.instanceCounter}-${Date.now()}`;
+    }
+    /**
+     * Checks if creating a new instance would exceed limits
+     */
+    checkInstanceLimits(templateName) {
+        // Check per-template limit
+        if (this.options.maxInstances > 0) {
+            const templateInstances = this.getTemplateInstances(templateName);
+            const activeCount = templateInstances.filter((instance) => instance.status !== 'terminating').length;
+            if (activeCount >= this.options.maxInstances) {
+                throw new Error(`Maximum instances (${this.options.maxInstances}) reached for template '${templateName}'`);
+            }
+        }
+        // Check total limit
+        if (this.options.maxTotalInstances && this.options.maxTotalInstances > 0) {
+            const activeCount = Array.from(this.instances.values()).filter((instance) => instance.status !== 'terminating').length;
+            if (activeCount >= this.options.maxTotalInstances) {
+                throw new Error(`Maximum total instances (${this.options.maxTotalInstances}) reached`);
+            }
+        }
+    }
+    /**
+     * Adds an instance to the template index
+     */
+    addToTemplateIndex(templateName, instanceKey) {
+        if (!this.templateToInstances.has(templateName)) {
+            this.templateToInstances.set(templateName, new Set());
+        }
+        this.templateToInstances.get(templateName).add(instanceKey);
+    }
+    /**
+     * Removes an instance from the template index
+     */
+    removeFromTemplateIndex(templateName, instanceKey) {
+        const instanceKeys = this.templateToInstances.get(templateName);
+        if (instanceKeys) {
+            instanceKeys.delete(instanceKey);
+            if (instanceKeys.size === 0) {
+                this.templateToInstances.delete(templateName);
+            }
+        }
+    }
+    /**
+     * Starts the periodic cleanup timer
+     */
+    startCleanupTimer() {
+        if (this.options.cleanupInterval > 0) {
+            this.cleanupTimer = setInterval(() => {
+                this.cleanupIdleInstances().catch((error) => {
+                    logger.error('Error during client instance cleanup:', error);
+                });
+            }, this.options.cleanupInterval);
+            // Ensure the timer doesn't prevent process exit
+            if (this.cleanupTimer.unref) {
+                this.cleanupTimer.unref();
+            }
+        }
+    }
+}
+//# sourceMappingURL=clientInstancePool.js.map

package/build/core/server/clientInstancePool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientInstancePool.js","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}

package/build/core/server/connectionManager.d.ts

@@ -0,0 +1,70 @@
+import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import type { OutboundConnections } from '../../core/types/client.js';
+import { InboundConnection, InboundConnectionConfig, OperationOptions } from '../../core/types/index.js';
+import type { ContextData } from '../../types/context.js';
+/**
+ * Manages transport connection lifecycle and inbound connections
+ */
+export declare class ConnectionManager {
+    private serverConfig;
+    private serverCapabilities;
+    private outboundConns;
+    private inboundConns;
+    private connectionSemaphore;
+    private disconnectingIds;
+    constructor(serverConfig: {
+        name: string;
+        version: string;
+    }, serverCapabilities: {
+        capabilities: Record<string, unknown>;
+    }, outboundConns: OutboundConnections);
+    /**
+     * Connect a transport with the given session ID and configuration
+     */
+    connectTransport(transport: Transport, sessionId: string, opts: InboundConnectionConfig, context?: ContextData, filteredInstructions?: string): Promise<void>;
+    /**
+     * Disconnect a transport by session ID
+     */
+    disconnectTransport(sessionId: string, forceClose?: boolean): Promise<void>;
+    /**
+     * Get transport by session ID
+     */
+    getTransport(sessionId: string): Transport | undefined;
+    /**
+     * Get all active transports
+     */
+    getTransports(): Map<string, Transport>;
+    /**
+     * Get server connection by session ID
+     */
+    getServer(sessionId: string): InboundConnection | undefined;
+    /**
+     * Get all inbound connections
+     */
+    getInboundConnections(): Map<string, InboundConnection>;
+    /**
+     * Get count of active transports
+     */
+    getActiveTransportsCount(): number;
+    /**
+     * Execute a server operation with error handling
+     */
+    executeServerOperation<T>(inboundConn: InboundConnection, operation: (inboundConn: InboundConnection) => Promise<T>, options?: OperationOptions): Promise<T>;
+    /**
+     * Perform the actual connection
+     */
+    private performConnection;
+    /**
+     * Do the actual connection work
+     */
+    private doConnect;
+    /**
+     * Register client with preset notification service
+     */
+    private registerClientForPresets;
+    /**
+     * Clean up all connections (for shutdown)
+     */
+    cleanup(): Promise<void>;
+}
+//# sourceMappingURL=connectionManager.d.ts.map

package/build/core/server/connectionManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"connectionManager.d.ts","sourceRoot":"","sources":["../../../src/core/server/connectionManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAG1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,gBAAgB,EAAgB,MAAM,0BAA0B,CAAC;AAOtH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD;;GAEG;AACH,qBAAa,iBAAiB;IAM1B,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,aAAa;IAPvB,OAAO,CAAC,YAAY,CAA6C;IACjE,OAAO,CAAC,mBAAmB,CAAyC;IACpE,OAAO,CAAC,gBAAgB,CAA0B;gBAGxC,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAC/C,kBAAkB,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,EAC7D,aAAa,EAAE,mBAAmB;IAG5C;;OAEG;IACU,gBAAgB,CAC3B,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,uBAAuB,EAC7B,OAAO,CAAC,EAAE,WAAW,EACrB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,IAAI,CAAC;IA2BhB;;OAEG;IACU,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoC/F;;OAEG;IACI,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAI7D;;OAEG;IACI,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAU9C;;OAEG;IACI,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIlE;;OAEG;IACI,qBAAqB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAI9D;;OAEG;IACI,wBAAwB,IAAI,MAAM;IAIzC;;OAEG;IACU,sBAAsB,CAAC,CAAC,EACnC,WAAW,EAAE,iBAAiB,EAC9B,SAAS,EAAE,CAAC,WAAW,EAAE,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,EACzD,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,CAAC,CAAC;IASb;;OAEG;YACW,iBAAiB;IA6B/B;;OAEG;YACW,SAAS;IAmDvB;;OAEG;YACW,wBAAwB;IAoCtC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAStC"}