koishi-plugin-rocom 1.0.17 → 1.0.18

package/lib/client.d.ts

@@ -66,7 +66,7 @@ export declare class RocomClient {
     getLineupList(ctx: Context, fwToken: string, pageNo?: number, category?: string, userIdentifier?: string): Promise<any>;
     getExchangePosters(ctx: Context, fwToken: string, pageNo?: number, userIdentifier?: string): Promise<any>;
     getMerchantInfo(ctx: Context, refresh?: boolean): Promise<any>;
-    queryPetSize(ctx: Context, diameter: number, weight: number, sameRideEgg?: boolean, userIdentifier?: string): Promise<any>;
+    queryPetSize(ctx: Context, diameter: number, weight: number, pool?: string, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     getActivitiesInfo(ctx: Context, refresh?: boolean, userIdentifier?: string): Promise<any>;
     syncConfig(ctx: Context, userIdentifier?: string): Promise<any>;
     getAnnouncementList(ctx: Context, params?: {
@@ -80,7 +80,6 @@ export declare class RocomClient {
         order?: string;
     }, userIdentifier?: string): Promise<any>;
     getAnnouncementDetail(ctx: Context, threadId: number | string, userIdentifier?: string): Promise<any>;
-    getEggSearch(ctx: Context, height: number, weight: number, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     getEggGroups(ctx: Context, userIdentifier?: string): Promise<any>;
     getEggGroupPets(ctx: Context, groupIds: string | number[], matchMode?: 'any' | 'all', pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     getEggPetGroups(ctx: Context, query: string, limit?: number, userIdentifier?: string): Promise<any>;

package/lib/client.js

@@ -616,23 +616,16 @@ class RocomClient {
             random_goods: 'all',
         });
     }
-    async queryPetSize(ctx, diameter, weight, sameRideEgg = false, userIdentifier = '') {
-        // 新版蛋尺寸反查：/wiki/pet-size/query（items[].pet/egg_size/match 结构），失败时回退旧接口。
-        const newParams = this.scopedParams({
+    async queryPetSize(ctx, diameter, weight, pool = 'magic', pageNo = 1, pageSize = 30, userIdentifier = '') {
+        const params = this.scopedParams({
             diameter,
             weight,
-            pool: sameRideEgg ? 'ride' : 'magic',
+            pool: pool || 'magic',
             include_display_only: 'false',
-            page_no: 1,
-            page_size: 30,
+            page_no: Math.max(Number(pageNo) || 1, 1),
+            page_size: Math.min(Math.max(Number(pageSize) || 30, 1), 100),
         }, userIdentifier);
-        const newRes = await this.get(ctx, '/api/v1/games/rocom/wiki/pet-size/query', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), newParams, { silentFailureDetails: true });
-        if (newRes && Array.isArray(newRes.items))
-            return newRes;
-        const params = this.scopedParams({ diameter, weight }, userIdentifier);
-        if (sameRideEgg)
-            params.sameRideEgg = 1;
-        return this.get(ctx, '/api/v1/games/rocom/pet/size-query', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), params);
+        return this.get(ctx, '/api/v1/games/rocom/wiki/pet-size/query', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), params);
     }
     async getActivitiesInfo(ctx, refresh = false, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/activities/info', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), this.scopedParams({ refresh: refresh ? 'true' : 'false' }, userIdentifier));
@@ -649,9 +642,6 @@ class RocomClient {
     async getAnnouncementDetail(ctx, threadId, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/announcement/detail', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), this.scopedParams({ thread_id: threadId }, userIdentifier));
     }
-    async getEggSearch(ctx, height, weight, pageNo = 1, pageSize = 20, userIdentifier = '') {
-        return this.get(ctx, '/api/v1/games/rocom/egg/search', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), this.scopedParams({ height, weight, page_no: pageNo, page_size: pageSize }, userIdentifier));
-    }
     async getEggGroups(ctx, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/egg/groups', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), this.scopedParams({}, userIdentifier));
     }

package/lib/commands/egg.js

@@ -111,17 +111,10 @@ function register(deps) {
             let fallback = '';
             if (height != null && weight != null) {
                 const heightInMeters = heightMeters ?? height / 100;
-                const eggSearchResults = await client.getEggSearch(ctx, heightInMeters, weight, 1, 20, session?.userId || '');
-                if (eggSearchResults) {
-                    data = eggService.buildEggSearchData(heightInMeters, weight, eggSearchResults, heightDisplay);
-                    fallback = eggService.buildEggSearchText(heightInMeters, weight, eggSearchResults, heightDisplay);
-                }
-                if (!data) {
-                    const backendResults = await client.queryPetSize(ctx, heightInMeters, weight, false, session?.userId || '');
-                    if (backendResults) {
-                        data = eggService.buildSizeSearchDataFromApi(height, weight, backendResults, heightDisplay);
-                        fallback = eggService.buildSizeSearchTextFromApi(height, weight, backendResults, heightDisplay);
-                    }
+                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);
                 }
             }
             if (!data) {
@@ -135,6 +128,43 @@ function register(deps) {
         const name = nameParts.join(' ');
         if (!name)
             return '请输入精灵名称。用法：洛克.查蛋 <精灵名>';
+        let backendDetail = null;
+        let backendProfile = null;
+        const backendList = await client.listWikiPets(ctx, name, 1, 10);
+        const backendItems = Array.isArray(backendList?.items) ? backendList.items : [];
+        if (backendItems.length) {
+            let selected = backendItems.find((item) => {
+                const itemName = String(item?.name || '').trim();
+                const itemForm = String(item?.form || '').trim();
+                return itemName === name || (itemForm && `${itemName}${itemForm}` === name);
+            });
+            if (!selected && backendItems.length === 1)
+                selected = backendItems[0];
+            const selectedId = selected?.pet_id ?? selected?.id;
+            if (selectedId != null && selectedId !== '') {
+                backendDetail = await client.getWikiPet(ctx, selectedId);
+                if (!backendDetail)
+                    backendDetail = selected;
+                backendProfile = await client.getWikiPetProfile(ctx, selectedId);
+            }
+        }
+        if (backendDetail) {
+            const compatibleByGroup = {};
+            const backendPet = { ...backendDetail, ...(backendProfile || {}) };
+            const eggGroups = Array.isArray(backendPet?.egg_groups) ? backendPet.egg_groups : [];
+            const eggGroupIds = eggGroups.length
+                ? eggGroups.map((group) => group?.id).filter((id) => id != null && id !== '')
+                : Array.isArray(backendPet?.egg_group_ids) ? backendPet.egg_group_ids : [];
+            for (const groupId of eggGroupIds) {
+                const groupResults = await client.listWikiPets(ctx, '', 1, 31, { egg_group_id: groupId });
+                compatibleByGroup[String(groupId)] = Array.isArray(groupResults?.items) ? groupResults.items : [];
+            }
+            const data = eggService.buildSearchDataFromWiki(backendPet, compatibleByGroup);
+            data.commandHint = '数据来自新版 Wiki；接口不可用时自动回退本地查蛋';
+            data.copyright = 'Koishi & WeGame 洛克王国插件';
+            await sendEggImage(deps, session, 'searcheggs', data, eggService.buildSearchTextFromWiki(data));
+            return;
+        }
         const sr = eggService.search(name);
         if (sr.matchType === 'multi') {
             const candidates = searchResultCandidates(sr);

package/lib/egg-service.d.ts

@@ -29,8 +29,6 @@ export declare class EggService {
     private formatSizeApiCard;
     private splitNewSizeApiItems;
     private sizeApiResultGroups;
-    private formatEggSearchCard;
-    private formatEggSearchTextLine;
     private mergeCardsByName;
     private mergeSizeCard;
     private minValue;
@@ -51,8 +49,8 @@ export declare class EggService {
         range: any[];
     }, heightDisplay?: string): string;
     buildSizeSearchTextFromApi(height?: number, weight?: number, results?: any, heightDisplay?: string): string;
-    buildEggSearchText(heightMeters?: number, weight?: number, results?: any, heightDisplay?: string): string;
     buildSearchText(pet: any): string;
+    buildSearchTextFromWiki(data: any): string;
     buildCandidatesText(keyword: string, candidates: any[]): string;
     buildWantPetText(pet: any): string;
     buildPairText(a: any, b: any): string;
@@ -117,6 +115,48 @@ export declare class EggService {
         commandHint: string;
         copyright: string;
     };
+    buildSearchDataFromWiki(pet: any, compatibleByGroup?: Record<string, any[]>): {
+        pet_name: any;
+        pet_id: any;
+        pet_icon: any;
+        pet_image: any;
+        type_label: string;
+        egg_groups_label: string;
+        egg_groups: (string | number)[];
+        egg_group_labels: {
+            [k: string]: string;
+        };
+        male_rate: number;
+        female_rate: number;
+        hatch_label: string;
+        weight_label: string;
+        height_label: string;
+        total_compatible: number;
+        is_undiscovered: boolean;
+        egg_group_sections: {
+            id: string | number;
+            label: string;
+            desc: string;
+            count: number;
+            members: {
+                name: any;
+                id: any;
+                type_label: string;
+                egg_groups_label: string;
+            }[];
+            has_more: boolean;
+            total: number;
+        }[];
+        total_stats: number;
+        egg_details: {
+            has_data: boolean;
+        };
+        commandHint: string;
+        copyright: string;
+    };
+    private wikiEggGroups;
+    private wikiTypeLabel;
+    private formatWikiMember;
     buildPairData(a: any, b: any): {
         commandHint: string;
         copyright: string;
@@ -230,14 +270,5 @@ export declare class EggService {
         commandHint: string;
         copyright: string;
     };
-    buildEggSearchData(heightMeters?: number, weight?: number, results?: any, heightDisplay?: string): {
-        query_label: string;
-        perfect_matches: any;
-        range_matches: any[];
-        total_count: any;
-        has_results: boolean;
-        commandHint: string;
-        copyright: string;
-    };
     private buildEggDetails;
 }

package/lib/egg-service.js

@@ -341,42 +341,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();
@@ -552,26 +516,6 @@ class EggService {
         }
         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 +529,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?.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 +638,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) => ({
@@ -748,7 +817,10 @@ class EggService {
             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 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 +832,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;