@mcpcn/mcp-notification 1.1.5 → 1.1.6

package/dist/index.js

@@ -12,13 +12,10 @@ function resolveChatSessionId(request) {
         }
         return undefined;
     };
-    return (pick(request?.params?._meta, ['chatSessionId', 'chatSessionID']) ??
+    return (pick(request?.meta, ['chatSessionId', 'chatSessionID']) ??
         pick(request?.params?.meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.meta, ['chatSessionId', 'chatSessionID']) ??
+        pick(request?.params?._meta, ['chatSessionId', 'chatSessionID']) ??
         pick(request?._meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.params, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.params?.arguments?.meta, ['chatSessionId', 'chatSessionID']) ??
-        pick(request?.params?.arguments?._meta, ['chatSessionId', 'chatSessionID']) ??
         pick(request?.params?.arguments, ['chatSessionId', 'chatSessionID']));
 }
 async function postJson(path, body, chatSessionId) {
@@ -98,21 +95,45 @@ class ReminderServer {
             tools: [
                 {
                     name: 'set_reminder',
-                    description: '设置通知提醒。支持一次性、按间隔循环、每日循环。',
+                    description: '设置通知提醒，支持一次性、按间隔循环、每日循环；一次性提醒需提供triggerAt或delaySec，或提供timeOfDay用于推算，优先提供delaySec。',
                     inputSchema: {
                         type: 'object',
                         properties: {
-                            content: { type: 'string' },
-                            repeat: { type: 'string', enum: ['none', 'interval', 'daily'] },
-                            delaySec: { type: 'number' },
-                            triggerAt: { type: 'string', description: 'RFC3339 时间，例如 2025-11-15T20:00:00+08:00' },
-                            intervalSec: { type: 'number' },
-                            timeOfDay: { type: 'string', description: '例如 18:00 或 18:00:00' },
-                            tzOffsetMin: { type: 'number', description: '时区偏移分钟，例如北京为 480' },
-                            chatSessionId: { type: 'string' },
+                            content: { type: 'string', minLength: 1, description: '提醒内容，例如 “开会”。' },
+                            repeat: { type: 'string', enum: ['none', 'interval', 'daily'], default: 'none', description: '提醒类型：none 一次性、interval 按间隔、daily 每日。' },
+                            delaySec: { type: 'number', minimum: 1, description: '一次性提醒相对延迟秒数，例如 300 表示5分钟后触发。与triggerAt二选一。' },
+                            triggerAt: { type: 'string', description: '一次性提醒绝对时间，RFC3339 格式，例如 2025-11-21T08:00:00+08:00。' },
+                            intervalSec: { type: 'number', minimum: 1, description: '按间隔循环的间隔秒数，例如 3600 表示每小时提醒一次。仅repeat=interval时必需。' },
+                            timeOfDay: { type: 'string', pattern: '^\\d{1,2}:\\d{2}(:\\d{2})?$', description: '一天中的时间，格式 HH:mm 或 HH:mm:ss，例如 08:00 或 08:00:00。repeat=daily时必需；repeat=none且未提供triggerAt/delaySec时用于推算。' },
+                            tzOffsetMin: { type: 'number', description: '时区偏移分钟，例如北京为 480；不提供时默认使用本机时区。' },
+                            chatSessionId: { type: 'string', minLength: 1, description: '设备会话标识，由宿主环境传入。' },
                         },
                         required: ['content', 'repeat'],
                         additionalProperties: false,
+                        oneOf: [
+                            {
+                                properties: { repeat: { const: 'none' } },
+                                anyOf: [
+                                    { required: ['triggerAt'] },
+                                    { required: ['delaySec'] },
+                                    { required: ['timeOfDay'] },
+                                ],
+                            },
+                            {
+                                properties: { repeat: { const: 'interval' } },
+                                required: ['intervalSec'],
+                            },
+                            {
+                                properties: { repeat: { const: 'daily' } },
+                                required: ['timeOfDay'],
+                            },
+                        ],
+                        examples: [
+                            { content: '开会', repeat: 'none', triggerAt: '2025-11-21T08:00:00+08:00' },
+                            { content: '喝水', repeat: 'none', delaySec: 300 },
+                            { content: '站立休息', repeat: 'interval', intervalSec: 1800 },
+                            { content: '打卡', repeat: 'daily', timeOfDay: '09:00', tzOffsetMin: 480 },
+                        ],
                     },
                 },
                 {
@@ -120,7 +141,7 @@ class ReminderServer {
                     description: '获取设备的提醒列表（仅未触发的 scheduled）。',
                     inputSchema: {
                         type: 'object',
-                        properties: { chatSessionId: { type: 'string' } },
+                        properties: { chatSessionId: { type: 'string', minLength: 1, description: '设备会话标识。' } },
                         required: [],
                         additionalProperties: false,
                     },
@@ -130,7 +151,7 @@ class ReminderServer {
                     description: '取消指定提醒。',
                     inputSchema: {
                         type: 'object',
-                        properties: { id: { type: 'string' }, chatSessionId: { type: 'string' } },
+                        properties: { id: { type: 'string', minLength: 1, description: '提醒ID。' }, chatSessionId: { type: 'string', minLength: 1, description: '设备会话标识。' } },
                         required: ['id'],
                         additionalProperties: false,
                     },
@@ -139,15 +160,17 @@ class ReminderServer {
         }));
         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, '无效的参数');
                 }
                 const name = request.params.name;
                 const args = request.params.arguments;
+                console.error(`收到工具调用请求: ${name}, 输入: ${JSON.stringify(args)}`);
                 const chatSessionId = resolveChatSessionId(request);
                 if (!chatSessionId) {
-                    console.error('未在请求中检测到 chatSessionId（meta.chatSessionId）');
-                    const baseMsg = '解析设备失败: chatSessionId不能为空，工具暂无法使用';
+                    console.error('通知工具未在请求中检测到 chatSessionId（meta.chatSessionId）');
+                    const baseMsg = '解析设备失败: chatSessionId不能为空，通知工具暂无法使用';
                     const errText = name === 'set_reminder'
                         ? `设置失败：${baseMsg}`
                         : name === 'list_reminders'
@@ -158,7 +181,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 = {
@@ -170,6 +193,73 @@ class ReminderServer {
                         timeOfDay: args.timeOfDay,
                         tzOffsetMin: args.tzOffsetMin,
                     };
+                    const needSingleTrigger = params.repeat === 'none';
+                    const hasTrigger = typeof params.triggerAt === 'string' && params.triggerAt.trim().length > 0;
+                    const hasDelay = typeof params.delaySec === 'number' && Number.isFinite(params.delaySec);
+                    const sendOffsetMin = typeof params.tzOffsetMin === 'number' ? params.tzOffsetMin : -new Date().getTimezoneOffset();
+                    params.tzOffsetMin = sendOffsetMin;
+                    if (needSingleTrigger && !hasTrigger && !hasDelay) {
+                        if (typeof params.timeOfDay === 'string' && params.timeOfDay.trim()) {
+                            const m = params.timeOfDay.trim().match(/^\s*(\d{1,2}):(\d{2})(?::(\d{2}))?\s*$/);
+                            if (!m) {
+                                return { content: [{ type: 'text', text: '设置失败：timeOfDay格式应为HH:mm或HH:mm:ss' }], isError: true };
+                            }
+                            const hh = parseInt(m[1], 10);
+                            const mi = parseInt(m[2], 10);
+                            const ss = m[3] ? parseInt(m[3], 10) : 0;
+                            if (hh < 0 || hh > 23 || mi < 0 || mi > 59 || ss < 0 || ss > 59) {
+                                return { content: [{ type: 'text', text: '设置失败：timeOfDay格式应为HH:mm或HH:mm:ss' }], isError: true };
+                            }
+                            const offsetMin = typeof params.tzOffsetMin === 'number' ? params.tzOffsetMin : -new Date().getTimezoneOffset();
+                            const nowUtc = Date.now();
+                            const zoneNowMs = nowUtc + offsetMin * 60000;
+                            const zoneNow = new Date(zoneNowMs);
+                            let y = zoneNow.getUTCFullYear();
+                            let mth = zoneNow.getUTCMonth();
+                            let d = zoneNow.getUTCDate();
+                            let targetUtcMs = Date.UTC(y, mth, d, hh, mi, ss) - offsetMin * 60000;
+                            if (targetUtcMs <= nowUtc) {
+                                const tomorrowZone = new Date(zoneNowMs + 86400000);
+                                y = tomorrowZone.getUTCFullYear();
+                                mth = tomorrowZone.getUTCMonth();
+                                d = tomorrowZone.getUTCDate();
+                                targetUtcMs = Date.UTC(y, mth, d, hh, mi, ss) - offsetMin * 60000;
+                            }
+                            const targetZone = new Date(targetUtcMs + offsetMin * 60000);
+                            const pad2 = (n) => String(n).padStart(2, '0');
+                            const yStr = String(targetZone.getUTCFullYear());
+                            const mStr = pad2(targetZone.getUTCMonth() + 1);
+                            const dStr = pad2(targetZone.getUTCDate());
+                            const sign = offsetMin >= 0 ? '+' : '-';
+                            const abs = Math.abs(offsetMin);
+                            const oh = pad2(Math.floor(abs / 60));
+                            const om = pad2(abs % 60);
+                            params.triggerAt = `${yStr}-${mStr}-${dStr}T${pad2(hh)}:${pad2(mi)}:${pad2(ss)}${sign}${oh}:${om}`;
+                            console.error(`自动计算triggerAt: ${params.triggerAt}`);
+                        }
+                        else {
+                            return { content: [{ type: 'text', text: '设置失败：必须提供triggerAt或delaySec，或提供timeOfDay用于推算' }], isError: true };
+                        }
+                    }
+                    if (needSingleTrigger && hasDelay && !hasTrigger) {
+                        const offsetMin = typeof params.tzOffsetMin === 'number' ? params.tzOffsetMin : -new Date().getTimezoneOffset();
+                        const pad2 = (n) => String(n).padStart(2, '0');
+                        const nowUtc = Date.now();
+                        const targetUtcMs = nowUtc + params.delaySec * 1000;
+                        const targetZone = new Date(targetUtcMs + offsetMin * 60000);
+                        const yStr = String(targetZone.getUTCFullYear());
+                        const mStr = pad2(targetZone.getUTCMonth() + 1);
+                        const dStr = pad2(targetZone.getUTCDate());
+                        const hhStr = pad2(targetZone.getUTCMinutes() >= 0 ? targetZone.getUTCHours() : targetZone.getUTCHours());
+                        const miStr = pad2(targetZone.getUTCMinutes());
+                        const ssStr = pad2(targetZone.getUTCSeconds());
+                        const sign = offsetMin >= 0 ? '+' : '-';
+                        const abs = Math.abs(offsetMin);
+                        const oh = pad2(Math.floor(abs / 60));
+                        const om = pad2(abs % 60);
+                        params.triggerAt = `${yStr}-${mStr}-${dStr}T${hhStr}:${miStr}:${ssStr}${sign}${oh}:${om}`;
+                        console.error(`delaySec计算triggerAt: ${params.triggerAt}`);
+                    }
                     const resp = await postJson('/reminder/set', params, chatSessionId);
                     if (resp.code !== 0) {
                         return { content: [{ type: 'text', text: `设置失败：${resp.msg}` }], isError: true };
@@ -213,8 +303,45 @@ class ReminderServer {
                     if (resp.code !== 0) {
                         return { content: [{ type: 'text', text: `获取失败：${resp.msg}` }], isError: true };
                     }
+                    const offsetMin = typeof args?.tzOffsetMin === 'number' ? args.tzOffsetMin : -new Date().getTimezoneOffset();
+                    const formatOffset = (min) => {
+                        const sign = min >= 0 ? '+' : '-';
+                        const abs = Math.abs(min);
+                        const hh = String(Math.floor(abs / 60)).padStart(2, '0');
+                        const mm = String(abs % 60).padStart(2, '0');
+                        return `${sign}${hh}:${mm}`;
+                    };
+                    const toLocal = (iso) => {
+                        if (!iso)
+                            return iso;
+                        const d = new Date(iso);
+                        if (isNaN(d.getTime()))
+                            return iso;
+                        const y = d.getFullYear();
+                        const m = String(d.getMonth() + 1).padStart(2, '0');
+                        const day = String(d.getDate()).padStart(2, '0');
+                        const hh = String(d.getHours()).padStart(2, '0');
+                        const mi = String(d.getMinutes()).padStart(2, '0');
+                        const ss = String(d.getSeconds()).padStart(2, '0');
+                        return `${y}-${m}-${day}T${hh}:${mi}:${ss}${formatOffset(offsetMin)}`;
+                    };
+                    const raw = resp.data?.list ?? [];
+                    const mapped = Array.isArray(raw)
+                        ? raw.map((it) => {
+                            if (it && typeof it === 'object') {
+                                const anyIt = it;
+                                if (anyIt.triggerAt)
+                                    anyIt.triggerAtLocal = toLocal(anyIt.triggerAt);
+                                if (anyIt.nextAt)
+                                    anyIt.nextAtLocal = toLocal(anyIt.nextAt);
+                                if (anyIt.scheduledAt)
+                                    anyIt.scheduledAtLocal = toLocal(anyIt.scheduledAt);
+                            }
+                            return it;
+                        })
+                        : raw;
                     return {
-                        content: [{ type: 'text', text: JSON.stringify(resp.data?.list ?? [], null, 2) }],
+                        content: [{ type: 'text', text: JSON.stringify(mapped, null, 2) }],
                         isError: false,
                     };
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mcpcn/mcp-notification",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "系统通知MCP服务器",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",