mcp-log-query-server 3.5.2 → 3.6.0

package/index.js

@@ -58,6 +58,23 @@ function safeStringify(obj, maxLen = 200) {
   }
 }
 
+// 合并多个 AbortSignal：任何一个 abort 则聚合 signal abort
+// Node 20+ 原生支持 AbortSignal.any；低版本回退到手工监听
+function anySignal(signals) {
+  const valid = signals.filter(Boolean);
+  if (valid.length === 0) return undefined;
+  if (valid.length === 1) return valid[0];
+  if (typeof AbortSignal.any === 'function') return AbortSignal.any(valid);
+  // 回退方案
+  const ctrl = new AbortController();
+  const onAbort = () => ctrl.abort();
+  for (const s of valid) {
+    if (s.aborted) { ctrl.abort(); break; }
+    s.addEventListener('abort', onAbort, { once: true });
+  }
+  return ctrl.signal;
+}
+
 // 进程级安全网：只记录日志，不退出进程
 // 退出会导致 stdio 断开，整个 MCP 不可用直到 IDE 重启；单次请求错误不应拖死服务
 process.on('unhandledRejection', (err) => log(`[unhandledRejection] ${err && err.stack || err}`));
@@ -67,7 +84,7 @@ process.on('uncaughtException', (err) => log(`[uncaughtException] ${err && err.s
 const server = new Server(
   {
     name: 'mcp-log-query',
-    version: '3.5.2',
+    version: '3.6.0',
   },
   {
     capabilities: {
@@ -347,29 +364,50 @@ server.setRequestHandler(ListToolsRequestSchema, async () => {
   };
 });
 // 处理工具调用
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
+server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
   const { name, arguments: args } = request.params;
   const startTime = Date.now();
+  // SDK 传入的 signal：Cascade 发 notifications/cancelled 时 signal.aborted=true
+  const signal = extra && extra.signal;
   log(`[Tool] → ${name} start args=${safeStringify(args)}`);
 
+  // 提前 cancel：立即抛错，让 SDK 检测到 signal.aborted 不发 response
+  if (signal && signal.aborted) {
+    log(`[Tool] ⊗ ${name} 收到请求时已 aborted，立即返回`);
+    throw new Error('Request cancelled before handler');
+  }
+
   // 看门狗：仅记录长时间未完成的请求，不再退出进程
-  // withTimeout(REQUEST_TIMEOUT) 已经保证单次请求超时会抛错
   const watchdog = setTimeout(() => {
     log(`[Watchdog] ${name} 仍在运行超过 ${WATCHDOG_WARN_TIMEOUT}ms（仅记录，不退出进程）`);
   }, WATCHDOG_WARN_TIMEOUT);
   watchdog.unref();
 
+  // cancel race：signal abort 时立即 reject，handler 不再等下游
+  const cancelPromise = new Promise((_, reject) => {
+    if (!signal) return;
+    const onAbort = () => {
+      log(`[Tool] ⊗ ${name} 收到 cancel signal (${Date.now() - startTime}ms)`);
+      reject(new Error('CANCELLED'));
+    };
+    signal.addEventListener('abort', onAbort, { once: true });
+  });
+
   try {
-    const result = await withTimeout(
-      handleToolCall(name, args),
-      REQUEST_TIMEOUT,
-      name
-    );
+    const result = await Promise.race([
+      withTimeout(handleToolCall(name, args, signal), REQUEST_TIMEOUT, name),
+      cancelPromise,
+    ]);
     clearTimeout(watchdog);
     log(`[Tool] ✓ ${name} done ${Date.now() - startTime}ms`);
     return result;
   } catch (error) {
     clearTimeout(watchdog);
+    // 取消场景：抛错让 SDK 知道（SDK 检测 signal.aborted 不发 response）
+    if (signal && signal.aborted) {
+      log(`[Tool] ⊗ ${name} CANCELLED ${Date.now() - startTime}ms`);
+      throw error;
+    }
     log(`[Tool] ✗ ${name} FAIL ${Date.now() - startTime}ms: ${error.message}`);
     return {
       content: [{ type: 'text', text: `## 执行错误\n\n❌ ${error.message}` }],
@@ -380,8 +418,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
 
 /**
  * 实际的工具调用处理逻辑
+ * @param {string} name - 工具名
+ * @param {object} args - 工具参数
+ * @param {AbortSignal} [signal] - Cascade 传入的取消信号；层层传给 Loki/SSH/kubectl
  */
-async function handleToolCall(name, args) {
+async function handleToolCall(name, args, signal) {
   try {
     switch (name) {
       case 'query_log': {
@@ -400,6 +441,7 @@ async function handleToolCall(name, args) {
           const timeOpts = { maxLines };
           if (args.from) timeOpts.from = parseTimeStr(args.from);
           if (args.to) timeOpts.to = parseTimeStr(args.to);
+          timeOpts.signal = signal;
 
           const lokiResult = await queryLokiAutoRange(envKey, expr, timeOpts);
 
@@ -428,7 +470,7 @@ async function handleToolCall(name, args) {
         const command = `tail -${lines}`;
 
         console.error(`[MCP] 查询日志: ${service.name} (namespace: ${service.namespace}), 命令: ${command}`);
-        const result = await queryLog(service, command);
+        const result = await queryLog(service, command, { signal });
 
         return {
           content: [{
@@ -454,6 +496,7 @@ async function handleToolCall(name, args) {
           const timeOpts = { maxLines: 200 };
           if (args.from) timeOpts.from = parseTimeStr(args.from);
           if (args.to) timeOpts.to = parseTimeStr(args.to);
+          timeOpts.signal = signal;
 
           const lokiResult = await queryLokiAutoRange(envKey, expr, timeOpts);
 
@@ -490,7 +533,7 @@ async function handleToolCall(name, args) {
         const command = `grep ${grepFlags} -C ${contextLines} "${keyword}"`;
 
         console.error(`[MCP] 搜索日志: ${service.name} (namespace: ${service.namespace}), 关键词: ${keyword}`);
-        const result = await queryLog(service, command);
+        const result = await queryLog(service, command, { signal });
 
         return {
           content: [{
@@ -535,7 +578,7 @@ async function handleToolCall(name, args) {
         }
 
         console.error(`[MCP] 列出 pods: namespace=${namespace}`);
-        const result = await executeKubectl(cmd);
+        const result = await executeKubectl(cmd, { signal });
 
         return {
           content: [{
@@ -554,7 +597,7 @@ async function handleToolCall(name, args) {
         console.error(`[MCP] 查找 pod: ${podPattern}`);
         
         const describeCmd = `kubectl describe $(kubectl get pod -n ${namespace} -o name | grep ${podPattern} | head -1) -n ${namespace}`;
-        const result = await executeKubectl(describeCmd);
+        const result = await executeKubectl(describeCmd, { signal });
 
         return {
           content: [{
@@ -576,7 +619,7 @@ async function handleToolCall(name, args) {
         }
 
         console.error(`[MCP] 获取 pod 日志: ${podPattern}, previous=${previous}`);
-        const result = await executeKubectl(cmd);
+        const result = await executeKubectl(cmd, { signal });
 
         const logType = previous ? '崩溃前日志' : '当前日志';
         return {
@@ -596,7 +639,7 @@ async function handleToolCall(name, args) {
         }
 
         console.error(`[MCP] 获取事件: namespace=${namespace}`);
-        const result = await executeKubectl(cmd);
+        const result = await executeKubectl(cmd, { signal });
 
         return {
           content: [{
@@ -633,7 +676,7 @@ async function handleToolCall(name, args) {
               const dirName = getLokiServiceDirName(svc);
               const expr = buildServiceLogQL(project, dirName, traceId, envKey);
               console.error(`[MCP] Loki trace: env=${envKey}, service=${svc}, traceId=${traceId}`);
-              const r = await queryLokiAutoRange(envKey, expr, { ...timeOpts, maxLines: 500 });
+              const r = await queryLokiAutoRange(envKey, expr, { ...timeOpts, maxLines: 500, signal });
               allLogs.push(...r.logs);
               allLabels.push(...r.labels);
             }
@@ -642,7 +685,7 @@ async function handleToolCall(name, args) {
             // 未指定服务：按项目一次查询所有服务（高效！）
             const expr = buildProjectLogQL(project, traceId, envKey);
             console.error(`[MCP] Loki trace (全项目): env=${envKey}, project=${project}, traceId=${traceId}`);
-            lokiResult = await queryLokiAutoRange(envKey, expr, { ...timeOpts, maxLines: 1000 });
+            lokiResult = await queryLokiAutoRange(envKey, expr, { ...timeOpts, maxLines: 1000, signal });
           }
 
           if (lokiResult.logs.length === 0) {
@@ -703,7 +746,7 @@ async function handleToolCall(name, args) {
 
           try {
             const command = `grep -i -C ${contextLines} "${traceId}"`;
-            const result = await queryLog(service, command, { timeout: TRACE_PER_SERVICE });
+            const result = await queryLog(service, command, { timeout: TRACE_PER_SERVICE, signal });
 
             if (result && result.trim() && !result.includes('未找到')) {
               results.push({ service: serviceName, namespace: service.namespace, logs: result });
@@ -857,7 +900,7 @@ async function main() {
   const transport = new StdioServerTransport();
   await server.connect(transport);
   const logPath = getLogFilePath();
-  log(`[MCP] Log Query Server v3.5.2 已启动 (超时保护 + SSH 并发限制 + 排队超时 + 文件日志 + 进程不自杀)`);
+  log(`[MCP] Log Query Server v3.6.0 已启动 (SSH排队超时 + Loki体超时 + 文件日志 + cancel signal 透传)`);
   if (logPath) log(`[MCP] 本地日志文件: ${logPath}`);
 }