@anyul/koishi-plugin-rss 5.2.3 → 5.2.4

package/lib/core/feeder.js

@@ -33,331 +33,50 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findRssItem = findRssItem;
-exports.getLastContent = getLastContent;
-exports.formatArg = formatArg;
-exports.mixinArg = mixinArg;
+exports.getLastContent = exports.findRssItem = exports.mixinArg = exports.formatArg = void 0;
 exports.feeder = feeder;
 exports.startFeeder = startFeeder;
 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 common_1 = require("../utils/common");
-const parser_1 = require("./parser");
-const constants_1 = require("../constants");
+const feeder_arg_1 = require("./feeder-arg");
+const feeder_runtime_1 = require("./feeder-runtime");
+const notification_queue_retry_1 = require("./notification-queue-retry");
+var feeder_arg_2 = require("./feeder-arg");
+Object.defineProperty(exports, "formatArg", { enumerable: true, get: function () { return feeder_arg_2.formatArg; } });
+Object.defineProperty(exports, "mixinArg", { enumerable: true, get: function () { return feeder_arg_2.mixinArg; } });
+var feeder_runtime_2 = require("./feeder-runtime");
+Object.defineProperty(exports, "findRssItem", { enumerable: true, get: function () { return feeder_runtime_2.findRssItem; } });
+Object.defineProperty(exports, "getLastContent", { enumerable: true, get: function () { return feeder_runtime_2.getLastContent; } });
 let interval = null;
 let queueInterval = null;
