koishi-plugin-cfmrmod 1.0.7 → 1.0.9

package/dist/cfmr/index.js

@@ -1893,6 +1893,28 @@ async function fetchCurseForgeDetail(id, apiKey, timeout, cfUrl = null) {
 }
 // 搜索入口 (MR)
 async function searchModrinth(query, type, timeout) {
+    // 先尝试直接通过ID/slug获取项目详情
+    try {
+        const project = await fetchJson(`${MR_BASE}/project/${encodeURIComponent(query)}`, {}, timeout);
+        if (project && project.slug) {
+            // 成功获取到项目,返回单个结果
+            return [{
+                    platform: 'Modrinth',
+                    id: project.slug,
+                    name: project.title,
+                    author: project.author || 'Unknown',
+                    summary: project.description,
+                    type,
+                    icon: project.icon_url,
+                    downloads: project.downloads || 0,
+                    updated: new Date(project.updated || project.published).toLocaleDateString()
+                }];
+        }
+    }
+    catch (e) {
+        // ID/slug获取失败,继续使用搜索API
+    }
+    // 使用搜索API
     const facet = MR_FACET_MAP[type];
     const url = `${MR_BASE}/search?query=${encodeURIComponent(query)}&facets=[["${facet}"]]&limit=20`;
     const json = await fetchJson(url, {}, timeout);
@@ -2029,8 +2051,10 @@ function apply(ctx, config) {
             '\n请输入序号查看详情 (p/n 翻页)';
     };
     const handleSearch = async (session, platform, type, keyword) => {
-        if (!keyword)
-            return session.send('请输入关键词');
+        if (!keyword) {
+            await session.send('请输入关键词');
+            return;
+        }
         let results = [];
         try {
             if (platform === 'mr')
@@ -2039,10 +2063,13 @@ function apply(ctx, config) {
                 results = await searchCurseForge(keyword, type, config.curseforgeApiKey, config.requestTimeout, config.curseforgeGameId);
         }
         catch (e) {
-            return session.send(`搜索出错: ${e.message}`);
+            await session.send(`搜索出错: ${e.message}`);
+            return;
+        }
+        if (!results.length) {
+            await session.send('未找到结果');
+            return;
         }
-        if (!results.length)
-            return session.send('未找到结果');
         if (results.length === 1) {
             const item = results[0];
             try {

package/dist/mcmod/index.js

@@ -2653,7 +2653,7 @@ function apply(ctx, config) {
                 const sentMessageIds = await session.send(listText);
                 searchStates.set(session.cid, {
                     results,
-                    page: 0,
+                    pageIndex: 0,
                     type: 'mod',
                     messageIds: Array.isArray(sentMessageIds) ? sentMessageIds : [sentMessageIds],
                     timer: setTimeout(() => {
@@ -2686,6 +2686,7 @@ function apply(ctx, config) {
         if (input === 'p' || input === 'n') {
             // 加入队列处理翻页，防止并发
             enqueue(session, 'page-turn', async () => {
+                var _a, _b;
                 // 重新获取状态，防止排队期间状态丢失
                 const currentState = searchStates.get(session.cid);
                 if (!currentState)
@@ -2693,10 +2694,11 @@ function apply(ctx, config) {
                 clearTimeout(currentState.timer);
                 currentState.timer = setTimeout(() => searchStates.delete(session.cid), TIMEOUT_MS);
                 const total = Math.ceil(currentState.results.length / PAGE_SIZE);
-                let newIndex = currentState.pageIndex;
-                if (input === 'n' && currentState.pageIndex < total - 1)
+                const currentPage = Number((_b = (_a = currentState.pageIndex) !== null && _a !== void 0 ? _a : currentState.page) !== null && _b !== void 0 ? _b : 0) || 0;
+                let newIndex = currentPage;
+                if (input === 'n' && currentPage < total - 1)
                     newIndex++;
-                else if (input === 'p' && currentState.pageIndex > 0)
+                else if (input === 'p' && currentPage > 0)
                     newIndex--;
                 else {
                     await session.send('没有更多页面了。');
@@ -2705,8 +2707,8 @@ function apply(ctx, config) {
                 // 撤回旧列表（可选，为了整洁）
                 await tryWithdraw(session, currentState.messageIds);
                 currentState.pageIndex = newIndex;
-                const newMsgIds = await session.send(formatListPage(currentState.results, currentState.pageIndex, currentState.type));
-                currentState.messageIds = newMsgIds;
+                const newMsgIds = await session.send(formatListPage(currentState.results, newIndex, currentState.type));
+                currentState.messageIds = Array.isArray(newMsgIds) ? newMsgIds : [newMsgIds];
             });
             return;
         }
@@ -2715,12 +2717,13 @@ function apply(ctx, config) {
         if (!isNaN(choice) && choice >= 1) {
             // 加入队列处理生成卡片
             enqueue(session, 'select-item', async () => {
-                var _a;
+                var _a, _b, _c;
                 const currentState = searchStates.get(session.cid);
                 if (!currentState)
                     return; // 状态可能已过期
                 const idx = choice - 1;
-                const pageStart = currentState.pageIndex * PAGE_SIZE;
+                const currentPage = Number((_b = (_a = currentState.pageIndex) !== null && _a !== void 0 ? _a : currentState.page) !== null && _b !== void 0 ? _b : 0) || 0;
+                const pageStart = currentPage * PAGE_SIZE;
                 const pageEnd = Math.min(pageStart + PAGE_SIZE, currentState.results.length);
                 if (choice < pageStart + 1 || choice > pageEnd) {
                     // 如果序号不在当前页，忽略或提示
@@ -2738,7 +2741,7 @@ function apply(ctx, config) {
                         if (currentState.type === 'author')
                             img = await drawAuthorCard(item.link);
                         else if (currentState.type === 'user') {
-                            const uid = ((_a = item.link.match(/\/(\d+)(?:\.html|\/)?$/)) === null || _a === void 0 ? void 0 : _a[1]) || '0';
+                            const uid = ((_c = item.link.match(/\/(\d+)(?:\.html|\/)?$/)) === null || _c === void 0 ? void 0 : _c[1]) || '0';
                             img = await drawCenterCardImpl(uid, logger);
                         }
                         else if (currentState.type === 'mod' || currentState.type === 'pack')

package/dist/notify.js

@@ -513,10 +513,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.7",
+  "version": "1.0.9",
   "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"
+      ]
     }
   }
 }