@mcpcn/mcp-notification 1.0.16 → 1.0.18

package/dist/index.js

@@ -12,22 +12,57 @@ function resolveChatSessionId(request) {
         }
         return undefined;
     };
-    return (pick(request?.params?._meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.params?.meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?._meta, ['chatSessionId', 'chatSessionID']));
+    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']);
 }
 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(body),
+                body: JSON.stringify(payload),
             });
             if (!resp.ok) {
                 const text = await resp.text().catch(() => '');
@@ -52,12 +87,16 @@ 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 resp = await fetch(`${API_BASE}${path}`, { headers });
+            const url = new URL(`${API_BASE}${path}`);
+            if (chatSessionId)
+                url.searchParams.set('chatSessionId', chatSessionId);
+            const resp = await fetch(url.toString(), { headers });
             if (!resp.ok) {
                 const text = await resp.text().catch(() => '');
                 const msg = `HTTP 错误: ${resp.status} ${resp.statusText}${text ? ` | 响应体: ${text.slice(0, 500)}` : ''}`;
@@ -132,7 +171,7 @@ class ReminderServer {
                 },
             ],
         }));
-        this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+        this.server.setRequestHandler((CallToolRequestSchema.passthrough ? CallToolRequestSchema.passthrough() : CallToolRequestSchema), async (request) => {
             try {
                 if (!request.params.arguments || typeof request.params.arguments !== 'object') {
                     throw new McpError(ErrorCode.InvalidParams, '无效的参数');
@@ -141,7 +180,7 @@ class ReminderServer {
                 const args = request.params.arguments;
                 const chatSessionId = resolveChatSessionId(request);
                 if (!chatSessionId) {
-                    console.error('未在请求中检测到 chatSessionId（meta.chatSessionId）');
+                    console.error('工具未在请求中检测到 chatSessionId');
                     const baseMsg = '解析设备失败: chatSessionId不能为空，工具暂无法使用';
                     const errText = name === 'set_reminder'
                         ? `设置失败：${baseMsg}`
@@ -153,7 +192,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.16",
+  "version": "1.0.18",
   "description": "系统通知MCP服务器",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",