mcp-log-query-server 3.3.0 → 3.4.1

package/index.js

@@ -670,25 +670,43 @@ async function handleToolCall(name, args) {
 
         console.error(`[MCP] 追踪日志: traceId=${traceId}, namespace=${targetNamespace || 'default'}, 服务数=${servicesToSearch.length}`);
 
+        const TRACE_TOTAL_TIMEOUT = 50000;  // 总耗时上限 50s
+        const TRACE_PER_SERVICE = 10000;    // 单服务超时 10s
+        const traceStart = Date.now();
         const results = [];
+        let searched = 0;
+        let skipped = 0;
+
         for (const serviceName of servicesToSearch) {
+          // 总耗时检查
+          if (Date.now() - traceStart > TRACE_TOTAL_TIMEOUT) {
+            skipped = servicesToSearch.length - searched;
+            console.error(`[MCP] trace_log 总耗时超过 ${TRACE_TOTAL_TIMEOUT}ms，跳过剩余 ${skipped} 个服务`);
+            break;
+          }
+
           const service = findService(serviceName, targetNamespace);
-          if (!service) continue;
+          if (!service) { searched++; continue; }
 
           try {
             const command = `grep -i -C ${contextLines} "${traceId}"`;
-            const result = await queryLog(service, command);
+            const result = await queryLog(service, command, { timeout: TRACE_PER_SERVICE });
 
             if (result && result.trim() && !result.includes('未找到')) {
               results.push({ service: serviceName, namespace: service.namespace, logs: result });
             }
           } catch (err) {
-            console.error(`[MCP] 搜索 ${serviceName} 失败: ${err.message}`);
+            // 快速跳过失败/超时的服务
+            console.error(`[MCP] ${serviceName} 跳过: ${err.message.substring(0, 80)}`);
           }
+          searched++;
         }
 
+        const elapsed = Date.now() - traceStart;
+        const timeNote = skipped > 0 ? `\n**注意**: 已搜索 ${searched}/${servicesToSearch.length} 个服务（耗时 ${elapsed}ms，跳过 ${skipped} 个）` : '';
+
         if (results.length === 0) {
-          return { content: [{ type: 'text', text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n\n❌ 未在任何服务中找到匹配的日志` }] };
+          return { content: [{ type: 'text', text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n\n❌ 未在已搜索的 ${searched} 个服务中找到匹配的日志${timeNote}` }] };
         }
 
         const output = results.map(r => `### ${r.service} (${r.namespace})\n\`\`\`\n${r.logs}\n\`\`\``).join('\n\n');
@@ -696,7 +714,7 @@ async function handleToolCall(name, args) {
         return {
           content: [{
             type: 'text',
-            text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n**匹配服务数**: ${results.length}\n\n${output}`
+            text: `## TraceId 追踪结果\n\n**traceId**: ${traceId}\n**namespace**: ${targetNamespace || '默认'}\n**匹配服务数**: ${results.length}${timeNote}\n\n${output}`
           }]
         };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-log-query-server",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "MCP Server for querying server logs via SSH jump host and Grafana Loki API",
   "main": "index.js",
   "type": "module",

package/ssh-client.js

@@ -34,32 +34,35 @@ export async function queryLog(service, command, options = {}) {
     let kubectlOutput = '';
     let collectingOutput = false;
 
-    // 设置超时
+    // 设置超时 - 使用 destroy() 强制关闭
+    let settled = false;
     timeoutId = setTimeout(() => {
-      conn.end();
-      reject(new Error(`命令执行超时 (${timeout}ms)`));
+      if (!settled) {
+        settled = true;
+        try { conn.destroy(); } catch {};
+        reject(new Error(`命令执行超时 (${timeout}ms)`));
+      }
     }, timeout);
 
     conn.on('ready', () => {
-      console.error('[SSH] 已连接到堡垒机');
-
       conn.shell({ term: 'xterm', rows: 24, cols: 500 }, (err, stream) => {
         if (err) {
           clearTimeout(timeoutId);
-          reject(err);
+          if (!settled) { settled = true; reject(err); }
           return;
         }
 
         stream.on('close', () => {
           clearTimeout(timeoutId);
-          conn.end();
-
-          // 清理输出
-          const cleanOutput = cleanTerminalOutput(kubectlOutput || buffer);
-          resolve(cleanOutput);
+          try { conn.destroy(); } catch {}
+          if (!settled) {
+            settled = true;
+            resolve(cleanTerminalOutput(kubectlOutput || buffer));
+          }
         });
 
         stream.on('data', (data) => {
+          if (settled) return; // 已超时，忽略后续数据
           const text = data.toString();
           buffer += text;
 
@@ -67,64 +70,43 @@ export async function queryLog(service, command, options = {}) {
             kubectlOutput += text;
           }
 
-          // JumpServer 状态机 - 检查累积的 buffer
-
-          // 阶段1: 等待 Opt> 提示符
+          // JumpServer 状态机
           if (stage === 'init' && buffer.includes('Opt>')) {
             stage = 'opt';
-            console.error('[SSH] 输入目标服务器 IP');
             stream.write(K8S_SERVER.host + '\r');
           }
-          // 阶段2: 等待 [Host]> 提示符（搜索结果列表后）
           else if (stage === 'opt' && buffer.includes('[Host]>')) {
             stage = 'host';
-            console.error('[SSH] 选择服务器 ID: ' + K8S_SERVER.selectOption);
             stream.write(K8S_SERVER.selectOption + '\r');
           }
-          // 阶段3: 等待进入服务器 shell（检测 ~]$ 或 ~]# 提示符）
           else if (stage === 'host' && (buffer.includes('~]$') || buffer.includes('~]#'))) {
             stage = 'server';
-            console.error('[SSH] 已进入服务器，执行 kubectl 命令');
-
-            // 构建并执行 kubectl 命令
             const kubectlCmd = buildKubectlCommand(service, command);
-            console.error(`[SSH] 命令: ${kubectlCmd.substring(0, 80)}...`);
-
-            // 重置 buffer，开始收集 kubectl 输出
             kubectlOutput = '';
             collectingOutput = true;
-
             stream.write(kubectlCmd + '\r');
             stage = 'kubectl';
           }
-          // 阶段4: kubectl 执行完成
           else if (stage === 'kubectl' && collectingOutput && kubectlOutput.length > 50) {
-            // 检测命令执行完成（返回到 shell 提示符）
             if (kubectlOutput.includes('~]$') || kubectlOutput.includes('~]#')) {
               stage = 'done';
               collectingOutput = false;
-              console.error('[SSH] 命令执行完成，退出');
-
-              // 立即退出
               stream.write('exit\r');
               stream.write('exit\r');
-              setTimeout(() => stream.end(), 500);
+              setTimeout(() => { try { stream.end(); } catch {} }, 300);
             }
           }
         });
 
-        stream.stderr.on('data', (data) => {
-          console.error('[SSH stderr]', data.toString());
-        });
+        stream.stderr.on('data', () => {});
       });
     });
 
     conn.on('error', (err) => {
       clearTimeout(timeoutId);
-      reject(new Error(`SSH 连接错误: ${err.message}`));
+      if (!settled) { settled = true; reject(new Error(`SSH 连接错误: ${err.message}`)); }
     });
 
-    // 连接堡垒机
     conn.connect({
       host: JUMP_HOST.host,
       port: JUMP_HOST.port,
@@ -227,32 +209,35 @@ export async function executeKubectl(kubectlCommand, options = {}) {
     let kubectlOutput = '';
     let collectingOutput = false;
 
-    // 设置超时
+    // 设置超时 - 使用 destroy() 强制关闭
+    let settled = false;
     timeoutId = setTimeout(() => {
-      conn.end();
-      reject(new Error(`命令执行超时 (${timeout}ms)`));
+      if (!settled) {
+        settled = true;
+        try { conn.destroy(); } catch {}
+        reject(new Error(`命令执行超时 (${timeout}ms)`));
+      }
     }, timeout);
 
     conn.on('ready', () => {
-      console.error('[SSH] 已连接到堡垒机');
-
       conn.shell({ term: 'xterm', rows: 24, cols: 500 }, (err, stream) => {
         if (err) {
           clearTimeout(timeoutId);
-          reject(err);
+          if (!settled) { settled = true; reject(err); }
           return;
         }
 
         stream.on('close', () => {
           clearTimeout(timeoutId);
-          conn.end();
-
-          // 清理输出
-          const cleanOutput = cleanTerminalOutput(kubectlOutput || buffer);
-          resolve(cleanOutput);
+          try { conn.destroy(); } catch {}
+          if (!settled) {
+            settled = true;
+            resolve(cleanTerminalOutput(kubectlOutput || buffer));
+          }
         });
 
         stream.on('data', (data) => {
+          if (settled) return;
           const text = data.toString();
           buffer += text;
 
@@ -261,60 +246,41 @@ export async function executeKubectl(kubectlCommand, options = {}) {
           }
 
           // JumpServer 状态机
-
-          // 阶段1: 等待 Opt> 提示符
           if (stage === 'init' && buffer.includes('Opt>')) {
             stage = 'opt';
-            console.error('[SSH] 输入目标服务器 IP');
             stream.write(K8S_SERVER.host + '\r');
           }
-          // 阶段2: 等待 [Host]> 提示符
           else if (stage === 'opt' && buffer.includes('[Host]>')) {
             stage = 'host';
-            console.error('[SSH] 选择服务器 ID: ' + K8S_SERVER.selectOption);
             stream.write(K8S_SERVER.selectOption + '\r');
           }
-          // 阶段3: 等待进入服务器 shell
           else if (stage === 'host' && (buffer.includes('~]$') || buffer.includes('~]#'))) {
             stage = 'server';
-            console.error('[SSH] 已进入服务器，执行 kubectl 命令');
-            console.error(`[SSH] 命令: ${kubectlCommand.substring(0, 100)}...`);
-
-            // 重置 buffer，开始收集 kubectl 输出
             kubectlOutput = '';
             collectingOutput = true;
-
             stream.write(kubectlCommand + '\r');
             stage = 'kubectl';
           }
-          // 阶段4: kubectl 执行完成
           else if (stage === 'kubectl' && collectingOutput && kubectlOutput.length > 50) {
-            // 检测命令执行完成（返回到 shell 提示符）
             if (kubectlOutput.includes('~]$') || kubectlOutput.includes('~]#')) {
               stage = 'done';
               collectingOutput = false;
-              console.error('[SSH] 命令执行完成，退出');
-
-              // 立即退出
               stream.write('exit\r');
               stream.write('exit\r');
-              setTimeout(() => stream.end(), 500);
+              setTimeout(() => { try { stream.end(); } catch {} }, 300);
             }
           }
         });
 
-        stream.stderr.on('data', (data) => {
-          console.error('[SSH stderr]', data.toString());
-        });
+        stream.stderr.on('data', () => {});
       });
     });
 
     conn.on('error', (err) => {
       clearTimeout(timeoutId);
-      reject(new Error(`SSH 连接错误: ${err.message}`));
+      if (!settled) { settled = true; reject(new Error(`SSH 连接错误: ${err.message}`)); }
     });
 
-    // 连接堡垒机
     conn.connect({
       host: JUMP_HOST.host,
       port: JUMP_HOST.port,