aiexecode 1.0.90 → 1.0.91

package/mcp-agent-lib/src/mcp_client.js

@@ -19,6 +19,8 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 // HTTP 전송: 일반 HTTP/HTTPS 요청-응답 기반 통신
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+// RAW 메시지 로거
+import { MCPMessageLogger, attachLoggerToTransport } from './mcp_message_logger.js';
 
 // 내부 디버그용 로그 함수 - 실제로는 아무 작업도 하지 않음 (성능 최적화)
 function consolelog() { }
@@ -56,9 +58,6 @@ export class MCPAgentClient extends EventEmitter {
       serverReadyTimeout: MCPAgentClient._safeParseInt(process.env.MCP_SERVER_READY_TIMEOUT || options.serverReadyTimeout, 10000),
       serverReadyRetries: MCPAgentClient._safeParseInt(process.env.MCP_SERVER_READY_RETRIES || options.serverReadyRetries, 5),
 
-      // 보안 설정: stdio 서버에서 실행 가능한 명령어 화이트리스트
-      allowedCommands: ['node', 'python', 'python3', 'npx', 'deno'],
-
       // 보안 설정: 명령 인자에서 금지되는 셸 특수문자 (command injection 방지)
       dangerousChars: ['&', ';', '|', '`', '$', '>', '<', '*', '?'],
 
@@ -76,9 +75,10 @@ export class MCPAgentClient extends EventEmitter {
       },
 
       // MCP 프로토콜: 클라이언트 식별 정보
+      // options.clientInfo로 전달 가능, 없으면 기본값 사용
       clientInfo: {
-        name: process.env.MCP_CLIENT_NAME || 'mcp-agent-lib',
-        version: process.env.MCP_CLIENT_VERSION || '1.0.0'
+        name: options.clientInfo?.name || 'mcp-agent-lib',
+        version: options.clientInfo?.version || '1.0.0'
       },
 
       // 사용자 메시지 템플릿 (다국어 지원용)
@@ -117,6 +117,12 @@ export class MCPAgentClient extends EventEmitter {
     // 연결 해제된 서버 정보를 주기적으로 정리 (interval 대신 on-demand 방식)
     this.memoryCleanupEnabled = options.memoryCleanupEnabled ?? true;
     this.lastCleanupTime = Date.now();
+
+    // RAW 메시지 로거 초기화
+    this.messageLogger = options.messageLogger || new MCPMessageLogger({
+      enabled: options.enableRawMessageLogging ?? false,
+      ...options.messageLoggerOptions
+    });
   }
 
   /**
@@ -403,10 +409,9 @@ export class MCPAgentClient extends EventEmitter {
    * 서버 설정 보안 검증
    *
    * 연결 전에 서버 설정이 안전한지 검사:
-   * 1. stdio 서버: 허용된 명령어만 실행 가능한지 확인
-   * 2. stdio 서버: 인자에 위험한 셸 문자가 없는지 확인
-   * 3. http 서버: URL이 http/https 프로토콜인지 확인
-   * 4. 환경변수가 문자열 key-value인지 확인
+   * 1. stdio 서버: 인자에 위험한 셸 문자가 없는지 확인
+   * 2. http 서버: URL이 http/https 프로토콜인지 확인
+   * 3. 환경변수가 문자열 key-value인지 확인
    */
   validateServerConfig(serverName, serverConfig) {
     if (!serverName || typeof serverName !== 'string') {
@@ -419,13 +424,6 @@ export class MCPAgentClient extends EventEmitter {
 
     // stdio 서버 보안 검증
     if (serverConfig.command) {
-      const allowedCommands = this.options.allowedCommands || ['node', 'python', 'python3', 'npx', 'deno'];
-
-      // 화이트리스트에 없는 명령어는 실행 불가
-      if (!allowedCommands.includes(serverConfig.command)) {
-        throw new Error(`Command '${serverConfig.command}' is not allowed. Allowed commands: ${allowedCommands.join(', ')}`);
-      }
-
       // 명령 인자에 셸 특수문자 포함 여부 검사 (command injection 방지)
       if (serverConfig.args && Array.isArray(serverConfig.args)) {
         const dangerousChars = this.options.dangerousChars || ['&', ';', '|', '`', '$', '>', '<', '*', '?'];
@@ -503,7 +501,7 @@ export class MCPAgentClient extends EventEmitter {
 
       } catch (error) {
         // 보안 에러는 즉시 전파 (다른 서버 연결 중단)
-        if (error.message.includes('not allowed') || error.message.includes('dangerous characters')) {
+        if (error.message.includes('dangerous characters')) {
           throw error;
         }
         // 일반 연결 에러는 로그만 남기고 다음 서버 계속 진행
@@ -588,6 +586,9 @@ export class MCPAgentClient extends EventEmitter {
         this.emit('serverDisconnected', serverName);
       };
 
+      // RAW 메시지 로거 연결
+      attachLoggerToTransport(transport, serverName, this.messageLogger);
+
       // MCP 프로토콜 핸드셰이크 수행
       await client.connect(transport);
 
@@ -600,10 +601,10 @@ export class MCPAgentClient extends EventEmitter {
       this.clients.set(serverName, client);
 
       // 서버가 완전히 준비될 때까지 대기 (재시도 로직 포함)
-      await this._waitForServerReady(client, serverName);
+      const readyData = await this._waitForServerReady(client, serverName);
 
       // 사용 가능한 tools/resources/prompts 목록 조회 및 저장
-      await this.listServerCapabilities(serverName);
+      await this.listServerCapabilities(serverName, readyData);
 
       // Log final server statistics without duplicate status setting
       const updatedServer = this.servers.get(serverName);
@@ -685,6 +686,9 @@ export class MCPAgentClient extends EventEmitter {
         this.emit('serverDisconnected', serverName);
       };
 
+      // RAW 메시지 로거 연결 (헤더 정보 포함)
+      attachLoggerToTransport(transport, serverName, this.messageLogger, serverConfig.headers);
+
       // Connect using SDK
       await client.connect(transport);
 
@@ -696,10 +700,10 @@ export class MCPAgentClient extends EventEmitter {
       this.clients.set(serverName, client);
 
       // Wait for server to be ready before querying capabilities
-      await this._waitForServerReady(client, serverName);
+      const readyData = await this._waitForServerReady(client, serverName);
 
       // List available capabilities
-      await this.listServerCapabilities(serverName);
+      await this.listServerCapabilities(serverName, readyData);
 
       this._log('info', `✅ Successfully connected to HTTP server ${serverName}`);
       return server;
@@ -763,6 +767,9 @@ export class MCPAgentClient extends EventEmitter {
       this.emit('serverDisconnected', name);
     };
 
+    // RAW 메시지 로거 연결 (헤더 정보 포함)
+    attachLoggerToTransport(transport, name, this.messageLogger, config.headers);
+
     await client.connect(transport);
     server.capabilities = client.getServerCapabilities();
     this._setServerStatus(name, 'connected');
@@ -771,9 +778,9 @@ export class MCPAgentClient extends EventEmitter {
     this.clients.set(name, client);
 
     // Wait for server to be ready before querying capabilities
-    await this._waitForServerReady(client, name);
+    const readyData = await this._waitForServerReady(client, name);
 
-    await this.listServerCapabilities(name);
+    await this.listServerCapabilities(name, readyData);
 
     this._log('info', `✅ ${name} SSE 연결됨`);
     return server;
@@ -782,7 +789,7 @@ export class MCPAgentClient extends EventEmitter {
   /**
    * List all capabilities of the connected server
    */
-  async listServerCapabilities(serverName) {
+  async listServerCapabilities(serverName, readyData = null) {
     const server = this.servers.get(serverName);
     if (!server) return;
 
@@ -795,56 +802,79 @@ export class MCPAgentClient extends EventEmitter {
         return;
       }
 
-      // Always try to list tools (even if capability is not explicitly declared)
-      try {
-        const toolsResponse = await client.listTools();
-        server.tools = toolsResponse.tools || [];
-        this._log('info', `🔧 Available tools from ${serverName}:`);
-        server.tools.forEach((tool, index) => {
-          this._log('info', `  ${index + 1}. ${tool.name}`);
-          if (tool.description) this._log('info', `     설명: ${tool.description}`);
-        });
-      } catch (toolsError) {
-        this._log('warn', `⚠️ Tools/list failed: ${toolsError.message}`);
-        server.tools = [];
-        // Mark server as partially connected if critical capabilities fail
-        if (toolsError.message.includes('timeout') || toolsError.message.includes('connection')) {
-          this._setServerStatus(serverName, 'partially_connected');
+      // Check capabilities to determine what to query
+      const capabilities = server.capabilities || {};
+
+      // Query tools only if capability is declared
+      if (capabilities.tools) {
+        try {
+          let toolsResponse;
+          if (readyData && readyData.tools) {
+            // Reuse data from _waitForServerReady
+            toolsResponse = readyData.tools;
+            this._log('debug', `♻️ Reusing tools data from readiness check`);
+          } else {
+            // Fetch tools if not available from readiness check
+            toolsResponse = await client.listTools();
+          }
+
+          server.tools = toolsResponse.tools || [];
+          this._log('info', `🔧 Available tools from ${serverName}:`);
+          server.tools.forEach((tool, index) => {
+            this._log('info', `  ${index + 1}. ${tool.name}`);
+            if (tool.description) this._log('info', `     설명: ${tool.description}`);
+          });
+        } catch (toolsError) {
+          this._log('warn', `⚠️ Tools/list failed: ${toolsError.message}`);
+          server.tools = [];
+          // Mark server as partially connected if critical capabilities fail
+          if (toolsError.message.includes('timeout') || toolsError.message.includes('connection')) {
+            this._setServerStatus(serverName, 'partially_connected');
+          }
         }
+      } else {
+        this._log('debug', `ℹ️ Server ${serverName} does not declare tools capability`);
+        server.tools = [];
       }
 
-      // Always try to list resources
+      // Query resources only if capability is declared
       let resources = [];
-      try {
-        const resourcesResponse = await client.listResources();
-        resources = resourcesResponse.resources || [];
-        this._log('info', `📄 Available resources from ${serverName}: ${resources.length} found`);
-        if (resources.length > 0) {
-          resources.forEach((resource, index) => {
-            this._log('info', `  ${index + 1}. ${resource.name} (${resource.uri})`);
-          });
+      if (capabilities.resources) {
+        try {
+          const resourcesResponse = await client.listResources();
+          resources = resourcesResponse.resources || [];
+          this._log('info', `📄 Available resources from ${serverName}: ${resources.length} found`);
+          if (resources.length > 0) {
+            resources.forEach((resource, index) => {
+              this._log('info', `  ${index + 1}. ${resource.name} (${resource.uri})`);
+            });
+          }
+        } catch (resourcesError) {
+          this._log('debug', `ℹ️ Resources not available from ${serverName}: ${resourcesError.message}`);
+          resources = [];
         }
-      } catch (resourcesError) {
-        this._log('debug', `ℹ️ Resources not available from ${serverName}: ${resourcesError.message}`);
-        resources = [];
-        // Don't mark as partially connected for resources as they're optional
+      } else {
+        this._log('debug', `ℹ️ Server ${serverName} does not declare resources capability`);
       }
 
-      // Always try to list prompts
+      // Query prompts only if capability is declared
       let prompts = [];
-      try {
-        const promptsResponse = await client.listPrompts();
-        prompts = promptsResponse.prompts || [];
-        this._log('info', `💬 Available prompts from ${serverName}: ${prompts.length} found`);
-        if (prompts.length > 0) {
-          prompts.forEach((prompt, index) => {
-            this._log('info', `  ${index + 1}. ${prompt.name}: ${prompt.description || 'No description'}`);
-          });
+      if (capabilities.prompts) {
+        try {
+          const promptsResponse = await client.listPrompts();
+          prompts = promptsResponse.prompts || [];
+          this._log('info', `💬 Available prompts from ${serverName}: ${prompts.length} found`);
+          if (prompts.length > 0) {
+            prompts.forEach((prompt, index) => {
+              this._log('info', `  ${index + 1}. ${prompt.name}: ${prompt.description || 'No description'}`);
+            });
+          }
+        } catch (promptsError) {
+          this._log('debug', `ℹ️ Prompts not available from ${serverName}: ${promptsError.message}`);
+          prompts = [];
         }
-      } catch (promptsError) {
-        this._log('debug', `ℹ️ Prompts not available from ${serverName}: ${promptsError.message}`);
-        prompts = [];
-        // Don't mark as partially connected for prompts as they're optional
+      } else {
+        this._log('debug', `ℹ️ Server ${serverName} does not declare prompts capability`);
       }
 
       // 새로운 서버 객체 생성하여 확실히 업데이트
@@ -1578,7 +1608,12 @@ export class MCPAgentClient extends EventEmitter {
             toolsStatus: toolsResponse.status,
             serverInfoStatus: serverInfo.status
           });
-          return true;
+
+          // Return tools data if available for reuse
+          return {
+            tools: toolsResponse.status === 'fulfilled' ? actualToolsResponse : null,
+            serverInfo: serverInfo.status === 'fulfilled' ? actualServerInfo : null
+          };
         }
 
       } catch (error) {
@@ -1614,7 +1649,7 @@ export class MCPAgentClient extends EventEmitter {
 
     // If we get here, server may be partially ready - don't fail completely
     this.secureLog('warn', `Server ${serverName} may not be fully ready, continuing anyway`);
-    return false;
+    return null;
   }
 
   /**
@@ -1726,6 +1761,11 @@ export class MCPAgentClient extends EventEmitter {
       this.servers.clear();
       this.clients.clear();
 
+      // RAW 메시지 로거 종료
+      if (this.messageLogger) {
+        this.messageLogger.close();
+      }
+
       this.secureLog('info', 'MCP Agent Client cleanup completed');
     } catch (error) {
       this.secureLog('error', 'Error during cleanup', { error: error.message });
@@ -1750,6 +1790,25 @@ export class MCPAgentClient extends EventEmitter {
   _categorizeTool(toolName) {
     return 'tool';
   }
+
+  /**
+   * RAW 메시지 로거 통계 조회
+   */
+  getMessageLoggerStats() {
+    if (!this.messageLogger) {
+      return null;
+    }
+    return this.messageLogger.getStats();
+  }
+
+  /**
+   * RAW 메시지 로거 통계 출력
+   */
+  printMessageLoggerStats() {
+    if (this.messageLogger) {
+      this.messageLogger.printStats();
+    }
+  }
 }
 
 // ========================================
@@ -1794,5 +1853,8 @@ export async function quickStart(config = {}, options = {}) {
   return agent;
 }
 
+// RAW 메시지 로거도 export
+export { MCPMessageLogger, attachLoggerToTransport } from './mcp_message_logger.js';
+
 // 기본 export
 export default MCPAgentClient;