koishi-plugin-cfmrmod 1.0.8 → 1.1.0

package/dist/notify.js

@@ -11,6 +11,7 @@ const cfmr_1 = require("./cfmr");
 const fetch = require('node-fetch');
 const MR_BASE = 'https://api.modrinth.com/v2';
 const CF_MIRROR_BASE = 'https://api.curse.tools/v1/cf';
+const CF_OFFICIAL_BASE = 'https://api.curseforge.com/v1';
 function normalizePlatform(platform) {
     if (platform === 'mr' || platform === 'cf')
         return platform;
@@ -388,9 +389,53 @@ function apply(ctx, config, options) {
         };
     }
     async function getLatestCurseForge(projectId, timeout) {
-        var _a;
-        const files = await fetchJson(`${CF_MIRROR_BASE}/mods/${projectId}/files?index=0&pageSize=1`, timeout);
-        const latest = (_a = files === null || files === void 0 ? void 0 : files.data) === null || _a === void 0 ? void 0 : _a[0];
+        var _a, _b, _c;
+        // 优先使用官方 API（如果配置了 API Key），否则回退到镜像
+        const apiKey = (_a = options === null || options === void 0 ? void 0 : options.cfmr) === null || _a === void 0 ? void 0 : _a.curseforgeApiKey;
+        if (apiKey && String(apiKey).trim()) {
+            // 使用官方 API
+            try {
+                const controller = new AbortController();
+                const id = setTimeout(() => controller.abort(), timeout);
+                try {
+                    // 官方 API 可以使用分页参数
+                    const res = await fetch(`${CF_OFFICIAL_BASE}/mods/${projectId}/files?index=0&pageSize=1`, {
+                        headers: {
+                            'Accept': 'application/json',
+                            'x-api-key': String(apiKey).trim(),
+                        },
+                        signal: controller.signal,
+                    });
+                    if (!res.ok)
+                        throw new Error(`HTTP ${res.status}`);
+                    const files = await res.json();
+                    const latest = (_b = files === null || files === void 0 ? void 0 : files.data) === null || _b === void 0 ? void 0 : _b[0];
+                    if (!latest)
+                        return null;
+                    return {
+                        versionId: String(latest.id),
+                        version: latest.displayName || latest.fileName || String(latest.id),
+                        changelog: latest.changelog || '',
+                        downloads: latest.downloadCount,
+                        datePublished: latest.fileDate || null,
+                        releaseType: latest.releaseType,
+                        loaders: Array.isArray(latest.gameVersions) ? latest.gameVersions.filter((v) => /forge|fabric|quilt|neoforge/i.test(String(v))) : [],
+                        gameVersions: Array.isArray(latest.gameVersions) ? latest.gameVersions.filter((v) => /\d/.test(String(v))) : [],
+                        fileName: latest.fileName || '',
+                        fileSize: latest.fileLength || 0,
+                    };
+                }
+                finally {
+                    clearTimeout(id);
+                }
+            }
+            catch (e) {
+                logger.warn(`[getLatestCurseForge] 官方 API 请求失败，回退到镜像: ${e.message}`);
+            }
+        }
+        // 回退到镜像 API - 不使用分页参数，避免缓存问题
+        const files = await fetchJson(`${CF_MIRROR_BASE}/mods/${projectId}/files`, timeout);
+        const latest = (_c = files === null || files === void 0 ? void 0 : files.data) === null || _c === void 0 ? void 0 : _c[0];
         if (!latest)
             return null;
         return {
@@ -422,7 +467,6 @@ function apply(ctx, config, options) {
                 const src = await toImageSrc(buf);
                 await sendToChannel(channelId, koishi_1.h.image(src));
             }
-            // 仅发送卡片，不发送文字
         }
         catch (e) {
             logger.warn(`发送通知失败(${platform}:${projectId}): ${e.message}`);
@@ -439,7 +483,8 @@ function apply(ctx, config, options) {
             try {
                 const key = `${sub.channelId}|${sub.platform}|${sub.projectId}`;
                 const lastCheck = lastCheckMap.get(key) || 0;
-                if (!force && Date.now() - lastCheck < sub.interval) {
+                const elapsed = Date.now() - lastCheck;
+                if (!force && elapsed < sub.interval) {
                     stats.skipped += 1;
                     continue;
                 }
@@ -513,10 +558,53 @@ function apply(ctx, config, options) {
         await updateState(sub.channelId, sub.platform, sub.projectId, latest.version || '');
         return { sent: true, updated: true };
     };
-    if (config.enabled) {
-        const tick = Math.max(60 * 1000, Number(config.interval) || 30 * 60 * 1000);
-        ctx.setInterval(() => checkOnce().catch(() => null), tick);
-    }
+    // 自动检查更新定时器
+    const startAutoCheck = async () => {
+        // 首先加载配置文件
+        await loadConfigFromFile();
+        // 计算轮询间隔：取所有订阅中最小的 interval，最小不低于 1 分钟
+        const getMinInterval = () => {
+            const subs = getConfigSubs();
+            if (!subs.length)
+                return Number(config.interval) || 30 * 60 * 1000;
+            const intervals = subs.map(s => s.interval);
+            return Math.min(...intervals);
+        };
+        // 使用较短的基准轮询间隔（1分钟），让 checkOnce 内部判断每个订阅是否到期
+        // 这样可以支持每个订阅的独立 interval
+        const baseTick = 60 * 1000; // 1 分钟基准轮询
+        // 自动轮询函数：每次都检查 config.enabled
+        const autoCheckLoop = async () => {
+            try {
+                await loadConfigFromFile();
+                if (config.enabled) {
+                    const subs = getConfigSubs();
+                    if (subs.length > 0) {
+                        logger.debug(`自动检查更新开始，共 ${subs.length} 个订阅...`);
+                        const stats = await checkOnce();
+                        if (stats) {
+                            logger.debug(`自动检查完成: checked=${stats.checked}, updated=${stats.updated}, skipped=${stats.skipped}, failed=${stats.failed}`);
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                logger.warn(`自动检查更新失败: ${e.message}`);
+            }
+        };
+        // 启动时延迟执行一次初始检查（给 bot 连接时间）
+        ctx.setTimeout(async () => {
+            await autoCheckLoop();
+        }, 10 * 1000);
+        // 设置定时器，每分钟轮询一次，由 checkOnce 内部判断哪些订阅到期
+        ctx.setInterval(autoCheckLoop, baseTick);
+        const minInterval = getMinInterval();
+        logger.info(`自动更新检查已启动，基准轮询间隔: 1 分钟，最短订阅间隔: ${Math.round(minInterval / 60000)} 分钟`);
+    };
+    // 使用 ctx.on('ready') 确保在 Koishi 完全就绪后启动
+    ctx.on('ready', () => {
+        startAutoCheck().catch(e => logger.warn(`启动自动检查失败: ${e.message}`));
+    });
     ctx.command('notify.add <platform> <projectId>', '添加更新订阅')
         .action(async ({ session }, platform, projectId) => {
         await loadConfigFromFile();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-cfmrmod",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "Koishi 插件：搜索 CurseForge/Modrinth/MCMod 并渲染图片卡片",
   "main": "dist/index.js",
   "files": [
@@ -39,8 +39,8 @@
     "pub": "npm run build && npm publish --access public"
   },
   "peerDependencies": {
-    "koishi": "^4.0.0",
-    "@ltxhhz/koishi-plugin-skia-canvas": "^0.0.10"
+    "@ltxhhz/koishi-plugin-skia-canvas": "^0.0.10",
+    "koishi": "^4.0.0"
   },
   "dependencies": {
     "cheerio": "^1.0.0-rc.12",
@@ -55,7 +55,10 @@
       "zh": "从 CurseForge/Modrinth/MCMod 搜索模组/整合包/光影等内容，并生成图片卡片。"
     },
     "service": {
-      "required": ["skia", "database"]
+      "required": [
+        "skia",
+        "database"
+      ]
     }
   }
 }