mcp-log-query-server 3.5.2 → 3.6.0

package/package.json

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

package/ssh-client.js

@@ -35,9 +35,13 @@ const _sshSem = {
 /**
  * 获取 SSH 信号量槽位
  * @param {number} [timeoutMs] - 排队超时（默认 60s），防止无限等
+ * @param {AbortSignal} [signal] - 用户 cancel 信号，abort 时立即从队列移除并 reject
  * @returns {Promise<void>}
  */
-function sshAcquire(timeoutMs = SSH_ACQUIRE_TIMEOUT) {
+function sshAcquire(timeoutMs = SSH_ACQUIRE_TIMEOUT, signal) {
+  if (signal && signal.aborted) {
+    return Promise.reject(new Error('CANCELLED before SSH acquire'));
+  }
   if (_sshSem.active < _sshSem.max) {
     _sshSem.active++;
     log(`[SSH-Sem] acquire 直接通过 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
@@ -49,10 +53,15 @@ function sshAcquire(timeoutMs = SSH_ACQUIRE_TIMEOUT) {
   log(`[SSH-Sem] acquire 进入排队 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length + 1}, timeout=${timeoutMs}ms)`);
   return new Promise((resolve, reject) => {
     let settled = false;
+    let onAbort;
+    const cleanup = () => {
+      clearTimeout(timer);
+      if (signal && onAbort) signal.removeEventListener('abort', onAbort);
+    };
     const enterQueue = () => {
-      if (settled) return; // 已超时，放弃并立刻腾位给下一个
+      if (settled) return; // 已超时/已取消，放弃并立刻腾位给下一个
       settled = true;
-      clearTimeout(timer);
+      cleanup();
       _sshSem.active++;
       log(`[SSH-Sem] acquire 出队获得槽位 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
       resolve();
@@ -61,12 +70,23 @@ function sshAcquire(timeoutMs = SSH_ACQUIRE_TIMEOUT) {
     const timer = setTimeout(() => {
       if (settled) return;
       settled = true;
-      // 从队列里移除自己的 entry
+      cleanup();
       const idx = _sshSem.queue.indexOf(enterQueue);
       if (idx >= 0) _sshSem.queue.splice(idx, 1);
       log(`[SSH-Sem] acquire 排队超时 (${timeoutMs}ms, active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
       reject(new Error(`SSH 排队等待超时 (${timeoutMs}ms)：前面请求卡住，或并发过高。可调整 SSH_MAX_CONCURRENT / SSH_ACQUIRE_TIMEOUT`));
     }, timeoutMs);
+    // 用户 cancel：立即从队列移除
+    onAbort = () => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      const idx = _sshSem.queue.indexOf(enterQueue);
+      if (idx >= 0) _sshSem.queue.splice(idx, 1);
+      log(`[SSH-Sem] acquire 用户 cancel，从队列移除 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
+      reject(new Error('CANCELLED in SSH queue'));
+    };
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
   });
 }
 
@@ -87,8 +107,9 @@ function sshRelease() {
  */
 export async function queryLog(service, command, options = {}) {
   const timeout = options.timeout || DEFAULTS.timeout;
+  const signal = options.signal;
 
-  await sshAcquire();
+  await sshAcquire(undefined, signal);
   try {
     return await new Promise((resolve, reject) => {
     const conn = new Client();
@@ -108,6 +129,20 @@ export async function queryLog(service, command, options = {}) {
       }
     }, timeout);
 
+    // 用户 cancel：立即 destroy 连接
+    const onAbort = () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timeoutId);
+      log(`[SSH] ⊗ 用户 cancel，destroy 连接 (${service.name})`);
+      try { conn.destroy(); } catch {};
+      reject(new Error('CANCELLED during SSH'));
+    };
+    if (signal) {
+      if (signal.aborted) { onAbort(); return; }
+      signal.addEventListener('abort', onAbort, { once: true });
+    }
+
     conn.on('ready', () => {
       conn.shell({ term: 'xterm', rows: 24, cols: 500 }, (err, stream) => {
         if (err) {
@@ -267,8 +302,9 @@ export async function testConnection() {
  */
 export async function executeKubectl(kubectlCommand, options = {}) {
   const timeout = options.timeout || DEFAULTS.timeout;
+  const signal = options.signal;
 
-  await sshAcquire();
+  await sshAcquire(undefined, signal);
   try {
     return await new Promise((resolve, reject) => {
     const conn = new Client();
@@ -288,6 +324,20 @@ export async function executeKubectl(kubectlCommand, options = {}) {
       }
     }, timeout);
 
+    // 用户 cancel：立即 destroy 连接
+    const onAbort = () => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timeoutId);
+      log(`[SSH] ⊗ 用户 cancel，destroy 连接 (kubectl: ${kubectlCommand.substring(0, 50)}...)`);
+      try { conn.destroy(); } catch {};
+      reject(new Error('CANCELLED during kubectl'));
+    };
+    if (signal) {
+      if (signal.aborted) { onAbort(); return; }
+      signal.addEventListener('abort', onAbort, { once: true });
+    }
+
     conn.on('ready', () => {
       conn.shell({ term: 'xterm', rows: 24, cols: 500 }, (err, stream) => {
         if (err) {