koishi-plugin-rocom 1.0.12 → 1.0.17

package/lib/egg-service.js

@@ -281,20 +281,30 @@ class EggService {
         };
     }
     formatSizeApiCard(item) {
-        const probability = num(item?.probability);
+        // 新版 /wiki/pet-size/query 返回 items[].pet / egg_size / match 结构；旧接口是平铺字段。
+        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 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 probability = num(item?.probability) ?? num(match?.percent);
         const matchCount = num(item?.matchCount);
-        const heightMin = num(item?.diameterMin);
-        const heightMax = num(item?.diameterMax);
-        const weightMin = num(item?.weightMin);
-        const weightMax = num(item?.weightMax);
+        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);
         return {
-            id: item?.petId || '-',
-            name: item?.pet || '未知精灵',
-            icon: item?.petIcon || petIconUrl(item?.petId),
-            image: item?.petImage || petImageUrl(item?.petId),
-            type_label: '后端未提供',
+            id: petId,
+            name: petName,
+            icon: petInfo?.icon || item?.petIcon || petIconUrl(petId),
+            image: petInfo?.small_icon || item?.petImage || petImageUrl(petId),
+            type_label: typeNames.length ? typeNames.join(' / ') : '后端未提供',
             egg_group_ids: [],
-            egg_groups_label: '后端未提供',
+            egg_groups_label: eggGroupNames.length ? eggGroupNames.join(' / ') : '后端未提供',
             height_min: heightMin,
             height_max: heightMax,
             height_label: fmtRange(heightMin, heightMax, 'm'),
@@ -303,7 +313,32 @@ class EggService {
             weight_label: fmtRange(weightMin, weightMax, 'kg'),
             probability,
             match_count: matchCount,
-            match_info_label: this.formatMatchSummary(probability, matchCount),
+            match_info_label: String(match?.match_percent_text || '') || this.formatMatchSummary(probability, matchCount),
+        };
+    }
+    // 新版尺寸反查按 match.layer 划分完美/范围匹配。
+    splitNewSizeApiItems(items) {
+        const perfect = [];
+        const ranged = [];
+        for (const item of items) {
+            const match = item?.match && typeof item.match === 'object' ? item.match : {};
+            const layer = String(match?.layer || '').toLowerCase();
+            const displayOnly = Boolean(match?.display_only);
+            if (['strict', 'exact'].includes(layer) && !displayOnly)
+                perfect.push(item);
+            else
+                ranged.push(item);
+        }
+        return [perfect, ranged];
+    }
+    sizeApiResultGroups(results) {
+        if (Array.isArray(results?.items)) {
+            const [perfect, ranged] = this.splitNewSizeApiItems(results.items);
+            return { exact: perfect, candidates: ranged };
+        }
+        return {
+            exact: Array.isArray(results?.exactResults) ? results.exactResults : [],
+            candidates: Array.isArray(results?.candidates) ? results.candidates : [],
         };
     }
     formatEggSearchCard(item) {
@@ -495,8 +530,7 @@ class EggService {
         if (weight != null)
             cond.push(`体重=${weight}kg`);
         const condStr = cond.join(' + ') || '当前条件';
-        const exact = results?.exactResults || [];
-        const candidates = results?.candidates || [];
+        const { exact, candidates } = this.sizeApiResultGroups(results);
         if (!exact.length && !candidates.length)
             return `❌ 未找到符合 ${condStr} 的精灵。`;
         const lines = [];
@@ -712,7 +746,8 @@ class EggService {
             conditions.push(`身高 ${heightDisplay || fmtRange(ht(height), ht(height), 'm')}`);
         if (weight != null)
             conditions.push(`体重 ${weight} kg`);
-        const [perfect, ranged] = this.mergeCardsByName((results?.exactResults || []).map((item) => this.formatSizeApiCard(item)), (results?.candidates || []).map((item) => this.formatSizeApiCard(item)));
+        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 queryLabel = `${conditions.join(' / ') || '尺寸反查'}${searchMode ? ` · 模式 ${searchMode}` : ''}`;
         return {

package/lib/index.d.ts

@@ -12,12 +12,21 @@ 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;
+    announcementSubscriptionEnabled: boolean;
+    announcementPollIntervalMinutes: number;
+    homeQueryWaitMs: number;
+    homeQueryPollIntervalMs: number;
+    homeQueryTimeoutMs: number;
+    lowBandwidthMode: boolean;
+    atlasZipUrls: string[];
+    atlasGitUrl: string;
     imageCompressionEnabled: boolean;
     imageCompressionMinBytes: number;
     imageCompressionLevel: number;