@anyul/koishi-plugin-rss 5.3.2 → 5.3.10

package/lib/types.d.ts

@@ -12,30 +12,53 @@ declare module 'koishi' {
         };
     }
 }
+export interface RssOwlRow {
+    id: number;
+    url: string;
+    platform: string;
+    guildId: string;
+    author: string;
+    rssId: string;
+    arg: rssArg;
+    lastContent: any;
+    title: string;
+    followers: string[];
+    lastPubDate: Date;
+}
+export interface RssMessageCacheRow {
+    id: number;
+    rssId: string;
+    guildId: string;
+    platform: string;
+    title: string;
+    content: string;
+    link: string;
+    pubDate: Date;
+    imageUrl: string;
+    videoUrl: string;
+    finalMessage: string;
+    createdAt: Date;
+}
+export interface RssNotificationQueueRow {
+    id: number;
+    subscribeId: string;
+    rssId: string;
+    uid: string;
+    guildId: string;
+    platform: string;
+    content: any;
+    status: string;
+    retryCount: number;
+    nextRetryTime: Date;
+    createdAt: Date;
+    updatedAt: Date;
+    failReason: string;
+}
 declare module 'koishi' {
-    interface rssOwl {
-        id: string | number;
-        url: string;
-        platform: string;
-        guildId: string;
-        author: string;
-        rssId: string | number;
-        arg: rssArg;
-        title: string;
-        lastPubDate: Date;
-    }
-    interface rss_message_cache {
-        id: number;
-        rssId: string;
-        guildId: string;
-        platform: string;
-        title: string;
-        content: string;
-        link: string;
-        pubDate: Date;
-        imageUrl: string;
-        videoUrl: string;
-        createdAt: Date;
+    interface Tables {
+        rssOwl: RssOwlRow;
+        rss_message_cache: RssMessageCacheRow;
+        rss_notification_queue: RssNotificationQueueRow;
     }
 }
 export interface Config {
@@ -50,7 +73,6 @@ export interface Config {
     security?: SecurityConfig;
     debug?: "disable" | "error" | "info" | "details";
     logging?: LoggingConfig;
-    errorTracking?: ErrorTrackingConfig;
     tdl?: TdlConfig;
 }
 export declare const debugLevel: string[];
@@ -64,6 +86,7 @@ export interface CustomTemplateItem {
 export interface BasicConfig {
     usePoster: boolean;
     mergeVideo?: boolean;
+    /** @deprecated 拼写错误，请使用 mergeVideo。运行时仍兼容读取。 */
     margeVideo?: boolean;
     defaultTemplate?: TemplateType;
     timeout?: number;
@@ -73,6 +96,7 @@ export interface BasicConfig {
     firstLoad?: boolean;
     urlDeduplication?: boolean;
     resendUpdatedContent?: 'disable' | 'latest' | 'all';
+    /** @deprecated 拼写错误，请使用 resendUpdatedContent。运行时仍兼容读取。 */
     resendUpdataContent?: 'disable' | 'latest' | 'all';
     imageMode?: 'base64' | 'File' | 'assets';
     videoMode?: 'filter' | 'href' | 'base64' | 'File' | 'assets';
@@ -155,10 +179,13 @@ export interface rssArg {
     block?: Array<string>;
     split?: number;
     nextUpdateTime?: number;
+    /** @deprecated 拼写错误，请使用 nextUpdateTime。运行时仍兼容读取。 */
     nextUpdataTime?: number;
     mergeVideo?: boolean;
+    /** @deprecated 拼写错误，请使用 mergeVideo。运行时仍兼容读取。 */
     margeVideo?: boolean;
     resendUpdatedContent?: 'disable' | 'latest' | 'all';
+    /** @deprecated 拼写错误，请使用 resendUpdatedContent。运行时仍兼容读取。 */
     resendUpdataContent?: 'disable' | 'latest' | 'all';
     type?: 'rss' | 'html';
     selector?: string;
@@ -186,14 +213,6 @@ export interface LoggingConfig {
     contextFields?: string[];
     sanitizeLogs?: boolean;
 }
-export interface ErrorTrackingConfig {
-    enabled?: boolean;
-    dsn?: string;
-    environment?: string;
-    release?: string;
-    tracesSampleRate?: number;
-    profilesSampleRate?: number;
-}
 /**
  * 联网搜索配置
  */

package/lib/utils/common.d.ts

@@ -1,5 +1,11 @@
 import { Config } from '../types';
 export declare const sleep: (delay?: number) => Promise<unknown>;
+/**
+ * 标准化 RSS 字段内容，统一数组 / 空值 / 非字符串输入。
+ *
+ * 统一入口，避免在各 core 模块内重复定义私有副本。
+ */
+export declare function normalizeText(value: unknown): string;
 export declare const parsePubDate: (config: Config, pubDate: any) => Date;
 export declare const ensureUrlProtocol: (url: string) => string;
 export declare const parseContent: (content: any, attr?: any) => string | undefined;

package/lib/utils/common.js

@@ -34,10 +34,23 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanContent = exports.parseQuickUrl = exports.parseTemplateContent = exports.parseContent = exports.ensureUrlProtocol = exports.parsePubDate = exports.sleep = void 0;
+exports.normalizeText = normalizeText;
 const logger_1 = require("./logger");
 const cheerio = __importStar(require("cheerio"));
 const sleep = (delay = 1000) => new Promise(resolve => setTimeout(resolve, delay));
 exports.sleep = sleep;
+/**
+ * 标准化 RSS 字段内容，统一数组 / 空值 / 非字符串输入。
+ *
+ * 统一入口，避免在各 core 模块内重复定义私有副本。
+ */
+function normalizeText(value) {
+    if (Array.isArray(value))
+        return value.join('');
+    if (value === undefined || value === null)
+        return '';
+    return String(value);
+}
 // 安全的时间解析函数，处理各种格式
 const parsePubDate = (config, pubDate) => {
     if (!pubDate)
@@ -87,7 +100,7 @@ const parseContent = (content, attr = undefined) => {
     else if (Object.prototype.toString.call(content) === '[object Object]') {
         return Object.values(content).reduce((t, v) => {
             if (v && (typeof v == 'string' || v?.join)) {
-                let text = v?.join("") || v;
+                const text = v?.join("") || v;
                 return (typeof text === 'string' && text.length > t.length) ? text : t;
             }
             else {
@@ -130,38 +143,15 @@ const parseTemplateContent = (template, item) => {
 exports.parseTemplateContent = parseTemplateContent;
 // 快速URL解析函数
 const parseQuickUrl = (url, rssHubUrl, quickList) => {
-    let correntQuickObj = quickList.find(i => new RegExp(`^${i.prefix}:`).test(url));
+    const correntQuickObj = quickList.find(i => new RegExp(`^${i.prefix}:`).test(url));
     if (!correntQuickObj)
         return url;
-    let routeMatch = url.match(new RegExp(`(?<=^${correntQuickObj.prefix}:).*`));
+    const routeMatch = url.match(new RegExp(`(?<=^${correntQuickObj.prefix}:).*`));
     if (!routeMatch)
         return url;
-    let route = routeMatch[0];
-    const parseContent = (template, item) => {
-        return template.replace(/{{(.+?)}}/g, (i) => {
-            // 添加空值检查，防止 match 返回 null 时崩溃
-            const match = i.match(/^{{(.*)}}$/);
-            if (!match)
-                return i;
-            const content = match[1];
-            if (!content)
-                return i;
-            return content.split("|").reduce((t, v) => {
-                const literalMatch = v.match(/^'(.*)'$/);
-                if (literalMatch) {
-                    return t || literalMatch[1];
-                }
-                return v.split(".").reduce((t, v) => {
-                    if (new RegExp("Date").test(v)) {
-                        const dateVal = t?.[v];
-                        return dateVal ? new Date(dateVal).toLocaleString('zh-CN') : "";
-                    }
-                    return t?.[v] || "";
-                }, item);
-            }, '');
-        });
-    };
-    let rUrl = parseContent(correntQuickObj.replace, { rsshub: rssHubUrl, route });
+    const route = routeMatch[0];
+    // 复用模块级 parseTemplateContent，避免内嵌重复实现
+    const rUrl = (0, exports.parseTemplateContent)(correntQuickObj.replace, { rsshub: rssHubUrl, route });
     return rUrl;
 };
 exports.parseQuickUrl = parseQuickUrl;
@@ -173,7 +163,7 @@ const cleanContent = (htmlContent) => {
     $('style').remove();
     $('img').remove();
     $('video').remove();
-    let plainText = $.text().replace(/\s+/g, ' ').trim();
+    const plainText = $.text().replace(/\s+/g, ' ').trim();
     return plainText;
 };
 exports.cleanContent = cleanContent;

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

@@ -3,6 +3,8 @@
  *
  * 将技术性错误转换为用户友好的提示信息
  */
+import { Context } from 'koishi';
+import type { Config } from '../types';
 /**
  * 错误类型枚举
  */
@@ -88,3 +90,50 @@ export declare function isPermissionError(error: any): boolean;
  * @returns 是否可重试
  */
 export declare function isRetryable(error: any): boolean;
+/**
+ * 命令执行结果
+ */
+export interface CommandResult {
+    success: boolean;
+    message: string;
+    error?: any;
+}
+/**
+ * 命令错误类型
+ */
+export declare enum CommandErrorType {
+    PERMISSION_DENIED = "PERMISSION_DENIED",
+    INVALID_ARGUMENT = "INVALID_ARGUMENT",
+    NOT_FOUND = "NOT_FOUND",
+    ALREADY_EXISTS = "ALREADY_EXISTS",
+    NETWORK_ERROR = "NETWORK_ERROR",
+    INTERNAL_ERROR = "INTERNAL_ERROR"
+}
+/**
+ * 命令错误类
+ */
+export declare class CommandError extends Error {
+    type: CommandErrorType;
+    details?: any;
+    constructor(type: CommandErrorType, message: string, details?: any);
+}
+/**
+ * 包装命令执行，提供统一的错误处理
+ */
+export declare function executeCommand(ctx: Context, config: Config, operationName: string, handler: () => Promise<string>): Promise<string>;
+/**
+ * 创建权限检查错误
+ */
+export declare function permissionDenied(customMessage?: string): CommandError;
+/**
+ * 创建参数错误
+ */
+export declare function invalidArgument(message: string): CommandError;
+/**
+ * 创建未找到错误
+ */
+export declare function notFound(resource: string): CommandError;
+/**
+ * 创建已存在错误
+ */
+export declare function alreadyExists(resource: string): CommandError;

package/lib/utils/error-handler.js

@@ -5,7 +5,7 @@
  * 将技术性错误转换为用户友好的提示信息
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ErrorType = void 0;
+exports.CommandError = exports.CommandErrorType = exports.ErrorType = void 0;
 exports.getErrorType = getErrorType;
 exports.getFriendlyErrorMessage = getFriendlyErrorMessage;
 exports.createError = createError;
@@ -14,6 +14,12 @@ exports.isNetworkError = isNetworkError;
 exports.isParseError = isParseError;
 exports.isPermissionError = isPermissionError;
 exports.isRetryable = isRetryable;
+exports.executeCommand = executeCommand;
+exports.permissionDenied = permissionDenied;
+exports.invalidArgument = invalidArgument;
+exports.notFound = notFound;
+exports.alreadyExists = alreadyExists;
+const logger_1 = require("./logger");
 /**
  * 错误类型枚举
  */
@@ -276,3 +282,107 @@ function isRetryable(error) {
     // 其他错误不建议重试
     return false;
 }
+/**
+ * 命令错误类型
+ */
+var CommandErrorType;
+(function (CommandErrorType) {
+    CommandErrorType["PERMISSION_DENIED"] = "PERMISSION_DENIED";
+    CommandErrorType["INVALID_ARGUMENT"] = "INVALID_ARGUMENT";
+    CommandErrorType["NOT_FOUND"] = "NOT_FOUND";
+    CommandErrorType["ALREADY_EXISTS"] = "ALREADY_EXISTS";
+    CommandErrorType["NETWORK_ERROR"] = "NETWORK_ERROR";
+    CommandErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
+})(CommandErrorType || (exports.CommandErrorType = CommandErrorType = {}));
+/**
+ * 命令错误类
+ */
+class CommandError extends Error {
+    type;
+    details;
+    constructor(type, message, details) {
+        super(message);
+        this.type = type;
+        this.details = details;
+        this.name = 'CommandError';
+    }
+}
+exports.CommandError = CommandError;
+/**
+ * 包装命令执行，提供统一的错误处理
+ */
+async function executeCommand(ctx, config, operationName, handler) {
+    try {
+        return await handler();
+    }
+    catch (error) {
+        // 如果是 CommandError，使用自定义消息
+        if (error instanceof CommandError) {
+            logCommandError(config, operationName, error);
+            return formatCommandError(error);
+        }
+        // 其他错误使用友好错误消息
+        logCommandError(config, operationName, error);
+        const friendlyMessage = getFriendlyErrorMessage(error, operationName);
+        return `${operationName}失败: ${friendlyMessage}`;
+    }
+}
+/**
+ * 记录命令错误
+ */
+function logCommandError(config, operation, error) {
+    const normalizedError = normalizeError(error, `${operation} failed`);
+    const context = {
+        command: operation,
+    };
+    if (error instanceof CommandError) {
+        context.commandErrorType = error.type;
+    }
+    if (normalizedError && typeof normalizedError.code === 'string') {
+        context.errorCode = normalizedError.code;
+    }
+    (0, logger_1.debugError)(config, normalizedError, `${operation} error`, context);
+}
+/**
+ * 格式化命令错误消息
+ */
+function formatCommandError(error) {
+    switch (error.type) {
+        case CommandErrorType.PERMISSION_DENIED:
+            return error.message;
+        case CommandErrorType.INVALID_ARGUMENT:
+            return `参数错误: ${error.message}`;
+        case CommandErrorType.NOT_FOUND:
+            return `未找到: ${error.message}`;
+        case CommandErrorType.ALREADY_EXISTS:
+            return `已存在: ${error.message}`;
+        case CommandErrorType.NETWORK_ERROR:
+            return `网络错误: ${error.message}`;
+        default:
+            return error.message || '操作失败，请稍后重试';
+    }
+}
+/**
+ * 创建权限检查错误
+ */
+function permissionDenied(customMessage) {
+    return new CommandError(CommandErrorType.PERMISSION_DENIED, customMessage || '权限不足');
+}
+/**
+ * 创建参数错误
+ */
+function invalidArgument(message) {
+    return new CommandError(CommandErrorType.INVALID_ARGUMENT, message);
+}
+/**
+ * 创建未找到错误
+ */
+function notFound(resource) {
+    return new CommandError(CommandErrorType.NOT_FOUND, resource);
+}
+/**
+ * 创建已存在错误
+ */
+function alreadyExists(resource) {
+    return new CommandError(CommandErrorType.ALREADY_EXISTS, resource);
+}

package/lib/utils/fetcher.js

@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createHttpFunction = exports.RequestManager = void 0;
 const axios_1 = __importDefault(require("axios"));
-const https_proxy_agent_1 = require("https-proxy-agent");
 const error_handler_1 = require("./error-handler");
-const error_tracker_1 = require("./error-tracker");
 const logger_1 = require("./logger");
 const common_1 = require("./common");
+const proxy_1 = require("./proxy");
 const security_1 = require("./security");
 // 简化版 RequestManager，仅用于普通 API 请求，大文件下载建议绕过
 class RequestManager {
@@ -91,12 +90,6 @@ const createHttpFunction = (ctx, config, requestManager) => {
                 requestDebug(`URL 安全验证失败: ${normalizedError.message}`, 'security', 'error', {
                     stage: 'security-validation',
                 });
-                (0, error_tracker_1.trackError)(normalizedError, {
-                    url,
-                    requestType,
-                    isHeavyRequest,
-                    stage: 'security-validation',
-                });
                 throw error;
             }
             throw error;
@@ -106,7 +99,7 @@ const createHttpFunction = (ctx, config, requestManager) => {
         const makeRequest = async () => {
             // 基础配置
             requestDebug(`[DEBUG_PROXY] fetcher makeRequest arg.proxyAgent: ${JSON.stringify(arg?.proxyAgent)}`, 'request', 'details');
-            let configObj = {
+            const configObj = {
                 timeout: requestTimeout,
                 headers: {
                     'User-Agent': config.net.userAgent || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'
@@ -114,32 +107,20 @@ const createHttpFunction = (ctx, config, requestManager) => {
                 // 允许传入自定义 proxyAgent
                 ...(arg.proxyAgent?.enabled ? {} : {})
             };
-            // 代理配置
-            let currentProxyAgent = arg?.proxyAgent;
-            // 防御性：如果 arg 中没有有效的代理配置，尝试使用全局配置（作为安全网）
-            if (!currentProxyAgent || currentProxyAgent.enabled === undefined || currentProxyAgent.enabled === null) {
-                if (config.net?.proxyAgent?.enabled) {
-                    currentProxyAgent = {
-                        enabled: true,
-                        protocol: config.net.proxyAgent.protocol,
-                        host: config.net.proxyAgent.host,
-                        port: config.net.proxyAgent.port,
-                        auth: config.net.proxyAgent.auth?.enabled ? config.net.proxyAgent.auth : undefined
-                    };
-                    requestDebug(`[DEBUG_PROXY] fetcher 使用防御性全局代理`, 'request', 'details', {
-                        proxyEnabled: true,
-                        proxyUrl: config.net.proxyAgent.host
-                            ? `${config.net.proxyAgent.protocol}://${config.net.proxyAgent.host}:${config.net.proxyAgent.port}`
-                            : '',
-                    });
-                }
-            }
+            // 代理配置：复用 utils/proxy.ts 的合并 + 构造 helper（CLAUDE.md:346 规范）
+            // mergeProxyAgent 已处理“arg 缺失回落全局 / arg 不完整用全局补全”的防御性逻辑
+            const currentProxyAgent = (0, proxy_1.mergeProxyAgent)(arg?.proxyAgent, config.net?.proxyAgent, config);
             const proxyEnabled = Boolean(currentProxyAgent?.enabled);
             let proxyUrl = '';
             if (proxyEnabled && currentProxyAgent.host) {
                 proxyUrl = `${currentProxyAgent.protocol}://${currentProxyAgent.host}:${currentProxyAgent.port}`;
-                const agent = new https_proxy_agent_1.HttpsProxyAgent(proxyUrl);
-                configObj.httpsAgent = agent;
+                requestDebug(`[DEBUG_PROXY] fetcher 使用代理`, 'request', 'details', {
+                    proxyEnabled: true,
+                    proxyUrl,
+                });
+                // 用合并后的片段构造 axios 代理配置，与 ai-client / search-providers 同源
+                const proxyConfig = (0, proxy_1.buildAxiosProxyConfig)({ net: { proxyAgent: currentProxyAgent } });
+                configObj.httpsAgent = proxyConfig.httpsAgent;
                 configObj.proxy = false; // 禁用 axios 原生 proxy
             }
             // 合并外部配置
@@ -190,13 +171,6 @@ const createHttpFunction = (ctx, config, requestManager) => {
                 status,
                 retriesRemaining: 0,
             });
-            (0, error_tracker_1.trackError)(normalizedError, {
-                url,
-                requestType,
-                isHeavyRequest,
-                status,
-                ...requestContext,
-            });
             throw normalizedError;
         };
         if (isHeavyRequest) {

package/lib/utils/legacy-config.js

@@ -9,8 +9,12 @@ exports.getNextUpdateTime = getNextUpdateTime;
 exports.setNextUpdateTime = setNextUpdateTime;
 function normalizeBasicConfig(basic) {
     const normalized = { ...(basic || {}) };
-    const mergeVideo = normalized.mergeVideo ?? normalized.margeVideo;
-    const resendUpdatedContent = normalized.resendUpdatedContent ?? normalized.resendUpdataContent;
+    // 读取归一：typo（旧拼写）优先。理由——schema 会为声明的规范名注入默认值
+    // （如 mergeVideo:false），若用 `correct ?? typo` 会被默认值短路，吞掉老用户
+    // 真实意图（margeVideo:true）。typo 存在则必来自历史用户数据，应优先采纳。
+    // 写入仍双写两个键（保持运行时兼容，下游直接读 margeVideo 仍可拿到值）。
+    const mergeVideo = normalized.margeVideo ?? normalized.mergeVideo;
+    const resendUpdatedContent = normalized.resendUpdataContent ?? normalized.resendUpdatedContent;
     if (mergeVideo !== undefined) {
         normalized.mergeVideo = mergeVideo;
         normalized.margeVideo = mergeVideo;
@@ -47,10 +51,12 @@ function getNextUpdateTime(arg) {
 }
 function setNextUpdateTime(target, nextUpdateTime) {
     if (nextUpdateTime === undefined) {
+        // 清理时双删：删规范名的同时顺手清掉残留的旧拼写名（老数据可能仍有）
         delete target.nextUpdateTime;
         delete target.nextUpdataTime;
         return;
     }
+    // 只写规范名：不再回写 nextUpdataTime，让旧拼写从数据中自然淘汰。
+    // 读取侧 getNextUpdateTime 已用 `nextUpdateTime ?? nextUpdataTime` 兜底老数据。
     target.nextUpdateTime = nextUpdateTime;
-    target.nextUpdataTime = nextUpdateTime;
 }

package/lib/utils/logger.d.ts

@@ -2,6 +2,12 @@ import { Logger } from 'koishi';
 import { Config } from '../types';
 declare const logger: Logger;
 export type DebugLogType = "disable" | "error" | "info" | "details";
+export declare function applyDebugLevel(config: Config): void;
+/**
+ * 按 config.debug 判定某级是否应输出。
+ * 在 debug() 中作为性能预检门控（避免对注定被丢弃的日志做脱敏/格式化），
+ * 与 applyDebugLevel 同步到 Koishi levels 的语义保持一致；最终输出与否仍由 reggol levels 决定。
+ */
 export declare function shouldLog(config: Config, type: DebugLogType): boolean;
 /**
  * 增强的调试日志函数