koishi-plugin-cs2-update-log 2.3.0 → 2.3.2

package/lib/index.js

@@ -31,8 +31,8 @@ const BRAND_LOGO_PATH = node_path_1.default.join(ASSET_DIR, 'brand-logo.png');
 const GITHUB_QRCODE_PATH = node_path_1.default.join(ASSET_DIR, 'github-qrcode.png');
 const loggerName = 'cs2-update-log';
 exports.Config = koishi_1.Schema.object({
-    interval: koishi_1.Schema.number().min(5).step(1).default(15).description('轮询间隔，单位：秒。'),
-    count: koishi_1.Schema.number().min(1).max(100).step(1).default(20).description('每次从 Steam 拉取的新闻数量。'),
+    interval: koishi_1.Schema.number().min(5).step(1).default(30).description('轮询间隔，单位：秒。'),
+    count: koishi_1.Schema.number().min(1).max(100).step(1).default(5).description('每次从 Steam 拉取的新闻数量。'),
     stateFile: koishi_1.Schema.string().default('.koishi-cs2-update-log.json').description('本地 gid 判重文件路径。相对路径会基于 Koishi 启动目录解析。'),
     pushOnFirstRun: koishi_1.Schema.boolean().default(false).description('首次启动时是否推送历史内容。默认关闭，避免刷屏。'),
     targets: koishi_1.Schema.array(koishi_1.Schema.object({
@@ -80,6 +80,9 @@ function apply(ctx, config) {
     };
     let stateInitialized = false;
     let polling = false;
+    let appReady = false;
+    let stateLoadPromise;
+    let initialPollStarted = false;
     function clearRuntimeCache(reason) {
         cache.rssFetchedAt = 0;
         cache.rssItems = [];
@@ -107,7 +110,9 @@ function apply(ctx, config) {
     }
     async function saveState(recentItems) {
         try {
-            const recentGids = recentItems.map((item) => item.gid).filter(Boolean);
+            const recentGids = recentItems
+                .map((item) => item.gid)
+                .filter((gid) => gid && knownGids.has(gid));
             const recentSet = new Set(recentGids);
             const gids = [
                 ...recentGids,
@@ -240,7 +245,11 @@ function apply(ctx, config) {
             let pushed = 0;
             for (const item of freshItems) {
                 const classified = classifyNews(item);
-                await pushNews(classified);
+                const delivered = await pushNews(classified);
+                if (!delivered) {
+                    logger.warn('新闻未成功送达，保留 gid 等待重试：gid=%s title=%s', item.gid, item.title);
+                    continue;
+                }
                 knownGids.add(item.gid);
                 pushed += 1;
             }
@@ -268,22 +277,55 @@ function apply(ctx, config) {
     async function pushNews(news) {
         if (!config.targets.length) {
             logger.warn('未配置推送目标，已跳过：%s', news.item.title);
-            return;
+            return false;
+        }
+        const deliveries = config.targets.map((target) => ({
+            target,
+            bot: findTargetBot(ctx, target),
+        }));
+        const unavailable = deliveries.filter(({ bot }) => !bot);
+        if (unavailable.length) {
+            for (const { target } of unavailable) {
+                logger.warn('找不到在线推送机器人 platform=%s selfId=%s', target.platform, target.selfId || '*');
+            }
+            return false;
         }
         const content = await buildNewsContent(news);
-        await Promise.all(config.targets.map(async (target) => {
+        const results = await Promise.all(deliveries.map(async ({ target, bot }) => {
             try {
-                const bot = findTargetBot(ctx, target);
-                if (!bot) {
-                    logger.warn('找不到推送机器人 platform=%s selfId=%s', target.platform, target.selfId || '*');
-                    return;
-                }
+                if (!bot)
+                    return false;
                 await bot.sendMessage(target.channelId, content);
+                return true;
             }
             catch (error) {
                 logger.error('推送到 channelId=%s 失败：%s', target.channelId, formatError(error));
+                return false;
             }
         }));
+        return results.every(Boolean);
+    }
+    function ensureStateLoaded() {
+        return stateLoadPromise ||= loadState();
+    }
+    function allTargetBotsOnline() {
+        return !!config.targets.length && config.targets.every((target) => !!findTargetBot(ctx, target));
+    }
+    async function pollWhenTargetsOnline(source) {
+        if (!appReady) {
+            logger.debug('应用尚未 ready，跳过本次 %s 轮询。', source);
+            return 0;
+        }
+        await ensureStateLoaded();
+        if (!allTargetBotsOnline()) {
+            logger.debug('目标机器人尚未全部在线，跳过本次 %s 轮询。', source);
+            return 0;
+        }
+        if (!initialPollStarted) {
+            initialPollStarted = true;
+            return pollAndPush('startup');
+        }
+        return pollAndPush(source);
     }
     async function renderOrFallbackText(news, title, bodyMarkdown, link) {
         const puppeteer = ctx.puppeteer;
@@ -440,7 +482,9 @@ function apply(ctx, config) {
     });
     ctx.command('cs2log.push', '手动检查并推送新的 CS2 官方公告')
         .action(async () => {
-        const pushed = await pollAndPush('manual');
+        if (!allTargetBotsOnline())
+            return '目标机器人尚未在线，暂未执行推送。';
+        const pushed = await pollWhenTargetsOnline('manual');
         return pushed ? `已推送 ${pushed} 条新的 CS2 官方新闻。` : '没有发现新的 CS2 官方新闻。';
     });
     ctx.command('cs2log.test', '测试推送最近 2 条 CS2 官方新闻')
@@ -457,15 +501,36 @@ function apply(ctx, config) {
         }
         return `已向当前会话触发 ${testItems.length} 条 CS2 官方新闻测试推送。本次测试不会写入 gid 判重 state。`;
     });
-    ctx.on('ready', () => {
-        void loadState()
-            .then(() => pollAndPush('startup'))
-            .catch((error) => {
+    ctx.on('ready', async () => {
+        appReady = true;
+        try {
+            await pollWhenTargetsOnline('startup');
+        }
+        catch (error) {
             logger.error('启动 CS2 新闻轮询失败：%s', formatError(error));
+        }
+    });
+    ctx.on('bot-status-updated', async (bot) => {
+        if (bot.status !== 1 /* Universal.Status.ONLINE */)
+            return;
+        const matchesTarget = config.targets.some((target) => {
+            if (target.platform && bot.platform !== target.platform)
+                return false;
+            if (target.selfId && bot.selfId !== target.selfId)
+                return false;
+            return true;
         });
+        if (!matchesTarget)
+            return;
+        try {
+            await pollWhenTargetsOnline('online');
+        }
+        catch (error) {
+            logger.error('机器人上线后检查 CS2 新闻失败：%s', formatError(error));
+        }
     });
     ctx.setInterval(() => {
-        void pollAndPush('timer');
+        void pollWhenTargetsOnline('timer');
     }, Math.max(5, config.interval) * 1000);
     ctx.setInterval(() => {
         clearRuntimeCache('short cache interval');
@@ -881,6 +946,8 @@ body {
 function findTargetBot(ctx, target) {
     const bots = Array.from(ctx.bots || []);
     return bots.find((bot) => {
+        if (bot.status !== 1 /* Universal.Status.ONLINE */)
+            return false;
         if (target.platform && bot.platform !== target.platform)
             return false;
         if (target.selfId && bot.selfId !== target.selfId)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-cs2-update-log",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Koishi plugin for monitoring CS2 official Steam announcements and update logs.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",