koishi-plugin-rocom 1.0.18 → 1.0.19

package/lib/commands/egg.js

@@ -111,10 +111,19 @@ function register(deps) {
             let fallback = '';
             if (height != null && weight != null) {
                 const heightInMeters = heightMeters ?? height / 100;
-                const backendResults = await client.queryPetSize(ctx, heightInMeters, weight, 'magic', 1, 30, session?.userId || '');
-                if (backendResults) {
-                    data = eggService.buildSizeSearchDataFromApi(height, weight, backendResults, heightDisplay);
-                    fallback = eggService.buildSizeSearchTextFromApi(height, weight, backendResults, heightDisplay);
+                const userId = session?.userId || '';
+                // 后端查蛋优先，失败后回退 Wiki 尺寸接口，再回退本地引擎。成功空集不回退。
+                const eggApiResults = await client.searchEggBySize(ctx, heightInMeters, weight, 1, 30, userId);
+                if (eggApiResults) {
+                    data = eggService.buildSizeSearchDataFromApi(height, weight, eggApiResults, heightDisplay);
+                    fallback = eggService.buildSizeSearchTextFromApi(height, weight, eggApiResults, heightDisplay);
+                }
+                else {
+                    const wikiResults = await client.queryPetSize(ctx, heightInMeters, weight, 'magic', 1, 30, userId);
+                    if (wikiResults) {
+                        data = eggService.buildSizeSearchDataFromApi(height, weight, wikiResults, heightDisplay);
+                        fallback = eggService.buildSizeSearchTextFromApi(height, weight, wikiResults, heightDisplay);
+                    }
                 }
             }
             if (!data) {
@@ -128,6 +137,59 @@ function register(deps) {
         const name = nameParts.join(' ');
         if (!name)
             return '请输入精灵名称。用法：洛克.查蛋 <精灵名>';
+        // 后端查蛋优先（上游 v3.8.0）：pet-groups → group-pets，接口不可用才回退 Wiki。
+        const userId = session?.userId || '';
+        const eggCandidatesRes = await client.getEggPetGroups(ctx, name, 20, userId);
+        if (eggCandidatesRes !== null) {
+            const eggCandidates = Array.isArray(eggCandidatesRes)
+                ? eggCandidatesRes
+                : (Array.isArray(eggCandidatesRes?.items) ? eggCandidatesRes.items : []);
+            if (!eggCandidates.length)
+                return `未找到名为「${name}」的精灵，请检查名称后重试。`;
+            let selected = eggCandidates.find((item) => {
+                const itemName = String(item?.name || '').trim();
+                const itemForm = String(item?.form || '').trim();
+                const display = itemForm && !itemName.includes(itemForm) ? `${itemName}（${itemForm}）` : itemName;
+                return String(item?.id || '') === name
+                    || itemName === name
+                    || display === name
+                    || (itemForm && `${itemName}${itemForm}` === name);
+            });
+            if (!selected && eggCandidates.length === 1)
+                selected = eggCandidates[0];
+            if (!selected) {
+                const data = eggService.buildCandidatesFromEggApi(name, eggCandidates);
+                const candidateText = [
+                    `找到多个查蛋候选（${eggCandidates.length}），请使用更精确名称：`,
+                    ...eggCandidates.slice(0, 10).map((item, index) => `${index + 1}. ${item?.name || '未知精灵'} #${item?.id || '-'}`),
+                ].join('\n');
+                await sendEggImage(deps, session, 'searcheggs/candidates', data, candidateText);
+                return;
+            }
+            const compatibleByGroup = {};
+            const groupIds = [];
+            for (const group of selected?.egg_groups || []) {
+                if (!group || typeof group !== 'object')
+                    continue;
+                const groupId = group.group_id || group.id;
+                if (groupId)
+                    groupIds.push(groupId);
+            }
+            if (groupIds.length) {
+                compatibleByGroup['__all__'] = await client.getEggGroupPets(ctx, groupIds, 'any', 1, 1, userId) || {};
+            }
+            for (const group of selected?.egg_groups || []) {
+                if (!group || typeof group !== 'object')
+                    continue;
+                const groupId = group.group_id || group.id;
+                if (!groupId)
+                    continue;
+                compatibleByGroup[String(groupId)] = await client.getEggGroupPets(ctx, [groupId], 'any', 1, 60, userId) || {};
+            }
+            const data = eggService.buildSearchDataFromEggApi(selected, compatibleByGroup);
+            await sendEggImage(deps, session, 'searcheggs', data, eggService.buildSearchTextFromWiki(data));
+            return;
+        }
         let backendDetail = null;
         let backendProfile = null;
         const backendList = await client.listWikiPets(ctx, name, 1, 10);

package/lib/commands/merchant.js

@@ -4,6 +4,12 @@ exports.register = register;
 const koishi_1 = require("koishi");
 const send_image_1 = require("../send-image");
 const subscription_send_1 = require("../subscription-send");
+const merchant_service_1 = require("../merchant-service");
+const merchant_clock_1 = require("../merchant-clock");
+const permissions_1 = require("../permissions");
+const subscription_runner_1 = require("../subscription-runner");
+const node_async_hooks_1 = require("node:async_hooks");
+const async_control_1 = require("../async-control");
 const logger = new koishi_1.Logger('rocom-merchant');
 const TEXT = {
     merchant: '\u8fdc\u884c\u5546\u4eba',
@@ -28,31 +34,21 @@ const ROUND_WINDOWS = [
     { id: 3, label: '16:00-20:00', startHour: 16, endHour: 20 },
     { id: 4, label: '20:00-24:00', startHour: 20, endHour: 24 },
 ];
-const CHINA_TIMEZONE = 'Asia/Shanghai';
-const chinaPartsFormatter = new Intl.DateTimeFormat('zh-CN', {
-    timeZone: CHINA_TIMEZONE,
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hour12: false,
-});
+const defaultClock = new merchant_clock_1.MerchantClock('Asia/Shanghai');
+// Scoped to each synchronous view build; plugin instances never overwrite another clock.
+const clockScope = new node_async_hooks_1.AsyncLocalStorage();
+const currentClock = () => clockScope.getStore() || defaultClock;
 function getChinaParts(input = Date.now()) {
-    const parts = {};
-    const date = input instanceof Date ? input : new Date(input);
-    for (const item of chinaPartsFormatter.formatToParts(date)) {
-        if (item.type !== 'literal')
-            parts[item.type] = item.value;
-    }
+    const ms = input instanceof Date ? input.getTime() : input;
+    const parts = currentClock().parts(ms);
+    const [year, month, day] = parts.date.split('-').map(Number);
     return {
-        year: Number(parts.year || '0'),
-        month: Number(parts.month || '0'),
-        day: Number(parts.day || '0'),
-        hour: Number(parts.hour || '0'),
-        minute: Number(parts.minute || '0'),
-        second: Number(parts.second || '0'),
+        year: year || 0,
+        month: month || 0,
+        day: day || 0,
+        hour: parts.hour,
+        minute: parts.minute,
+        second: parts.second,
     };
 }
 function padNumber(value) {
@@ -62,10 +58,6 @@ function getChinaDateText(input = Date.now()) {
     const parts = getChinaParts(input);
     return `${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}`;
 }
-function getChinaDayStartMs(input = Date.now()) {
-    const parts = getChinaParts(input);
-    return new Date(`${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}T00:00:00+08:00`).getTime();
-}
 function classifyMerchantItem(item) {
     const start = normalizeTimestamp(item?.start_time);
     const end = normalizeTimestamp(item?.end_time);
@@ -115,34 +107,6 @@ function getMerchantActivity(res) {
     const activities = res?.merchantActivities || res?.merchant_activities || [];
     return activities[0] || {};
 }
-function getMerchantProducts(res) {
-    const activity = getMerchantActivity(res);
-    const groups = [];
-    if (Array.isArray(activity?.products))
-        groups.push(activity.products);
-    if (Array.isArray(activity?.product_list))
-        groups.push(activity.product_list);
-    if (Array.isArray(activity?.get_props))
-        groups.push(activity.get_props);
-    if (Array.isArray(activity?.get_extra_props))
-        groups.push(activity.get_extra_props);
-    if (Array.isArray(activity?.get_pets))
-        groups.push(activity.get_pets);
-    const merged = [];
-    const seen = new Set();
-    for (const list of groups) {
-        for (const item of list) {
-            const start = normalizeTimestamp(item?.start_time) ?? 0;
-            const end = normalizeTimestamp(item?.end_time) ?? Infinity;
-            const key = `${item?.id ?? ''}|${item?.name ?? ''}|${start}|${end === Infinity ? 'inf' : end}`;
-            if (seen.has(key))
-                continue;
-            seen.add(key);
-            merged.push(item);
-        }
-    }
-    return merged;
-}
 function isMerchantItemActive(item, now = Date.now()) {
     const nowMs = now instanceof Date ? now.getTime() : now;
     const start = normalizeTimestamp(item?.start_time);
@@ -154,8 +118,7 @@ function isMerchantItemToday(item, now = Date.now()) {
     const end = normalizeTimestamp(item?.end_time);
     if (start === null || end === null)
         return true;
-    const startOfDay = getChinaDayStartMs(now);
-    const endOfDay = startOfDay + 24 * 60 * 60 * 1000;
+    const { start: startOfDay, end: endOfDay } = currentClock().dayBounds(now instanceof Date ? now.getTime() : now);
     return start < endOfDay && end > startOfDay;
 }
 function getRoundForItem(item, now = Date.now()) {
@@ -220,61 +183,49 @@ function parseMerchantSubscriptionArgs(args, defaultItems) {
 }
 function getSubscriptionTarget(session) {
     const platform = session.platform || session.bot?.platform || '';
-    const privateChat = !session.guildId;
+    const privateChat = (0, permissions_1.isDirectSession)(session);
     const channelId = session.channelId || session.guildId || session.userId || '';
-    const key = privateChat ? `private_${session.userId}` : session.guildId;
+    const key = privateChat ? `private_${session.userId}` : (session.guildId || channelId);
     return { key, platform, channelId, privateChat };
 }
 function isBotAdmin(session, adminUserIds) {
     return adminUserIds.includes(session?.userId || '');
 }
+// 订阅管理权限：群主/管理员与 Bot 管理员按独立开关生效（上游 v4.0）。
+function canManageGroupSubscription(deps, session) {
+    return (0, permissions_1.canManageSubscription)(deps.config, session);
+}
 function sameStringArray(left, right) {
     return JSON.stringify(left) === JSON.stringify(right);
 }
-function getRandomGoodsMaps(res) {
-    const priceMap = new Map();
-    const limitMap = new Map();
-    const randomGoods = Array.isArray(res?.random_goods)
-        ? res.random_goods
-        : Array.isArray(res?.randomGoods)
-            ? res.randomGoods
-            : [];
-    for (const item of randomGoods) {
-        const name = String(item?.goods_name || item?.name || '').trim();
-        if (!name)
-            continue;
-        if (item?.price !== undefined && item?.price !== null && item.price !== '')
-            priceMap.set(name, item.price);
-        if (item?.buy_limit_num !== undefined && item?.buy_limit_num !== null && item.buy_limit_num !== '') {
-            limitMap.set(name, item.buy_limit_num);
-        }
-    }
-    return { priceMap, limitMap };
-}
 function normalizeMerchantProducts(res, now = new Date()) {
-    return getMerchantProducts(res).map((item) => {
-        const name = String(item?.name || item?.goods_name || TEXT.unknown).trim() || TEXT.unknown;
+    const nowMs = now.getTime();
+    const { items } = (0, merchant_service_1.normalizeMerchant)(res, nowMs);
+    return items.map((item) => {
+        const source = { start_time: item.startsAt, end_time: item.endsAt };
         return {
-            name,
-            image: String(item?.icon_url || item?.iconUrl || ''),
-            time_label: formatProductWindow(item),
-            category: classifyMerchantItem(item),
-            round_id: getRoundForItem(item, now),
-            is_active: isMerchantItemActive(item, now),
-            start_time: normalizeTimestamp(item?.start_time),
-            end_time: normalizeTimestamp(item?.end_time),
+            name: item.name,
+            image: item.icon,
+            time_label: formatProductWindow(source),
+            category: classifyMerchantItem(source),
+            round_id: getRoundForItem(source, now),
+            is_active: item.active,
+            start_time: item.startsAt,
+            end_time: item.endsAt,
+            price: item.price,
+            limit: item.limit,
+            item_category: item.category,
         };
     });
 }
-function buildMerchantCardItems(products, res, options) {
-    const { priceMap, limitMap } = getRandomGoodsMaps(res);
+function buildMerchantCardItems(products, options) {
     const catOrder = { round: 0, normal: 1, weekend: 2 };
     const startY = 592;
     const cardHeight = 308;
     const gap = 43;
     const goodsAll = products.map((product) => {
-        const limit = limitMap.get(product.name);
-        const limitText = limit === undefined || limit === null || limit === '' ? '--' : String(limit);
+        const limit = product.limit;
+        const limitText = limit === undefined || limit === null ? '--' : String(limit);
         const isHot = product.category !== 'round';
         const isEnded = options.includeEnded ? !product.is_active : false;
         const roundPrefix = product.round_id ? `第${product.round_id}轮·` : '';
@@ -286,7 +237,7 @@ function buildMerchantCardItems(products, res, options) {
         return {
             goods_name: product.name,
             iconUrl: product.image,
-            price: priceMap.get(product.name) ?? 0,
+            price: product.price ?? 0,
             num: '',
             category: product.category,
             roundId: product.round_id || 0,
@@ -397,7 +348,7 @@ function buildMerchantRenderPayload(res, now = new Date()) {
     const data = {
         dateStr: getMerchantDateStr(now),
         timeRange,
-        ...buildMerchantCardItems(products, res, { includeEnded: false }),
+        ...buildMerchantCardItems(products, { includeEnded: false }),
     };
     const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
     return { products, roundInfo, data, fallback };
@@ -432,7 +383,7 @@ function buildTodayMerchantRenderPayload(res, now = new Date()) {
     });
     const data = {
         dateStr: getMerchantDateStr(now),
-        ...buildMerchantCardItems(products, res, { includeEnded: true }),
+        ...buildMerchantCardItems(products, { includeEnded: true }),
     };
     const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, products);
     return { products, data, fallback };
@@ -472,36 +423,52 @@ function useLegacyMerchantUi(deps) {
     return deps.config.merchantUiStyle === 'old';
 }
 function buildConfiguredMerchantRenderPayload(deps, res, now = new Date()) {
-    const payload = useLegacyMerchantUi(deps)
-        ? buildLegacyMerchantRenderPayload(res, now)
-        : buildMerchantRenderPayload(res, now);
-    return {
-        ...payload,
-        templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/merchant',
-    };
+    return clockScope.run(new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai'), () => {
+        const payload = useLegacyMerchantUi(deps)
+            ? buildLegacyMerchantRenderPayload(res, now)
+            : buildMerchantRenderPayload(res, now);
+        return {
+            ...payload,
+            templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/merchant',
+        };
+    });
 }
 function buildConfiguredTodayMerchantRenderPayload(deps, res, now = new Date()) {
-    const payload = useLegacyMerchantUi(deps)
-        ? buildLegacyTodayMerchantRenderPayload(res, now)
-        : buildTodayMerchantRenderPayload(res, now);
-    return {
-        ...payload,
-        templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/today',
-    };
+    return clockScope.run(new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai'), () => {
+        const payload = useLegacyMerchantUi(deps)
+            ? buildLegacyTodayMerchantRenderPayload(res, now)
+            : buildTodayMerchantRenderPayload(res, now);
+        return {
+            ...payload,
+            templateName: useLegacyMerchantUi(deps) ? 'yuanxing-shangren' : 'yuanxing-shangren/today',
+        };
+    });
 }
-async function checkMerchantSubscriptions(deps) {
+async function checkMerchantSubscriptions(deps, signal) {
     const { ctx, client, merchantSubMgr, renderer, config } = deps;
-    const res = await client.getMerchantInfo(ctx, true);
+    const subs = merchantSubMgr.getAll();
+    if (!Object.keys(subs).length)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'no-subscriptions' };
+    if (signal?.aborted)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'cancelled' };
+    const res = await client.getMerchantInfo(ctx, true, { signal });
+    if (signal?.aborted)
+        return { subscriptions: 0, matched: 0, pushed: 0, kind: 'cancelled' };
     if (!res)
-        return { subscriptions: 0, matched: 0, pushed: 0 };
+        return { subscriptions: Object.keys(subs).length, matched: 0, pushed: 0, kind: 'error' };
     const { products, roundInfo, data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
+    if (!products.length)
+        return { subscriptions: Object.keys(subs).length, matched: 0, pushed: 0, kind: 'empty' };
     const productNames = products.map((p) => p.name || '').filter(Boolean);
-    const rendered = await renderer.renderHtml(ctx, templateName, data);
+    const rendered = await renderer.renderHtml(ctx, templateName, data, { signal });
     const renderedImage = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
-    const subs = merchantSubMgr.getAll();
     let matchedCount = 0;
     let pushedCount = 0;
     for (const [key, sub] of Object.entries(subs)) {
+        if (signal?.aborted)
+            break;
+        if (JSON.stringify(merchantSubMgr.getAll()[key]) !== JSON.stringify(sub))
+            continue;
         const matchAll = !!sub.match_all;
         const matched = matchAll
             ? productNames
@@ -534,8 +501,9 @@ async function checkMerchantSubscriptions(deps) {
             channelId,
             guildId: sub.group_id || '',
             userId: sub.user_id || '',
-        }, renderedImage, fallbackText, !!sub.mention_all);
-        if (!sent)
+            selfId: sub.self_id || '',
+        }, renderedImage, fallbackText, !!sub.mention_all, signal);
+        if (!sent || signal?.aborted || JSON.stringify(merchantSubMgr.getAll()[key]) !== JSON.stringify(sub))
             continue;
         pushedCount++;
         merchantSubMgr.upsert(key, {
@@ -544,12 +512,15 @@ async function checkMerchantSubscriptions(deps) {
             last_matched_items: matched,
         });
     }
-    return { subscriptions: Object.keys(subs).length, matched: matchedCount, pushed: pushedCount };
+    return { subscriptions: Object.keys(subs).length, matched: matchedCount, pushed: pushedCount, kind: 'success' };
 }
 function register(deps) {
+    const merchantRunner = (0, subscription_runner_1.createRunner)(deps.ctx);
+    const merchantClock = new merchant_clock_1.MerchantClock(deps.config.merchantTimezone || 'Asia/Shanghai');
     const { ctx, config, client, merchantSubMgr } = deps;
     ctx.command(TEXT.merchant, '\u67e5\u770b\u8fdc\u884c\u5546\u4eba\u5546\u54c1')
         .alias('yxsr')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
@@ -559,6 +530,7 @@ function register(deps) {
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren', deps.config);
     });
     ctx.command(TEXT.todayMerchant, '查看今日远行商人全部商品')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
@@ -568,10 +540,11 @@ function register(deps) {
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren:today', deps.config);
     });
     ctx.command(`${TEXT.subscribe} [args:text]`, '\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\u63d0\u9192')
+        .userFields(['authority'])
         .action(async ({ session }, args) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         if (target.privateChat && !config.merchantPrivateSubscriptionEnabled)
             return '个人私聊订阅功能已被禁用，请联系机器人管理员。';
         const parsed = parseMerchantSubscriptionArgs(args, config.merchantSubscriptionItems);
@@ -582,6 +555,7 @@ function register(deps) {
             type: target.privateChat ? '个人订阅' : '群订阅',
             channel_id: target.channelId,
             platform: target.platform,
+            self_id: session.selfId || session.bot?.selfId || '',
             items: parsed.items,
             match_all: parsed.match_all,
             mention_all: target.privateChat ? false : parsed.mention_all,
@@ -592,10 +566,11 @@ function register(deps) {
         return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.match_all ? '\u5168\u90e8\u5546\u54c1\uff08\u6bcf\u8f6e\u63a8\u9001\uff09' : parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
     });
     ctx.command(TEXT.viewSubscribe, '\u67e5\u770b\u5f53\u524d\u4f1a\u8bdd\u7684\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         const sub = merchantSubMgr.get(target.key);
         const scopeName = target.privateChat ? '你' : '当前群组';
         if (!sub)
@@ -604,48 +579,71 @@ function register(deps) {
         return `${scopeName}订阅商品：${itemsText}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
     });
     ctx.command(TEXT.unsubscribe, '\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         const target = getSubscriptionTarget(session);
-        if (!target.privateChat && !isBotAdmin(session, config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.privateChat && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         merchantSubMgr.delete(target.key);
         return '\u2705 \u5df2\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605\u3002';
     });
     ctx.command('洛克').subcommand('.调试远行商人订阅', '立即执行一次远行商人订阅检查')
         .alias('洛克调试远行商人订阅')
+        .userFields(['authority'])
         .action(async ({ session }) => {
         if (!isBotAdmin(session, config.adminUserIds))
             return '此指令仅限管理员使用。';
-        const result = await checkMerchantSubscriptions(deps);
+        const result = await merchantRunner(signal => checkMerchantSubscriptions(deps, signal));
+        if (!result)
+            return '订阅检查正在运行或插件已停止。';
         return `远行商人订阅检查完成：订阅 ${result.subscriptions} 条，命中 ${result.matched} 条，推送 ${result.pushed} 条。`;
     });
+    const roundKey = () => {
+        const p = merchantClock.parts();
+        return p.date + ':' + Math.floor(p.hour / 4);
+    };
+    const runMerchantCheck = () => merchantRunner(async (signal) => {
+        const round = roundKey();
+        for (let retry = 0; retry <= 3; retry++) {
+            if (signal.aborted || (retry > 0 && roundKey() !== round))
+                return;
+            if (!Object.keys(merchantSubMgr.getAll()).length)
+                return;
+            const result = await checkMerchantSubscriptions(deps, signal);
+            if (result.kind !== 'empty' || retry === 3)
+                return;
+            await (0, async_control_1.delay)(240000 + Math.floor(Math.random() * 60001) - 30000, signal);
+        }
+    }).catch(err => { if (!merchantRunner.aborted())
+        logger.warn('远行商人订阅检查失败: ' + err); });
     if (config.merchantSubscriptionEnabled) {
-        // 上游 v3.1.0：检查前加入 ±30s 随机延迟，降低刷新窗口和并发请求冲突。
-        const MERCHANT_JITTER_MS = 30000;
-        const runCheckWithJitter = () => {
-            const jitter = Math.floor(Math.random() * MERCHANT_JITTER_MS);
-            setTimeout(() => {
-                checkMerchantSubscriptions(deps).catch(err => logger.warn(`远行商人订阅检查失败: ${err}`));
-            }, jitter);
-        };
         if (config.merchantCheckMode === 'times' && config.merchantCheckTimes.length > 0) {
-            let lastMerchantCheckKey = '';
-            ctx.setInterval(async () => {
-                const now = new Date();
-                const timeStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
-                if (!config.merchantCheckTimes.includes(timeStr))
+            const times = config.merchantCheckTimes.filter(value => /^([01]\d|2[0-3]):[0-5]\d$/.test(value));
+            let lastWallKey = '';
+            const schedule = (after = Date.now()) => {
+                if (merchantRunner.aborted())
+                    return;
+                const target = merchantClock.nextTimeFor(times, after);
+                if (target === null)
                     return;
-                const checkKey = `${now.toDateString()}-${timeStr}`;
-                if (checkKey === lastMerchantCheckKey)
+                const wallKey = merchantClock.date(target) + ':' + merchantClock.timeText(target);
+                if (wallKey === lastWallKey) {
+                    schedule(target);
                     return;
-                lastMerchantCheckKey = checkKey;
-                runCheckWithJitter();
-            }, 60000);
+                }
+                const jitter = Math.floor(Math.random() * 60001) - 30000;
+                ctx.setTimeout(() => {
+                    lastWallKey = wallKey;
+                    void runMerchantCheck();
+                    schedule(target);
+                }, Math.max(0, target + jitter - Date.now()));
+            };
+            schedule();
         }
         else {
-            ctx.setInterval(async () => {
-                runCheckWithJitter();
-            }, config.merchantCheckInterval);
+            ctx.setInterval(() => {
+                ctx.setTimeout(() => { void runMerchantCheck(); }, Math.floor(Math.random() * 30001));
+            }, Math.max(30000, config.merchantCheckInterval || 300000));
         }
     }
 }