@anyul/koishi-plugin-rss 5.2.2 → 5.2.3

package/lib/core/item-processor.js

@@ -43,6 +43,8 @@ const renderer_1 = require("./renderer");
 const template_1 = require("../utils/template");
 const ai_1 = require("./ai");
 const marked_1 = require("marked");
+const sanitizer_1 = require("../utils/sanitizer");
+const security_1 = require("../utils/security");
 class RssItemProcessor {
     ctx;
     config;
@@ -59,6 +61,11 @@ class RssItemProcessor {
         let html;
         let videoList = [];
         item.description = item.description?.join?.('') || item.description;
+        // HTML 安全清理
+        const sanitizer = (0, sanitizer_1.createSanitizer)(this.config);
+        if (sanitizer.isEnabled() && item.description) {
+            item.description = sanitizer.sanitize(item.description);
+        }
         // --- AI 逻辑 START ---
         let aiSummary = "";
         let formattedAiSummary = "";
@@ -205,41 +212,7 @@ class RssItemProcessor {
             await Promise.all(html('img').map(async (v, i) => i.attribs.src = await (0, media_1.getImageUrl)(this.ctx, this.config, this.$http, i.attribs.src, arg, true)).get());
         }
         html('img').attr('style', 'object-fit:scale-down;max-width:100%;');
-        let msg = "";
-        const imageMode = this.config.basic?.imageMode;
-        if (imageMode == 'base64') {
-            (0, logger_1.debug)(this.config, '使用 base64 模式渲染', 'render mode', 'info');
-            msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, html.html(), arg)).toString();
-        }
-        else if (imageMode == 'File' || imageMode == 'assets') {
-            if (!this.ctx.puppeteer) {
-                (0, logger_1.debug)(this.config, '未安装 puppeteer 插件，跳过图片渲染', 'puppeteer error', 'error');
-                msg = html.html();
-            }
-            else {
-                try {
-                    (0, logger_1.debug)(this.config, `使用 ${imageMode} 模式渲染`, 'render mode', 'info');
-                    let processedHtml = await (0, renderer_1.preprocessHtmlImages)(this.ctx, this.config, this.$http, html.html(), arg);
-                    if ((this.config.template?.deviceScaleFactor ?? 1) !== 1) {
-                        msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, processedHtml, arg)).toString();
-                    }
-                    else {
-                        msg = await this.ctx.puppeteer.render(processedHtml);
-                    }
-                    msg = await (0, media_1.puppeteerToFile)(this.ctx, this.config, msg);
-                    (0, logger_1.debug)(this.config, 'puppeteer 渲染完成', 'render success', 'info');
-                }
-                catch (error) {
-                    (0, logger_1.debug)(this.config, `puppeteer render 失败: ${error}`, 'puppeteer error', 'error');
-                    msg = html.html();
-                }
-            }
-        }
-        else {
-            // 未知 imageMode，回退到 HTML
-            (0, logger_1.debug)(this.config, `未知的 imageMode: ${imageMode}，回退到 HTML`, 'render warning', 'error');
-            msg = html.html();
-        }
+        let msg = await this.renderImage(html.html(), arg);
         return parseContent(this.config.template?.customRemark || '', { ...item, arg, description: msg });
     }
     async processContentTemplate(item, arg, html, parseContent) {
@@ -300,42 +273,7 @@ class RssItemProcessor {
         }
         html('img').attr('style', 'object-fit:scale-down;max-width:100%;');
         (0, logger_1.debug)(this.config, `当前 imageMode: ${this.config.basic?.imageMode}`, 'imageMode', 'info');
-        let msg = "";
-        const imageMode = this.config.basic?.imageMode;
-        if (imageMode == 'base64') {
-            (0, logger_1.debug)(this.config, '使用 base64 模式渲染', 'render mode', 'info');
-            msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, html.html(), arg)).toString();
-        }
-        else if (imageMode == 'File' || imageMode == 'assets') {
-            if (!this.ctx.puppeteer) {
-                (0, logger_1.debug)(this.config, '未安装 puppeteer 插件，跳过图片渲染', 'puppeteer error', 'error');
-                msg = html.html();
-            }
-            else {
-                try {
-                    (0, logger_1.debug)(this.config, `使用 ${imageMode} 模式渲染`, 'render mode', 'info');
-                    let processedHtml = await (0, renderer_1.preprocessHtmlImages)(this.ctx, this.config, this.$http, html.html(), arg);
-                    if ((this.config.template?.deviceScaleFactor ?? 1) !== 1) {
-                        msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, processedHtml, arg)).toString();
-                    }
-                    else {
-                        msg = await this.ctx.puppeteer.render(processedHtml);
-                    }
-                    (0, logger_1.debug)(this.config, `puppeteer.render() 返回: ${msg.substring(0, 100)}...`, 'puppeteer result', 'info');
-                    msg = await (0, media_1.puppeteerToFile)(this.ctx, this.config, msg);
-                    (0, logger_1.debug)(this.config, `puppeteerToFile 转换完成`, 'puppeteer', 'info');
-                }
-                catch (error) {
-                    (0, logger_1.debug)(this.config, `puppeteer render 失败: ${error}`, 'puppeteer error', 'error');
-                    msg = html.html();
-                }
-            }
-        }
-        else {
-            // 未知 imageMode，回退到 HTML
-            (0, logger_1.debug)(this.config, `未知的 imageMode: ${imageMode}，回退到 HTML`, 'render warning', 'error');
-            msg = html.html();
-        }
+        let msg = await this.renderImage(html.html(), arg);
         return msg;
     }
     async processOnlyDescriptionTemplate(item, arg, html, parseContent) {
@@ -369,82 +307,34 @@ class RssItemProcessor {
             await Promise.all(html('img').map(async (v, i) => i.attribs.src = await (0, media_1.getImageUrl)(this.ctx, this.config, this.$http, i.attribs.src, arg, true)).get());
         }
         html('img').attr('style', 'object-fit:scale-down;max-width:100%;');
-        let msg = "";
-        const imageMode = this.config.basic?.imageMode;
-        if (imageMode == 'base64') {
-            msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, html.html(), arg)).toString();
-        }
-        else if (imageMode == 'File' || imageMode == 'assets') {
-            if (!this.ctx.puppeteer) {
-                (0, logger_1.debug)(this.config, '未安装 puppeteer 插件，跳过图片渲染', 'puppeteer error', 'error');
-                msg = html.html();
-            }
-            else {
-                try {
-                    let processedHtml = await (0, renderer_1.preprocessHtmlImages)(this.ctx, this.config, this.$http, html.html(), arg);
-                    if ((this.config.template?.deviceScaleFactor ?? 1) !== 1) {
-                        msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, processedHtml, arg)).toString();
-                    }
-                    else {
-                        msg = await this.ctx.puppeteer.render(processedHtml);
-                    }
-                    msg = await (0, media_1.puppeteerToFile)(this.ctx, this.config, msg);
-                }
-                catch (error) {
-                    (0, logger_1.debug)(this.config, `puppeteer render 失败: ${error}`, 'puppeteer error', 'error');
-                    msg = html.html();
-                }
-            }
-        }
-        else {
-            // 未知 imageMode，回退到 HTML
-            (0, logger_1.debug)(this.config, `未知的 imageMode: ${imageMode}，回退到 HTML`, 'render warning', 'error');
-            msg = html.html();
-        }
+        let msg = await this.renderImage(html.html(), arg);
         return msg;
     }
     async processLinkTemplate(item, arg) {
         let html = cheerio.load(item.description);
         let src = html('a')[0].attribs.href;
         (0, logger_1.debug)(this.config, src, 'link src', 'info');
+        // URL 安全验证
+        try {
+            (0, security_1.validateUrlOrThrow)(src, (0, security_1.getSecurityOptions)(this.config));
+        }
+        catch (error) {
+            if (error instanceof security_1.SecurityError) {
+                (0, logger_1.debug)(this.config, `链接 URL 安全验证失败: ${error.message}`, 'security', 'error');
+                return `链接安全验证失败: ${error.message}`;
+            }
+            throw error;
+        }
         let html2 = cheerio.load((await this.$http(src, arg)).data);
         if (arg?.proxyAgent?.enabled) {
             await Promise.all(html2('img').map(async (v, i) => i.attribs.src = await (0, media_1.getImageUrl)(this.ctx, this.config, this.$http, i.attribs.src, arg, true)).get());
         }
         html2('img').attr('style', 'object-fit:scale-down;max-width:100%;');
-        html2('body').attr('style', `width:${this.config.template?.bodyWidth || 600}px;padding:${this.config.template?.bodyPadding || 20}px;`);
-        let msg = "";
-        const imageMode = this.config.basic?.imageMode;
-        if (imageMode == 'base64') {
-            msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, html2.xml(), arg)).toString();
-        }
-        else if (imageMode == 'File' || imageMode == 'assets') {
-            if (!this.ctx.puppeteer) {
-                (0, logger_1.debug)(this.config, '未安装 puppeteer 插件，跳过图片渲染', 'puppeteer error', 'error');
-                msg = html2.xml();
-            }
-            else {
-                try {
-                    let processedHtml = await (0, renderer_1.preprocessHtmlImages)(this.ctx, this.config, this.$http, html2.xml(), arg);
-                    if ((this.config.template?.deviceScaleFactor ?? 1) !== 1) {
-                        msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, processedHtml, arg)).toString();
-                    }
-                    else {
-                        msg = await this.ctx.puppeteer.render(processedHtml);
-                    }
-                    msg = await (0, media_1.puppeteerToFile)(this.ctx, this.config, msg);
-                }
-                catch (error) {
-                    (0, logger_1.debug)(this.config, `puppeteer render 失败: ${error}`, 'puppeteer error', 'error');
-                    msg = html2.xml();
-                }
-            }
-        }
-        else {
-            // 未知 imageMode，回退到 HTML
-            (0, logger_1.debug)(this.config, `未知的 imageMode: ${imageMode}，回退到 HTML`, 'render warning', 'error');
-            msg = html2.xml();
-        }
+        // link 模板使用订阅级参数设置 body 样式
+        const bodyWidth = arg?.bodyWidth ?? this.config.template?.bodyWidth ?? 600;
+        const bodyPadding = arg?.bodyPadding ?? this.config.template?.bodyPadding ?? 20;
+        html2('body').attr('style', `width:${bodyWidth}px;padding:${bodyPadding}px;`);
+        let msg = await this.renderImage(html2.xml(), arg);
         return msg;
     }
     async processVideos(html, arg, videoList) {
@@ -464,5 +354,45 @@ class RssItemProcessor {
             return (0, koishi_1.h)('video', { src, poster });
         }).join('');
     }