-function buildFeedLogContext(rssItem) {
-    return {
-        subscribeId: String(rssItem.id),
-        rssId: rssItem.rssId || rssItem.title,
-        rssTitle: rssItem.title,
-        url: rssItem.url,
-        guildId: rssItem.guildId,
-        platform: rssItem.platform,
-    };
-}
-function createFeedDebug(config, rssItem) {
-    return (0, logger_1.createDebugWithContext)(config, buildFeedLogContext(rssItem));
-}
-function findRssItem(rssList, keyword) {
-    // 优先匹配列表索引（用户看到的序号 1, 2, 3...）
-    if (typeof keyword === 'number' || /^\d+$/.test(String(keyword))) {
-        const listIndex = parseInt(String(keyword)) - 1; // 转换为数组索引（0-based）
-        if (listIndex >= 0 && listIndex < rssList.length) {
-            return rssList[listIndex];
-        }
-    }
-    // 其他匹配方式：按 rssId、url、title 等
-    const index = ((rssList.findIndex(i => i.rssId === +keyword) + 1) ||
-        (rssList.findIndex(i => i.url == keyword) + 1) ||
-        (rssList.findIndex(i => i.url.indexOf(keyword) + 1) + 1) ||
-        (rssList.findIndex(i => i.title.indexOf(keyword) + 1) + 1)) - 1;
-    // 边界检查：确保索引有效
-    if (index < 0 || index >= rssList.length) {
-        return undefined;
-    }
-    return rssList[index];
-}
-function getLastContent(item, config) {
-    let arr = ['title', 'description', 'link', 'guid'];
-    let obj = Object.assign({}, ...arr.map(i => (0, koishi_1.clone)(item?.[i]) ? { [i]: item[i] } : {}));
-    return { ...obj, description: String(obj?.description).replaceAll(/\s/g, '') };
-}
-function formatArg(options, config) {
-    let { arg, template, auth } = options;
-    const parseArrayArg = (value) => {
-        return value
-            .split('/')
-            .map(item => item.trim())
-            .filter(Boolean);
-    };
-    // 特殊处理：提取完整的 proxyAgent URL
-    let proxyAgentUrl;
-    if (arg && arg.includes('proxyAgent:')) {
-        const match = arg.match(/proxyAgent:([^,]+)/);
-        if (match) {
-            proxyAgentUrl = match[1];
-            // 从 arg 中移除 proxyAgent，避免被 split(":") 破坏
-            arg = arg.replace(/proxyAgent:[^,]+/, '').replace(/^,|,$/g, '').replace(/,,/g, ',');
-        }
-    }
-    let json = Object.assign({}, ...(arg?.split(',')?.map((i) => ({ [i.split(":")[0]]: i.split(":")[1] })) || []));
-    let key = ["forceLength", "reverse", "timeout", "interval", "merge", "maxRssItem", "firstLoad", "bodyWidth", "bodyPadding", "filter", "block"];
-    let booleanKey = ['firstLoad', "reverse", 'merge'];
-    let numberKey = ['forceLength', "timeout", 'interval', 'maxRssItem', 'bodyWidth', 'bodyPadding'];
-    let falseContent = ['false', 'null', ''];
-    json = Object.assign({}, ...Object.keys(json).filter((i) => key.some((key) => key == i)).map((key) => ({ [key]: booleanKey.some((bkey) => bkey == key) ? !falseContent.some((c) => c == json[key]) : numberKey.some((nkey) => nkey == key) ? (+json[key]) : json[key] })));
-    if (template && config.template) {
-        json['template'] = template;
-    }
-    // Date/Number conversions
-    if (json.interval)
-        json.interval = parseInt(json.interval) * 1000;
-    if (json.forceLength)
-        json.forceLength = parseInt(json.forceLength);
-    // Array conversions
-    if (json.filter && typeof json.filter === 'string')
-        json.filter = parseArrayArg(json.filter);
-    if (json.block && typeof json.block === 'string')
-        json.block = parseArrayArg(json.block);
-    // Proxy Argument Parsing (使用提取的完整 URL)
-    if (proxyAgentUrl) {
-        if (['false', 'none', ''].includes(String(proxyAgentUrl))) {
-            json.proxyAgent = { enabled: false };
-        }
-        else if (typeof proxyAgentUrl === 'string') {
-            // Parse string proxy: socks5://127.0.0.1:7890
-            let protocolMatch = proxyAgentUrl.match(/^(http|https|socks5)/);
-            let protocol = protocolMatch ? protocolMatch[1] : 'http';
-            let hostMatch = proxyAgentUrl.match(/:\/\/([^:\/]+)/);
-            let host = hostMatch ? hostMatch[1] : '';
-            let portMatch = proxyAgentUrl.match(/:(\d+)/);
-            let port = portMatch ? parseInt(portMatch[1]) : 7890;
-            let proxyAgentObj = { enabled: true, protocol, host, port };
-            // Use auth from options if provided
-            if (auth) {
-                let [username, password] = auth.split("/");
-                proxyAgentObj.auth = { username, password };
-            }
-            json.proxyAgent = proxyAgentObj;
-        }
-    }
-    return json;
-}
-const mergeProxyAgent = (argProxy, configProxy, config) => {
-    // 打印调试信息
-    (0, logger_1.debug)(config, `合并代理配置 - argProxy: ${JSON.stringify(argProxy)}, configProxy.enabled: ${configProxy?.enabled}`, 'proxy merge debug', 'details');
-    // 1. Explicit disable in Args (必须是明确设置为 false)
-    if (argProxy?.enabled === false) {
-        (0, logger_1.debug)(config, `订阅明确禁用代理`, 'proxy merge', 'details');
-        return { enabled: false };
-    }
-    // 2. Arg 有完整的 proxy 配置 (enabled=true 且有 host) -> 使用 Arg
-    if (argProxy?.enabled === true && argProxy?.host) {
-        (0, logger_1.debug)(config, `使用订阅的代理配置`, 'proxy merge', 'details');
-        return argProxy;
-    }
-    // 3. Arg 是空对象、undefined、null，或者没有 enabled 字段 -> 使用全局配置
-    // 这是关键：如果订阅没有单独配置代理，就应该使用全局配置
-    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;
-        }
-        else {
-            (0, logger_1.debug)(config, `全局代理未启用`, 'proxy merge', 'details');
-        }
-    }
-    // 4. Arg 的 enabled=true 但没有 host -> 尝试补充全局配置
-    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;
-    }
-    // 5. Default disabled
-    (0, logger_1.debug)(config, `代理未配置，使用默认(禁用)`, 'proxy merge', 'details');
-    return { enabled: false };
-};
-const mergeProxyAgentWithLog = (argProxy, configProxy, config) => {
-    const result = 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;
-};
-function mixinArg(arg, config) {
-    const mergedProxy = mergeProxyAgentWithLog(arg?.proxyAgent, config.net?.proxyAgent, config);
-    // 打印代理配置合并结果（方便调试）
-    if (mergedProxy?.enabled) {
-        (0, logger_1.debug)(config, `使用代理: ${mergedProxy.protocol}://${mergedProxy.host}:${mergedProxy.port}`, 'proxy merge', 'details');
+function shouldSkipByInterval(rssItem, arg, originalArg) {
+    if (!rssItem.arg.interval)
+        return false;
+    const now = Date.now();
+    const nextUpdateTime = (0, legacy_config_1.getNextUpdateTime)(arg);
+    if (nextUpdateTime && nextUpdateTime > now)
+        return true;
+    if (nextUpdateTime) {
+        const missed = Math.ceil((now - nextUpdateTime) / arg.interval);
+        (0, legacy_config_1.setNextUpdateTime)(originalArg, nextUpdateTime + (arg.interval * (missed || 1)));
     }
     else {
-        (0, logger_1.debug)(config, `代理未启用`, 'proxy merge', 'details');
+        (0, legacy_config_1.setNextUpdateTime)(originalArg, now + arg.interval);
     }
-    // Flatten config into base object, prioritizing Config values
-    // We explicitly take known safe config sections
-    const baseConfig = {
-        ...config.basic,
-        // Add other flat config sections if necessary
-    };
-    const res = {
-        ...baseConfig,
-        ...arg, // Args override basic config
-        filter: [...(config.msg?.keywordFilter || []), ...(arg?.filter || [])],
-        block: [...(config.msg?.keywordBlock || []), ...(arg?.block || [])],
-        template: arg.template ?? config.basic?.defaultTemplate,
-        proxyAgent: mergedProxy
-    };
-    (0, logger_1.debug)(config, `[DEBUG_PROXY] mixinArg return: ${JSON.stringify(res.proxyAgent)}`, 'mixin', 'details');
-    return res;
+    return false;
 }
-// ============ 拆分出的辅助函数 ============
-/**
- * 1. 抓取 RSS 数据
- */
-async function fetchRssItems(ctx, config, $http, rssItem, arg, feedDebug) {
-    const rssHubUrl = config.msg?.rssHubUrl || 'https://hub.slarker.me';
-    try {
-        const urls = rssItem.url.split("|").map((u) => (0, common_1.parseQuickUrl)(u, rssHubUrl, constants_1.quickList));
-        const fetchPromises = urls.map((url) => (0, parser_1.getRssData)(ctx, config, $http, url, arg));
-        const results = await Promise.all(fetchPromises);
-        return results.flat(1);
-    }
-    catch (err) {
-        const normalizedError = (0, error_handler_1.normalizeError)(err);
-        feedDebug(`Fetch failed for ${rssItem.title}: ${normalizedError.message}`, 'feeder', 'error', {
-            stage: 'fetch',
-        });
-        (0, error_tracker_1.trackError)(normalizedError, {
-            ...buildFeedLogContext(rssItem),
-            stage: 'fetch',
-        });
-        return [];
-    }
-}
-/**
- * 2. 过滤关键字
- */
-function filterItems(config, items, arg, feedDebug) {
-    return items.filter(item => {
-        const matchKeyword = arg.filter?.find((keyword) => new RegExp(keyword, 'im').test(item.title) || new RegExp(keyword, 'im').test(item.description));
-        if (matchKeyword) {
-            feedDebug(`filter:${matchKeyword}`, 'feeder', 'info', { matchedKeyword: matchKeyword });
-            feedDebug(item, 'filter rss item', 'info', { matchedKeyword: matchKeyword });
-        }
-        return !matchKeyword;
-    });
-}
-/**
- * 3. 检查更新（时间+内容）
- */
-function checkForUpdates(config, rssItem, items, arg, feedDebug) {
-    // 按时间排序
-    let itemArray = items
-        .sort((a, b) => (0, common_1.parsePubDate)(config, b.pubDate).getTime() - (0, common_1.parsePubDate)(config, a.pubDate).getTime());
-    if (itemArray.length === 0) {
-        return { newItems: [], latestPubDate: new Date(), currentContent: [] };
-    }
-    const latestItem = itemArray[0];
-    const lastPubDate = (0, common_1.parsePubDate)(config, latestItem.pubDate);
-    feedDebug(`${rssItem.title}: Latest item date=${lastPubDate.toISOString()}, DB date=${rssItem.lastPubDate ? new Date(rssItem.lastPubDate).toISOString() : 'none'}`, 'feeder', 'details');
-    // 准备去重内容
-    const currentContent = config.basic?.resendUpdataContent === 'all'
-        ? itemArray.map((i) => getLastContent(i, config))
-        : [getLastContent(latestItem, config)];
-    // 反转顺序（发送顺序：最早的先发）
-    if (arg.reverse) {
-        itemArray = itemArray.reverse();
-    }
-    let rssItemArray = [];
-    if (rssItem.arg.forceLength) {
-        // 强制长度模式：忽略时间，只取 N 条
-        rssItemArray = itemArray.slice(0, rssItem.arg.forceLength);
-        feedDebug(`${rssItem.title}: Force length mode, taking ${rssItemArray.length} items`, 'feeder', 'details');
-    }
-    else {
-        // 标准模式：时间 + 内容检查
-        feedDebug(`${rssItem.title}: Checking ${itemArray.length} items for updates`, 'feeder', 'details');
-        rssItemArray = itemArray.filter((v, i) => {
-            const currentItemTime = (0, common_1.parsePubDate)(config, v.pubDate).getTime();
-            const lastTime = rssItem.lastPubDate ? (0, common_1.parsePubDate)(config, rssItem.lastPubDate).getTime() : 0;
-            feedDebug(`[${i}] ${v.title?.substring(0, 30)}: time=${new Date(currentItemTime).toISOString()} > last=${new Date(lastTime).toISOString()} ? ${currentItemTime > lastTime}`, 'feeder', 'details');
-            // 严格时间检查
-            if (currentItemTime > lastTime) {
-                feedDebug(`[${i}] ✓ Item is new (time check)`, 'feeder', 'details');
-                return true;
-            }
-            // 内容哈希检查（时间相同但内容变化）
-            if (config.basic?.resendUpdataContent !== 'disable') {
-                const newItemContent = getLastContent(v, config);
-                const oldItemMatch = rssItem.lastContent?.itemArray?.find((old) => (newItemContent.guid && old.guid === newItemContent.guid) ||
-                    (old.link === newItemContent.link && old.title === newItemContent.title));
-                if (oldItemMatch) {
-                    const descriptionChanged = JSON.stringify(oldItemMatch.description) !== JSON.stringify(newItemContent.description);
-                    if (descriptionChanged) {
-                        feedDebug(`[${i}] ✓ Item is updated (content changed)`, 'feeder', 'details');
-                    }
-                    else {
-                        feedDebug(`[${i}] ✗ Item filtered (already sent)`, 'feeder', 'details');
-                    }
-                    return descriptionChanged;
-                }
-                else {
-                    feedDebug(`[${i}] ✗ Item filtered (no match in lastContent)`, 'feeder', 'details');
-                }
-            }
-            feedDebug(`[${i}] ✗ Item filtered (failed all checks)`, 'feeder', 'details');
-            return false;
-        });
-        // 应用最大条目限制
-        if (arg.maxRssItem) {
-            rssItemArray = rssItemArray.slice(0, arg.maxRssItem);
-        }
-    }
-    return { newItems: rssItemArray, latestPubDate: lastPubDate, currentContent };
+async function persistSubscriptionState(ctx, rssItemId, state) {
+    await ctx.database.set('rssOwl', { id: rssItemId }, state);
 }
-/**
- * 4. 生成消息
- */
-async function generateMessages(processor, items, rssItem, arg) {
-    const itemsToSend = [...items].reverse();
-    // 生成所有消息
-    const messageList = (await Promise.all(itemsToSend.map(async (i) => await processor.parseRssItem(i, { ...rssItem, ...arg }, rssItem.author)))).filter(m => m);
-    return { messageList, itemsToSend };
-}
-/**
- * 5. 构建最终消息
- */
-function buildFinalMessage(config, messageList, rssItem, arg) {
-    let message = "";
-    const shouldMerge = arg.merge === true || config.basic?.merge === '一直合并' || (config.basic?.merge === '有多条更新时合并' && messageList.length > 1);
-    // 检查是否需要合并视频
-    const hasVideo = config.basic?.margeVideo && messageList.some(msg => /<video/.test(msg));
-    if (shouldMerge || hasVideo) {
-        message = `<message forward><author id="${rssItem.author}"/>${messageList.map(m => `<message>${m}</message>`).join("")}</message>`;
-    }
-    else {
-        message = messageList.join("");
-    }
-    // 添加提及
-    if (rssItem.followers && rssItem.followers.length > 0) {
-        const mentions = rssItem.followers.map((id) => `<at ${id === 'all' ? 'type="all"' : `id="${id}"`}/>`).join(" ");
-        message += `<message>${mentions}</message>`;
-    }
-    return message;
+function buildQueueUid(item, config) {
+    return String(item?.link
+        || item?.guid
+        || JSON.stringify((0, feeder_runtime_1.getLastContent)(item, config)));
 }
 // ============ 主函数 ============
 /**
@@ -365,78 +84,62 @@ function buildFinalMessage(config, messageList, rssItem, arg) {
  */
 async function feeder(deps, processor) {
     const { ctx, config, $http, queueManager } = deps;
-    // Use type assertion for custom table
     const rssList = await ctx.database.get('rssOwl', {});
     if (!rssList || rssList.length === 0)
         return;
     for (const rssItem of rssList) {
         try {
-            const feedDebug = createFeedDebug(config, rssItem);
-            // 1. Prepare Arguments
-            let arg = mixinArg(rssItem.arg || {}, config);
+            const feedDebug = (0, feeder_runtime_1.createFeedDebug)(config, rssItem);
+            const arg = (0, feeder_arg_1.mixinArg)(rssItem.arg || {}, config);
             feedDebug(`[DEBUG_PROXY] feeder mixinArg result proxyAgent: ${JSON.stringify(arg.proxyAgent)}`, 'feeder', 'details');
-            let originalArg = (0, koishi_1.clone)(rssItem.arg || {});
-            // 2. Interval Check
-            if (rssItem.arg.interval) {
-                const now = Date.now();
-                if (arg.nextUpdataTime && arg.nextUpdataTime > now)
-                    continue;
-                // Calculate next update time
-                if (arg.nextUpdataTime) {
-                    const missed = Math.ceil((now - arg.nextUpdataTime) / arg.interval);
-                    originalArg.nextUpdataTime = arg.nextUpdataTime + (arg.interval * (missed || 1));
-                }
-                else {
-                    originalArg.nextUpdataTime = now + arg.interval;
-                }
-            }
-            // 3. Fetch RSS Data
-            const rssItemList = await fetchRssItems(ctx, config, $http, rssItem, arg, feedDebug);
+            const originalArg = (0, legacy_config_1.normalizeSubscriptionArg)((0, koishi_1.clone)(rssItem.arg || {}));
+            if (shouldSkipByInterval(rssItem, arg, originalArg))
+                continue;
+            const rssItemList = await (0, feeder_runtime_1.fetchRssItems)(ctx, config, $http, rssItem, arg, feedDebug);
             if (rssItemList.length === 0) {
-                await ctx.database.set('rssOwl', { id: rssItem.id }, {
+                await persistSubscriptionState(ctx, rssItem.id, {
                     lastPubDate: rssItem.lastPubDate,
                     arg: originalArg,
-                    lastContent: rssItem.lastContent || { itemArray: [] }
+                    lastContent: rssItem.lastContent || { itemArray: [] },
                 });
                 continue;
             }
-            // 4. Filter Items
-            const filteredItems = filterItems(config, rssItemList, arg, feedDebug);
+            const filteredItems = (0, feeder_runtime_1.filterItems)(rssItemList, arg, feedDebug);
             if (filteredItems.length === 0) {
                 const latestItem = [...rssItemList]
                     .sort((a, b) => (0, common_1.parsePubDate)(config, b.pubDate).getTime() - (0, common_1.parsePubDate)(config, a.pubDate).getTime())[0];
-                await ctx.database.set('rssOwl', { id: rssItem.id }, {
+                await persistSubscriptionState(ctx, rssItem.id, {
                     lastPubDate: latestItem ? (0, common_1.parsePubDate)(config, latestItem.pubDate) : rssItem.lastPubDate,
                     arg: originalArg,
                     lastContent: latestItem
-                        ? { itemArray: [getLastContent(latestItem, config)] }
-                        : (rssItem.lastContent || { itemArray: [] })
+                        ? { itemArray: [(0, feeder_runtime_1.getLastContent)(latestItem, config)] }
+                        : (rssItem.lastContent || { itemArray: [] }),
                 });
                 continue;
             }
-            // 5. Check for Updates
-            const { newItems, latestPubDate, currentContent } = checkForUpdates(config, rssItem, filteredItems, arg, feedDebug);
+            const { newItems, latestPubDate, currentContent } = (0, feeder_runtime_1.checkForUpdates)(config, rssItem, filteredItems, arg, feedDebug);
             if (newItems.length === 0) {
                 feedDebug(`${rssItem.title}: No new items found after filtering`, 'feeder', 'info', { newItemCount: 0 });
-                await ctx.database.set('rssOwl', { id: rssItem.id }, {
+                await persistSubscriptionState(ctx, rssItem.id, {
                     lastPubDate: latestPubDate,
                     arg: originalArg,
-                    lastContent: { itemArray: currentContent }
+                    lastContent: { itemArray: currentContent },
                 });
                 continue;
             }
             feedDebug(`${rssItem.title}: Found ${newItems.length} new items`, 'feeder', 'info', { newItemCount: newItems.length });
             feedDebug(newItems.map(i => i.title), 'feeder', 'info', { newItemCount: newItems.length });
-            // 6. Generate Messages
-            const { messageList, itemsToSend } = await generateMessages(processor, newItems, rssItem, arg);
+            const { messageList, itemsToSend } = await (0, feeder_runtime_1.generateMessages)(processor, newItems, rssItem, arg);
             if (messageList.length === 0) {
                 feedDebug(`${rssItem.title}: Items found but parsed to empty messages`, 'feeder', 'info', { newItemCount: newItems.length });
-                await ctx.database.set('rssOwl', { id: rssItem.id }, { lastPubDate: latestPubDate, arg: originalArg, lastContent: { itemArray: currentContent } });
+                await persistSubscriptionState(ctx, rssItem.id, {
+                    lastPubDate: latestPubDate,
+                    arg: originalArg,
+                    lastContent: { itemArray: currentContent },
+                });
                 continue;
             }
-            // 7. Build Final Message
-            const message = buildFinalMessage(config, messageList, rssItem, arg);
-            // 8. Add to Queue
+            const message = (0, feeder_runtime_1.buildFinalMessage)(config, messageList, rssItem, arg);
             const taskContent = {
                 message,
                 originalItem: itemsToSend[0],
@@ -445,29 +148,28 @@ async function feeder(deps, processor) {
                 description: itemsToSend[0]?.description,
                 link: itemsToSend[0]?.link,
                 pubDate: (0, common_1.parsePubDate)(config, itemsToSend[0]?.pubDate),
-                imageUrl: itemsToSend[0]?.enclosure?.url
+                imageUrl: itemsToSend[0]?.enclosure?.url,
             };
             await queueManager.addTask({
                 subscribeId: String(rssItem.id),
-                rssId: rssItem.rssId || rssItem.title,
-                uid: itemsToSend[0]?.link || itemsToSend[0]?.guid || `${Date.now()}`,
+                rssId: String(rssItem.rssId || rssItem.title),
+                uid: buildQueueUid(itemsToSend[0], config),
                 guildId: rssItem.guildId,
                 platform: rssItem.platform,
-                content: taskContent
+                content: taskContent,
             });
             feedDebug(`✓ 已添加到发送队列: ${rssItem.title}`, 'feeder', 'info', {
                 queuedItemTitle: itemsToSend[0]?.title,
             });
-            // 9. Update Database State
-            await ctx.database.set('rssOwl', { id: rssItem.id }, {
+            await persistSubscriptionState(ctx, rssItem.id, {
                 lastPubDate: latestPubDate,
                 arg: originalArg,
-                lastContent: { itemArray: currentContent }
+                lastContent: { itemArray: currentContent },
             });
         }
         catch (err) {
             const normalizedError = (0, error_handler_1.normalizeError)(err);
-            const feedContext = buildFeedLogContext(rssItem);
+            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);
         }
@@ -476,6 +178,7 @@ async function feeder(deps, processor) {
 function startFeeder(ctx, config, $http, processor, queueManager) {
     const deps = { ctx, config, $http, queueManager };
     const lifecycleDebug = (0, logger_1.createDebugWithContext)(config, { lifecycle: 'feeder' });
+    const queueRuntimeConfig = (0, notification_queue_retry_1.getQueueRuntimeConfig)(config);
     // Initial run
     feeder(deps, processor).catch(err => {
         const normalizedError = (0, error_handler_1.normalizeError)(err);
@@ -498,7 +201,7 @@ function startFeeder(ctx, config, $http, processor, queueManager) {
     }, refreshInterval);
     // 启动消费者定时器（处理发送队列）
     // 频率更高，确保消息快速发送
-    const queueProcessInterval = 30 * 1000; // 每 30 秒处理一次队列
+    const queueProcessInterval = queueRuntimeConfig.processIntervalSeconds * 1000;
     queueInterval = setInterval(async () => {
         await queueManager.processQueue();
     }, queueProcessInterval);

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

@@ -0,0 +1,46 @@
+import * as cheerio from 'cheerio';
+import { Context } from 'koishi';
+import { Config, rssArg } from '../types';
+export interface ItemProcessorRuntimeDeps {
+    ctx: Context;
+    config: Config;
+    $http: any;
+}
+interface RenderDescriptionOptions {
+    contentStyle?: string;
+    dividerStyle?: string;
+    logImageMode?: boolean;
+}
+/**
+ * 标准化 RSS 字段内容，统一数组 / 空值 / 非字符串输入。
+ */
+export declare function normalizeText(value: unknown): string;
+/**
+ * 解析并去重 HTML 中的图片资源，返回原图到最终地址的映射表。
+ */
+export declare function buildResolvedImageMap(deps: ItemProcessorRuntimeDeps, html: cheerio.CheerioAPI, arg: rssArg): Promise<Record<string, string>>;
+/**
+ * 将 HTML 中的唯一图片列表解析为消息图片串。
+ */
+export declare function renderImageListFromHtml(deps: ItemProcessorRuntimeDeps, html: cheerio.CheerioAPI, arg: rssArg): Promise<string>;
+/**
+ * 将已加载的 HTML 内容渲染为最终消息。
+ */
+export declare function renderLoadedHtml(deps: ItemProcessorRuntimeDeps, html: cheerio.CheerioAPI, arg: rssArg, useXml?: boolean): Promise<string>;
+/**
+ * 渲染模板描述正文，并在图片模式下按需注入 AI 摘要。
+ */
+export declare function renderTemplatedDescription(deps: ItemProcessorRuntimeDeps, item: any, arg: rssArg, description: string, options?: RenderDescriptionOptions): Promise<string>;
+/**
+ * 提取 HTML 中的视频资源，并按配置补齐 poster 图。
+ */
+export declare function processVideos(deps: ItemProcessorRuntimeDeps, html: cheerio.CheerioAPI, arg: rssArg, videoList: Array<[string, string]>): Promise<void>;
+/**
+ * 将视频列表格式化为最终消息片段。
+ */
+export declare function formatVideoList(videoList: Array<[string, string]>): string;
+/**
+ * 统一执行图片渲染，兼容 base64 / File / assets / HTML 回退。
+ */
+export declare function renderImage(htmlContent: string, deps: ItemProcessorRuntimeDeps, arg: rssArg): Promise<string>;
+export {};