mcp-log-query-server 3.4.0 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-log-query-server",
-  "version": "3.4.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,