+    /**
+     * 统一的图片渲染方法
+     * 提取了 custom、default、only description、link 模板中重复的图片渲染逻辑
+     */
+    async renderImage(htmlContent, arg) {
+        const imageMode = this.config.basic?.imageMode;
+        // base64 模式
+        if (imageMode === 'base64') {
+            (0, logger_1.debug)(this.config, '使用 base64 模式渲染', 'render mode', 'info');
+            return (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, htmlContent, arg)).toString();
+        }
+        // File 或 assets 模式
+        if (imageMode === 'File' || imageMode === 'assets') {
+            if (!this.ctx.puppeteer) {
+                (0, logger_1.debug)(this.config, '未安装 puppeteer 插件，跳过图片渲染', 'puppeteer error', 'error');
+                return htmlContent;
+            }
+            try {
+                (0, logger_1.debug)(this.config, `使用 ${imageMode} 模式渲染`, 'render mode', 'info');
+                const processedHtml = await (0, renderer_1.preprocessHtmlImages)(this.ctx, this.config, this.$http, htmlContent, arg);
+                let msg;
+                if ((this.config.template?.deviceScaleFactor ?? 1) !== 1) {
+                    msg = (await (0, renderer_1.renderHtml2Image)(this.ctx, this.config, this.$http, processedHtml, arg)).toString();
+                }
+                else {
+                    msg = await this.ctx.puppeteer.render(processedHtml);
+                }
+                msg = await (0, media_1.puppeteerToFile)(this.ctx, this.config, msg);
+                (0, logger_1.debug)(this.config, 'puppeteer 渲染完成', 'render success', 'info');
+                return msg;
+            }
+            catch (error) {
+                (0, logger_1.debug)(this.config, `puppeteer render 失败: ${error}`, 'puppeteer error', 'error');
+                return htmlContent;
+            }
+        }
+        // 未知模式，回退到 HTML
+        (0, logger_1.debug)(this.config, `未知的 imageMode: ${imageMode}，回退到 HTML`, 'render warning', 'error');
+        return htmlContent;
+    }
 }
 exports.RssItemProcessor = RssItemProcessor;

