@anyul/koishi-plugin-rss 5.3.2 → 5.3.4

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");
@@ -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-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) {
@@ -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, '获取订阅数据')}`;
         }
     });

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/config.js

@@ -191,14 +191,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");
@@ -171,7 +170,6 @@ 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);
         }
     }
 }
@@ -185,10 +183,6 @@ function startFeeder(ctx, config, $http, processor, queueManager) {
         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;
@@ -211,10 +205,6 @@ function startFeeder(ctx, config, $http, processor, queueManager) {
         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,

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',
-            });
         }
     }
 }

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', {

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.js

@@ -25,7 +25,6 @@ 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");
@@ -42,6 +41,9 @@ exports.inject = { required: ["database"], optional: ["puppeteer", "censor", "as
 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 +57,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);