koishi-plugin-rocom 1.0.18 → 1.0.19

package/lib/egg-service.js

@@ -9,6 +9,7 @@ exports.formatEggGroups = formatEggGroups;
 const koishi_1 = require("koishi");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const pet_size_1 = require("./pet-size");
 const logger = new koishi_1.Logger('rocom-egg');
 exports.EGG_GROUP_META = {
     1: { label: '未发现', desc: '不能和任何精灵生蛋' },
@@ -70,6 +71,8 @@ function fmtRange(lo, hi, u) {
     return `${lo ?? hi}${u}`;
 }
 function num(value) {
+    if (value === null || value === undefined || value === '')
+        return null;
     const parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : null;
 }
@@ -275,33 +278,60 @@ class EggService {
             weight_min: weightMin,
             weight_max: weightMax,
             weight_label: fmtRange(weightMin, weightMax, 'kg'),
+            ...(0, pet_size_1.sizeVariantPayload)(queryWeight, pet?.breeding?.weight_low == null ? null : pet.breeding.weight_low / 1000, pet?.breeding?.weight_high == null ? null : pet.breeding.weight_high / 1000),
             probability,
             match_count: matchCount,
             match_info_label: this.formatMatchSummary(probability, matchCount),
         };
     }
-    formatSizeApiCard(item) {
-        // 新版 /wiki/pet-size/query 返回 items[].pet / egg_size / match 结构；旧接口是平铺字段。
+    formatSizeApiCard(item, queryWeight) {
+        // 兼容 /wiki/pet-size/query 的 items[].pet/egg_size/match 结构与 /egg/search 的
+        // height_range_m/cm、weight_range_kg/g、r_value/range_area 平铺结构。
         const petInfo = item?.pet && typeof item.pet === 'object' ? item.pet : {};
         const eggSize = item?.egg_size && typeof item.egg_size === 'object' ? item.egg_size : {};
         const heightRange = eggSize?.height && typeof eggSize.height === 'object' ? eggSize.height : {};
         const weightRange = eggSize?.weight && typeof eggSize.weight === 'object' ? eggSize.weight : {};
         const match = item?.match && typeof item.match === 'object' ? item.match : {};
-        const petId = petInfo?.pet_id || item?.petId || item?.pet_id || '-';
-        const petName = petInfo?.name || (typeof item?.pet === 'string' ? item.pet : '') || item?.name || '未知精灵';
+        const petId = petInfo?.pet_id || petInfo?.id || item?.petId || item?.pet_id || item?.id || '-';
+        const petForm = String(petInfo?.form || item?.form || '').trim();
+        let petName = petInfo?.name || (typeof item?.pet === 'string' ? item.pet : '') || item?.name || item?.pet_name || '未知精灵';
+        if (petForm && !String(petName).includes(petForm))
+            petName = `${petName}（${petForm}）`;
         const typeNames = Array.isArray(petInfo?.type_names) ? petInfo.type_names.filter(Boolean) : [];
         const eggGroupNames = Array.isArray(petInfo?.egg_group_names) ? petInfo.egg_group_names.filter(Boolean) : [];
+        const [heightRangeMMin, heightRangeMMax] = this.rangePair(item?.height_range_m);
+        const [heightRangeCmMin, heightRangeCmMax] = this.rangePair(item?.height_range_cm);
+        const [weightRangeKgMin, weightRangeKgMax] = this.rangePair(item?.weight_range_kg);
+        const [weightRangeGMin, weightRangeGMax] = this.rangePair(item?.weight_range_g);
         const probability = num(item?.probability) ?? num(match?.percent);
         const matchCount = num(item?.matchCount);
-        const heightMin = num(heightRange?.min_m ?? item?.diameterMin);
-        const heightMax = num(heightRange?.max_m ?? item?.diameterMax);
-        const weightMin = num(weightRange?.min_kg ?? item?.weightMin);
-        const weightMax = num(weightRange?.max_kg ?? item?.weightMax);
+        const heightMin = num(heightRange?.min_m) ?? heightRangeMMin
+            ?? (heightRangeCmMin == null ? null : heightRangeCmMin / 100)
+            ?? num(item?.diameterMin);
+        const heightMax = num(heightRange?.max_m) ?? heightRangeMMax
+            ?? (heightRangeCmMax == null ? null : heightRangeCmMax / 100)
+            ?? num(item?.diameterMax);
+        const weightMin = num(weightRange?.min_kg) ?? weightRangeKgMin
+            ?? (weightRangeGMin == null ? null : weightRangeGMin / 1000)
+            ?? num(item?.weightMin);
+        const weightMax = num(weightRange?.max_kg) ?? weightRangeKgMax
+            ?? (weightRangeGMax == null ? null : weightRangeGMax / 1000)
+            ?? num(item?.weightMax);
+        const rValue = num(item?.r_value);
+        const rangeArea = num(item?.range_area);
+        const sizeVariant = (0, pet_size_1.sizeVariantPayload)(queryWeight, weightMin, weightMax, fmtRange(weightMin, weightMax, 'kg'));
+        const fallbackMatchLabel = [
+            rValue != null ? `R值 ${formatNumber(rValue, 3)}` : '',
+            rangeArea != null ? `范围面积 ${formatNumber(rangeArea, 0)}` : '',
+        ].filter(Boolean).join(' / ');
+        const matchInfoLabel = String(match?.match_percent_text || '')
+            || fallbackMatchLabel
+            || this.formatMatchSummary(probability, matchCount);
         return {
             id: petId,
             name: petName,
-            icon: petInfo?.icon || item?.petIcon || petIconUrl(petId),
-            image: petInfo?.small_icon || item?.petImage || petImageUrl(petId),
+            icon: petInfo?.icon || item?.pet_icon_url || item?.petIcon || petIconUrl(petId),
+            image: petInfo?.small_icon || item?.pet_img_url || item?.petImage || petImageUrl(petId),
             type_label: typeNames.length ? typeNames.join(' / ') : '后端未提供',
             egg_group_ids: [],
             egg_groups_label: eggGroupNames.length ? eggGroupNames.join(' / ') : '后端未提供',
@@ -311,11 +341,18 @@ class EggService {
             weight_min: weightMin,
             weight_max: weightMax,
             weight_label: fmtRange(weightMin, weightMax, 'kg'),
+            query_weight: queryWeight,
+            ...sizeVariant,
             probability,
             match_count: matchCount,
-            match_info_label: String(match?.match_percent_text || '') || this.formatMatchSummary(probability, matchCount),
+            match_info_label: matchInfoLabel,
         };
     }
+    rangePair(value) {
+        if (Array.isArray(value) && value.length >= 2)
+            return [num(value[0]), num(value[1])];
+        return [null, null];
+    }
     // 新版尺寸反查按 match.layer 划分完美/范围匹配。
     splitNewSizeApiItems(items) {
         const perfect = [];
@@ -473,7 +510,7 @@ class EggService {
             lines.push(`✅ 完美匹配 ${condStr} 的精灵（共 ${results.perfect.length} 只）：`);
             results.perfect.slice(0, 10).forEach((p, i) => {
                 const br = p.breeding || {};
-                lines.push(`  ${i + 1}. ${petName(p)} (#${p.id}) — ${fmtRange(ht(br.height_low), ht(br.height_high), 'm')} / ${fmtRange(wt(br.weight_low), wt(br.weight_high), 'kg')} · ${formatEggGroups(this.getEggGroups(p))}`);
+                lines.push(`  ${i + 1}. ${petName(p)} (#${p.id}) — ${fmtRange(ht(br.height_low), ht(br.height_high), 'm')} / ${fmtRange(wt(br.weight_low), wt(br.weight_high), 'kg')} · ${formatEggGroups(this.getEggGroups(p))}${this.formatPetCard(p, height, weight).size_variant_label ? ' · 【' + this.formatPetCard(p, height, weight).size_variant_label + '】' : ''}`);
             });
         }
         if (results.range.length) {
@@ -482,7 +519,7 @@ class EggService {
             lines.push(`🔍 范围匹配 ${condStr} 的精灵（共 ${results.range.length} 只，容差±15%）：`);
             results.range.slice(0, 10).forEach((p, i) => {
                 const br = p.breeding || {};
-                lines.push(`  ${i + 1}. ${petName(p)} (#${p.id}) — ${fmtRange(ht(br.height_low), ht(br.height_high), 'm')} / ${fmtRange(wt(br.weight_low), wt(br.weight_high), 'kg')} · ${formatEggGroups(this.getEggGroups(p))}`);
+                lines.push(`  ${i + 1}. ${petName(p)} (#${p.id}) — ${fmtRange(ht(br.height_low), ht(br.height_high), 'm')} / ${fmtRange(wt(br.weight_low), wt(br.weight_high), 'kg')} · ${formatEggGroups(this.getEggGroups(p))}${this.formatPetCard(p, height, weight).size_variant_label ? ' · 【' + this.formatPetCard(p, height, weight).size_variant_label + '】' : ''}`);
             });
         }
         return lines.join('\n');
@@ -501,8 +538,8 @@ class EggService {
         if (exact.length) {
             lines.push(`✅ 完美匹配 ${condStr} 的精灵（共 ${exact.length} 只）：`);
             exact.slice(0, 10).forEach((item, i) => {
-                const card = this.formatSizeApiCard(item);
-                lines.push(`  ${i + 1}. ${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label}`);
+                const card = this.formatSizeApiCard(item, weight);
+                lines.push(`  ${i + 1}. ${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label}${card.size_variant_label ? ` · 【${card.size_variant_label}】` : ''}`);
             });
         }
         if (candidates.length) {
@@ -510,8 +547,8 @@ class EggService {
                 lines.push('');
             lines.push(`🔍 范围匹配 ${condStr} 的精灵（共 ${candidates.length} 只）：`);
             candidates.slice(0, 10).forEach((item, i) => {
-                const card = this.formatSizeApiCard(item);
-                lines.push(`  ${i + 1}. ${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label}`);
+                const card = this.formatSizeApiCard(item, weight);
+                lines.push(`  ${i + 1}. ${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label}${card.size_variant_label ? ` · 【${card.size_variant_label}】` : ''}`);
             });
         }
         return lines.join('\n');
@@ -534,7 +571,7 @@ class EggService {
             `🥚 ${data?.pet_name || '未知精灵'} (#${data?.pet_id || '-'})`,
             `属性：${data?.type_label || '未知'}`,
             `蛋组：${data?.egg_groups_label || '暂无蛋组数据'}`,
-            `可配种精灵数：${data?.total_compatible || 0}`,
+            `${data?.compatible_total_known === false ? '当前预览精灵数' : '可配种精灵数'}：${data?.total_compatible || 0}`,
         ];
         if (data?.is_undiscovered)
             lines.push('⚠️ 该精灵属于「未发现」蛋组，无法配种。');
@@ -792,6 +829,185 @@ class EggService {
             copyright: 'Koishi & WeGame 洛克王国插件',
         };
     }
+    // ─── 后端 Egg API 转换（上游 v3.8.0）───
+    buildCandidatesFromEggApi(keyword, candidates) {
+        return {
+            keyword,
+            count: candidates.length,
+            candidates: candidates.map(item => this.formatEggApiCard(item)),
+            commandHint: '请使用更精确的名称重新查询',
+            copyright: 'Koishi & WeGame 洛克王国插件',
+        };
+    }
+    buildSearchDataFromEggApi(pet, compatibleByGroup = {}) {
+        const groups = this.eggApiGroups(pet);
+        const groupIds = [];
+        const groupLabels = {};
+        for (const group of groups) {
+            const id = this.eggGroupId(group);
+            if (id === null || groupIds.includes(id))
+                continue;
+            groupIds.push(id);
+            groupLabels[id] = this.eggGroupLabel(group);
+        }
+        const seen = new Set();
+        let totalCompatible = 0;
+        const sections = groups.map((group) => {
+            const gid = this.eggGroupId(group);
+            const label = this.eggGroupLabel(group);
+            if (gid === null)
+                return null;
+            if (this.isUndiscoveredEggGroup(gid, label)) {
+                return {
+                    id: gid,
+                    label: label || '未发现',
+                    desc: '不能和任何精灵生蛋，多用于传说中的精灵',
+                    count: 0,
+                    members: [],
+                    has_more: false,
+                    total: 0,
+                };
+            }
+            const groupResult = compatibleByGroup[String(gid)] ?? compatibleByGroup[gid] ?? {};
+            const rawMembers = Array.isArray(groupResult)
+                ? groupResult
+                : (Array.isArray(groupResult?.items) ? groupResult.items : []);
+            const members = [];
+            for (const item of rawMembers) {
+                const itemId = item?.id ?? item?.pet_id;
+                if (String(itemId ?? '') === String(pet?.id ?? pet?.pet_id ?? ''))
+                    continue;
+                const key = String(itemId ?? item?.name ?? '');
+                if (key && !seen.has(key)) {
+                    seen.add(key);
+                    totalCompatible += 1;
+                }
+                members.push(this.formatEggApiMember(item));
+            }
+            const total = num(groupResult?.total) ?? members.length;
+            return {
+                id: gid,
+                label,
+                desc: this.eggGroupDesc(group),
+                count: total,
+                members: members.slice(0, 30),
+                has_more: total > 30 || members.length > 30,
+                total,
+            };
+        }).filter(Boolean);
+        const [heightMin, heightMax] = this.eggHeightRangeM(pet);
+        const [weightMin, weightMax] = this.eggWeightRangeKg(pet);
+        const petId = pet?.id ?? pet?.pet_id ?? '-';
+        return {
+            pet_name: this.eggPetDisplayName(pet),
+            pet_id: petId,
+            pet_icon: pet?.pet_icon_url || pet?.icon_url || petIconUrl(petId),
+            pet_image: pet?.pet_img_url || pet?.image_url || petImageUrl(petId),
+            type_label: this.eggApiTypeLabel(pet),
+            egg_groups_label: groupIds.map(id => groupLabels[id] || String(id)).join(' / ') || '暂无蛋组数据',
+            egg_groups: groupIds,
+            egg_group_labels: groupLabels,
+            male_rate: null,
+            female_rate: null,
+            hatch_label: '后端未提供',
+            weight_label: fmtRange(weightMin, weightMax, 'kg'),
+            height_label: fmtRange(heightMin, heightMax, 'm'),
+            total_compatible: num(compatibleByGroup.__all__?.total) ?? totalCompatible,
+            compatible_total_known: num(compatibleByGroup.__all__?.total) !== null,
+            is_undiscovered: groups.some(group => this.isUndiscoveredEggGroup(this.eggGroupId(group), this.eggGroupLabel(group))),
+            egg_group_sections: sections,
+            total_stats: '后端未提供',
+            egg_details: { has_data: false },
+            commandHint: '数据来自后端查蛋；接口不可用时自动回退 Wiki / 本地查蛋' + (num(compatibleByGroup.__all__?.total) === null ? '。总数不可用，当前数量仅为已加载预览' : ''),
+            copyright: 'Koishi & WeGame 洛克王国插件',
+        };
+    }
+    formatEggApiCard(item) {
+        const petId = item?.id ?? item?.pet_id ?? '-';
+        const [heightMin, heightMax] = this.eggHeightRangeM(item);
+        const [weightMin, weightMax] = this.eggWeightRangeKg(item);
+        return {
+            id: petId,
+            name: this.eggPetDisplayName(item),
+            icon: item?.pet_icon_url || item?.icon_url || petIconUrl(petId),
+            image: item?.pet_img_url || item?.image_url || petImageUrl(petId),
+            type_label: this.eggApiTypeLabel(item),
+            egg_group_ids: [],
+            egg_groups_label: this.eggGroupsLabel(item),
+            height_min: heightMin,
+            height_max: heightMax,
+            height_label: fmtRange(heightMin, heightMax, 'm'),
+            weight_min: weightMin,
+            weight_max: weightMax,
+            weight_label: fmtRange(weightMin, weightMax, 'kg'),
+            probability: null,
+            match_count: null,
+            match_info_label: '后端命中',
+        };
+    }
+    formatEggApiMember(item) {
+        return {
+            name: this.eggPetDisplayName(item),
+            id: item?.id ?? item?.pet_id ?? '-',
+            type_label: this.eggApiTypeLabel(item),
+            egg_groups_label: this.eggGroupsLabel(item),
+        };
+    }
+    eggApiGroups(item) {
+        const groups = item?.egg_groups ?? item?.egg_group ?? [];
+        const list = Array.isArray(groups) ? groups : [groups];
+        return list
+            .filter(Boolean)
+            .map(group => (group && typeof group === 'object' ? group : { name: String(group), official_name: String(group) }));
+    }
+    eggGroupId(group) {
+        return num(group?.group_id ?? group?.id);
+    }
+    eggGroupLabel(group) {
+        return String(group?.official_name || group?.name || group?.display_name || '').trim();
+    }
+    eggGroupDesc(group) {
+        const label = this.eggGroupLabel(group);
+        const display = String(group?.display_name || '').trim();
+        return display && display !== label ? display : '';
+    }
+    isUndiscoveredEggGroup(id, label) {
+        const text = String(label || '');
+        return String(id) === '1' || text.includes('未发现') || text.includes('无法孵蛋');
+    }
+    eggPetDisplayName(item) {
+        const name = String(item?.name || item?.pet_name || '未知精灵').trim() || '未知精灵';
+        const form = String(item?.form || '').trim();
+        return form && !name.includes(form) ? `${name}（${form}）` : name;
+    }
+    eggApiTypeLabel(item) {
+        const types = item?.unit_type;
+        if (Array.isArray(types) && types.length)
+            return types.filter(Boolean).join(' / ') || '未知';
+        return String(item?.type || item?.attribute_name || '未知');
+    }
+    eggGroupsLabel(item) {
+        const labels = this.eggApiGroups(item).map(group => this.eggGroupLabel(group)).filter(Boolean);
+        return labels.length ? labels.join(' / ') : '暂无蛋组数据';
+    }
+    eggHeightRangeM(item) {
+        const direct = this.rangePair(item?.height_range_m);
+        if (direct[0] != null || direct[1] != null)
+            return direct;
+        const cm = this.rangePair(item?.height_range_cm);
+        if (cm[0] != null || cm[1] != null)
+            return [cm[0] == null ? null : cm[0] / 100, cm[1] == null ? null : cm[1] / 100];
+        return [null, null];
+    }
+    eggWeightRangeKg(item) {
+        const direct = this.rangePair(item?.weight_range_kg);
+        if (direct[0] != null || direct[1] != null)
+            return direct;
+        const g = this.rangePair(item?.weight_range_g);
+        if (g[0] != null || g[1] != null)
+            return [g[0] == null ? null : g[0] / 1000, g[1] == null ? null : g[1] / 1000];
+        return [null, null];
+    }
     buildSizeSearchData(height, weight, results, heightDisplay) {
         const conditions = [];
         if (height != null)
@@ -816,7 +1032,7 @@ class EggService {
         if (weight != null)
             conditions.push(`体重 ${weight} kg`);
         const groups = this.sizeApiResultGroups(results);
-        const [perfect, ranged] = this.mergeCardsByName(groups.exact.map((item) => this.formatSizeApiCard(item)), groups.candidates.map((item) => this.formatSizeApiCard(item)));
+        const [perfect, ranged] = this.mergeCardsByName(groups.exact.map((item) => this.formatSizeApiCard(item, weight)), groups.candidates.map((item) => this.formatSizeApiCard(item, weight)));
         const poolName = results?.query?.pool && typeof results.query.pool === 'object'
             ? results.query.pool.name
             : '';

package/lib/index.d.ts

@@ -17,6 +17,10 @@ export interface Config {
     merchantCheckMode: 'interval' | 'times';
     merchantCheckInterval: number;
     merchantCheckTimes: string[];
+    merchantTimezone: string;
+    subscriptionGroupAdminEnabled: boolean;
+    subscriptionBotAdminEnabled: boolean;
+    subscriptionBotAdminAuthority: number;
     homeSubscriptionEnabled: boolean;
     homeSubscriptionIntervalMinutes: number;
     announcementSubscriptionEnabled: boolean;
@@ -25,6 +29,7 @@ export interface Config {
     homeQueryPollIntervalMs: number;
     homeQueryTimeoutMs: number;
     lowBandwidthMode: boolean;
+    renderTimeout: number;
     atlasZipUrls: string[];
     atlasGitUrl: string;
     imageCompressionEnabled: boolean;

package/lib/index.js

@@ -22,6 +22,8 @@ const wiki_1 = require("./commands/wiki");
 const egg_1 = require("./commands/egg");
 const tools_1 = require("./commands/tools");
 const admin_1 = require("./commands/admin");
+const ranking_1 = require("./commands/ranking");
+const share_code_1 = require("./commands/share-code");
 const send_image_1 = require("./send-image");
 exports.name = 'rocom';
 exports.inject = { required: ['puppeteer', 'database'] };
@@ -51,10 +53,10 @@ const MENU_GROUPS = [
             { cmd: '洛克.阵容', desc: '查看阵容推荐' },
             { cmd: '查看阵容', desc: '查看阵容详情' },
             { cmd: '洛克.交换大厅', desc: '查看交换大厅' },
-            { cmd: '洛克.玩家', desc: '查询 ingame 玩家资料' },
+            { cmd: '洛克.玩家', desc: '查询 ingame 玩家资料（可选 UID）' },
             { cmd: '洛克.家园', desc: '查询家园菜园' },
             { cmd: '洛克.家园详情', desc: '家园精灵完整数据' },
-            { cmd: '洛克.商店', desc: '查询 ingame 商店' },
+            { cmd: '洛克.商店', desc: '查询 ingame 商店（默认 3009）' },
             { cmd: '洛克.日历', desc: '查看活动日历' },
             { cmd: '洛克.公告', desc: '查看公告列表' },
             { cmd: '洛克.好友关系', desc: '查询好友关系' },
@@ -84,6 +86,10 @@ const MENU_GROUPS = [
             { cmd: '图鉴下载', desc: '下载图鉴缓存(管理员)' },
             { cmd: '洛克.查蛋', desc: '精灵查蛋 / 尺寸反查' },
             { cmd: '洛克.配种', desc: '配种查询' },
+            { cmd: '异色排行榜', desc: '异色精灵收集排行 [UID] [数量]' },
+            { cmd: '炫彩排行榜', desc: '炫彩精灵收集排行 [UID] [数量]' },
+            { cmd: '阵容码 解析', desc: '解析阵容分享码或链接' },
+            { cmd: '阵容码 查询', desc: '查询阵容分享码历史' },
         ],
     },
 ];
@@ -126,7 +132,11 @@ exports.Config = koishi_1.Schema.intersect([
         merchantCheckMode: koishi_1.Schema.union(['interval', 'times']).default('interval').description('商人检查模式：interval 定期轮询 / times 指定时间点'),
         merchantCheckInterval: koishi_1.Schema.number().default(300000).description('商人检查间隔，单位毫秒（仅 interval 模式生效）'),
         merchantCheckTimes: koishi_1.Schema.array(String).default([]).description('商人定时检查时间点（HH:MM 格式，如 08:00，仅 times 模式生效）'),
+        merchantTimezone: koishi_1.Schema.string().default('Asia/Shanghai').description('远行商人时区（IANA 名称，如 Asia/Shanghai；默认 UTC+8）'),
         merchantPrivateSubscriptionEnabled: koishi_1.Schema.boolean().default(true).description('允许个人私聊订阅远行商人推送'),
+        subscriptionGroupAdminEnabled: koishi_1.Schema.boolean().default(true).description('允许群主/管理员管理当前群订阅（对应上游 merchant_group_admin_enabled）'),
+        subscriptionBotAdminEnabled: koishi_1.Schema.boolean().default(true).description('允许白名单/高权限 Bot 管理员管理订阅（对应上游 merchant_bot_admin_enabled）'),
+        subscriptionBotAdminAuthority: koishi_1.Schema.number().default(4).description('Bot 管理员 authority 阈值；达到该值即视为 Bot 管理员'),
         homeSubscriptionEnabled: koishi_1.Schema.boolean().default(true).description('启用家园菜园和灵感订阅推送'),
         homeSubscriptionIntervalMinutes: koishi_1.Schema.number().default(5).description('家园订阅检查间隔，单位分钟'),
         announcementSubscriptionEnabled: koishi_1.Schema.boolean().default(true).description('启用洛克公告订阅推送'),
@@ -137,6 +147,7 @@ exports.Config = koishi_1.Schema.intersect([
         homeQueryPollIntervalMs: koishi_1.Schema.number().default(3000).description('家园查询进入排队后的轮询间隔，单位毫秒'),
         homeQueryTimeoutMs: koishi_1.Schema.number().default(180000).description('家园查询排队等候的总超时，单位毫秒，超时后提示稍后重试'),
         lowBandwidthMode: koishi_1.Schema.boolean().default(false).description('低带宽模式：家园详情不再加载技能图标，降低长图生成压力'),
+        renderTimeout: koishi_1.Schema.number().default(30000).description('单次渲染总超时，单位毫秒（导航、资源等待与截图共享截止时间）'),
     }).description('家园查询排队设置'),
     koishi_1.Schema.object({
         atlasZipUrls: koishi_1.Schema.array(String).default([
@@ -155,7 +166,7 @@ function apply(ctx, config) {
     const homeSubMgr = new user_1.HomeSubscriptionManager(dataDir);
     const announcementSubMgr = new user_1.AnnouncementSubscriptionManager(dataDir);
     const resPath = node_path_1.default.resolve(__dirname, '..');
-    const renderer = new render_1.Renderer(resPath);
+    const renderer = new render_1.Renderer(resPath, { timeoutMs: config.renderTimeout || 30000 });
     const renderTemplateRoot = node_fs_1.default.existsSync(node_path_1.default.join(resPath, 'lib', 'render-templates'))
         ? node_path_1.default.join(resPath, 'lib', 'render-templates')
         : node_path_1.default.join(resPath, 'src', 'render-templates');
@@ -186,4 +197,6 @@ function apply(ctx, config) {
     (0, egg_1.register)(deps);
     (0, tools_1.register)(deps);
     (0, admin_1.register)(deps);
+    (0, ranking_1.register)(deps);
+    (0, share_code_1.register)(deps);
 }

package/lib/merchant-clock.d.ts

@@ -0,0 +1,22 @@
+export interface ClockParts {
+    date: string;
+    hour: number;
+    minute: number;
+    second: number;
+}
+export declare class MerchantClock {
+    private formatter;
+    private fixedOffset;
+    readonly zone: string;
+    constructor(requested?: string);
+    parts(nowMs?: number): ClockParts;
+    date(nowMs?: number): string;
+    /** Boundaries in absolute time, including 23/25-hour DST days. */
+    dayBounds(nowMs?: number): {
+        start: number;
+        end: number;
+    };
+    minuteOfDay(nowMs?: number): number;
+    timeText(nowMs?: number): string;
+    nextTimeFor(times: string[], nowMs?: number): number | null;
+}

package/lib/merchant-clock.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MerchantClock = void 0;
+function pad(value, width = 2) {
+    return String(value).padStart(width, '0');
+}
+// 统一时钟：默认上海时区失败时固定 +08:00，避免 UTC 服务器上商品日期/轮次错位。
+class MerchantClock {
+    formatter;
+    fixedOffset = false;
+    zone;
+    constructor(requested = 'Asia/Shanghai') {
+        const wanted = requested || 'Asia/Shanghai';
+        let zone = wanted;
+        try {
+            new Intl.DateTimeFormat('en-CA', { timeZone: zone }).format(0);
+        }
+        catch {
+            if (wanted === 'Asia/Shanghai') {
+                zone = 'UTC';
+                this.fixedOffset = true;
+            }
+            else {
+                zone = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
+            }
+        }
+        this.zone = this.fixedOffset ? 'UTC+08:00' : zone;
+        this.formatter = new Intl.DateTimeFormat('en-CA', {
+            timeZone: zone,
+            hourCycle: 'h23',
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+        });
+    }
+    parts(nowMs = Date.now()) {
+        const timestamp = nowMs + (this.fixedOffset ? 8 * 3600_000 : 0);
+        const values = {};
+        for (const part of this.formatter.formatToParts(timestamp)) {
+            if (part.type !== 'literal')
+                values[part.type] = part.value;
+        }
+        return {
+            date: `${values.year}-${values.month}-${values.day}`,
+            hour: Number(values.hour),
+            minute: Number(values.minute),
+            second: Number(values.second),
+        };
+    }
+    date(nowMs = Date.now()) {
+        return this.parts(nowMs).date;
+    }
+    /** Boundaries in absolute time, including 23/25-hour DST days. */
+    dayBounds(nowMs = Date.now()) {
+        const day = this.date(nowMs);
+        const edge = (before) => {
+            let low = before ? nowMs - 48 * 3600_000 : nowMs;
+            let high = before ? nowMs : nowMs + 48 * 3600_000;
+            while (high - low > 1) {
+                const mid = Math.floor((low + high) / 2);
+                if (before ? this.date(mid) < day : this.date(mid) === day)
+                    low = mid;
+                else
+                    high = mid;
+            }
+            return high;
+        };
+        return { start: edge(true), end: edge(false) };
+    }
+    minuteOfDay(nowMs = Date.now()) {
+        const p = this.parts(nowMs);
+        return p.hour * 60 + p.minute;
+    }
+    timeText(nowMs = Date.now()) {
+        const p = this.parts(nowMs);
+        return `${pad(p.hour)}:${pad(p.minute)}`;
+    }
+    // 下一个匹配给定 HH:MM 墙钟列表的时刻（毫秒），扫描精度 1 分钟。
+    nextTimeFor(times, nowMs = Date.now()) {
+        const targets = new Set(times.map(item => String(item || '').trim()).filter(Boolean));
+        if (!targets.size)
+            return null;
+        let cursor = Math.floor(nowMs / 60000) * 60000 + 60000;
+        for (let i = 0; i < 60 * 24 * 8; i++) {
+            if (targets.has(this.timeText(cursor)))
+                return cursor;
+            cursor += 60000;
+        }
+        return null;
+    }
+}
+exports.MerchantClock = MerchantClock;

package/lib/merchant-service.d.ts

@@ -0,0 +1,24 @@
+export interface MerchantItem {
+    id: string;
+    parentId?: string;
+    name: string;
+    icon: string;
+    price: number | null;
+    limit: number | null;
+    startsAt: number | null;
+    endsAt: number | null;
+    active: boolean;
+    category: string;
+    source: 'live' | 'legacy';
+}
+export interface NormalizedMerchant {
+    source: 'live' | 'legacy';
+    items: MerchantItem[];
+}
+export declare const numberOrNull: (v: unknown) => number | null;
+export declare function livePrice(value: any): number | null;
+export declare function merchantTimestampMs(value: any): number | null;
+export declare function normalizeLiveMerchant(payload: any, nowMs?: number): MerchantItem[];
+export declare function normalizeLegacyMerchant(payload: any, nowMs?: number): MerchantItem[];
+export declare function isLiveMerchantPayload(payload: any): boolean;
+export declare function normalizeMerchant(payload: any, nowMs?: number): NormalizedMerchant;