koishi-plugin-rocom 1.0.17 → 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 = [];
@@ -341,42 +378,6 @@ class EggService {
             candidates: Array.isArray(results?.candidates) ? results.candidates : [],
         };
     }
-    formatEggSearchCard(item) {
-        const eggGroups = Array.isArray(item?.egg_groups)
-            ? item.egg_groups
-                .map((group) => group?.official_name || group?.display_name || `蛋组${group?.group_id}`)
-                .filter(Boolean)
-            : [];
-        const heightRange = Array.isArray(item?.height_range_m) ? item.height_range_m : [];
-        const weightRange = Array.isArray(item?.weight_range_kg) ? item.weight_range_kg : [];
-        const typeLabel = Array.isArray(item?.unit_type) && item.unit_type.length
-            ? item.unit_type.join(' / ')
-            : '未知';
-        return {
-            id: item?.id || '-',
-            name: item?.name || '未知精灵',
-            icon: item?.pet_icon_url || petIconUrl(item?.id),
-            image: item?.pet_img_url || petImageUrl(item?.id),
-            type_label: typeLabel,
-            egg_group_ids: Array.isArray(item?.egg_groups)
-                ? item.egg_groups.map((group) => Number(group?.group_id)).filter((value) => Number.isFinite(value))
-                : [],
-            egg_groups_label: eggGroups.length ? eggGroups.join(' / ') : '暂无蛋组数据',
-            height_min: num(heightRange[0]),
-            height_max: num(heightRange[1]),
-            height_label: fmtRange(num(heightRange[0]), num(heightRange[1]), 'm'),
-            weight_min: num(weightRange[0]),
-            weight_max: num(weightRange[1]),
-            weight_label: fmtRange(num(weightRange[0]), num(weightRange[1]), 'kg'),
-            probability: null,
-            match_count: null,
-            match_info_label: '',
-        };
-    }
-    formatEggSearchTextLine(item) {
-        const card = this.formatEggSearchCard(item);
-        return `${card.name} (#${card.id}) — ${card.height_label} / ${card.weight_label} · ${card.egg_groups_label}`;
-    }
     mergeCardsByName(perfect, ranged) {
         const perfectMap = new Map();
         const rangedMap = new Map();
@@ -509,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) {
@@ -518,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');
@@ -537,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) {
@@ -546,32 +547,12 @@ 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');
     }
