@anyul/koishi-plugin-rss 5.3.4 → 5.3.11

package/lib/utils/common.js

@@ -100,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 {
@@ -143,13 +143,13 @@ 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 route = routeMatch[0];
     // 复用模块级 parseTemplateContent，避免内嵌重复实现
     const rUrl = (0, exports.parseTemplateContent)(correntQuickObj.replace, { rsshub: rssHubUrl, route });
     return rUrl;
@@ -163,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/fetcher.js

@@ -99,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'

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

@@ -50,10 +50,10 @@ async function tryUnlink(filePath) {
     }
 }
 const getCacheDir = (config) => {
-    let dir = config.basic.cacheDir ? path.resolve('./', config.basic.cacheDir || "") : `${__dirname}/cache`;
-    let mkdir = (path, deep = 2) => {
-        let dir = path.split("\\").splice(0, deep).join("\\");
-        let dirDeep = path.split("\\").length;
+    const dir = config.basic.cacheDir ? path.resolve('./', config.basic.cacheDir || "") : `${__dirname}/cache`;
+    const mkdir = (path, deep = 2) => {
+        const dir = path.split("\\").splice(0, deep).join("\\");
+        const dirDeep = path.split("\\").length;
         if (!fs.existsSync(dir)) {
             fs.mkdirSync(dir);
         }
@@ -68,11 +68,11 @@ exports.getCacheDir = getCacheDir;
 const writeCacheFile = async (fileUrl, config) => {
     const cacheDir = (0, exports.getCacheDir)(config);
     (0, logger_1.debug)(config, cacheDir, 'cacheDir', 'details');
-    let suffix = /(?<=^data:.+?\/).+?(?=;base64)/.exec(fileUrl)?.[0] || 'bin';
+    const suffix = /(?<=^data:.+?\/).+?(?=;base64)/.exec(fileUrl)?.[0] || 'bin';
     // 使用时间戳 + 随机数生成唯一文件名，避免竞态条件
-    let fileName = `${Date.now()}-${Math.random().toString(36).substring(2, 11)}.${suffix}`;
-    let base64Data = fileUrl.replace(/^data:.+?;base64,/, "");
-    let filePath = `${cacheDir}/${fileName}`;
+    const fileName = `${Date.now()}-${Math.random().toString(36).substring(2, 11)}.${suffix}`;
+    const base64Data = fileUrl.replace(/^data:.+?;base64,/, "");
+    const filePath = `${cacheDir}/${fileName}`;
     fs.writeFileSync(filePath, base64Data, 'base64');
     if (config.basic.replaceDir) {
         return `file:///${config.basic.replaceDir}/${fileName}`;
@@ -120,10 +120,10 @@ const getImageUrl = async (ctx, config, $http, url, arg, useBase64Mode = false)
         (0, logger_1.debug)(config, `图片请求失败: ${error}`, 'img error', 'error');
         return '';
     }
-    let contentType = res.headers["content-type"] || 'image/jpeg';
-    let suffix = contentType?.split('/')[1] || 'jpg';
-    let base64Prefix = `data:${contentType};base64,`;
-    let base64Data = base64Prefix + Buffer.from(res.data, 'binary').toString('base64');
+    const contentType = res.headers["content-type"] || 'image/jpeg';
+    const suffix = contentType?.split('/')[1] || 'jpg';
+    const base64Prefix = `data:${contentType};base64,`;
+    const base64Data = base64Prefix + Buffer.from(res.data, 'binary').toString('base64');
     // 根据发送模式处理
     const imageMode = config.basic.imageMode;
     // base64 模式：直接返回 base64
@@ -132,13 +132,13 @@ const getImageUrl = async (ctx, config, $http, url, arg, useBase64Mode = false)
     }
     // File 模式：下载到本地，返回 file:// URL
     if (imageMode == 'File') {
-        let fileUrl = await (0, exports.writeCacheFile)(base64Data, config);
+        const fileUrl = await (0, exports.writeCacheFile)(base64Data, config);
         return fileUrl;
     }
     // assets 模式：下载到本地，上传到 assets，返回 assets URL
     if (imageMode === 'assets' && ctx.assets) {
         try {
-            let assetUrl = await ctx.assets.upload(base64Data, `rss-img-${Date.now()}.${suffix}`);
+            const assetUrl = await ctx.assets.upload(base64Data, `rss-img-${Date.now()}.${suffix}`);
             (0, logger_1.debug)(config, `图片 Assets 上传成功: ${assetUrl}`, 'assets', 'info');
             return assetUrl;
         }
@@ -152,7 +152,7 @@ const getImageUrl = async (ctx, config, $http, url, arg, useBase64Mode = false)
 };
 exports.getImageUrl = getImageUrl;
 const getVideoUrl = async (ctx, config, $http, url, arg, useBase64Mode = false, dom) => {
-    let src = dom.attribs.src || dom.children["0"].attribs.src;
+    const src = dom.attribs.src || dom.children["0"].attribs.src;
     // 根据发送模式处理
     const videoMode = config.basic.videoMode;
     // filter 模式：过滤掉所有视频
@@ -222,23 +222,23 @@ const getVideoUrl = async (ctx, config, $http, url, arg, useBase64Mode = false,
     // file:// 已读入内存（bufferData），后续 base64/File/assets 都基于内存数据，
     // 源文件不再需要 —— 立即删，避免几十 MB 视频在缓存目录堆积
     await tryUnlink(localSourcePath);
-    let suffix = contentType?.split('/')[1] || 'mp4';
-    let base64Prefix = `data:${contentType};base64,`;
-    let base64Data = base64Prefix + bufferData.toString('base64');
+    const suffix = contentType?.split('/')[1] || 'mp4';
+    const base64Prefix = `data:${contentType};base64,`;
+    const base64Data = base64Prefix + bufferData.toString('base64');
     // base64 模式：直接返回 base64（注意：视频 base64 可能非常长）
     if (videoMode === 'base64' || useBase64Mode) {
         return base64Data;
     }
     // File 模式：下载到本地，返回 file:// URL
     if (videoMode === 'File') {
-        let fileUrl = await (0, exports.writeCacheFile)(base64Data, config);
+        const fileUrl = await (0, exports.writeCacheFile)(base64Data, config);
         return fileUrl;
     }
     // assets 模式：下载到本地，上传到 assets，返回 assets URL
     if (videoMode === 'assets' && ctx.assets) {
         try {
             // 注意：大型视频的 base64 字符串可能很长，某些 assets 插件可能处理较慢
-            let assetUrl = await ctx.assets.upload(base64Data, `rss-video-${Date.now()}.${suffix}`);
+            const assetUrl = await ctx.assets.upload(base64Data, `rss-video-${Date.now()}.${suffix}`);
             (0, logger_1.debug)(config, `视频 Assets 上传成功: ${assetUrl}`, 'assets', 'info');
             return assetUrl;
         }
@@ -254,7 +254,7 @@ exports.getVideoUrl = getVideoUrl;
 const puppeteerToFile = async (ctx, config, puppeteer) => {
     // puppeteer.render() 返回 Element 字符串，格式如: <img src="data:image/png;base64,..."/> 或 <img src="https://..."/>
     // 提取 src 属性
-    let base64 = /(?<=src=").+?(?=")/.exec(puppeteer)?.[0];
+    const base64 = /(?<=src=").+?(?=")/.exec(puppeteer)?.[0];
     if (!base64) {
         (0, logger_1.debug)(config, `puppeteer render 返回值格式异常: ${puppeteer}`, 'puppeteerToFile', 'error');
         return puppeteer;

package/lib/utils/message-cache.d.ts

@@ -124,3 +124,11 @@ export declare function initMessageCache(ctx: Context, config: Config, maxSize?:
  * 获取全局消息缓存管理器
  */
 export declare function getMessageCache(): MessageCacheManager | null;
+/**
+ * 销毁全局消息缓存管理器
+ *
+ * 必须在插件 dispose 时调用：MessageCacheManager 构造时持有了 ctx，
+ * 若热重载后仍复用旧实例，会对已 dispose 的 ctx 执行数据库操作而报错/静默丢失。
+ * 置 null 后，下次 initMessageCache 会用新 ctx 重建实例。
+ */
+export declare function disposeMessageCache(): void;

package/lib/utils/message-cache.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageCacheManager = void 0;
 exports.initMessageCache = initMessageCache;
 exports.getMessageCache = getMessageCache;
+exports.disposeMessageCache = disposeMessageCache;
 const koishi_1 = require("koishi");
 const logger_1 = require("./logger");
 const logger = new koishi_1.Logger('rss-owl:cache');
@@ -253,3 +254,14 @@ function initMessageCache(ctx, config, maxSize = 100) {
 function getMessageCache() {
     return globalMessageCache;
 }
+/**
+ * 销毁全局消息缓存管理器
+ *
+ * 必须在插件 dispose 时调用：MessageCacheManager 构造时持有了 ctx，
+ * 若热重载后仍复用旧实例，会对已 dispose 的 ctx 执行数据库操作而报错/静默丢失。
+ * 置 null 后，下次 initMessageCache 会用新 ctx 重建实例。
+ */
+function disposeMessageCache() {
+    globalMessageCache = null;
+    logger.info('消息缓存管理器已销毁');
+}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@anyul/koishi-plugin-rss",
   "description": "Koishi RSS订阅器，支持多种RSS源、图片渲染、AI摘要等高级功能",
-  "version": "5.3.4",
+  "version": "5.3.11",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "packageManager": "pnpm@10.12.1",
   "author": "Anyuluo <anyul@email.com>",
   "contributors": [],
   "repository": {
@@ -43,16 +44,28 @@
     "x2js": "^3.4.4"
   },
   "devDependencies": {
+    "@eslint/js": "^8.57.1",
     "@jest/globals": "^30.2.0",
     "@types/jest": "^30.0.0",
+    "@types/node": "^26.0.1",
+    "eslint": "^9.39.4",
+    "globals": "^15.15.0",
     "jest": "^30.2.0",
     "ts-jest": "^29.4.6",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.62.0"
   },
   "scripts": {
     "test": "jest",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
-    "build": "tsc"
+    "test:ci": "jest --ci --reporters=default",
+    "build": "tsc",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint src tests",
+    "lint:fix": "eslint src tests --fix"
+  },
+  "engines": {
+    "node": ">=20"
   }
 }