mcp-log-query-server 3.4.2 → 3.5.1

package/config.js

@@ -49,10 +49,10 @@ export const SERVICES = {
     name: 'clife-senior-archives',
     description: '养老档案服务',
     namespace: 'saas-itest',
-    podPattern: 'clife-senior-archives-app',
-    logPath: '/www/logs/clife-senior-archives-app/normal_logs',
+    podPattern: 'clife-senior-archive-app',
+    logPath: '/www/logs/clife-senior-archive-app/normal_logs',
     logFile: 'normal.log',
-    aliases: ['archives', '档案']
+    aliases: ['archive', 'archives', '档案']
   },
   'clife-senior-assess': {
     name: 'clife-senior-assess',
@@ -81,14 +81,59 @@ export const SERVICES = {
     logFile: 'normal.log',
     aliases: ['core', '核心']
   },
-  'clife-senior-device-center': {
-    name: 'clife-senior-device-center',
-    description: '养老设备中心服务',
+  'clife-senior-crm': {
+    name: 'clife-senior-crm',
+    description: '养老CRM客户关系管理服务',
     namespace: 'saas-itest',
-    podPattern: 'clife-senior-device-center-app',
-    logPath: '/www/logs/clife-senior-device-center-app/normal_logs',
+    podPattern: 'clife-senior-crm-app',
+    logPath: '/www/logs/clife-senior-crm-app/normal_logs',
     logFile: 'normal.log',
-    aliases: ['device-center', '设备中心']
+    aliases: ['crm', '客户关系', '客户管理']
+  },
+  'clife-senior-device-scene-base': {
+    name: 'clife-senior-device-scene-base',
+    description: '养老设备场景基础服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-device-scene-base-service',
+    logPath: '/www/logs/clife-senior-device-scene-base-service/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['device-scene-base', 'scene-base', '设备场景基础']
+  },
+  'clife-senior-device-manage': {
+    name: 'clife-senior-device-manage',
+    description: '养老设备管理服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-device-manage-service',
+    logPath: '/www/logs/clife-senior-device-manage-service/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['device-manage', '设备管理']
+  },
+  'clife-senior-device-iot5-source': {
+    name: 'clife-senior-device-iot5-source',
+    description: '养老设备IoT5数据源服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-device-iot5-source-service',
+    logPath: '/www/logs/clife-senior-device-iot5-source-service/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['device-iot5-source', 'device-iot5', 'iot5', 'iot5-source', '设备IoT5', '设备IoT5数据源']
+  },
+  'clife-senior-device-simulation-source': {
+    name: 'clife-senior-device-simulation-source',
+    description: '养老设备模拟数据源服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-device-simulation-source-service',
+    logPath: '/www/logs/clife-senior-device-simulation-source-service/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['device-simulation-source', 'device-simulation', 'simulation-source', 'simulation', '设备模拟', '模拟数据源']
+  },
+  'clife-senior-device-third-source': {
+    name: 'clife-senior-device-third-source',
+    description: '养老设备第三方数据源服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-device-third-source-app',
+    logPath: '/www/logs/clife-senior-device-third-source-app/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['device-third-source', 'third-source', '设备第三方数据源', '第三方数据源']
   },
   'clife-senior-device-warn': {
     name: 'clife-senior-device-warn',
@@ -220,10 +265,10 @@ export const SERVICES = {
     name: 'clife-senior-open',
     description: '养老开放平台服务',
     namespace: 'saas-itest',
-    podPattern: 'clife-senior-open-app',
-    logPath: '/www/logs/clife-senior-open-app/normal_logs',
+    podPattern: 'clife-senior-open-service',
+    logPath: '/www/logs/clife-senior-open-service/normal_logs',
     logFile: 'normal.log',
-    aliases: ['open', '开放平台']
+    aliases: ['open', 'open-service', '开放平台']
   },
   'clife-senior-optimal-aging': {
     name: 'clife-senior-optimal-aging',
@@ -324,6 +369,15 @@ export const SERVICES = {
     logFile: 'normal.log',
     aliases: ['station-assistant-bff', 'station-assistant', '驿站助手', '驿站BFF']
   },
+  'clife-senior-station-cmini-bff': {
+    name: 'clife-senior-station-cmini-bff',
+    description: '养老驿站小程序BFF服务',
+    namespace: 'saas-itest',
+    podPattern: 'clife-senior-station-cmini-bff-app',
+    logPath: '/www/logs/clife-senior-station-cmini-bff-app/normal_logs',
+    logFile: 'normal.log',
+    aliases: ['station-cmini-bff', 'station-cmini', 'cmini-bff', '驿站小程序', '驿站小程序BFF']
+  },
   'clife-senior-third-bff': {
     name: 'clife-senior-third-bff',
     description: '养老第三方BFF服务',

package/index.js

@@ -35,8 +35,8 @@ import {
 } from './loki-client.js';
 
 // 超时配置
-const REQUEST_TIMEOUT = 60000;  // MCP 请求兜底超时 60s
-const WATCHDOG_TIMEOUT = 120000; // 进程看门狗 120s，卡死则强制退出
+const REQUEST_TIMEOUT = 60000;             // MCP 请求兑底超时 60s（withTimeout 强制终止）
+const WATCHDOG_WARN_TIMEOUT = 120000;      // 看门狗 120s，仅记录告警（不再 process.exit）
 
 function withTimeout(promise, ms, label) {
   return Promise.race([
@@ -47,15 +47,16 @@ function withTimeout(promise, ms, label) {
   ]);
 }
 
-// 进程级安全网
+// 进程级安全网：只记录日志，不退出进程
+// 退出会导致 stdio 断开，整个 MCP 不可用直到 IDE 重启；单次请求错误不应拖死服务
 process.on('unhandledRejection', (err) => console.error('[unhandledRejection]', err));
-process.on('uncaughtException', (err) => { console.error('[uncaughtException]', err); process.exit(1); });
+process.on('uncaughtException', (err) => console.error('[uncaughtException]', err));
 
 // 创建 MCP Server
 const server = new Server(
   {
     name: 'mcp-log-query',
-    version: '3.1.0',
+    version: '3.5.1',
   },
   {
     capabilities: {
@@ -339,11 +340,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const { name, arguments: args } = request.params;
   const startTime = Date.now();
 
-  // 进程级看门狗：如果整个请求卡死超时，强制重启进程
+  // 看门狗：仅记录长时间未完成的请求，不再退出进程
+  // withTimeout(REQUEST_TIMEOUT) 已经保证单次请求超时会抛错
   const watchdog = setTimeout(() => {
-    console.error(`[Watchdog] ${name} 卡死超过 ${WATCHDOG_TIMEOUT}ms，强制退出进程`);
-    process.exit(1);
-  }, WATCHDOG_TIMEOUT);
+    console.error(`[Watchdog] ${name} 仍在运行超过 ${WATCHDOG_WARN_TIMEOUT}ms（仅记录，不退出进程）`);
+  }, WATCHDOG_WARN_TIMEOUT);
   watchdog.unref();
 
   try {
@@ -843,7 +844,7 @@ async function main() {
 
   const transport = new StdioServerTransport();
   await server.connect(transport);
-  console.error('[MCP] Log Query Server v3.2.0 已启动 (支持超时保护 + 进程看门狗 + 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.4.2",
+  "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

@@ -16,6 +16,67 @@
 import { Client } from 'ssh2';
 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,
+  queue: [],
+  max: SSH_MAX_CONCURRENT,
+  queueMax: SSH_QUEUE_MAX,
+};
+
+/**
+ * 获取 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}），请稍后重试`));
+  }
+  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})`);
+}
+
 /**
  * 执行日志查询
  * @param {Object} service - 服务配置
@@ -26,7 +87,9 @@ import { JUMP_HOST, K8S_SERVER, DEFAULTS } from './config.js';
 export async function queryLog(service, command, options = {}) {
   const timeout = options.timeout || DEFAULTS.timeout;
 
-  return new Promise((resolve, reject) => {
+  await sshAcquire();
+  try {
+    return await new Promise((resolve, reject) => {
     const conn = new Client();
     let buffer = '';  // 累积所有输出
     let timeoutId;
@@ -115,6 +178,9 @@ export async function queryLog(service, command, options = {}) {
       readyTimeout: DEFAULTS.connectTimeout
     });
   });
+  } finally {
+    sshRelease();
+  }
 }
 
 /**
@@ -201,7 +267,9 @@ export async function testConnection() {
 export async function executeKubectl(kubectlCommand, options = {}) {
   const timeout = options.timeout || DEFAULTS.timeout;
 
-  return new Promise((resolve, reject) => {
+  await sshAcquire();
+  try {
+    return await new Promise((resolve, reject) => {
     const conn = new Client();
     let buffer = '';
     let timeoutId;
@@ -289,4 +357,7 @@ export async function executeKubectl(kubectlCommand, options = {}) {
       readyTimeout: DEFAULTS.connectTimeout
     });
   });
+  } finally {
+    sshRelease();
+  }
 }