package/lib/core/notification-queue.d.ts

@@ -47,6 +47,8 @@ export declare class NotificationQueueManager {
     private batchSize;
     private backoffDelays;
     constructor(ctx: Context, config: Config);
+    private buildTaskLogContext;
+    private createTaskDebug;
     /**
      * 添加任务到队列
      */

package/lib/core/notification-queue.js

@@ -38,6 +38,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationQueueManager = void 0;
+const error_handler_1 = require("../utils/error-handler");
+const error_tracker_1 = require("../utils/error-tracker");
 const logger_1 = require("../utils/logger");
 /**
  * 消息发送队列管理器
@@ -54,6 +56,26 @@ class NotificationQueueManager {
         this.ctx = ctx;
         this.config = config;
     }
+    buildTaskLogContext(task) {
+        const context = {
+            subscribeId: task.subscribeId,
+            rssId: task.rssId,
+            uid: task.uid,
+            guildId: task.guildId,
+            platform: task.platform,
+            retryCount: task.retryCount,
+        };
+        if (task.id !== undefined) {
+            context.taskId = String(task.id);
+        }
+        if (task.platform && task.guildId) {
+            context.target = `${task.platform}:${task.guildId}`;
+        }
+        return context;
+    }
+    createTaskDebug(task) {
+        return (0, logger_1.createDebugWithContext)(this.config, this.buildTaskLogContext(task));
+    }
     /**
      * 添加任务到队列
      */
@@ -65,8 +87,9 @@ class NotificationQueueManager {
             createdAt: new Date(),
             updatedAt: new Date()
         };
+        const taskDebug = this.createTaskDebug(queueTask);
         await this.ctx.database.create('rss_notification_queue', queueTask);
-        (0, logger_1.debug)(this.config, `任务已加入队列: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
+        taskDebug(`任务已加入队列: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
         return queueTask;
     }
     /**
@@ -74,7 +97,7 @@ class NotificationQueueManager {
      */
     async processQueue() {
         if (this.processing) {
-            (0, logger_1.debug)(this.config, '队列正在处理中，跳过本次', 'queue', 'details');
+            (0, logger_1.debug)(this.config, '队列正在处理中，跳过本次', 'queue', 'details', { processing: true });
             return;
         }
         this.processing = true;
@@ -84,15 +107,16 @@ class NotificationQueueManager {
             if (tasks.length === 0) {
                 return;
             }
-            (0, logger_1.debug)(this.config, `开始处理 ${tasks.length} 个待发送任务`, 'queue', 'info');
+            (0, logger_1.debug)(this.config, `开始处理 ${tasks.length} 个待发送任务`, 'queue', 'info', { taskCount: tasks.length });
             // 2. 逐个处理任务
             for (const task of tasks) {
                 await this.processTask(task);
             }
         }
         catch (err) {
-            (0, logger_1.debug)(this.config, `队列处理异常: ${err.message}`, 'queue', 'error');
-            console.error('Queue processing error:', err);
+            const normalizedError = (0, error_handler_1.normalizeError)(err);
+            (0, logger_1.debug)(this.config, `队列处理异常: ${normalizedError.message}`, 'queue', 'error', { processing: true });
+            (0, error_tracker_1.trackError)(normalizedError, { operation: 'processQueue' });
         }
         finally {
             this.processing = false;
@@ -118,13 +142,14 @@ class NotificationQueueManager {
      * 处理单个任务
      */
     async processTask(task) {
-        (0, logger_1.debug)(this.config, `处理任务 [${task.rssId}] ${task.content.title} (重试${task.retryCount}次)`, 'queue', 'details');
+        const taskDebug = this.createTaskDebug(task);
+        taskDebug(`处理任务 [${task.rssId}] ${task.content.title} (重试${task.retryCount}次)`, 'queue', 'details');
         try {
             // 尝试发送消息
             await this.sendMessage(task);
             // 发送成功：标记为 SUCCESS
             await this.markTaskSuccess(task.id);
-            (0, logger_1.debug)(this.config, `✓ 任务发送成功: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
+            taskDebug(`✓ 任务发送成功: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
             // 写入缓存
             await this.cacheMessage(task);
         }
@@ -139,16 +164,17 @@ class NotificationQueueManager {
     async sendMessage(task) {
         const { guildId, platform, content } = task;
         const target = `${platform}:${guildId}`;
+        const taskDebug = this.createTaskDebug(task);
         try {
             // 第一次尝试：发送原始消息
             await this.ctx.broadcast([target], content.message);
-            (0, logger_1.debug)(this.config, `消息发送成功: ${target}`, 'queue', 'details');
+            taskDebug(`消息发送成功: ${target}`, 'queue', 'details');
         }
         catch (sendError) {
             // OneBot retcode 1200: 不支持的消息格式（通常是视频）
             const isOneBot1200 = sendError.code?.toString?.() === '1200' || sendError.message?.includes('1200');
             if (isOneBot1200 && !content.isDowngraded) {
-                (0, logger_1.debug)(this.config, `检测到 OneBot 1200 错误，尝试降级处理`, 'queue', 'info');
+                taskDebug(`检测到 OneBot 1200 错误，尝试降级处理`, 'queue', 'info', { errorCode: '1200' });
                 throw { ...sendError, isMediaError: true, requiresDowngrade: true };
             }
             throw sendError;
@@ -158,25 +184,40 @@ class NotificationQueueManager {
      * 处理发送错误
      */
     async handleSendError(task, error) {
-        const errorMsg = error.message || 'Unknown error';
+        const taskDebug = this.createTaskDebug(task);
+        const normalizedError = (0, error_handler_1.normalizeError)(error);
+        const errorMsg = normalizedError.message || 'Unknown error';
+        (0, error_tracker_1.trackError)(normalizedError, {
+            ...this.buildTaskLogContext(task),
+            failReason: errorMsg,
+            requiresDowngrade: Boolean(error?.requiresDowngrade),
+        });
         // 1. 永久性错误 (Fatal) - 不需要重试
         if (this.isFatalError(error)) {
             await this.markTaskFailed(task.id, errorMsg);
-            (0, logger_1.debug)(this.config, `✗ 永久性失败，放弃重试: [${task.rssId}] ${task.content.title} - ${errorMsg}`, 'queue', 'error');
+            taskDebug(`✗ 永久性失败，放弃重试: [${task.rssId}] ${task.content.title} - ${errorMsg}`, 'queue', 'error', {
+                fatal: true,
+                failReason: errorMsg,
+            });
             return;
         }
         // 2. 降级重试 (Downgrade) - 针对媒体格式错误
         if (error.requiresDowngrade && !task.content.isDowngraded) {
             const downgradedContent = await this.downgradeMessage(task.content);
-            await this.updateTaskForDowngrade(task.id, downgradedContent);
-            (0, logger_1.debug)(this.config, `→ 消息已降级，立即重试: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
+            await this.updateTaskForDowngrade(task, downgradedContent);
+            taskDebug(`→ 消息已降级，立即重试: [${task.rssId}] ${task.content.title}`, 'queue', 'info', {
+                requiresDowngrade: true,
+            });
             return;
         }
         // 3. 暂时性错误 (Transient) - 使用指数退避
         const delay = this.backoffDelays[task.retryCount] || this.backoffDelays[this.backoffDelays.length - 1];
         const nextTime = new Date(Date.now() + delay * 1000);
-        await this.markTaskRetry(task.id, nextTime, errorMsg);
-        (0, logger_1.debug)(this.config, `→ 任务将在 ${Math.ceil(delay / 60)} 分钟后重试: [${task.rssId}] ${task.content.title}`, 'queue', 'info');
+        await this.markTaskRetry(task, nextTime, errorMsg);
+        taskDebug(`→ 任务将在 ${Math.ceil(delay / 60)} 分钟后重试: [${task.rssId}] ${task.content.title}`, 'queue', 'info', {
+            nextRetryTime: nextTime.toISOString(),
+            failReason: errorMsg,
+        });
     }
     /**
      * 判断是否为永久性错误
@@ -239,13 +280,11 @@ class NotificationQueueManager {
     /**
      * 标记任务为重试
      */
-    async markTaskRetry(taskId, nextTime, reason) {
-        await this.ctx.database.set('rss_notification_queue', { id: taskId }, {
+    async markTaskRetry(task, nextTime, reason) {
+        await this.ctx.database.set('rss_notification_queue', { id: task.id }, {
             status: 'RETRY',
             nextRetryTime: nextTime,
-            retryCount: this.ctx.database.get('rss_notification_queue', { id: taskId }).then((tasks) => {
-                return (tasks[0]?.retryCount || 0) + 1;
-            }),
+            retryCount: (task.retryCount || 0) + 1,
             failReason: reason,
             updatedAt: new Date()
         });
@@ -253,17 +292,12 @@ class NotificationQueueManager {
     /**
      * 更新任务为降级重试
      */
-    async updateTaskForDowngrade(taskId, newContent) {
-        // 获取当前任务
-        const tasks = await this.ctx.database.get('rss_notification_queue', { id: taskId });
-        if (tasks.length === 0)
-            return;
-        const currentTask = tasks[0];
-        await this.ctx.database.set('rss_notification_queue', { id: taskId }, {
+    async updateTaskForDowngrade(task, newContent) {
+        await this.ctx.database.set('rss_notification_queue', { id: task.id }, {
             content: newContent,
             status: 'RETRY',
             nextRetryTime: new Date(), // 立即重试
-            retryCount: currentTask.retryCount + 1,
+            retryCount: (task.retryCount || 0) + 1,
             updatedAt: new Date()
         });
     }
@@ -284,6 +318,7 @@ class NotificationQueueManager {
         if (!this.config.cache?.enabled) {
             return;
         }
+        const taskDebug = this.createTaskDebug(task);
         const { getMessageCache } = await Promise.resolve().then(() => __importStar(require('../utils/message-cache')));
         const cache = getMessageCache();
         if (!cache) {
@@ -304,7 +339,12 @@ class NotificationQueueManager {
             });
         }
         catch (err) {
-            (0, logger_1.debug)(this.config, `缓存消息失败: ${err.message}`, 'cache', 'info');
+            const normalizedError = (0, error_handler_1.normalizeError)(err);
+            taskDebug(`缓存消息失败: ${normalizedError.message}`, 'cache', 'info');
+            (0, error_tracker_1.trackError)(normalizedError, {
+                ...this.buildTaskLogContext(task),
+                operation: 'cacheMessage',
+            });
         }
     }
     /**
@@ -325,7 +365,8 @@ class NotificationQueueManager {
     async retryFailedTasks(taskId) {
         const where = taskId ? { id: taskId } : { status: 'FAILED' };
         const tasks = await this.ctx.database.get('rss_notification_queue', where);
-        for (const task of tasks) {
+        const failedTasks = tasks.filter(task => task.status === 'FAILED');
+        for (const task of failedTasks) {
             await this.ctx.database.set('rss_notification_queue', { id: task.id }, {
                 status: 'PENDING',
                 retryCount: 0,
@@ -333,8 +374,11 @@ class NotificationQueueManager {
                 updatedAt: new Date()
             });
         }
-        (0, logger_1.debug)(this.config, `已重置 ${tasks.length} 个失败任务为 PENDING 状态`, 'queue', 'info');
-        return tasks.length;
+        (0, logger_1.debug)(this.config, `已重置 ${failedTasks.length} 个失败任务为 PENDING 状态`, 'queue', 'info', {
+            resetCount: failedTasks.length,
+            taskId,
+        });
+        return failedTasks.length;
     }
     /**
      * 清理旧的成功任务
@@ -345,7 +389,10 @@ class NotificationQueueManager {
         for (const task of tasks) {
             await this.ctx.database.remove('rss_notification_queue', { id: task.id });
         }
-        (0, logger_1.debug)(this.config, `已清理 ${tasks.length} 个旧的成功任务`, 'queue', 'info');
+        (0, logger_1.debug)(this.config, `已清理 ${tasks.length} 个旧的成功任务`, 'queue', 'info', {
+            cleanupCount: tasks.length,
+            olderThanHours,
+        });
         return tasks.length;
     }
 }

package/lib/core/parser.js

@@ -37,10 +37,22 @@ exports.getRssData = getRssData;
 const cheerio = __importStar(require("cheerio"));
 const logger_1 = require("../utils/logger");
 const common_1 = require("../utils/common");
+const security_1 = require("../utils/security");
 const X2JS = require("x2js");
 const x2js = new X2JS();
 async function getRssData(ctx, config, $http, url, arg) {
     try {
+        // URL 安全验证
+        try {
+            (0, security_1.validateUrlOrThrow)(url, (0, security_1.getSecurityOptions)(config));
+        }
+        catch (error) {
+            if (error instanceof security_1.SecurityError) {
+                (0, logger_1.debug)(config, `URL 安全验证失败: ${error.message}`, 'security', 'error');
+                throw error;
+            }
+            throw error;
+        }
         // --- HTML 抓取预处理 START ---
         let rssData;
         let contentType = '';

package/lib/core/renderer.d.ts

@@ -1,4 +1,19 @@
 import { Context } from 'koishi';
 import { Config, rssArg } from '../types';
+export interface RenderContentMetrics {
+    bodyScrollHeight: number;
+    bodyOffsetHeight: number;
+    documentScrollHeight: number;
+    contentRangeHeight: number;
+    maxElementBottom: number;
+    paddingTop: number;
+    paddingBottom: number;
+    marginTop: number;
+    marginBottom: number;
+    marginLeft: number;
+    bodyWidth: number;
+    viewportHeight: number;
+}
+export declare function calculateContentHeight(metrics: RenderContentMetrics): number;
 export declare function preprocessHtmlImages(ctx: Context, config: Config, $http: any, htmlContent: string, arg?: rssArg): Promise<string>;
 export declare function renderHtml2Image(ctx: Context, config: Config, $http: any, htmlContent: string, arg?: rssArg): Promise<any>;