koishi-plugin-imx 2.2.1 → 2.2.2

package/lib/modules/bilibili.js

@@ -7,6 +7,7 @@ exports.Config = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
+const axios_error_1 = require("../utils/axios-error");
 exports.name = 'bilibili';
 exports.Config = koishi_1.Schema.object({
     enabled: koishi_1.Schema.boolean().description('启用 Bilibili 直播监控').default(false),
@@ -38,11 +39,11 @@ function apply(ctx, config) {
         }
         const statusList = [];
         for (const roomId of config.roomIds) {
-            try {
-                const isLive = await getRoomLiveStatus(roomId);
+            const isLive = await (0, axios_error_1.axiosRequestWithLog)(logger, () => getRoomLiveStatus(roomId), `获取房间 ${roomId} 状态`);
+            if (isLive !== null) {
                 statusList.push(`房间 ${roomId}: ${isLive ? '🔴 直播中' : '⚫ 未直播'}`);
             }
-            catch (error) {
+            else {
                 statusList.push(`房间 ${roomId}: ❌ 获取失败`);
             }
         }
@@ -52,20 +53,21 @@ function apply(ctx, config) {
 }
 async function checkLiveStatus(ctx, config, logger) {
     for (const roomId of config.roomIds) {
-        try {
-            const isLive = await getRoomLiveStatus(roomId);
-            const wasLive = liveStatusCache.get(roomId) || false;
-            if (isLive && !wasLive) {
-                // 开播通知
-                const roomInfo = await getRoomInfo(roomId);
+        const isLive = await (0, axios_error_1.axiosRequestWithLog)(logger, () => getRoomLiveStatus(roomId), `检查房间 ${roomId} 直播状态`);
+        if (isLive === null) {
+            // 请求失败，跳过此次检查
+            continue;
+        }
+        const wasLive = liveStatusCache.get(roomId) || false;
+        if (isLive && !wasLive) {
+            // 开播通知
+            const roomInfo = await (0, axios_error_1.axiosRequestWithLog)(logger, () => getRoomInfo(roomId), `获取房间 ${roomId} 信息`);
+            if (roomInfo) {
                 const message = formatLiveMessage(roomInfo);
                 await sendToChannels(ctx, config.watchChannels, message, logger);
             }
-            liveStatusCache.set(roomId, isLive);
-        }
-        catch (error) {
-            logger.error(`检查房间 ${roomId} 状态失败:`, error);
         }
+        liveStatusCache.set(roomId, isLive);
     }
 }
 async function getRoomLiveStatus(roomId) {
@@ -90,7 +92,8 @@ async function sendToChannels(ctx, channels, message, logger) {
             await ctx.broadcast([channelId], message);
         }
         catch (error) {
-            logger.error(`发送消息到频道 ${channelId} 失败:`, error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, `发送消息到频道 ${channelId}`);
+            logger.warn(simplified.message);
         }
     }
 }

package/lib/modules/github.js

@@ -7,6 +7,7 @@ exports.Config = exports.name = void 0;
 exports.apply = apply;
 const koishi_1 = require("koishi");
 const axios_1 = __importDefault(require("axios"));
+const axios_error_1 = require("../utils/axios-error");
 exports.name = 'github';
 exports.Config = koishi_1.Schema.object({
     enabled: koishi_1.Schema.boolean().description('启用 GitHub 功能').default(false),
@@ -32,11 +33,11 @@ function apply(ctx, config) {
         }
         const statusList = [];
         for (const repo of config.repositories) {
-            try {
-                const repoInfo = await getRepoInfo(repo);
+            const repoInfo = await (0, axios_error_1.axiosRequestWithLog)(logger, () => getRepoInfo(repo), `获取仓库 ${repo} 信息`);
+            if (repoInfo) {
                 statusList.push(`${repo}: ⭐ ${repoInfo.stargazers_count} | 🍴 ${repoInfo.forks_count}`);
             }
-            catch (error) {
+            else {
                 statusList.push(`${repo}: ❌ 获取失败`);
             }
         }

package/lib/modules/mx-space.d.ts

@@ -8,7 +8,6 @@ export interface Config {
         secret?: string;
         path?: string;
         watchChannels?: string[];
-        requireSignature?: boolean;
     };
     greeting?: {
         enabled?: boolean;

package/lib/modules/mx-space.js

@@ -48,6 +48,7 @@ const hitokoto_1 = require("../utils/hitokoto");
 const mx_api_1 = require("../utils/mx-api");
 const mx_url_builder_1 = require("../utils/mx-url-builder");
 const mx_event_handler_1 = require("../utils/mx-event-handler");
+const axios_error_1 = require("../utils/axios-error");
 dayjs_1.default.extend(relativeTime_1.default);
 exports.name = 'mx-space';
 exports.inject = ['server'];
@@ -58,7 +59,6 @@ exports.Config = koishi_1.Schema.object({
         secret: koishi_1.Schema.string().description('MX Space Webhook Secret').role('secret'),
         path: koishi_1.Schema.string().description('Webhook 路径').default('/mx-space/webhook'),
         watchChannels: koishi_1.Schema.array(koishi_1.Schema.string()).description('监听的频道ID列表').default([]),
-        requireSignature: koishi_1.Schema.boolean().description('是否要求签名验证（禁用可允许健康检查等请求）').default(true),
     }).description('Webhook 配置'),
     greeting: koishi_1.Schema.object({
         enabled: koishi_1.Schema.boolean().description('启用问候功能').default(true),
@@ -91,7 +91,7 @@ function apply(ctx, config) {
         memoChatId: null,
     };
     // 设置 Webhook 处理器
-    if (config.webhook && ctx.server) {
+    if (config.webhook?.secret && ctx.server) {
         setupWebhook(ctx, config, logger);
     }
     // 设置问候功能
@@ -113,11 +113,11 @@ function apply(ctx, config) {
     logger.info('MX Space 模块已启动');
 }
 function setupWebhook(ctx, config, logger) {
-    if (!ctx.server) {
-        logger.warn('Server 插件未启用，无法设置 webhook');
+    if (!config.webhook?.secret || !ctx.server) {
+        logger.warn('Webhook 配置不完整或 server 插件未启用');
         return;
     }
-    const webhookPath = config.webhook?.path || '/mx-space/webhook';
+    const webhookPath = config.webhook.path || '/mx-space/webhook';
     ctx.server.post(webhookPath, async (koaCtx) => {
         try {
             logger.debug('收到 webhook 请求:', {
@@ -127,8 +127,17 @@ function setupWebhook(ctx, config, logger) {
                 body: koaCtx.request.body
             });
             const body = koaCtx.request.body;
-            const signature = koaCtx.request.headers['x-hub-signature-256'] ||
-                koaCtx.request.headers['x-webhook-signature256'];
+            const headers = koaCtx.request.headers;
+            // 兼容多种签名头格式
+            // GitHub: x-hub-signature-256
+            // MX Space: X-Webhook-Signature (SHA1), X-Webhook-Signature256 (SHA256)
+            const signature = headers['x-hub-signature-256'] ||
+                headers['x-webhook-signature256'] ||
+                headers['x-webhook-signature'];
+            // 获取事件类型和其他 MX Space 专用头
+            const eventType = headers['x-webhook-event'];
+            const webhookId = headers['x-webhook-id'];
+            const timestamp = headers['x-webhook-timestamp'];
             // 检查请求体是否存在
             if (!body) {
                 logger.warn('Webhook 请求体为空');
@@ -136,75 +145,94 @@ function setupWebhook(ctx, config, logger) {
                 koaCtx.body = { error: 'Request body is empty' };
                 return;
             }
-            // 检查webhook事件类型
-            const eventType = koaCtx.request.headers['x-webhook-event'];
-            // 健康检查等系统事件允许无签名通过
-            const isSystemEvent = ['health_check', 'ping'].includes(eventType);
-            // 检查是否需要签名验证
-            const requireSignature = config.webhook?.requireSignature !== false; // 默认为true
-            // 验证签名（系统事件可以跳过）
-            if (requireSignature && config.webhook?.secret && !isSystemEvent) {
-                if (!signature) {
-                    logger.warn(`事件 ${eventType} 缺少签名头，但配置要求签名验证`);
-                    koaCtx.status = 401;
-                    koaCtx.body = { error: 'Missing signature' };
-                    return;
-                }
+            // 验证签名
+            if (config.webhook?.secret && signature) {
                 const crypto = await Promise.resolve().then(() => __importStar(require('crypto')));
                 const payload = JSON.stringify(body);
-                const hmac = crypto.createHmac('sha256', config.webhook.secret);
-                hmac.update(payload);
-                const expectedSignature = 'sha256=' + hmac.digest('hex');
+                let isValidSignature = false;
+                // 判断签名算法并验证
+                if (signature.startsWith('sha256=') || headers['x-webhook-signature256']) {
+                    // SHA256 签名验证
+                    const hmac = crypto.createHmac('sha256', config.webhook.secret);
+                    hmac.update(payload);
+                    const expectedSignature = signature.startsWith('sha256=')
+                        ? 'sha256=' + hmac.digest('hex')
+                        : hmac.digest('hex');
+                    isValidSignature = signature === expectedSignature;
+                }
+                else if (headers['x-webhook-signature']) {
+                    // SHA1 签名验证（MX Space 默认）
+                    const hmac = crypto.createHmac('sha1', config.webhook.secret);
+                    hmac.update(payload);
+                    const expectedSignature = hmac.digest('hex');
+                    isValidSignature = signature === expectedSignature;
+                }
                 logger.debug('签名验证:', {
-                    event: eventType,
                     received: signature,
-                    expected: expectedSignature
+                    algorithm: signature.startsWith('sha256=') ? 'SHA256' : (headers['x-webhook-signature256'] ? 'SHA256' : 'SHA1'),
+                    isValid: isValidSignature,
+                    eventType,
+                    webhookId,
+                    timestamp
                 });
-                if (signature !== expectedSignature) {
-                    logger.warn(`事件 ${eventType} 签名验证失败`);
+                if (!isValidSignature) {
+                    logger.warn('Webhook 签名验证失败');
                     koaCtx.status = 401;
                     koaCtx.body = { error: 'Invalid signature' };
                     return;
                 }
             }
-            else if (!requireSignature) {
-                logger.debug('签名验证已禁用，跳过签名检查');
+            else if (config.webhook?.secret && !signature) {
+                logger.warn('配置了签名但请求中没有签名头');
+                koaCtx.status = 401;
+                koaCtx.body = { error: 'Missing signature' };
+                return;
             }
-            else if (isSystemEvent) {
-                logger.debug(`系统事件 ${eventType} 跳过签名验证`);
+            // 检查请求体格式
+            // 兼容多种格式：
+            // 1. GitHub 格式: { type, data }
+            // 2. MX Space 格式: 直接的事件数据，事件类型在 X-Webhook-Event 头中
+            let eventTypeToProcess;
+            let eventData;
+            if (eventType) {
+                // MX Space 格式：事件类型在头部，数据在请求体
+                eventTypeToProcess = eventType;
+                eventData = body;
             }
-            // 检查标准请求体格式
-            if (!body.type || !body.data) {
-                // 如果是健康检查但没有标准格式，也允许通过
-                if (eventType === 'health_check' || Object.keys(body).length === 0) {
-                    logger.info('处理健康检查或空载荷请求');
-                    koaCtx.status = 200;
-                    koaCtx.body = { message: 'Health check successful' };
-                    return;
-                }
+            else if (body.type && body.data) {
+                // GitHub 格式：事件类型和数据都在请求体
+                eventTypeToProcess = body.type;
+                eventData = body.data;
+            }
+            else {
                 logger.warn('Webhook 请求体格式错误:', body);
                 koaCtx.status = 400;
                 koaCtx.body = {
                     error: 'Invalid webhook payload',
-                    details: 'Missing required fields: type or data',
-                    received: body
+                    details: 'Missing required fields: event type or data',
+                    received: body,
+                    headers: { eventType, webhookId, timestamp }
                 };
                 return;
             }
-            logger.info(`处理 MX Space 事件: ${body.type}`);
+            logger.info(`处理 MX Space 事件: ${eventTypeToProcess}`, {
+                webhookId,
+                timestamp,
+                format: eventType ? 'mx-space' : 'github'
+            });
             // 处理事件
-            await (0, mx_event_handler_1.handleMxSpaceEvent)(ctx, config, body.type, body.data, logger);
+            await (0, mx_event_handler_1.handleMxSpaceEvent)(ctx, config, eventTypeToProcess, eventData, logger);
             koaCtx.status = 200;
             koaCtx.body = { message: 'Webhook processed successfully' };
         }
         catch (error) {
-            logger.error('处理 MX Space webhook 失败:', error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '处理 MX Space webhook');
+            logger.error(simplified.message);
             koaCtx.status = 500;
-            koaCtx.body = { error: 'Internal server error', details: error.message };
+            koaCtx.body = { error: 'Internal server error', details: simplified.message };
         }
     });
-    const signatureStatus = config.webhook?.requireSignature !== false ? '已启用' : '已禁用';
-    logger.info(`MX Space Webhook 已启动，监听路径: ${webhookPath}，签名验证: ${signatureStatus}`);
+    logger.info(`MX Space Webhook 已启动，监听路径: ${webhookPath}`);
 }
 function setupWelcomeNewMember(ctx, config, logger) {
     if (!config.welcomeNewMember?.channels?.length)
@@ -220,7 +248,8 @@ function setupWelcomeNewMember(ctx, config, logger) {
             await session.send(welcomeMessage);
         }
         catch (error) {
-            logger.error('发送欢迎消息失败:', error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '发送欢迎消息');
+            logger.warn(simplified.message);
         }
     });
     logger.info('新成员欢迎功能已启用');
@@ -250,7 +279,8 @@ function setupCommentReply(ctx, config, logger, globalState) {
             globalState.memoChatId = null;
         }
         catch (error) {
-            await session.send(`回复失败！${error.message || error}`);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '回复评论');
+            await session.send(`回复失败！${simplified.message}`);
             globalState.toCommentId = null;
             globalState.memoChatId = null;
         }
@@ -275,7 +305,8 @@ function setupGreeting(ctx, config, logger) {
             await sendToChannels(ctx, config.greeting.channels || [], message, logger);
         }
         catch (error) {
-            logger.error('发送早安消息失败:', error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '发送早安消息');
+            logger.warn(simplified.message);
         }
     }, null, false, 'Asia/Shanghai');
     // 晚安定时任务
@@ -294,7 +325,8 @@ function setupGreeting(ctx, config, logger) {
             await sendToChannels(ctx, config.greeting.channels || [], message, logger);
         }
         catch (error) {
-            logger.error('发送晚安消息失败:', error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '发送晚安消息');
+            logger.warn(simplified.message);
         }
     }, null, false, 'Asia/Shanghai');
     morningJob.start();
@@ -319,7 +351,8 @@ function setupCommands(ctx, config, logger) {
             return `💭 ${hitokoto}\n\n—— ${from || '未知'}`;
         }
         catch (error) {
-            logger.error('获取一言失败:', error);
+            const simplified = (0, axios_error_1.simplifyAxiosError)(error, '获取一言');
+            logger.warn(simplified.message);
             return '获取一言失败';
         }
     });

package/lib/utils/axios-error.d.ts

@@ -0,0 +1,35 @@
+import { Logger } from 'koishi';
+export interface SimplifiedError {
+    message: string;
+    status?: number;
+    code?: string;
+}
+/**
+ * 简化 axios 错误信息
+ * @param error axios 错误对象
+ * @param context 错误上下文描述
+ * @returns 简化的错误信息
+ */
+export declare function simplifyAxiosError(error: any, context?: string): SimplifiedError;
+/**
+ * 记录简化的错误日志
+ * @param logger 日志记录器
+ * @param error 错误对象
+ * @param context 错误上下文
+ */
+export declare function logSimplifiedError(logger: Logger, error: any, context?: string): void;
+/**
+ * 安全的 axios 请求包装器
+ * @param requestFn axios 请求函数
+ * @param context 请求上下文描述
+ * @returns Promise<T | null>
+ */
+export declare function safeAxiosRequest<T>(requestFn: () => Promise<T>, context?: string): Promise<T | null>;
+/**
+ * 带日志的 axios 请求包装器
+ * @param logger 日志记录器
+ * @param requestFn axios 请求函数
+ * @param context 请求上下文描述
+ * @returns Promise<T | null>
+ */
+export declare function axiosRequestWithLog<T>(logger: Logger, requestFn: () => Promise<T>, context?: string): Promise<T | null>;

package/lib/utils/axios-error.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simplifyAxiosError = simplifyAxiosError;
+exports.logSimplifiedError = logSimplifiedError;
+exports.safeAxiosRequest = safeAxiosRequest;
+exports.axiosRequestWithLog = axiosRequestWithLog;
+const axios_1 = __importDefault(require("axios"));
+/**
+ * 简化 axios 错误信息
+ * @param error axios 错误对象
+ * @param context 错误上下文描述
+ * @returns 简化的错误信息
+ */
+function simplifyAxiosError(error, context = '请求') {
+    if (axios_1.default.isAxiosError(error)) {
+        const axiosError = error;
+        // 网络错误
+        if (!axiosError.response) {
+            return {
+                message: `${context}失败: 网络连接错误`,
+                code: axiosError.code || 'NETWORK_ERROR'
+            };
+        }
+        // HTTP 错误状态码
+        const status = axiosError.response.status;
+        const statusText = axiosError.response.statusText;
+        switch (status) {
+            case 400:
+                return { message: `${context}失败: 请求参数错误`, status };
+            case 401:
+                return { message: `${context}失败: 未授权访问`, status };
+            case 403:
+                return { message: `${context}失败: 访问被拒绝`, status };
+            case 404:
+                return { message: `${context}失败: 资源不存在`, status };
+            case 429:
+                return { message: `${context}失败: 请求过于频繁`, status };
+            case 500:
+                return { message: `${context}失败: 服务器内部错误`, status };
+            case 502:
+                return { message: `${context}失败: 网关错误`, status };
+            case 503:
+                return { message: `${context}失败: 服务不可用`, status };
+            default:
+                return {
+                    message: `${context}失败: HTTP ${status} ${statusText}`,
+                    status
+                };
+        }
+    }
+    // 其他类型的错误
+    return {
+        message: `${context}失败: ${error?.message || '未知错误'}`,
+        code: 'UNKNOWN_ERROR'
+    };
+}
+/**
+ * 记录简化的错误日志
+ * @param logger 日志记录器
+ * @param error 错误对象
+ * @param context 错误上下文
+ */
+function logSimplifiedError(logger, error, context = '操作') {
+    const simplified = simplifyAxiosError(error, context);
+    if (simplified.status && simplified.status >= 500) {
+        // 服务器错误使用 error 级别
+        logger.error(simplified.message);
+    }
+    else if (simplified.status && simplified.status >= 400) {
+        // 客户端错误使用 warn 级别
+        logger.warn(simplified.message);
+    }
+    else {
+        // 网络错误等使用 error 级别
+        logger.error(simplified.message);
+    }
+}
+/**
+ * 安全的 axios 请求包装器
+ * @param requestFn axios 请求函数
+ * @param context 请求上下文描述
+ * @returns Promise<T | null>
+ */
+async function safeAxiosRequest(requestFn, context = '请求') {
+    try {
+        return await requestFn();
+    }
+    catch (error) {
+        // 静默处理错误，返回 null
+        return null;
+    }
+}
+/**
+ * 带日志的 axios 请求包装器
+ * @param logger 日志记录器
+ * @param requestFn axios 请求函数
+ * @param context 请求上下文描述
+ * @returns Promise<T | null>
+ */
+async function axiosRequestWithLog(logger, requestFn, context = '请求') {
+    try {
+        return await requestFn();
+    }
+    catch (error) {
+        logSimplifiedError(logger, error, context);
+        return null;
+    }
+}

package/lib/utils/mx-api.js

@@ -5,6 +5,7 @@ exports.getMxSpaceAggregateData = getMxSpaceAggregateData;
 const api_client_1 = require("@mx-space/api-client");
 const axios_1 = require("@mx-space/api-client/dist/adaptors/axios");
 const constants_1 = require("../constants");
+const axios_error_1 = require("./axios-error");
 let apiClientInstance;
 function getApiClient(ctx, config) {
     if (apiClientInstance) {
@@ -27,12 +28,15 @@ function getApiClient(ctx, config) {
         return res;
     }, (err) => {
         const res = err.response;
-        const error = Promise.reject(err);
         if (!res) {
-            return error;
+            // 网络错误等，记录简化日志
+            (0, axios_error_1.logSimplifiedError)(logger, err, 'MX Space API 请求');
         }
-        logger.error(`HTTP Response Failed ${`${res.config.baseURL || ''}${res.config.url}`}`);
-        return error;
+        else {
+            // HTTP 错误，记录简化日志
+            (0, axios_error_1.logSimplifiedError)(logger, err, `MX Space API 请求 ${res.config.url}`);
+        }
+        return Promise.reject(err);
     });
     const apiClient = (0, api_client_1.createClient)(axios_1.axiosAdaptor)(config.baseUrl, {
         controllers: api_client_1.allControllers,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-imx",
   "description": "Mix-Space Bot for Koishi - 集成多种功能的聊天机器人插件",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [