koishi-plugin-rocom 1.0.12 → 1.0.13

package/lib/commands/merchant.js

@@ -7,6 +7,7 @@ const subscription_send_1 = require("../subscription-send");
 const logger = new koishi_1.Logger('rocom-merchant');
 const TEXT = {
     merchant: '\u8fdc\u884c\u5546\u4eba',
+    todayMerchant: '今日远行商人',
     subscribe: '\u8ba2\u9605\u8fdc\u884c\u5546\u4eba',
     unsubscribe: '\u53d6\u6d88\u8ba2\u9605\u8fdc\u884c\u5546\u4eba',
     viewSubscribe: '\u67e5\u770b\u8fdc\u884c\u5546\u4eba\u8ba2\u9605',
@@ -21,6 +22,12 @@ const CATEGORY_LABELS = {
     round: '常规商品',
     weekend: '周末限定',
 };
+const ROUND_WINDOWS = [
+    { id: 1, label: '08:00-12:00', startHour: 8, endHour: 12 },
+    { id: 2, label: '12:00-16:00', startHour: 12, endHour: 16 },
+    { 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,
@@ -29,19 +36,36 @@ const chinaPartsFormatter = new Intl.DateTimeFormat('zh-CN', {
     day: '2-digit',
     hour: '2-digit',
     minute: '2-digit',
+    second: '2-digit',
     hour12: false,
 });
-function getChinaParts(timestampMs) {
+function getChinaParts(input = Date.now()) {
     const parts = {};
-    for (const item of chinaPartsFormatter.formatToParts(new Date(timestampMs))) {
+    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;
     }
     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'),
     };
 }
+function padNumber(value) {
+    return String(value).padStart(2, '0');
+}
+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);
@@ -72,16 +96,12 @@ function formatProductWindow(product) {
     if (!start && !end)
         return '';
     const formatDate = (timestamp) => {
-        const date = new Date(timestamp);
-        const month = String(date.getMonth() + 1).padStart(2, '0');
-        const day = String(date.getDate()).padStart(2, '0');
-        return `${month}-${day}`;
+        const parts = getChinaParts(timestamp);
+        return `${padNumber(parts.month)}-${padNumber(parts.day)}`;
     };
     const formatTime = (timestamp) => {
-        const date = new Date(timestamp);
-        const hour = String(date.getHours()).padStart(2, '0');
-        const minute = String(date.getMinutes()).padStart(2, '0');
-        return `${hour}:${minute}`;
+        const parts = getChinaParts(timestamp);
+        return `${padNumber(parts.hour)}:${padNumber(parts.minute)}`;
     };
     if (start && end) {
         const datePart = formatDate(start);
@@ -95,7 +115,7 @@ function getMerchantActivity(res) {
     const activities = res?.merchantActivities || res?.merchant_activities || [];
     return activities[0] || {};
 }
-function getActiveProducts(res) {
+function getMerchantProducts(res) {
     const activity = getMerchantActivity(res);
     const groups = [];
     if (Array.isArray(activity?.products))
@@ -110,13 +130,10 @@ function getActiveProducts(res) {
         groups.push(activity.get_pets);
     const merged = [];
     const seen = new Set();
-    const now = Date.now();
     for (const list of groups) {
         for (const item of list) {
             const start = normalizeTimestamp(item?.start_time) ?? 0;
             const end = normalizeTimestamp(item?.end_time) ?? Infinity;
-            if (now < start || now >= end)
-                continue;
             const key = `${item?.id ?? ''}|${item?.name ?? ''}|${start}|${end === Infinity ? 'inf' : end}`;
             if (seen.has(key))
                 continue;
@@ -126,36 +143,58 @@ function getActiveProducts(res) {
     }
     return merged;
 }
-function getCurrentMerchantRound() {
-    const now = new Date();
-    const hour = now.getHours();
-    const rounds = [8, 12, 16, 20];
-    let currentRound = null;
-    let nextRound = null;
-    for (let i = 0; i < rounds.length; i++) {
-        if (hour >= rounds[i] && (i === rounds.length - 1 || hour < rounds[i + 1])) {
-            currentRound = i + 1;
-            nextRound = i < rounds.length - 1 ? rounds[i + 1] : rounds[0];
-            break;
-        }
+function isMerchantItemActive(item, now = Date.now()) {
+    const nowMs = now instanceof Date ? now.getTime() : now;
+    const start = normalizeTimestamp(item?.start_time);
+    const end = normalizeTimestamp(item?.end_time);
+    return (start === null || nowMs >= start) && (end === null || nowMs < end);
+}
+function isMerchantItemToday(item, now = Date.now()) {
+    const start = normalizeTimestamp(item?.start_time);
+    const end = normalizeTimestamp(item?.end_time);
+    if (start === null || end === null)
+        return true;
+    const startOfDay = getChinaDayStartMs(now);
+    const endOfDay = startOfDay + 24 * 60 * 60 * 1000;
+    return start < endOfDay && end > startOfDay;
+}
+function getRoundForItem(item, now = Date.now()) {
+    const start = normalizeTimestamp(item?.start_time);
+    if (start === null)
+        return null;
+    const startParts = getChinaParts(start);
+    const nowParts = getChinaParts(now);
+    if (startParts.year !== nowParts.year || startParts.month !== nowParts.month || startParts.day !== nowParts.day) {
+        return null;
+    }
+    const startHour = startParts.hour + startParts.minute / 60;
+    const round = ROUND_WINDOWS.find(win => startHour >= win.startHour && startHour < win.endHour);
+    return round?.id ?? null;
+}
+function getCurrentMerchantRound(now = new Date()) {
+    const parts = getChinaParts(now);
+    const secondsOfDay = parts.hour * 3600 + parts.minute * 60 + parts.second;
+    const marketStartSeconds = 8 * 3600;
+    const marketEndSeconds = 24 * 3600;
+    const datePart = getChinaDateText(now);
+    if (secondsOfDay < marketStartSeconds || secondsOfDay >= marketEndSeconds) {
+        return {
+            current: null,
+            total: ROUND_WINDOWS.length,
+            countdown: TEXT.notOpen,
+            is_open: false,
+            round_id: `${datePart}-closed`,
+        };
     }
-    if (currentRound === null)
-        nextRound = rounds[0];
-    const nextTime = new Date(now);
-    if (nextRound <= hour)
-        nextTime.setDate(nextTime.getDate() + 1);
-    nextTime.setHours(nextRound, 0, 0, 0);
-    const diff = nextTime.getTime() - now.getTime();
+    const currentWindow = ROUND_WINDOWS.find(win => parts.hour >= win.startHour && parts.hour < win.endHour);
+    const currentRound = currentWindow?.id ?? null;
+    const roundEndSeconds = (currentWindow?.endHour ?? 24) * 3600;
+    const diff = Math.max(0, (roundEndSeconds - secondsOfDay) * 1000);
     const hours = Math.floor(diff / 3600000);
     const mins = Math.floor((diff % 3600000) / 60000);
-    const datePart = [
-        now.getFullYear(),
-        String(now.getMonth() + 1).padStart(2, '0'),
-        String(now.getDate()).padStart(2, '0'),
-    ].join('-');
     return {
         current: currentRound,
-        total: rounds.length,
+        total: ROUND_WINDOWS.length,
         countdown: `${hours}\u5c0f\u65f6${mins}\u5206\u949f`,
         is_open: currentRound !== null,
         round_id: `${datePart}-${currentRound || 'closed'}`,
@@ -192,69 +231,272 @@ function isBotAdmin(session, adminUserIds) {
 function sameStringArray(left, right) {
     return JSON.stringify(left) === JSON.stringify(right);
 }
-function buildMerchantRenderPayload(res) {
-    const products = getActiveProducts(res);
-    const roundInfo = getCurrentMerchantRound();
-    const activity = getMerchantActivity(res);
-    const renderedProducts = products.map((p) => ({
-        name: p.name || TEXT.unknown,
-        image: p.icon_url || '',
-        time_label: formatProductWindow(p),
-        category: classifyMerchantItem(p),
+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;
+        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),
+        };
+    });
+}
+function buildMerchantCardItems(products, res, options) {
+    const { priceMap, limitMap } = getRandomGoodsMaps(res);
+    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 isHot = product.category !== 'round';
+        const isEnded = options.includeEnded ? !product.is_active : false;
+        const roundPrefix = product.round_id ? `第${product.round_id}轮·` : '';
+        const remainingStr = product.category === 'normal'
+            ? `本日限购${limitText}个`
+            : product.category === 'weekend'
+                ? `活动期间限购${limitText}个`
+                : `${isEnded ? roundPrefix : ''}本轮限购${limitText}个`;
+        return {
+            goods_name: product.name,
+            iconUrl: product.image,
+            price: priceMap.get(product.name) ?? 0,
+            num: '',
+            category: product.category,
+            roundId: product.round_id || 0,
+            isHot,
+            isEnded,
+            remainingStr,
+            top: 0,
+        };
+    });
+    goodsAll.sort((a, b) => {
+        if (options.includeEnded && a.isEnded !== b.isEnded)
+            return a.isEnded ? 1 : -1;
+        if (a.category !== b.category)
+            return catOrder[a.category] - catOrder[b.category];
+        return Number(b.price || 0) - Number(a.price || 0);
+    });
+    const goods = goodsAll.map((item, index) => ({
+        ...item,
+        num: String(index + 1).padStart(2, '0'),
+        top: startY + index * (cardHeight + gap),
     }));
-    const categoryMap = {
-        normal: [],
-        round: [],
-        weekend: [],
-    };
-    for (const product of renderedProducts) {
-        categoryMap[product.category].push(product);
+    const lastCardTop = goods.length > 0 ? goods[goods.length - 1].top : startY;
+    const bottomFrameTop = lastCardTop + 287;
+    const pageHeight = bottomFrameTop + 160;
+    return { goods, bottomFrameTop, pageHeight };
+}
+function getCurrentMerchantProducts(products, roundInfo) {
+    return products.filter((product) => {
+        if (!product.is_active)
+            return false;
+        if (product.category === 'round')
+            return !!roundInfo.current && product.round_id === roundInfo.current;
+        return true;
+    });
+}
+function buildMerchantFallbackText(title, products, roundInfo) {
+    const fallbackLines = [title];
+    if (roundInfo) {
+        fallbackLines.push(`轮次：第 ${roundInfo.current || TEXT.notOpen} / ${roundInfo.total} 轮`);
+        fallbackLines.push(`剩余：${roundInfo.countdown}`);
+    }
+    fallbackLines.push('');
+    if (!products.length) {
+        fallbackLines.push(roundInfo ? '当前轮次暂无商品。' : '今日暂无已公布的远行商人商品。');
+        return fallbackLines.join('\n').trimEnd();
+    }
+    for (const key of CATEGORY_ORDER) {
+        const group = products.filter(product => product.category === key);
+        if (!group.length)
+            continue;
+        fallbackLines.push(`【${CATEGORY_LABELS[key]}】`);
+        group.forEach((product, index) => {
+            const tail = product.time_label ? ` (${product.time_label})` : '';
+            fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
+        });
+        fallbackLines.push('');
     }
-    const categories = CATEGORY_ORDER
-        .filter(key => categoryMap[key].length > 0)
-        .map(key => ({
-        key,
-        label: CATEGORY_LABELS[key],
-        products: categoryMap[key],
+    return fallbackLines.join('\n').trimEnd();
+}
+function getMerchantActivityTitle(res) {
+    const activity = getMerchantActivity(res);
+    return String(activity?.name || TEXT.merchant).trim() || TEXT.merchant;
+}
+function getMerchantActivitySubtitle(res) {
+    const activity = getMerchantActivity(res);
+    return String(activity?.start_date || '每日 08:00 / 12:00 / 16:00 / 20:00 刷新').trim();
+}
+function getLegacyRoundGroups(now, roundInfo) {
+    return ROUND_WINDOWS.map(win => ({
+        round_id: win.id,
+        label: `${padNumber(win.startHour)}:00 - ${padNumber(win.endHour)}:00`,
+        is_current: roundInfo.current === win.id,
+        products: [],
     }));
+}
+function buildLegacyCategoryGroups(products, roundGroups) {
+    return CATEGORY_ORDER
+        .map((key) => {
+        const groups = roundGroups
+            .map(group => ({
+            round_id: group.round_id,
+            label: group.label,
+            is_current: group.is_current,
+            products: group.products.filter(product => product.category === key),
+        }))
+            .filter(group => group.products.length > 0);
+        return {
+            key,
+            label: CATEGORY_LABELS[key],
+            roundGroups: groups,
+            product_count: groups.reduce((sum, group) => sum + group.products.length, 0),
+        };
+    })
+        .filter(category => category.product_count > 0);
+}
+function getMerchantDateStr(now = new Date()) {
+    const parts = getChinaParts(now);
+    return `${parts.month}.${parts.day}`;
+}
+function buildMerchantRenderPayload(res, now = new Date()) {
+    const allProducts = normalizeMerchantProducts(res, now);
+    const roundInfo = getCurrentMerchantRound(now);
+    const products = getCurrentMerchantProducts(allProducts, roundInfo);
+    const currentWindow = ROUND_WINDOWS.find(win => win.id === roundInfo.current);
+    const timeRange = currentWindow
+        ? `${padNumber(currentWindow.startHour)}:00-${padNumber(currentWindow.endHour)}:00`
+        : '--:--~--:--';
+    const data = {
+        dateStr: getMerchantDateStr(now),
+        timeRange,
+        ...buildMerchantCardItems(products, res, { includeEnded: false }),
+    };
+    const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
+    return { products, roundInfo, data, fallback };
+}
+function buildLegacyMerchantRenderPayload(res, now = new Date()) {
+    const allProducts = normalizeMerchantProducts(res, now);
+    const roundInfo = getCurrentMerchantRound(now);
+    const products = getCurrentMerchantProducts(allProducts, roundInfo);
+    const roundGroups = getLegacyRoundGroups(now, roundInfo);
+    const currentGroup = roundGroups.find(group => group.round_id === roundInfo.current) || roundGroups[0];
+    currentGroup.products.push(...products);
+    const categories = buildLegacyCategoryGroups(products, roundGroups);
     const data = {
         background: '',
-        title: activity.name || TEXT.merchant,
-        subtitle: activity.start_date || '\u6bcf\u65e5 08:00 / 12:00 / 16:00 / 20:00 \u5237\u65b0',
-        titleIcon: true,
-        product_count: renderedProducts.length,
-        round_info: roundInfo,
+        title: getMerchantActivityTitle(res),
+        subtitle: getMerchantActivitySubtitle(res),
         categories,
-        products: renderedProducts,
+        roundGroups,
+        total_products: products.length,
     };
-    const fallbackLines = [];
-    if (renderedProducts.length) {
-        fallbackLines.push(`\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff08\u5171 ${renderedProducts.length} \u4ef6\uff09`);
-        fallbackLines.push(`\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\uff0c\u5269\u4f59\uff1a${roundInfo.countdown}`);
-        fallbackLines.push('');
-        for (const cat of categories) {
-            fallbackLines.push(`\u3010${cat.label}\u3011`);
-            cat.products.forEach((product, index) => {
-                const tail = product.time_label ? ` (${product.time_label})` : '';
-                fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
-            });
-            fallbackLines.push('');
-        }
-    }
-    else {
-        fallbackLines.push('\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002');
+    const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
+    return { products, roundInfo, data, fallback };
+}
+function buildTodayMerchantRenderPayload(res, now = new Date()) {
+    const products = normalizeMerchantProducts(res, now)
+        .filter(product => {
+        const source = {
+            start_time: product.start_time,
+            end_time: product.end_time,
+        };
+        return isMerchantItemToday(source, now);
+    });
+    const data = {
+        dateStr: getMerchantDateStr(now),
+        ...buildMerchantCardItems(products, res, { includeEnded: true }),
+    };
+    const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, products);
+    return { products, data, fallback };
+}
+function buildLegacyTodayMerchantRenderPayload(res, now = new Date()) {
+    const allProducts = normalizeMerchantProducts(res, now)
+        .filter(product => {
+        const source = {
+            start_time: product.start_time,
+            end_time: product.end_time,
+        };
+        return isMerchantItemToday(source, now);
+    });
+    const roundInfo = getCurrentMerchantRound(now);
+    const roundGroups = getLegacyRoundGroups(now, roundInfo);
+    for (const product of allProducts) {
+        const roundId = product.category === 'round' ? product.round_id : null;
+        const group = roundId
+            ? roundGroups.find(item => item.round_id === roundId)
+            : roundGroups[0];
+        if (group)
+            group.products.push(product);
     }
-    const fallback = fallbackLines.join('\n').trimEnd();
-    return { products: renderedProducts, roundInfo, data, fallback };
+    const categories = buildLegacyCategoryGroups(allProducts, roundGroups);
+    const data = {
+        background: '',
+        title: TEXT.todayMerchant,
+        subtitle: `${getChinaDateText(now)} · 每日 08:00 / 12:00 / 16:00 / 20:00 刷新`,
+        categories,
+        roundGroups,
+        total_products: allProducts.length,
+    };
+    const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, allProducts);
+    return { products: allProducts, data, fallback };
+}
+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',
+    };
+}
+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',
+    };
 }
 async function checkMerchantSubscriptions(deps) {
     const { ctx, client, merchantSubMgr, renderer, config } = deps;
     const res = await client.getMerchantInfo(ctx, true);
     if (!res)
         return { subscriptions: 0, matched: 0, pushed: 0 };
-    const { products, roundInfo, data, fallback } = buildMerchantRenderPayload(res);
+    const { products, roundInfo, data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
     const productNames = products.map((p) => p.name || '').filter(Boolean);
-    const rendered = await renderer.renderHtml(ctx, 'yuanxing-shangren', data);
+    const rendered = await renderer.renderHtml(ctx, templateName, data);
     const renderedImage = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
     const subs = merchantSubMgr.getAll();
     let matchedCount = 0;
@@ -311,10 +553,19 @@ function register(deps) {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
             return `\u83b7\u53d6\u8fdc\u884c\u5546\u4eba\u6570\u636e\u5931\u8d25\uff1a${client.getLastErrorBrief()}`;
-        const { data, fallback } = buildMerchantRenderPayload(res);
-        const png = await deps.renderer.renderHtml(ctx, 'yuanxing-shangren', data);
+        const { data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
+        const png = await deps.renderer.renderHtml(ctx, templateName, data);
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren', deps.config);
     });
+    ctx.command(TEXT.todayMerchant, '查看今日远行商人全部商品')
+        .action(async ({ session }) => {
+        const res = await client.getMerchantInfo(ctx, true);
+        if (!res)
+            return `获取今日远行商人数据失败：${client.getLastErrorBrief()}`;
+        const { data, fallback, templateName } = buildConfiguredTodayMerchantRenderPayload(deps, res);
+        const png = await deps.renderer.renderHtml(ctx, templateName, data);
+        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')
         .action(async ({ session }, args) => {
         const target = getSubscriptionTarget(session);

package/lib/commands/query.js

@@ -827,7 +827,7 @@ function panelPetDetailData(uid, pet, updatedAtText) {
     };
 }
 async function refreshPanelPets(deps, uid, userId = '') {
-    const res = await deps.client.ingameHomeInfo(deps.ctx, uid, 20000);
+    const res = await deps.client.ingameHomeInfo(deps.ctx, uid, { waitMs: 20000, timeoutMs: 30000 });
     if (res) {
         const homeInfo = homeInfoPayload(res);
         const pets = buildPanelPetList(homeInfo);
@@ -860,7 +860,7 @@ function formatPanelUpdatedAt(ts) {
         return new Date().toLocaleString('zh-CN');
     return new Date(value * 1000).toLocaleString('zh-CN');
 }
-function extractHomePet(raw, index, guard = false) {
+function extractHomePet(deps, raw, index, guard = false) {
     if (!raw || typeof raw !== 'object')
         return null;
     const homePet = raw.home_pet_info && typeof raw.home_pet_info === 'object' ? raw.home_pet_info : raw;
@@ -874,6 +874,7 @@ function extractHomePet(raw, index, guard = false) {
     const eggReady = hasEgg || (predictedEggTime > 0 && nowTs >= predictedEggTime);
     const feedRound = Number(homePet.feed_round || raw.feed_round || 0) || 0;
     const gender = Number(display.gender || raw.gender || 0) || 0;
+    const mutationType = Number(display.mutation_type || raw.mutation_type || homePet.mutation_type || 0) || 0;
     const isMale = gender === 1;
     const status = homePet.status ?? raw.status;
     const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(status).toLowerCase());
@@ -913,7 +914,11 @@ function extractHomePet(raw, index, guard = false) {
         name: String(homePet.name || homePet.pet_name || raw.name || raw.pet_name || `精灵 ${petId || ''}`),
         level: display.level || raw.level || homePet.level || '--',
         iconUrl: homePetIcon(petId, raw.icon_url || raw.pet_img_url || raw.petIcon || ''),
+        starIconUrl: [1, 8, 9].includes(mutationType)
+            ? deps.renderer.resourceUrl(`render-templates/home/img/rocomuid/star_${mutationType}.png`)
+            : '',
         badge: isGuard ? '守' : (hasEgg ? '蛋' : ''),
+        mutationType,
         isGuard,
         statusText,
         statusClass,
@@ -1038,7 +1043,7 @@ function buildHomeRenderData(deps, res, uid) {
     const indoorPets = [];
     const guardPets = [];
     indoorSources.forEach((raw, index) => {
-        const item = extractHomePet(raw, index);
+        const item = extractHomePet(deps, raw, index);
         if (!item)
             return;
         if (item.isGuard)
@@ -1047,7 +1052,7 @@ function buildHomeRenderData(deps, res, uid) {
             indoorPets.push(item);
     });
     guardSources.forEach((raw, index) => {
-        const item = extractHomePet(raw, index, true);
+        const item = extractHomePet(deps, raw, index, true);
         if (item)
             guardPets.push(item);
     });
@@ -1320,7 +1325,7 @@ async function checkHomeSubscriptions(deps) {
             continue;
         checkedCount++;
         if (!cache.has(sub.uid)) {
-            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid));
+            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid, { timeoutMs: 30000 }));
         }
         const res = cache.get(sub.uid);
         if (!res)
@@ -1809,7 +1814,18 @@ function register(deps) {
         }
         if (!targetUid)
             return '请提供玩家 UID，或先完成绑定后使用 洛克.家园。';
-        const res = await client.ingameHomeInfo(ctx, targetUid);
+        let queuedNotified = false;
+        const res = await client.ingameHomeInfo(ctx, targetUid, {
+            waitMs: deps.config.homeQueryWaitMs,
+            intervalMs: deps.config.homeQueryPollIntervalMs,
+            timeoutMs: deps.config.homeQueryTimeoutMs,
+            onQueued: async () => {
+                if (queuedNotified)
+                    return;
+                queuedNotified = true;
+                await session?.send?.(`UID ${targetUid} 的家园查询已进入队列，正在等待游戏侧返回，请稍候…`);
+            },
+        });
         if (!res)
             return `家园查询失败：${client.getLastErrorBrief()}`;
         await sendImage(deps, session, 'home', buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);

package/lib/index.d.ts

@@ -12,12 +12,16 @@ export interface Config {
     autoRefreshTime: string[];
     merchantSubscriptionEnabled: boolean;
     merchantSubscriptionItems: string[];
+    merchantUiStyle: 'new' | 'old';
     merchantPrivateSubscriptionEnabled: boolean;
     merchantCheckMode: 'interval' | 'times';
     merchantCheckInterval: number;
     merchantCheckTimes: string[];
     homeSubscriptionEnabled: boolean;
     homeSubscriptionIntervalMinutes: number;
+    homeQueryWaitMs: number;
+    homeQueryPollIntervalMs: number;
+    homeQueryTimeoutMs: number;
     imageCompressionEnabled: boolean;
     imageCompressionMinBytes: number;
     imageCompressionLevel: number;