@mcpcn/mcp-notification 1.0.20 → 1.1.2

package/dist/index.js

@@ -1,8 +1,7 @@
 #!/usr/bin/env node
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js';
-import { z } from 'zod';
+import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js';
 const API_BASE = process.env.REMINDER_API_BASE || 'https://www.mcpcn.cc/api';
 function resolveChatSessionId(request) {
     const pick = (obj, keys) => {
@@ -13,57 +12,23 @@ function resolveChatSessionId(request) {
         }
         return undefined;
     };
-    const direct = pick(request?.params?._meta, ['chatSessionId', 'chatSessionID']) ||
-        pick(request?.params?.meta, ['chatSessionId', 'chatSessionID']) ||
-        pick(request?.meta, ['chatSessionId', 'chatSessionID']) ||
-        pick(request?._meta, ['chatSessionId', 'chatSessionID']);
-    if (direct)
-        return direct;
-    const inArgs = pick(request?.params?.arguments?._meta, ['chatSessionId', 'chatSessionID']) ||
-        pick(request?.params?.arguments?.meta, ['chatSessionId', 'chatSessionID']) ||
-        pick(request?.params?.arguments, ['chatSessionId', 'chatSessionID']);
-    if (inArgs)
-        return inArgs;
-    const scan = (obj, keys, maxDepth = 3) => {
-        const queue = [obj];
-        const seen = new Set();
-        let depth = 0;
-        while (queue.length && depth <= maxDepth) {
-            const cur = queue.shift();
-            if (!cur || typeof cur !== 'object' || seen.has(cur)) {
-                depth++;
-                continue;
-            }
-            seen.add(cur);
-            for (const k of keys) {
-                const v = cur[k];
-                if (typeof v === 'string' && v)
-                    return v;
-            }
-            for (const v of Object.values(cur)) {
-                if (v && typeof v === 'object')
-                    queue.push(v);
-            }
-            depth++;
-        }
-        return undefined;
-    };
-    return scan(request, ['chatSessionId', 'chatSessionID']);
+    return (pick(request?.params?.arguments, ['chatSessionId', 'chatSessionID']) ??
+        pick(request?.meta, ['chatSessionId', 'chatSessionID']) ??
+        pick(request?.params?._meta, ['chatSessionId', 'chatSessionID']) ??
+        pick(request?.params?.meta, ['chatSessionId', 'chatSessionID']) ??
+        pick(request?._meta, ['chatSessionId', 'chatSessionID']));
 }
 async function postJson(path, body, chatSessionId) {
     const headers = { 'Content-Type': 'application/json', Accept: 'application/json' };
-    if (chatSessionId) {
+    if (chatSessionId)
         headers['chatSessionId'] = chatSessionId;
-        headers['x-chat-session-id'] = chatSessionId;
-    }
-    const payload = chatSessionId ? { ...body, chatSessionId } : body;
     let lastError;
     for (let attempt = 0; attempt < 3; attempt++) {
         try {
             const resp = await fetch(`${API_BASE}${path}`, {
                 method: 'POST',
                 headers,
-                body: JSON.stringify(payload),
+                body: JSON.stringify(body),
             });
             if (!resp.ok) {
                 const text = await resp.text().catch(() => '');
@@ -88,16 +53,12 @@ async function postJson(path, body, chatSessionId) {
 }
 async function getJson(path, chatSessionId) {
     const headers = { Accept: 'application/json' };
-    if (chatSessionId) {
+    if (chatSessionId)
         headers['chatSessionId'] = chatSessionId;
-    }
     let lastError;
     for (let attempt = 0; attempt < 3; attempt++) {
         try {
-            const url = new URL(`${API_BASE}${path}`);
-            if (chatSessionId)
-                url.searchParams.set('chatSessionId', chatSessionId);
-            const resp = await fetch(url.toString(), { headers });
+            const resp = await fetch(`${API_BASE}${path}`, { headers });
             if (!resp.ok) {
                 const text = await resp.text().catch(() => '');
                 const msg = `HTTP 错误: ${resp.status} ${resp.statusText}${text ? ` | 响应体: ${text.slice(0, 500)}` : ''}`;
@@ -145,6 +106,7 @@ class ReminderServer {
                             intervalSec: { type: 'number' },
                             timeOfDay: { type: 'string', description: '例如 18:00 或 18:00:00' },
                             tzOffsetMin: { type: 'number', description: '时区偏移分钟，例如北京为 480' },
+                            chatSessionId: { type: 'string' },
                         },
                         required: ['content', 'repeat'],
                         additionalProperties: false,
@@ -155,7 +117,7 @@ class ReminderServer {
                     description: '获取设备的提醒列表（仅未触发的 scheduled）。',
                     inputSchema: {
                         type: 'object',
-                        properties: {},
+                        properties: { chatSessionId: { type: 'string' } },
                         required: [],
                         additionalProperties: false,
                     },
@@ -165,46 +127,16 @@ class ReminderServer {
                     description: '取消指定提醒。',
                     inputSchema: {
                         type: 'object',
-                        properties: { id: { type: 'string' } },
+                        properties: { id: { type: 'string' }, chatSessionId: { type: 'string' } },
                         required: ['id'],
                         additionalProperties: false,
                     },
                 },
             ],
         }));
-        const CallToolWithMetaSchema = z
-            .object({
-            jsonrpc: z.literal('2.0'),
-            method: z.literal('tools/call'),
-            id: z.union([z.string(), z.number()]),
-            params: z
-                .object({
-                name: z.string(),
-                arguments: z.any().optional(),
-                _meta: z
-                    .object({
-                    chatSessionId: z.string().optional(),
-                    chatSessionID: z.string().optional(),
-                })
-                    .passthrough()
-                    .optional(),
-                meta: z
-                    .object({
-                    chatSessionId: z.string().optional(),
-                    chatSessionID: z.string().optional(),
-                })
-                    .passthrough()
-                    .optional(),
-            })
-                .passthrough(),
-        })
-            .passthrough();
-        this.server.setRequestHandler(CallToolWithMetaSchema, async (request) => {
-            try {
-                console.error('CallToolRequest raw:', JSON.stringify(request));
-            }
-            catch { }
+        this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
             try {
+                console.error('[调试] request.params keys = ' + JSON.stringify(Object.keys(request.params || {})));
                 if (!request.params.arguments || typeof request.params.arguments !== 'object') {
                     throw new McpError(ErrorCode.InvalidParams, '无效的参数');
                 }
@@ -212,8 +144,8 @@ class ReminderServer {
                 const args = request.params.arguments;
                 const chatSessionId = resolveChatSessionId(request);
                 if (!chatSessionId) {
-                    console.error('工具未在请求中检测到 chatSessionId');
-                    const baseMsg = '解析设备失败: chatSessionId不能为空，工具暂无法使用';
+                    console.error('通知工具未在请求中检测到 chatSessionId（meta.chatSessionId）');
+                    const baseMsg = '解析设备失败: chatSessionId不能为空，通知工具暂无法使用';
                     const errText = name === 'set_reminder'
                         ? `设置失败：${baseMsg}`
                         : name === 'list_reminders'
@@ -224,7 +156,7 @@ class ReminderServer {
                     return { content: [{ type: 'text', text: errText }], isError: true };
                 }
                 else {
-                    console.error(`工具接收到 chatSessionId: ${chatSessionId}`);
+                    console.error(`通知工具接收到 chatSessionId: ${chatSessionId}`);
                 }
                 if (name === 'set_reminder') {
                     const params = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpcn/mcp-notification",
-  "version": "1.0.20",
+  "version": "1.1.2",
   "description": "系统通知MCP服务器",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
@@ -36,7 +36,6 @@
     "typescript": "^5.7.2"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.10.0",
-    "zod": "^3.25.76"
+    "@modelcontextprotocol/sdk": "^1.10.0"
   }
 }