@anyul/koishi-plugin-rss 5.3.2 → 5.3.10

package/lib/commands/index.js

@@ -11,7 +11,6 @@ exports.handleCacheClear = handleCacheClear;
 exports.handleCacheCleanup = handleCacheCleanup;
 exports.handleCachePull = handleCachePull;
 const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
 const logger_1 = require("../utils/logger");
 const message_cache_1 = require("../utils/message-cache");
 const utils_1 = require("./utils");
@@ -288,7 +287,7 @@ async function handleCacheList(cmdCtx, args, config) {
     }
 }
 async function handleCacheMessage(cmdCtx, args, config) {
-    const { cache, logContext } = cmdCtx;
+    const { logContext } = cmdCtx;
     const realId = parseInt(args[0]);
     if (!realId || realId < 1) {
         return '请提供真实 ID\n用法: rsso.cache message <ID>\n示例: rsso.cache message 42\n💡 提示：使用 "rsso.cache list" 查看方括号中的真实 ID';
@@ -525,7 +524,6 @@ async function resolveCacheMessageById(cmdCtx, realId) {
 function logCacheError(config, error, scope, context) {
     const normalizedError = (0, error_handler_1.normalizeError)(error);
     (0, logger_1.debug)(config, normalizedError, scope, 'error', context);
-    (0, error_tracker_1.trackError)(normalizedError, context);
 }
 var subscription_management_1 = require("./subscription-management");
 Object.defineProperty(exports, "registerSubscriptionManagementCommands", { enumerable: true, get: function () { return subscription_management_1.registerSubscriptionManagementCommands; } });

package/lib/commands/subscription-create.d.ts

@@ -1,4 +1,5 @@
 import { Context } from 'koishi';
+import { SubscriptionStore } from '../core/subscription-store';
 import type { Config } from '../types';
 export interface QuickListItem {
     prefix: string;
@@ -20,6 +21,7 @@ export declare function resolveQuickItem(input: string, quickList: QuickListItem
 export interface SubscriptionCreateCommandDeps {
     ctx: Context;
     config: Config;
+    store: SubscriptionStore;
     usage: string;
     quickList: QuickListItem[];
     parseQuickUrl: (url: string) => string;

package/lib/commands/subscription-create.js

@@ -71,7 +71,7 @@ function registerSubscriptionCreateCommand(deps) {
         if (!(0, utils_1.isValidUrl)((0, common_1.ensureUrlProtocol)(url))) {
             return '❌ URL 格式不正确，请以 http:// 或 https:// 开头';
         }
-        const rssList = await deps.ctx.database.get('rssOwl', { platform, guildId });
+        const rssList = await deps.store.findByGuild(platform, guildId);
         if (rssList.find(item => item.url === url))
             return '❌ 该订阅已存在';
         const rawArg = deps.formatArg(options);
@@ -137,7 +137,7 @@ function registerSubscriptionCreateCommand(deps) {
             else if (deps.config.basic.urlDeduplication && rssList.find(item => item.rssId === rssItem.rssId)) {
                 return `❌ 订阅已存在: ${rssItem.rssId}`;
             }
-            await deps.ctx.database.create('rssOwl', rssItem);
+            await deps.store.create(rssItem);
             if (deps.config.basic.firstLoad && arg.firstLoad !== false && rssItemList.length > 0) {
                 let itemArray = rssItemList.sort((a, b) => deps.parsePubDate(b.pubDate).getTime() - deps.parsePubDate(a.pubDate).getTime());
                 if (arg.reverse)

package/lib/commands/subscription-edit.d.ts

@@ -1,7 +1,9 @@
 import { Context } from 'koishi';
+import { SubscriptionStore } from '../core/subscription-store';
 import type { Config } from '../types';
 export interface SubscriptionEditCommandDeps {
     ctx: Context;
     config: Config;
+    store: SubscriptionStore;
 }
 export declare function registerSubscriptionEditCommand(deps: SubscriptionEditCommandDeps): void;

package/lib/commands/subscription-edit.js

@@ -37,7 +37,7 @@ function registerSubscriptionEditCommand(deps) {
         .example('rsso.edit 1 -t "新标题"')
         .action(async ({ session, options }, id) => {
         const { guildId, platform, authority } = (0, utils_1.extractSessionInfo)(session);
-        const rssList = await deps.ctx.database.get('rssOwl', { platform, guildId });
+        const rssList = await deps.store.findByGuild(platform, guildId);
         const listIndex = id - 1;
         if (listIndex < 0 || listIndex >= rssList.length) {
             return `❌ 序号 ${id} 不存在\n当前共有 ${rssList.length} 个订阅\n\n使用 rsso.list 查看完整列表`;
@@ -62,7 +62,7 @@ function registerSubscriptionEditCommand(deps) {
         if (options.test) {
             return buildEditPreview(rssItem, id, options, parseResult.targets);
         }
-        return saveSubscriptionChanges(deps.ctx, rssItem, id, options, parseResult.targets);
+        return saveSubscriptionChanges(deps.store, rssItem, id, options, parseResult.targets);
     });
 }
 function buildEditPreview(rssItem, id, options, parsedTargets) {
@@ -90,7 +90,7 @@ function buildEditPreview(rssItem, id, options, parsedTargets) {
     testOutput += '\n⚠️ 测试模式：不会保存修改\n去掉 --test 选项保存更改';
     return testOutput;
 }
-async function saveSubscriptionChanges(ctx, rssItem, id, options, parsedTargets) {
+async function saveSubscriptionChanges(store, rssItem, id, options, parsedTargets) {
     const updates = {};
     if (options.title)
         updates.title = options.title;
@@ -114,7 +114,7 @@ async function saveSubscriptionChanges(ctx, rssItem, id, options, parsedTargets)
                 const [newPlatform, newGuildId] = parsedTargets[0].split(/[:：]/);
                 updates.platform = newPlatform;
                 updates.guildId = newGuildId;
-                await ctx.database.set('rssOwl', rssItem.id, updates);
+                await store.update(rssItem.id, updates);
                 let result = `✅ 订阅已更新 [序号:${id} | ID:${rssItem.id}]\n\n`;
                 if (options.title)
                     result += `标题: ${rssItem.title} → ${options.title}\n`;
@@ -131,14 +131,10 @@ async function saveSubscriptionChanges(ctx, rssItem, id, options, parsedTargets)
             let result = `✅ 订阅已更新 [序号:${id} | ID:${rssItem.id}]\n\n`;
             result += `已创建 ${parsedTargets.length} 个推送目标:\n\n`;
             result += `1. 原订阅 (本群): ${originalTarget}\n`;
-            await ctx.database.set('rssOwl', rssItem.id, updates);
+            await store.update(rssItem.id, updates);
             for (let i = 0; i < parsedTargets.length; i++) {
                 const [newPlatform, newGuildId] = parsedTargets[i].split(/[:：]/);
-                const existing = await ctx.database.get('rssOwl', {
-                    platform: newPlatform,
-                    guildId: newGuildId,
-                    url: rssItem.url
-                });
+                const existing = await store.findByGuildAndUrl(newPlatform, newGuildId, rssItem.url);
                 if (existing.length > 0) {
                     result += `${i + 2}. ⚠️ ${newPlatform}:${newGuildId} (订阅已存在，已跳过)\n`;
                     continue;
@@ -149,7 +145,7 @@ async function saveSubscriptionChanges(ctx, rssItem, id, options, parsedTargets)
                     platform: newPlatform,
                     guildId: newGuildId,
                 };
-                const created = await ctx.database.create('rssOwl', newSubscription);
+                const created = await store.create(newSubscription);
                 result += `${i + 2}. ✅ ${newPlatform}:${newGuildId} (新订阅ID: ${created.id})\n`;
             }
             if (options.title)
@@ -159,7 +155,7 @@ async function saveSubscriptionChanges(ctx, rssItem, id, options, parsedTargets)
             result += '\n💡 提示: 可以使用 rsso.list 查看所有订阅';
             return result.trim();
         }
-        await ctx.database.set('rssOwl', rssItem.id, updates);
+        await store.update(rssItem.id, updates);
         let result = `✅ 订阅已更新 [序号:${id} | ID:${rssItem.id}]\n\n`;
         if (options.title)
             result += `标题: ${rssItem.title} → ${options.title}\n`;

package/lib/commands/subscription-management.d.ts

@@ -1,8 +1,10 @@
 import { Context } from 'koishi';
+import { SubscriptionStore } from '../core/subscription-store';
 import type { Config } from '../types';
 export interface SubscriptionCommandDeps {
     ctx: Context;
     config: Config;
+    store: SubscriptionStore;
     parsePubDate: (pubDate: any) => Date;
     parseQuickUrl: (url: string) => string;
     getRssData: (url: string, arg: any) => Promise<any[]>;

package/lib/commands/subscription-management.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerSubscriptionManagementCommands = registerSubscriptionManagementCommands;
 const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
 const logger_1 = require("../utils/logger");
 const utils_1 = require("./utils");
 function registerSubscriptionManagementCommands(deps) {
@@ -24,7 +23,7 @@ function registerListCommand(deps) {
         .example('rsso.list')
         .action(async ({ session }, id) => {
         const { guildId, platform } = (0, utils_1.extractSessionInfo)(session);
-        const rssList = await getGuildSubscriptions(deps.ctx, platform, guildId);
+        const rssList = await getGuildSubscriptions(deps.store, platform, guildId);
         if (id === undefined) {
             if (rssList.length === 0)
                 return '当前没有任何订阅';
@@ -70,14 +69,14 @@ function registerRemoveCommand(deps) {
             const authorityCheck = (0, utils_1.checkAuthority)(authority, deps.config.basic.authority, `权限不足！当前权限: ${authority}，需要权限: ${deps.config.basic.authority} 或以上`);
             if (!authorityCheck.success)
                 return authorityCheck.message;
-            await deps.ctx.database.remove('rssOwl', { platform, guildId });
+            await deps.store.removeAllByGuild(platform, guildId);
             return '✅ 已删除全部订阅';
         }
-        const rssList = await getGuildSubscriptions(deps.ctx, platform, guildId);
+        const rssList = await getGuildSubscriptions(deps.store, platform, guildId);
         const rssItem = getSubscriptionByIndex(rssList, id);
         if (!rssItem)
             return getSubscriptionNotFoundMessage(id, rssList.length);
-        await deps.ctx.database.remove('rssOwl', { id: rssItem.id });
+        await deps.store.remove(rssItem.id);
         return `✅ 已删除订阅: ${rssItem.title}`;
     });
 }
@@ -93,7 +92,7 @@ function registerPullCommand(deps) {
         .example('rsso.pull 1')
         .action(async ({ session }, id) => {
         const { guildId, platform } = (0, utils_1.extractSessionInfo)(session);
-        const rssList = await getGuildSubscriptions(deps.ctx, platform, guildId);
+        const rssList = await getGuildSubscriptions(deps.store, platform, guildId);
         const rssItem = getSubscriptionByIndex(rssList, id);
         if (!rssItem)
             return getSubscriptionNotFoundMessage(id, rssList.length);
@@ -121,7 +120,6 @@ function registerPullCommand(deps) {
         catch (error) {
             const normalizedError = (0, error_handler_1.normalizeError)(error);
             (0, logger_1.debug)(deps.config, normalizedError, 'pull error', 'error', logContext);
-            (0, error_tracker_1.trackError)(normalizedError, logContext);
             return `拉取失败: ${(0, error_handler_1.getFriendlyErrorMessage)(error, '获取订阅数据')}`;
         }
     });
@@ -140,7 +138,7 @@ function registerFollowCommand(deps) {
         .example('rsso.follow 1')
         .action(async ({ session, options }, id) => {
         const { guildId, platform, authorId, authority } = (0, utils_1.extractSessionInfo)(session);
-        const rssList = await getGuildSubscriptions(deps.ctx, platform, guildId);
+        const rssList = await getGuildSubscriptions(deps.store, platform, guildId);
         const rssItem = getSubscriptionByIndex(rssList, id);
         if (!rssItem)
             return getSubscriptionNotFoundMessage(id, rssList.length);
@@ -152,18 +150,18 @@ function registerFollowCommand(deps) {
             if (followers.includes('all'))
                 return '💡 已经设置全员提醒';
             followers.push('all');
-            await deps.ctx.database.set('rssOwl', { id: rssItem.id }, { followers });
+            await deps.store.update(rssItem.id, { followers });
             return '✅ 已设置全员提醒';
         }
         if (followers.includes(authorId))
             return '💡 已经关注过了';
         followers.push(authorId);
-        await deps.ctx.database.set('rssOwl', { id: rssItem.id }, { followers });
+        await deps.store.update(rssItem.id, { followers });
         return '✅ 关注成功';
     });
 }
-async function getGuildSubscriptions(ctx, platform, guildId) {
-    return ctx.database.get('rssOwl', { platform, guildId });
+async function getGuildSubscriptions(store, platform, guildId) {
+    return store.findByGuild(platform, guildId);
 }
 function getSubscriptionByIndex(rssList, id) {
     const listIndex = id - 1;

package/lib/commands/utils.d.ts

@@ -33,11 +33,6 @@ export declare function extractSessionInfo(session: Session): SessionInfo;
  * 构建命令日志上下文
  */
 export declare function buildCommandLogContext(session: Session, command?: string, operation?: string): Record<string, any>;
-/**
- * 命令错误处理包装器
- * 统一处理命令执行中的错误
- */
-export declare function withCommandErrorHandling(config: Config, operation: string, handler: () => Promise<string>, context?: Record<string, any>): Promise<string>;
 /**
  * 权限检查辅助函数
  */

package/lib/commands/utils.js

@@ -6,14 +6,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractSessionInfo = extractSessionInfo;
 exports.buildCommandLogContext = buildCommandLogContext;
-exports.withCommandErrorHandling = withCommandErrorHandling;
 exports.checkAuthority = checkAuthority;
 exports.parseTarget = parseTarget;
 exports.parseTargets = parseTargets;
 exports.isValidUrl = isValidUrl;
-const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
-const logger_1 = require("../utils/logger");
 /**
  * 从会话中提取信息
  */
@@ -39,18 +35,6 @@ function buildCommandLogContext(session, command, operation) {
         context.operation = operation;
     return context;
 }
-/**
- * 命令错误处理包装器
- * 统一处理命令执行中的错误
- */
-function withCommandErrorHandling(config, operation, handler, context) {
-    return handler().catch((error) => {
-        const normalizedError = (0, error_handler_1.normalizeError)(error);
-        (0, logger_1.debug)(config, normalizedError, `${operation} error`, 'error', context);
-        (0, error_tracker_1.trackError)(normalizedError, context);
-        return Promise.resolve(`${operation}失败: ${(0, error_handler_1.getFriendlyErrorMessage)(error, operation)}`);
-    });
-}
 /**
  * 权限检查辅助函数
  */

package/lib/commands/web-monitor.d.ts

@@ -1,4 +1,5 @@
 import { Context } from 'koishi';
+import { SubscriptionStore } from '../core/subscription-store';
 import type { Config, TemplateType, rssArg } from '../types';
 type DebugType = 'disable' | 'error' | 'info' | 'details';
 type HtmlMonitorArg = rssArg & {
@@ -21,6 +22,7 @@ interface WatchCommandOptions {
 export interface WebMonitorCommandDeps {
     ctx: Context;
     config: Config;
+    store: SubscriptionStore;
     debug: (message: any, name?: string, type?: DebugType, context?: Record<string, any>) => void;
     mixinArg: (arg: Record<string, any>) => rssArg;
     getRssData: (url: string, arg: Record<string, any>) => Promise<any[]>;

package/lib/commands/web-monitor.js

@@ -55,7 +55,7 @@ HTML 网页监控功能，使用 CSS 选择器提取内容
                     return '❌ 未找到符合选择器的元素';
                 return buildItemsPreview(items, `找到 ${items.length} 个元素:`, true);
             }
-            const rssList = await deps.ctx.database.get('rssOwl', { platform, guildId });
+            const rssList = await deps.store.findByGuild(platform, guildId);
             if (rssList.find(item => item.url === normalizedUrl))
                 return '❌ 该订阅已存在';
             const htmlItems = await deps.getRssData(normalizedUrl, arg);
@@ -77,7 +77,7 @@ HTML 网页监控功能，使用 CSS 选择器提取内容
             if (deps.config.basic.urlDeduplication && rssList.find(item => item.rssId === rssItem.rssId)) {
                 return `❌ 订阅已存在: ${rssItem.rssId}`;
             }
-            await deps.ctx.database.create('rssOwl', rssItem);
+            await deps.store.create(rssItem);
             if (deps.config.basic.firstLoad && arg.firstLoad !== false && htmlItems.length > 0) {
                 await broadcastInitialItems(deps, `${platform}:${guildId}`, htmlItems, rssItem);
             }

package/lib/config.js

@@ -54,10 +54,12 @@ exports.Config = koishi_1.Schema.object({
         maxRssItem: koishi_1.Schema.number().description('限制更新时的最大推送数量上限，超出上限时较早的更新会被忽略').default(10),
         firstLoad: koishi_1.Schema.boolean().description('首次订阅时是否发送最后的更新').default(true),
         urlDeduplication: koishi_1.Schema.boolean().description('同群组中不允许重复添加相同订阅').default(true),
-        resendUpdataContent: koishi_1.Schema.union(['disable', 'latest', 'all']).description('当内容更新时再次发送').default('disable').experimental(),
+        resendUpdatedContent: koishi_1.Schema.union(['disable', 'latest', 'all']).description('当内容更新时再次发送').default('disable'),
+        resendUpdataContent: koishi_1.Schema.union(['disable', 'latest', 'all']).description('（已弃用，请使用 resendUpdatedContent）').hidden().deprecated(),
         imageMode: koishi_1.Schema.union(['base64', 'File', 'assets']).description('图片发送模式<br>\`base64\` Base64格式（兼容性好但容易超长）<br>\`File\` 本地文件（不支持沙盒环境）<br>\`assets\` Assets服务（推荐，需安装assets-xxx插件并配置）').default('base64'),
         videoMode: koishi_1.Schema.union(['filter', 'href', 'base64', 'File', 'assets']).description('视频发送模式（iframe标签内的视频无法处理）<br>\`filter\` 过滤视频，含有视频的推送将不会被发送<br>\`href\` 使用视频网络地址直接发送<br>\`base64\` 下载后以base64格式发送<br>\`File\` 下载后以文件发送<br>\`assets\` 上传到assets服务（需安装assets-xxx插件并配置）').default('href'),
-        margeVideo: koishi_1.Schema.boolean().default(false).description('以合并消息发送视频'),
+        mergeVideo: koishi_1.Schema.boolean().default(false).description('以合并消息发送视频'),
+        margeVideo: koishi_1.Schema.boolean().description('（已弃用，请使用 mergeVideo）').hidden().deprecated(),
         usePoster: koishi_1.Schema.boolean().default(false).description('加载视频封面'),
         autoSplitImage: koishi_1.Schema.boolean().description('垂直拆分大尺寸图片，解决部分适配器发不出长图的问题').default(true),
         cacheDir: koishi_1.Schema.string().description('File模式时使用的缓存路径').default('data/cache/rssOwl'),
@@ -191,14 +193,6 @@ exports.Config = koishi_1.Schema.object({
         contextFields: koishi_1.Schema.array(koishi_1.Schema.string()).description('要包含的上下文字段（如 guildId, platform 等）').default([]),
         sanitizeLogs: koishi_1.Schema.boolean().description('自动脱敏日志中的敏感信息').default(true),
     }).description('日志设置'),
-    errorTracking: koishi_1.Schema.object({
-        enabled: koishi_1.Schema.boolean().description('启用错误追踪').default(false),
-        dsn: koishi_1.Schema.string().role('secret').description('Sentry DSN').default(''),
-        environment: koishi_1.Schema.string().description('错误追踪环境').default('production'),
-        release: koishi_1.Schema.string().description('错误追踪版本号').default('5.2.48'),
-        tracesSampleRate: koishi_1.Schema.number().min(0).max(1).description('性能追踪采样率').default(0.1),
-        profilesSampleRate: koishi_1.Schema.number().min(0).max(1).description('性能分析采样率').default(0.1),
-    }).description('错误追踪设置'),
     tdl: koishi_1.Schema.object({
         enabled: koishi_1.Schema.boolean().description('启用 Telegram 大视频 tdl 兜底下载<br>当 RSSHub 返回 "Video is too big" 占位时，调用外部 tdl 直接从 Telegram 拉取原始视频。<br><b>需宿主机自行安装</b>: `go install github.com/iyear/tdl@latest` 或下载 [Release](https://github.com/iyear/tdl/releases)，并执行 `tdl login` 完成登录。<br>插件运行时探测 PATH，缺失则跳过、不阻塞主流程。').default(false),
         binPath: koishi_1.Schema.string().description('tdl 二进制路径，默认从 PATH 探测<br>Docker/容器场景下若 tdl 装在持久卷（如 /koishi/bin/tdl），在此指定可避免依赖容器 PATH').default(''),

package/lib/core/feeder-arg.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatArg = formatArg;
 exports.mixinArg = mixinArg;
 const legacy_config_1 = require("../utils/legacy-config");
+const proxy_1 = require("../utils/proxy");
 const logger_1 = require("../utils/logger");
 const ARG_ENTRY_KEYS = [
     'forceLength',
@@ -102,45 +103,9 @@ function parseProxyAgentArg(value, auth) {
         return undefined;
     }
 }
-function mergeProxyAgent(argProxy, configProxy, config) {
-    (0, logger_1.debug)(config, `合并代理配置 - argProxy: ${JSON.stringify(argProxy)}, configProxy.enabled: ${configProxy?.enabled}`, 'proxy merge debug', 'details');
-    if (argProxy?.enabled === false) {
-        (0, logger_1.debug)(config, '订阅明确禁用代理', 'proxy merge', 'details');
-        return { enabled: false };
-    }
-    if (argProxy?.enabled === true && argProxy?.host) {
-        (0, logger_1.debug)(config, '使用订阅的代理配置', 'proxy merge', 'details');
-        return argProxy;
-    }
-    const shouldUseConfigProxy = !argProxy || Object.keys(argProxy || {}).length === 0 || argProxy?.enabled === undefined || argProxy?.enabled === null;
-    if (shouldUseConfigProxy) {
-        if (configProxy?.enabled) {
-            const result = {
-                enabled: true,
-                protocol: configProxy.protocol,
-                host: configProxy.host,
-                port: configProxy.port,
-                auth: configProxy.auth?.enabled ? configProxy.auth : undefined,
-            };
-            (0, logger_1.debug)(config, `使用全局代理: ${result.protocol}://${result.host}:${result.port}`, 'proxy merge', 'info');
-            return result;
-        }
-        (0, logger_1.debug)(config, '全局代理未启用', 'proxy merge', 'details');
-    }
-    if (argProxy?.enabled === true && !argProxy?.host) {
-        const result = {
-            ...configProxy,
-            ...argProxy,
-            auth: configProxy?.auth?.enabled ? configProxy.auth : undefined,
-        };
-        (0, logger_1.debug)(config, '订阅代理配置不完整，补充全局配置', 'proxy merge', 'details');
-        return result;
-    }
-    (0, logger_1.debug)(config, '代理未配置，使用默认(禁用)', 'proxy merge', 'details');
-    return { enabled: false };
-}
+// mergeProxyAgent 已提升到 utils/proxy.ts，统一代理 helper 归属
 function mergeProxyAgentWithLog(argProxy, configProxy, config) {
-    const result = mergeProxyAgent(argProxy, configProxy, config);
+    const result = (0, proxy_1.mergeProxyAgent)(argProxy, configProxy, config);
     (0, logger_1.debug)(config, `[DEBUG_PROXY] mergeProxyAgent input: arg=${JSON.stringify(argProxy)} conf=${JSON.stringify(configProxy)} output=${JSON.stringify(result)}`, 'proxy merge', 'details');
     return result;
 }

package/lib/core/feeder-runtime.js

@@ -13,7 +13,6 @@ const koishi_1 = require("koishi");
 const constants_1 = require("../constants");
 const common_1 = require("../utils/common");
 const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
 const legacy_config_1 = require("../utils/legacy-config");
 const logger_1 = require("../utils/logger");
 const parser_1 = require("./parser");
@@ -101,10 +100,6 @@ async function fetchRssItems(ctx, config, $http, rssItem, arg, feedDebug) {
         feedDebug(`Fetch failed for ${rssItem.title}: ${normalizedError.message}`, 'feeder', 'error', {
             stage: 'fetch',
         });
-        (0, error_tracker_1.trackError)(normalizedError, {
-            ...buildFeedLogContext(rssItem),
-            stage: 'fetch',
-        });
         return [];
     }
 }

package/lib/core/feeder.js

@@ -40,7 +40,6 @@ exports.stopFeeder = stopFeeder;
 const koishi_1 = require("koishi");
 const common_1 = require("../utils/common");
 const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
 const legacy_config_1 = require("../utils/legacy-config");
 const logger_1 = require("../utils/logger");
 const feeder_arg_1 = require("./feeder-arg");
@@ -54,6 +53,12 @@ Object.defineProperty(exports, "findRssItem", { enumerable: true, get: function
 Object.defineProperty(exports, "getLastContent", { enumerable: true, get: function () { return feeder_runtime_2.getLastContent; } });
 let interval = null;
 let queueInterval = null;
+let cleanupInterval = null;
+// 重入栅栏：feeder() 单轮可能跑很久（订阅多 + 网络/tdl 慢），
+// 若耗时超过 refreshInterval，下一次 interval tick 会并发启动第二个 feeder()，
+// 导致同一消息被重复入队（addTask 的读-写去重非原子）→ 重复推送。
+// 仿照 NotificationQueueManager.processQueue 的 processing 标志，单轮串行。
+let feederRunning = false;
 function shouldSkipByInterval(rssItem, arg, originalArg) {
     if (!rssItem.arg.interval)
         return false;
@@ -171,24 +176,44 @@ async function feeder(deps, processor) {
             const normalizedError = (0, error_handler_1.normalizeError)(err);
             const feedContext = (0, feeder_runtime_1.buildFeedLogContext)(rssItem);
             (0, logger_1.debug)(config, `Feeder error for ${rssItem.url}: ${normalizedError.message}`, 'feeder', 'error', feedContext);
-            (0, error_tracker_1.trackError)(normalizedError, feedContext);
         }
     }
 }
 function startFeeder(ctx, config, $http, processor, queueManager) {
+    // 幂等清理：若上一实例的 interval 尚未清理（未走 dispose 就再次 startFeeder），
+    // 先清掉旧句柄，避免 ghost 定时器泄漏。
+    if (interval) {
+        clearInterval(interval);
+        interval = null;
+    }
+    if (queueInterval) {
+        clearInterval(queueInterval);
+        queueInterval = null;
+    }
+    if (cleanupInterval) {
+        clearInterval(cleanupInterval);
+        cleanupInterval = null;
+    }
     const deps = { ctx, config, $http, queueManager };
     const lifecycleDebug = (0, logger_1.createDebugWithContext)(config, { lifecycle: 'feeder' });
     const queueRuntimeConfig = (0, notification_queue_retry_1.getQueueRuntimeConfig)(config);
+    // 受重入栅栏保护的 feeder 运行：避免上一轮未跑完时下一轮并发启动
+    const runFeederGuarded = () => {
+        if (feederRunning) {
+            (0, logger_1.debug)(config, 'feeder 上一轮仍在运行，跳过本次 tick', 'feeder', 'details', { skipped: true });
+            return Promise.resolve();
+        }
+        feederRunning = true;
+        return feeder(deps, processor).finally(() => {
+            feederRunning = false;
+        });
+    };
     // Initial run
-    feeder(deps, processor).catch(err => {
+    runFeederGuarded().catch(err => {
         const normalizedError = (0, error_handler_1.normalizeError)(err);
         lifecycleDebug(`Initial feeder run failed: ${normalizedError.message}`, 'feeder', 'error', {
             operation: 'initial-feeder-run',
         });
-        (0, error_tracker_1.trackError)(normalizedError, {
-            lifecycle: 'feeder',
-            operation: 'initial-feeder-run',
-        });
     });
     // 启动生产者定时器（抓取 RSS）
     const refreshInterval = (config.basic?.refresh || 600) * 1000;
@@ -197,7 +222,7 @@ function startFeeder(ctx, config, $http, processor, queueManager) {
             const { delCache } = await Promise.resolve().then(() => __importStar(require('../utils/media')));
             await delCache(config);
         }
-        await feeder(deps, processor);
+        await runFeederGuarded();
     }, refreshInterval);
     // 启动消费者定时器（处理发送队列）
     // 频率更高，确保消息快速发送
@@ -205,16 +230,26 @@ function startFeeder(ctx, config, $http, processor, queueManager) {
     queueInterval = setInterval(async () => {
         await queueManager.processQueue();
     }, queueProcessInterval);
+    // 启动清理定时器：周期性删除过期的 SUCCESS/FAILED 任务，
+    // 防止 rss_notification_queue 表无限膨胀拖慢查询（此前只手动命令清理）。
+    // 每小时一次，cleanupHours 控制具体保留时长。
+    cleanupInterval = setInterval(async () => {
+        try {
+            await queueManager.runAutomaticCleanup();
+        }
+        catch (err) {
+            const normalizedError = (0, error_handler_1.normalizeError)(err);
+            lifecycleDebug(`自动清理失败: ${normalizedError.message}`, 'queue', 'error', {
+                operation: 'automatic-cleanup',
+            });
+        }
+    }, 60 * 60 * 1000);
     // 立即处理一次队列（启动时）
     queueManager.processQueue().catch(err => {
         const normalizedError = (0, error_handler_1.normalizeError)(err);
         lifecycleDebug(`Initial queue processing failed: ${normalizedError.message}`, 'queue', 'error', {
             operation: 'initial-queue-processing',
         });
-        (0, error_tracker_1.trackError)(normalizedError, {
-            lifecycle: 'feeder',
-            operation: 'initial-queue-processing',
-        });
     });
     lifecycleDebug('Feeder started', 'feeder', 'info', {
         refreshInterval,
@@ -230,6 +265,12 @@ function stopFeeder(config) {
         clearInterval(queueInterval);
         queueInterval = null;
     }
+    if (cleanupInterval) {
+        clearInterval(cleanupInterval);
+        cleanupInterval = null;
+    }
+    // 复位栅栏：避免上一轮未跑完就 stopFeeder 后，下次 startFeeder 时栅栏卡死
+    feederRunning = false;
     if (config) {
         const lifecycleDebug = (0, logger_1.createDebugWithContext)(config, { lifecycle: 'feeder' });
         lifecycleDebug('Feeder stopped', 'feeder', 'info');

package/lib/core/item-processor-runtime.d.ts

@@ -1,6 +1,7 @@
 import * as cheerio from 'cheerio';
 import { Context } from 'koishi';
 import { Config, rssArg } from '../types';
+import { normalizeText } from '../utils/common';
 export interface ItemProcessorRuntimeDeps {
     ctx: Context;
     config: Config;
@@ -13,8 +14,10 @@ interface RenderDescriptionOptions {
 }
 /**
  * 标准化 RSS 字段内容，统一数组 / 空值 / 非字符串输入。
+ *
+ * 实现已收敛到 `utils/common.ts`，此处 re-export 以维持现有 import 路径不变。
  */
-export declare function normalizeText(value: unknown): string;
+export { normalizeText };
 /**
  * 解析并去重 HTML 中的图片资源，返回原图到最终地址的映射表。
  */
@@ -48,4 +51,3 @@ export declare function formatVideoList(videoList: Array<[string, string]>): str
  * 统一执行图片渲染，兼容 base64 / File / assets / HTML 回退。
  */
 export declare function renderImage(htmlContent: string, deps: ItemProcessorRuntimeDeps, arg: rssArg): Promise<string>;
-export {};

package/lib/core/item-processor-runtime.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeText = normalizeText;
+exports.normalizeText = void 0;
 exports.buildResolvedImageMap = buildResolvedImageMap;
 exports.renderImageListFromHtml = renderImageListFromHtml;
 exports.renderLoadedHtml = renderLoadedHtml;
@@ -44,6 +44,8 @@ exports.renderImage = renderImage;
 const cheerio = __importStar(require("cheerio"));
 const koishi_1 = require("koishi");
 const marked_1 = require("marked");
+const common_1 = require("../utils/common");
+Object.defineProperty(exports, "normalizeText", { enumerable: true, get: function () { return common_1.normalizeText; } });
 const logger_1 = require("../utils/logger");
 const media_1 = require("../utils/media");
 const renderer_1 = require("./renderer");
@@ -62,7 +64,7 @@ function collectUniqueImageSources(html) {
     return [...new Set(imageSources)];
 }
 async function prependAiSummarySection(config, htmlContent, item, options) {
-    const aiSummary = normalizeText(item?.aiSummary).trim();
+    const aiSummary = (0, common_1.normalizeText)(item?.aiSummary).trim();
     if (!aiSummary || !isImageRenderEnabled(config))
         return htmlContent;
     const aiSummaryHtml = await (0, marked_1.marked)(aiSummary);
@@ -99,16 +101,6 @@ async function prepareHtmlForRender(deps, html, arg, useXml = false) {
     html('img').attr('style', 'object-fit:scale-down;max-width:100%;height:auto;');
     return useXml ? html.xml() : html.html();
 }
-/**
- * 标准化 RSS 字段内容，统一数组 / 空值 / 非字符串输入。
- */
-function normalizeText(value) {
-    if (Array.isArray(value))
-        return value.join('');
-    if (value === undefined || value === null)
-        return '';
-    return String(value);
-}
 /**
  * 解析并去重 HTML 中的图片资源，返回原图到最终地址的映射表。
  */

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

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationQueueSender = void 0;
 exports.downgradeQueueMessage = downgradeQueueMessage;
 const error_handler_1 = require("../utils/error-handler");
-const error_tracker_1 = require("../utils/error-tracker");
 const notification_queue_retry_1 = require("./notification-queue-retry");
 function downgradeQueueMessage(content) {
     if (content.isDowngraded) {
@@ -108,10 +107,6 @@ class NotificationQueueSender {
         catch (err) {
             const normalizedError = (0, error_handler_1.normalizeError)(err);
             taskDebug(`缓存消息失败: ${normalizedError.message}`, 'cache', 'info');
-            (0, error_tracker_1.trackError)(normalizedError, {
-                ...this.deps.buildTaskLogContext(task),
-                operation: 'cacheMessage',
-            });
         }
     }
 }