-    buildEggSearchText(heightMeters, weight, results, heightDisplay) {
-        const cond = [];
-        if (heightMeters != null)
-            cond.push(`身高=${heightDisplay || `${formatNumber(heightMeters)}m`}`);
-        if (weight != null)
-            cond.push(`体重=${weight}kg`);
-        const condStr = cond.join(' + ') || '当前条件';
-        const items = Array.isArray(results?.items) ? results.items : [];
-        if (!items.length)
-            return `❌ 未找到符合 ${condStr} 的精灵。`;
-        const total = results?.total ?? items.length;
-        const lines = [`✅ 符合 ${condStr} 的精灵（共 ${total} 只）：`];
-        items.slice(0, 10).forEach((item, index) => {
-            lines.push(`  ${index + 1}. ${this.formatEggSearchTextLine(item)}`);
-        });
-        if (results?.has_more) {
-            lines.push(`  ... 还有更多结果，可尝试更精确的尺寸或等待后续分页支持。`);
-        }
-        return lines.join('\n');
-    }
     buildSearchText(pet) {
         const egs = this.getEggGroups(pet);
         const compat = this.getCompatiblePets(pet);
@@ -585,6 +566,17 @@ class EggService {
             lines.push('⚠️ 该精灵属于「未发现」蛋组，无法配种。');
         return lines.join('\n');
     }
+    buildSearchTextFromWiki(data) {
+        const lines = [
+            `🥚 ${data?.pet_name || '未知精灵'} (#${data?.pet_id || '-'})`,
+            `属性：${data?.type_label || '未知'}`,
+            `蛋组：${data?.egg_groups_label || '暂无蛋组数据'}`,
+            `${data?.compatible_total_known === false ? '当前预览精灵数' : '可配种精灵数'}：${data?.total_compatible || 0}`,
+        ];
+        if (data?.is_undiscovered)
+            lines.push('⚠️ 该精灵属于「未发现」蛋组，无法配种。');
+        return lines.join('\n');
+    }
     buildCandidatesText(keyword, candidates) {
         const lines = [`🔍 「${keyword}」匹配到 ${candidates.length} 只精灵，请精确输入：`];
         candidates.slice(0, 10).forEach((p, i) => {
@@ -683,6 +675,120 @@ class EggService {
             copyright: 'Koishi & WeGame 洛克王国插件',
         };
     }
+    buildSearchDataFromWiki(pet, compatibleByGroup = {}) {
+        const eggGroups = this.wikiEggGroups(pet);
+        const eggGroupIds = eggGroups.map(group => group.id);
+        const eggGroupLabels = Object.fromEntries(eggGroups.map(group => [group.id, group.name]));
+        const seen = new Set();
+        let totalCompatible = 0;
+        const sections = eggGroups.map(group => {
+            const isUndiscovered = group.id === 1 || group.name.includes('未发现');
+            if (isUndiscovered) {
+                return {
+                    id: 1,
+                    label: '未发现',
+                    desc: '不能和任何精灵生蛋，多用于传说中的精灵',
+                    count: 0,
+                    members: [],
+                    has_more: false,
+                    total: 0,
+                };
+            }
+            const rawMembers = compatibleByGroup[String(group.id)] || [];
+            const members = rawMembers
+                .filter(item => String(item?.pet_id ?? item?.id ?? '') !== String(pet?.pet_id ?? pet?.id ?? ''))
+                .map(item => {
+                const key = String(item?.pet_id ?? item?.id ?? item?.name ?? '');
+                if (key && !seen.has(key)) {
+                    seen.add(key);
+                    totalCompatible += 1;
+                }
+                return this.formatWikiMember(item);
+            });
+            return {
+                id: group.id,
+                label: group.name,
+                desc: '',
+                count: members.length,
+                members: members.slice(0, 30),
+                has_more: members.length > 30,
+                total: members.length,
+            };
+        });
+        const petId = pet?.pet_id ?? pet?.id ?? '-';
+        const height = pet?.body_size?.height || {};
+        const weight = pet?.body_size?.weight || {};
+        const attributes = pet?.attributes || {};
+        const maleRate = num(pet?.gender_ratio?.male_percent);
+        const femaleRate = num(pet?.gender_ratio?.female_percent);
+        const totalStats = num(attributes?.sum) ?? ['hp', 'physical_attack', 'magic_attack', 'physical_defense', 'magic_defense', 'speed']
+            .reduce((sum, key) => sum + (num(attributes?.[key]) || 0), 0);
+        return {
+            pet_name: pet?.name || '未知精灵',
+            pet_id: petId,
+            pet_icon: pet?.icon || pet?.small_icon || petIconUrl(petId),
+            pet_image: pet?.small_icon || pet?.icon || petImageUrl(petId),
+            type_label: this.wikiTypeLabel(pet),
+            egg_groups_label: eggGroups.map(group => group.name).join(' / ') || '暂无蛋组数据',
+            egg_groups: eggGroupIds,
+            egg_group_labels: eggGroupLabels,
+            male_rate: maleRate,
+            female_rate: femaleRate,
+            hatch_label: '暂无数据',
+            weight_label: fmtRange(num(weight?.min_kg), num(weight?.max_kg), 'kg'),
+            height_label: fmtRange(num(height?.min_m), num(height?.max_m), 'm'),
+            total_compatible: totalCompatible,
+            is_undiscovered: eggGroups.some(group => group.id === 1 || group.name.includes('未发现')),
+            egg_group_sections: sections,
+            total_stats: totalStats,
+            egg_details: { has_data: false },
+            commandHint: '数据来自新版 Wiki；接口不可用时自动回退本地查蛋',
+            copyright: 'Koishi & WeGame 洛克王国插件',
+        };
+    }
+    wikiEggGroups(pet) {
+        const groups = Array.isArray(pet?.egg_groups) ? pet.egg_groups : [];
+        const normalized = groups
+            .map((group) => {
+            if (group && typeof group === 'object') {
+                const name = String(group?.name || group?.label || '').trim();
+                const id = group?.id ?? group?.group_id ?? (name.includes('未发现') ? 1 : name);
+                return name ? { id, name } : null;
+            }
+            const name = String(group || '').trim();
+            return name ? { id: name.includes('未发现') ? 1 : name, name } : null;
+        })
+            .filter(Boolean);
+        if (normalized.length)
+            return normalized;
+        const ids = Array.isArray(pet?.egg_group_ids) ? pet.egg_group_ids : [];
+        const names = Array.isArray(pet?.egg_group_names) ? pet.egg_group_names : [];
+        return names.map((rawName, index) => {
+            const name = String(rawName || '').trim();
+            return {
+                id: ids[index] ?? (name.includes('未发现') ? 1 : name),
+                name,
+            };
+        }).filter(group => group.name);
+    }
+    wikiTypeLabel(pet) {
+        const typeNames = Array.isArray(pet?.type_names) ? pet.type_names.filter(Boolean) : [];
+        if (typeNames.length)
+            return typeNames.join(' / ');
+        const types = Array.isArray(pet?.types)
+            ? pet.types.map((type) => type?.name || type).filter(Boolean)
+            : [];
+        return types.length ? types.join(' / ') : '未知';
+    }
+    formatWikiMember(item) {
+        const groups = this.wikiEggGroups(item);
+        return {
+            name: item?.name || '未知精灵',
+            id: item?.pet_id ?? item?.id ?? '-',
+            type_label: this.wikiTypeLabel(item),
+            egg_groups_label: groups.map(group => group.name).join(' / ') || '暂无蛋组数据',
+        };
+    }
     buildPairData(a, b) {
         const ev = this.evaluatePair(a, b);
         const makePetCard = (p) => ({
@@ -723,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)
@@ -747,8 +1032,11 @@ 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 searchMode = results?.searchMode || '';
+        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
+            : '';
+        const searchMode = results?.searchMode || poolName || '';
         const queryLabel = `${conditions.join(' / ') || '尺寸反查'}${searchMode ? ` · 模式 ${searchMode}` : ''}`;
         return {
             query_label: queryLabel,
@@ -760,28 +1048,8 @@ class EggService {
             copyright: 'Koishi & WeGame 洛克王国插件',
         };
     }
-    buildEggSearchData(heightMeters, weight, results, heightDisplay) {
-        const conditions = [];
-        if (heightMeters != null)
-            conditions.push(`身高 ${heightDisplay || `${formatNumber(heightMeters)} m`}`);
-        if (weight != null)
-            conditions.push(`体重 ${weight} kg`);
-        const cards = (Array.isArray(results?.items) ? results.items : []).map((item) => this.formatEggSearchCard(item));
-        const pageNo = num(results?.page_no);
-        const totalPages = num(results?.total_pages);
-        const pageLabel = pageNo && totalPages ? ` · 第 ${pageNo}/${totalPages} 页` : '';
-        return {
-            query_label: `${conditions.join(' / ') || '孵蛋反查'}${pageLabel}`,
-            perfect_matches: cards,
-            range_matches: [],
-            total_count: results?.total ?? cards.length,
-            has_results: cards.length > 0,
-            commandHint: '洛克查蛋 <精灵名> | 洛克查蛋 0.18m 1.5kg | 洛克配种 <父体> <母体>',
-            copyright: 'Koishi & WeGame 洛克王国插件',
-        };
-    }
     buildEggDetails(breeding) {
-        if (!breeding)
+        if (!breeding || !Object.keys(breeding).length)
             return { has_data: false };
         const baseProb = breeding.egg_base_glass_prob_array;
         const addProb = breeding.egg_add_glass_prob_array;

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;