@anyul/koishi-plugin-rss 5.3.2 → 5.3.10

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

@@ -16,4 +16,11 @@ export declare class NotificationQueueStore {
     getStats(): Promise<QueueStats>;
     retryFailedTasks(taskId?: number): Promise<number>;
     cleanupSuccessTasks(olderThanHours?: number): Promise<number>;
+    /**
+     * 清理旧的 FAILED 任务。
+     *
+     * 与 SUCCESS 对称：FAILED 任务此前只进不出（无清理命令、无定时器），
+     * 长期运行会无限堆积，拖慢 getStats / getPendingTasks 的全表查询。
+     */
+    cleanupFailedTasks(olderThanHours?: number): Promise<number>;
 }

package/lib/core/notification-queue-store.js

@@ -46,13 +46,18 @@ class NotificationQueueStore {
         };
     }
     async getPendingTasks() {
-        const now = new Date();
+        const now = Date.now();
         const pendingTasks = await this.ctx.database.get(exports.RSS_NOTIFICATION_QUEUE_TABLE, { status: 'PENDING' }, { limit: this.batchSize });
         const retryTasks = await this.ctx.database.get(exports.RSS_NOTIFICATION_QUEUE_TABLE, { status: 'RETRY' }, { limit: this.batchSize });
-        const readyRetryTasks = retryTasks.filter(task => task.nextRetryTime && new Date(task.nextRetryTime) <= now);
-        return [...pendingTasks, ...readyRetryTasks]
-            .sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
-            .slice(0, this.batchSize);
+        const readyRetryTasks = retryTasks.filter(task => task.nextRetryTime && new Date(task.nextRetryTime).getTime() <= now);
+        // PENDING 优先于 RETRY：避免一个持续高频失败的源因其 RETRY 任务 createdAt 较老
+        // 而长期占用 batchSize 槽位，把新订阅的新消息饿死（延迟数分钟才发）。
+        // 各组内部仍按 createdAt 升序（先入先出）。
+        const byCreatedAsc = (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
+        return [
+            ...pendingTasks.sort(byCreatedAsc),
+            ...readyRetryTasks.sort(byCreatedAsc),
+        ].slice(0, this.batchSize);
     }
     async markTaskSuccess(taskId) {
         await this.ctx.database.set(exports.RSS_NOTIFICATION_QUEUE_TABLE, { id: taskId }, {
@@ -90,7 +95,10 @@ class NotificationQueueStore {
         });
     }
     async recoverRetryTasksWithoutNextRetryTime() {
-        const retryTasks = await this.ctx.database.get(exports.RSS_NOTIFICATION_QUEUE_TABLE, { status: 'RETRY' }, { limit: this.batchSize });
+        // 不限制 limit：损坏的 RETRY 任务可能 > batchSize（老版本升级 / DB 手工修改），
+        // 若只修前 batchSize 条，剩余的会因 nextRetryTime 永远为空而既不重试也不失败，永久卡住。
+        // 本操作幂等（只修 nextRetryTime 为空的），可安全重复执行。
+        const retryTasks = await this.ctx.database.get(exports.RSS_NOTIFICATION_QUEUE_TABLE, { status: 'RETRY' });
         const invalidTasks = retryTasks.filter(task => !task.nextRetryTime);
         for (const task of invalidTasks) {
             await this.ctx.database.set(exports.RSS_NOTIFICATION_QUEUE_TABLE, { id: task.id }, {
@@ -133,5 +141,19 @@ class NotificationQueueStore {
         }
         return tasks.length;
     }
+    /**
+     * 清理旧的 FAILED 任务。
+     *
+     * 与 SUCCESS 对称：FAILED 任务此前只进不出（无清理命令、无定时器），
+     * 长期运行会无限堆积，拖慢 getStats / getPendingTasks 的全表查询。
+     */
+    async cleanupFailedTasks(olderThanHours = 168) {
+        const cutoffTime = new Date(Date.now() - olderThanHours * 60 * 60 * 1000);
+        const tasks = await this.ctx.database.get(exports.RSS_NOTIFICATION_QUEUE_TABLE, { status: 'FAILED', updatedAt: { $lt: cutoffTime } });
+        for (const task of tasks) {
+            await this.ctx.database.remove(exports.RSS_NOTIFICATION_QUEUE_TABLE, { id: task.id });
+        }
+        return tasks.length;
+    }
 }
 exports.NotificationQueueStore = NotificationQueueStore;

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

@@ -57,4 +57,14 @@ export declare class NotificationQueueManager {
      * 清理旧的成功任务
      */
     cleanupSuccessTasks(olderThanHours?: number): Promise<number>;
+    /**
+     * 自动清理：周期性删除过期的 SUCCESS / FAILED 任务。
+     *
+     * SUCCESS 用 cleanupHours，FAILED 用 7×cleanupHours（失败记录保留更久便于排查，
+     * 但仍需回收，否则永久堆积拖慢全表查询）。供 feeder 定时器调用。
+     */
+    runAutomaticCleanup(): Promise<{
+        success: number;
+        failed: number;
+    }>;
 }

package/lib/core/notification-queue.js

@@ -2,7 +2,6 @@
 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");
 const notification_queue_retry_1 = require("./notification-queue-retry");
 const notification_queue_sender_1 = require("./notification-queue-sender");
@@ -109,7 +108,6 @@ class NotificationQueueManager {
         catch (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;
@@ -139,11 +137,6 @@ class NotificationQueueManager {
         const classification = (0, notification_queue_retry_1.classifyQueueError)(error, task.content);
         const normalizedError = classification.normalizedError;
         const errorMsg = normalizedError.message || 'Unknown error';
-        (0, error_tracker_1.trackError)(normalizedError, {
-            ...this.buildTaskLogContext(task),
-            failReason: errorMsg,
-            queueErrorAction: classification.action,
-        });
         if (classification.action === 'FAILED') {
             await this.store.markTaskFailed(task.id, errorMsg);
             taskDebug(`✗ 永久性失败，放弃重试: [${task.rssId}] ${task.content.title} - ${errorMsg}`, 'queue', 'error', {
@@ -218,5 +211,23 @@ class NotificationQueueManager {
         });
         return cleanupCount;
     }
+    /**
+     * 自动清理：周期性删除过期的 SUCCESS / FAILED 任务。
+     *
+     * SUCCESS 用 cleanupHours，FAILED 用 7×cleanupHours（失败记录保留更久便于排查，
+     * 但仍需回收，否则永久堆积拖慢全表查询）。供 feeder 定时器调用。
+     */
+    async runAutomaticCleanup() {
+        const success = await this.store.cleanupSuccessTasks(this.cleanupHours);
+        // FAILED 保留时长为 SUCCESS 的 7 倍（默认 7 天），兼顾排查与回收
+        const failed = await this.store.cleanupFailedTasks(this.cleanupHours * 7);
+        if (success > 0 || failed > 0) {
+            (0, logger_1.debug)(this.config, `自动清理：${success} 个成功任务、${failed} 个失败任务`, 'queue', 'info', {
+                cleanupSuccess: success,
+                cleanupFailed: failed,
+            });
+        }
+        return { success, failed };
+    }
 }
 exports.NotificationQueueManager = NotificationQueueManager;

package/lib/core/parser.js

@@ -76,7 +76,7 @@ async function getRssData(ctx, config, $http, url, arg) {
                     try {
                         await page.waitForSelector(arg.waitSelector, { timeout: 5000 });
                     }
-                    catch (e) { }
+                    catch { }
                 }
                 else if (arg.waitFor) {
                     await new Promise(r => setTimeout(r, arg.waitFor));
@@ -93,7 +93,7 @@ async function getRssData(ctx, config, $http, url, arg) {
                 try {
                     await page.close();
                 }
-                catch (e) { /* 忽略页面已关闭的错误 */ }
+                catch { /* 忽略页面已关闭的错误 */ }
             }
         }
         else {
@@ -113,7 +113,7 @@ async function getRssData(ctx, config, $http, url, arg) {
                 rssData = JSON.parse(rssData);
                 isJson = true;
             }
-            catch (e) { /* ignore */ }
+            catch { /* ignore */ }
         }
         if (isJson) {
             (0, logger_1.debug)(config, rssData, 'JSON Feed Response', 'details');
@@ -178,7 +178,7 @@ async function getRssData(ctx, config, $http, url, arg) {
                     try {
                         link = new URL(link, url).href;
                     }
-                    catch (e) { }
+                    catch { }
                 }
                 // 3. 提取内容
                 const description = arg.textOnly ? $el.text().trim() : ($el.html() || '').trim();
@@ -217,7 +217,7 @@ async function getRssData(ctx, config, $http, url, arg) {
         }
         else if (rssJson.feed) {
             // Atom
-            let rss = { channel: {} };
+            const rss = { channel: {} };
             let item = rssJson.feed.entry.map(i => ({
                 ...i,
                 title: (0, common_1.parseContent)(i.title),

package/lib/core/renderer.js

@@ -137,7 +137,7 @@ async function preprocessHtmlImages(ctx, config, $http, htmlContent, arg) {
     return $.html();
 }
 async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
-    let page = await ctx.puppeteer.page();
+    const page = await ctx.puppeteer.page();
     try {
         (0, logger_1.debug)(config, htmlContent, 'htmlContent', 'details');
         const initialViewportHeight = 2000;
@@ -265,15 +265,15 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
             return koishi_1.h.image(image, 'image/png');
         }
         let height = actualHeight;
-        let width = clipWidth;
-        let x = clipX;
-        let y = clipY;
+        const width = clipWidth;
+        const x = clipX;
+        const y = clipY;
         // 保守处理：如果高度异常，使用更小的值
         if (height > 5000) {
             (0, logger_1.debug)(config, `检测到异常高度 ${height}，进行裁剪`, 'height warn', 'info');
             height = Math.min(height, 2000);
         }
-        let size = 10000;
+        const size = 10000;
         (0, logger_1.debug)(config, [height, width, x, y], 'pptr img size', 'details');
         const split = Math.ceil(height / size);
         if (!split) {
@@ -298,7 +298,7 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
         const reduceY = (index) => Math.floor(height / split * index);
         // 最后一份使用完整高度减去前面所有份的高度，确保覆盖全部内容
         const reduceHeight = (index) => index === split - 1 ? height - reduceY(index) : Math.floor(height / split);
-        let imgData = await Promise.all(Array.from({ length: split }, async (v, i) => await page.screenshot({
+        const imgData = await Promise.all(Array.from({ length: split }, async (v, i) => await page.screenshot({
             type: "png",
             clip: {
                 x,
@@ -329,6 +329,6 @@ async function renderHtml2Image(ctx, config, $http, htmlContent, arg) {
         try {
             await page.close();
         }
-        catch (e) { /* 忽略页面已关闭的错误 */ }
+        catch { /* 忽略页面已关闭的错误 */ }
     }
 }

package/lib/core/search-format.d.ts

@@ -1,3 +1,3 @@
 import { SearchResponse } from './search-types';
 export declare function formatSearchResults(response: SearchResponse): string;
-export declare function buildPromptWithSearchContext(originalPrompt: string, searchResults: SearchResponse, searchQuery: string): string;
+export declare function buildPromptWithSearchContext(originalPrompt: string, searchResults: SearchResponse, _searchQuery: string): string;

package/lib/core/search-format.js

@@ -21,7 +21,7 @@ function formatSearchResults(response) {
     });
     return lines.join('\n');
 }
-function buildPromptWithSearchContext(originalPrompt, searchResults, searchQuery) {
+function buildPromptWithSearchContext(originalPrompt, searchResults, _searchQuery) {
     if (!searchResults.success || searchResults.results.length === 0) {
         return originalPrompt;
     }

package/lib/core/subscription-store.d.ts

@@ -0,0 +1,44 @@
+import { Context } from 'koishi';
+import type { RssOwlRow } from '../types';
+/**
+ * 订阅数据访问仓储（Repository）。
+ *
+ * 设计目的：`rssOwl` 是订阅核心表，原本被命令层（subscription-create /
+ * subscription-edit / subscription-management / web-monitor）的 15 处
+ * 直接 `ctx.database.*('rssOwl', ...)` 调用散落访问，违反「命令层只复用
+ * 核心函数」的分层约定。本类作为该表的唯一封装，命令层通过依赖注入拿到
+ * 实例，不再直接触碰 `ctx.database`，与 `NotificationQueueStore` /
+ * `MessageCacheManager` 的既有分层保持一致。
+ *
+ * 注意：feeder（`core/feeder.ts`）也在核心层直接读写 `rssOwl`，那是核心层
+ * 对自身数据的合法访问，不强制走本仓储；强制收口会破坏 feeder 作为纯函数
+ * 的可测试性（见 5.3.8 的 disposed 评估取舍）。
+ */
+export declare class SubscriptionStore {
+    private ctx;
+    constructor(ctx: Context);
+    /**
+     * 按群组查询订阅列表（命令层最常用的读取入口）。
+     */
+    findByGuild(platform: string, guildId: string): Promise<RssOwlRow[]>;
+    /**
+     * 按 群组 + URL 查询（用于编辑推送目标时判断目标群是否已有同源订阅）。
+     */
+    findByGuildAndUrl(platform: string, guildId: string, url: string): Promise<RssOwlRow[]>;
+    /**
+     * 创建一条订阅，返回含生成主键的完整行。
+     */
+    create(data: Partial<RssOwlRow>): Promise<RssOwlRow>;
+    /**
+     * 按主键更新任意字段。
+     */
+    update(id: number, patch: Partial<RssOwlRow>): Promise<void>;
+    /**
+     * 按主键删除单条订阅。
+     */
+    remove(id: number): Promise<void>;
+    /**
+     * 删除某个群组的全部订阅（rsso.remove --all）。
+     */
+    removeAllByGuild(platform: string, guildId: string): Promise<void>;
+}

package/lib/core/subscription-store.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubscriptionStore = void 0;
+/**
+ * 订阅数据访问仓储（Repository）。
+ *
+ * 设计目的：`rssOwl` 是订阅核心表，原本被命令层（subscription-create /
+ * subscription-edit / subscription-management / web-monitor）的 15 处
+ * 直接 `ctx.database.*('rssOwl', ...)` 调用散落访问，违反「命令层只复用
+ * 核心函数」的分层约定。本类作为该表的唯一封装，命令层通过依赖注入拿到
+ * 实例，不再直接触碰 `ctx.database`，与 `NotificationQueueStore` /
+ * `MessageCacheManager` 的既有分层保持一致。
+ *
+ * 注意：feeder（`core/feeder.ts`）也在核心层直接读写 `rssOwl`，那是核心层
+ * 对自身数据的合法访问，不强制走本仓储；强制收口会破坏 feeder 作为纯函数
+ * 的可测试性（见 5.3.8 的 disposed 评估取舍）。
+ */
+class SubscriptionStore {
+    ctx;
+    constructor(ctx) {
+        this.ctx = ctx;
+    }
+    /**
+     * 按群组查询订阅列表（命令层最常用的读取入口）。
+     */
+    async findByGuild(platform, guildId) {
+        return this.ctx.database.get('rssOwl', { platform, guildId });
+    }
+    /**
+     * 按 群组 + URL 查询（用于编辑推送目标时判断目标群是否已有同源订阅）。
+     */
+    async findByGuildAndUrl(platform, guildId, url) {
+        return this.ctx.database.get('rssOwl', { platform, guildId, url });
+    }
+    /**
+     * 创建一条订阅，返回含生成主键的完整行。
+     */
+    async create(data) {
+        return this.ctx.database.create('rssOwl', data);
+    }
+    /**
+     * 按主键更新任意字段。
+     */
+    async update(id, patch) {
+        await this.ctx.database.set('rssOwl', id, patch);
+    }
+    /**
+     * 按主键删除单条订阅。
+     */
+    async remove(id) {
+        await this.ctx.database.remove('rssOwl', { id });
+    }
+    /**
+     * 删除某个群组的全部订阅（rsso.remove --all）。
+     */
+    async removeAllByGuild(platform, guildId) {
+        await this.ctx.database.remove('rssOwl', { platform, guildId });
+    }
+}
+exports.SubscriptionStore = SubscriptionStore;

package/lib/core/telegram-video-restore.js

@@ -54,6 +54,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreTelegramVideos = restoreTelegramVideos;
+const common_1 = require("../utils/common");
 const logger_1 = require("../utils/logger");
 const media_1 = require("../utils/media");
 const tdl_1 = require("../utils/tdl");
@@ -82,7 +83,7 @@ async function restoreTelegramVideos(html, item, arg, config, ffmpegExe) {
         return false;
     if (!(0, tdl_1.detectVideoTooBig)(html))
         return false;
-    const link = normalizeText(item?.link);
+    const link = (0, common_1.normalizeText)(item?.link);
     const linkInfo = (0, tdl_1.parseTelegramLink)(link);
     if (!linkInfo) {
         (0, logger_1.debug)(config, `检测到 Video is too big 但 link 非 Telegram 消息链接，跳过: ${link}`, 'tg-restore', 'info');
@@ -237,10 +238,4 @@ function replaceTooBigBlockquotesIndexed(html, builder, onEach) {
 function escapeAttr(s) {
     return String(s || '').replace(/"/g, '"');
 }
-function normalizeText(v) {
-    if (Array.isArray(v))
-        return v.join('');
-    if (v === undefined || v === null)
-        return '';
-    return String(v);
-}
+// normalizeText 已收敛到 utils/common.ts

package/lib/index.d.ts

@@ -4,8 +4,5 @@ export * from './types';
 export { templateList } from './config';
 import type { Config } from './types';
 export declare const name = "@anyul/koishi-plugin-rss";
-export declare const inject: {
-    required: string[];
-    optional: string[];
-};
+export declare const using: string[];
 export declare function apply(ctx: Context, config: Config): void;

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inject = exports.name = exports.templateList = exports.Config = void 0;
+exports.using = exports.name = exports.templateList = exports.Config = void 0;
 exports.apply = apply;
 // Export types and config
 var config_1 = require("./config");
@@ -25,23 +25,28 @@ Object.defineProperty(exports, "templateList", { enumerable: true, get: function
 exports.name = '@anyul/koishi-plugin-rss';
 const fetcher_1 = require("./utils/fetcher");
 const media_1 = require("./utils/media");
-const error_tracker_1 = require("./utils/error-tracker");
 const tdl_1 = require("./utils/tdl");
 const logger_1 = require("./utils/logger");
 const commands_1 = require("./commands");
 // Import core modules
 const item_processor_1 = require("./core/item-processor");
 const feeder_1 = require("./core/feeder");
+const subscription_store_1 = require("./core/subscription-store");
 const message_cache_1 = require("./utils/message-cache");
 const message_cache_service_1 = require("./services/message-cache-service");
 const notification_queue_1 = require("./core/notification-queue");
 // Import database and constants
 const database_1 = require("./database");
 const constants_1 = require("./constants");
-exports.inject = { required: ["database"], optional: ["puppeteer", "censor", "assets", "server", "ffmpeg"] };
+// Koishi 4.11+ 约定：必需服务用 `using` 声明（替代旧 `inject`）。
+// 可选服务（puppeteer/censor/assets/server/ffmpeg）不在此声明，代码内统一用可选链访问。
+exports.using = ['database'];
 function apply(ctx, config) {
     // Setup database
     (0, database_1.setupDatabase)(ctx);
+    // 把 config.debug 同步到 Koishi 原生日志分级（Logger.levels['rss-owl']），
+    // 让 WebUI 的 logger 插件 / 全局 levels 都能控制本插件日志可见性。
+    (0, logger_1.applyDebugLevel)(config);
     // 启用时探测 tdl 外部二进制可用性，并报告 Koishi ffmpeg 服务注入状态，便于用户排查
     // 探测异步进行、失败仅打日志，不阻塞插件加载
     // 注意：tdl 的版本命令是 `version` 子命令，不是 `-v` flag
@@ -55,16 +60,6 @@ function apply(ctx, config) {
             (0, logger_1.debug)(config, `Telegram 大视频工具探测：tdl=${hasTdl ? '✓' + tdlLoc : '✗（请安装 iyear/tdl 并 tdl login）'}，ffmpeg=${ffmpegStatus}`, 'tdl', 'info');
         }).catch(() => { });
     }
-    if (config.errorTracking?.enabled) {
-        (0, error_tracker_1.initErrorTracker)({
-            enabled: config.errorTracking.enabled ?? false,
-            dsn: config.errorTracking.dsn || '',
-            environment: config.errorTracking.environment,
-            release: config.errorTracking.release,
-            tracesSampleRate: config.errorTracking.tracesSampleRate,
-            profilesSampleRate: config.errorTracking.profilesSampleRate,
-        });
-    }
     // Initialize request manager and HTTP function
     const requestManager = new fetcher_1.RequestManager(3, 2, 10);
     const $http = (0, fetcher_1.createHttpFunction)(ctx, config, requestManager);
@@ -73,6 +68,8 @@ function apply(ctx, config) {
     const commandRuntime = (0, commands_1.createCommandRuntimeDeps)(ctx, config, $http, processor);
     // Initialize notification queue manager
     const queueManager = new notification_queue_1.NotificationQueueManager(ctx, config);
+    // Initialize subscription repository (rssOwl 表的唯一封装)
+    const subscriptionStore = new subscription_store_1.SubscriptionStore(ctx);
     // Initialize message cache
     if (config.cache?.enabled) {
         (0, message_cache_1.initMessageCache)(ctx, config, config.cache.maxSize || 100);
@@ -85,8 +82,12 @@ function apply(ctx, config) {
     });
     ctx.on('dispose', async () => {
         (0, feeder_1.stopFeeder)(config);
-        if (config.basic.imageMode === 'File') {
-            (0, media_1.delCache)(config);
+        // 销毁消息缓存单例：避免热重载后复用持有旧 ctx 的实例（P1-2）
+        if (config.cache?.enabled) {
+            (0, message_cache_1.disposeMessageCache)();
+        }
+        if (config.basic?.imageMode === 'File') {
+            await (0, media_1.delCache)(config);
         }
     });
     // ============================================
@@ -95,6 +96,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionManagementCommands)({
         ctx,
         config,
+        store: subscriptionStore,
         parsePubDate: commandRuntime.parsePubDate,
         parseQuickUrl: commandRuntime.parseQuickUrl,
         getRssData: commandRuntime.getRssData,
@@ -104,6 +106,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionCreateCommand)({
         ctx,
         config,
+        store: subscriptionStore,
         usage: constants_1.usage,
         quickList: constants_1.quickList,
         parseQuickUrl: commandRuntime.parseQuickUrl,
@@ -117,6 +120,7 @@ function apply(ctx, config) {
     (0, commands_1.registerWebMonitorCommands)({
         ctx,
         config,
+        store: subscriptionStore,
         debug: commandRuntime.debug,
         mixinArg: commandRuntime.mixinArg,
         getRssData: commandRuntime.getRssData,
@@ -127,6 +131,7 @@ function apply(ctx, config) {
     (0, commands_1.registerSubscriptionEditCommand)({
         ctx,
         config,
+        store: subscriptionStore,
     });
     (0, commands_1.registerManagementCommands)({
         ctx,