mcp-log-query-server 3.5.0 → 3.5.1

package/config.js

@@ -81,6 +81,15 @@ export const SERVICES = {
     logFile: 'normal.log',
     aliases: ['core', '核心']
   },
+  'clife-senior-crm': {
+    name: 'clife-senior-crm',
+    description: '养老CRM客户关系管理服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-crm-app',
+    logPath: '/www/logs/clife-senior-crm-app/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['crm', '客户关系', '客户管理']
+  },
   'clife-senior-device-scene-base': {
     name: 'clife-senior-device-scene-base',
     description: '养老设备场景基础服务',

package/index.js

@@ -56,7 +56,7 @@ process.on('uncaughtException', (err) => console.error('[uncaughtException]', er
 const server = new Server(
   {
     name: 'mcp-log-query',
-    version: '3.5.0',
+    version: '3.5.1',
   },
   {
     capabilities: {
@@ -844,7 +844,7 @@ async function main() {
 
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  console.error('[MCP] Log Query Server v3.5.0 已启动 (超时保护 + SSH 并发限制 + 进程不自杀 + stdin 优雅关闭)');
+  console.error('[MCP] Log Query Server v3.5.1 已启动 (超时保护 + SSH 并发限制 + 排队超时 + 进程不自杀 + stdin 优雅关闭)');
 }
 
 main().catch((error) => {

package/package.json

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

@@ -21,6 +21,8 @@ import { JUMP_HOST, K8S_SERVER, DEFAULTS } from './config.js';
 // ============================================================
 const SSH_MAX_CONCURRENT = parseInt(process.env.SSH_MAX_CONCURRENT || '3', 10);
 const SSH_QUEUE_MAX = parseInt(process.env.SSH_QUEUE_MAX || '50', 10);
+// 排队等待最长时间（毫秒），防止前面请求卡死后面无限等
+const SSH_ACQUIRE_TIMEOUT = parseInt(process.env.SSH_ACQUIRE_TIMEOUT || '60000', 10);
 
 const _sshSem = {
   active: 0,
@@ -29,26 +31,50 @@ const _sshSem = {
   queueMax: SSH_QUEUE_MAX,
 };
 
-function sshAcquire() {
+/**
+ * 获取 SSH 信号量槽位
+ * @param {number} [timeoutMs] - 排队超时（默认 60s），防止无限等
+ * @returns {Promise<void>}
+ */
+function sshAcquire(timeoutMs = SSH_ACQUIRE_TIMEOUT) {
   if (_sshSem.active < _sshSem.max) {
     _sshSem.active++;
+    console.error(`[SSH-Sem] acquire 直接通过 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
     return Promise.resolve();
   }
   if (_sshSem.queue.length >= _sshSem.queueMax) {
     return Promise.reject(new Error(`SSH 并发队列已满（>${_sshSem.queueMax}），请稍后重试`));
   }
-  return new Promise(resolve => {
-    _sshSem.queue.push(() => {
+  console.error(`[SSH-Sem] acquire 进入排队 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length + 1}, timeout=${timeoutMs}ms)`);
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const enterQueue = () => {
+      if (settled) return; // 已超时，放弃并立刻腾位给下一个
+      settled = true;
+      clearTimeout(timer);
       _sshSem.active++;
+      console.error(`[SSH-Sem] acquire 出队获得槽位 (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
       resolve();
-    });
+    };
+    _sshSem.queue.push(enterQueue);
+    const timer = setTimeout(() => {
+      if (settled) return;
+      settled = true;
+      // 从队列里移除自己的 entry
+      const idx = _sshSem.queue.indexOf(enterQueue);
+      if (idx >= 0) _sshSem.queue.splice(idx, 1);
+      console.error(`[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);
   });
 }
 
 function sshRelease() {
   _sshSem.active = Math.max(0, _sshSem.active - 1);
+  // 超时的 entry 已在 timer 里从 queue 移除，这里 shift 到的都是活的
   const next = _sshSem.queue.shift();
   if (next) next();
+  console.error(`[SSH-Sem] release (active=${_sshSem.active}/${_sshSem.max}, queue=${_sshSem.queue.length})`);
 }
 
 /**