koishi-plugin-rocom 1.0.19 → 1.0.24

package/lib/atlas-service.js

@@ -149,7 +149,7 @@ class AtlasService {
         }
         return text;
     }
-    // 解析上游简单结构的 pets.yaml：`正式名:` + 缩进 `- 别名` 列表。
+    // 解析简单结构的 pets.yaml：`正式名:` + 缩进 `- 别名` 列表。
     loadPetAliases() {
         const filePath = this.aliasPath();
         if (!node_fs_1.default.existsSync(filePath))

package/lib/client.d.ts

@@ -88,6 +88,10 @@ export declare class RocomClient {
     getMerchantInfo(ctx: Context, refresh?: boolean, options?: IngameTaskPollOptions & {
         auth?: IngameAuthContext;
     }): Promise<any>;
+    getLegacyMerchantInfo(ctx: Context, refresh?: boolean, options?: {
+        signal?: AbortSignal;
+        auth?: IngameAuthContext;
+    }): Promise<any>;
     queryPetSize(ctx: Context, diameter: number, weight: number, pool?: string, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     searchEggBySize(ctx: Context, heightMeters: number, weightKg: number, pageNo?: number, pageSize?: number, userIdentifier?: string): Promise<any>;
     getPetCollectionRanking(ctx: Context, rankType: 'shining' | 'glass', limit?: number, uid?: string, options?: {
@@ -133,6 +137,12 @@ export declare class RocomClient {
     ingameMerchantInfo(ctx: Context, shopId?: string | number | null, options?: IngameTaskPollOptions & {
         auth?: IngameAuthContext;
     }): Promise<any>;
+    ingameHomeEggs(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
+    ingameHomePetData(ctx: Context, uid: string, options?: IngameTaskPollOptions & {
+        auth?: IngameAuthContext;
+    }): Promise<any>;
     ingamePetData(ctx: Context, uid: string, extras?: {
         petGid?: string | number;
         npcId?: string | number;

package/lib/client.js

@@ -11,7 +11,7 @@ const INGAME_FAILED_STATUSES = ['failed', 'error', 'timeout', 'cancelled', 'canc
 const INGAME_COMPLETED_STATUSES = ['done', 'success', 'succeeded', 'completed', 'finished'];
 const isObject = (v) => v !== null && typeof v === 'object' && !Array.isArray(v);
 exports.isObject = isObject;
-// 每剥离一层 envelope 时继承 goods_mapping，避免只改商品渲染后拿不到名称/图标（上游 v4.1.0）。
+// 每剥离一层 envelope 时继承 goods_mapping，避免只改商品渲染后拿不到名称/图标。
 function inheritGoodsMapping(parent, child) {
     const mapping = child._goods_mapping ?? child.goods_mapping
         ?? parent._goods_mapping ?? parent.goods_mapping;
@@ -624,7 +624,7 @@ class RocomClient {
             stillQueued: (taskId) => `玩家搜索任务仍在排队，请稍后重试（task_id: ${taskId}）`,
         });
     }
-    // 玩家名片（上游 v4.1.0）：需要补充收集数/名片图时按需查询。
+    // 玩家名片：需要补充收集数/名片图时按需查询。
     async ingamePlayerCard(ctx, uid, options = {}) {
         const sanitizedUid = this.sanitizeUid(uid);
         if (!sanitizedUid && !options.auth?.fwToken) {
@@ -667,6 +667,10 @@ class RocomClient {
         }
         if (options.signal?.aborted)
             return null;
+        return this.getLegacyMerchantInfo(ctx, refresh, options);
+    }
+    // 旧版 merchant/info 直取（商品目录 / 实时接口不可用时的回退）。
+    async getLegacyMerchantInfo(ctx, refresh = false, options = {}) {
         const legacy = await this.get(ctx, '/api/v1/games/rocom/merchant/info', this.wegameHeaders(options.auth?.fwToken, options.auth?.userIdentifier), {
             refresh: refresh ? 'true' : 'false',
             random_goods: 'all',
@@ -688,7 +692,7 @@ class RocomClient {
         }, userIdentifier);
         return this.get(ctx, '/api/v1/games/rocom/wiki/pet-size/query', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), params);
     }
-    // 后端查蛋（上游 v3.8.0）：按展示身高/体重查询，参数名是 height/weight。
+    // 后端查蛋：按展示身高/体重查询，参数名是 height/weight。
     async searchEggBySize(ctx, heightMeters, weightKg, pageNo = 1, pageSize = 30, userIdentifier = '') {
         const params = this.scopedParams({
             height: heightMeters,
@@ -698,7 +702,7 @@ class RocomClient {
         }, userIdentifier);
         return this.get(ctx, '/api/v1/games/rocom/egg/search', this.wegameHeaders('', userIdentifier, 'bot', 'koishi'), params);
     }
-    // 异色/炫彩收集排行榜（上游 v3.9.0）。
+    // 异色/炫彩收集排行榜。
     async getPetCollectionRanking(ctx, rankType, limit = 10, uid = '', options = {}) {
         if (!['shining', 'glass'].includes(rankType)) {
             this.setLastError('无效榜单类型');
@@ -713,7 +717,7 @@ class RocomClient {
             params.uid = this.sanitizeUid(uid);
         return this.get(ctx, `/api/v1/games/rocom/ingame/player/card/pet-stats/rankings/${rankType}`, this.wegameHeaders('', options.userIdentifier || '', 'bot', 'koishi'), this.scopedParams(params, options.userIdentifier || ''));
     }
-    // 阵容分享码解析与历史查询（上游 v3.9.0）。
+    // 阵容分享码解析与历史查询。
     async parseShareCode(ctx, shareCode, userIdentifier = '') {
         const code = String(shareCode || '').trim();
         if (!code) {
@@ -808,7 +812,7 @@ class RocomClient {
             stillQueued: (taskId) => `家园查询任务仍在排队，请稍后重试（task_id: ${taskId}）`,
         });
     }
-    // 远行商人实时接口（上游 v4.1.0）：优先 ingame live，返回 goods/shop/meta 或任务轮询结果。
+    // 远行商人实时接口：优先 ingame live，返回 goods/shop/meta 或任务轮询结果。
     // 未指定商店时不传 shop_id；调用方负责在新接口不可用时回退旧 merchant/info。
     async ingameMerchantInfo(ctx, shopId, options = {}) {
         const waitMs = Number(options.waitMs) || 5000;
@@ -820,7 +824,39 @@ class RocomClient {
             stillQueued: (taskId) => `远行商人任务仍在排队，请稍后重试（task_id: ${taskId}）`,
         });
     }
-    // 家园详情：批量或单只查询家园摆放精灵的完整 ingame 数据（上游 v3.6.1）。
+    // 家园蛋状态轻量接口：只返回蛋相关数据，供蛋状态订阅轮询与即时查询。
+    async ingameHomeEggs(ctx, uid, options = {}) {
+        const sanitizedUid = this.sanitizeUid(uid);
+        if (!sanitizedUid && !options.auth?.fwToken) {
+            this.setLastError('UID 不能为空');
+            return null;
+        }
+        const waitMs = Number(options.waitMs) || 5000;
+        const payload = { wait_ms: waitMs };
+        if (sanitizedUid)
+            payload.uid = sanitizedUid;
+        return this.queuedQuery(ctx, '/api/v1/games/rocom/ingame/home/eggs', payload, options, {
+            queuedNoTaskId: '家园蛋状态任务已入队，但未返回 task_id',
+            stillQueued: (taskId) => `家园蛋状态任务仍在排队，请稍后重试（task_id: ${taskId}）`,
+        });
+    }
+    // 家园精灵列表：走 home/pet-data 路径，返回侧重体重和声音的精灵一览。
+    async ingameHomePetData(ctx, uid, options = {}) {
+        const sanitizedUid = this.sanitizeUid(uid);
+        if (!sanitizedUid && !options.auth?.fwToken) {
+            this.setLastError('UID 不能为空');
+            return null;
+        }
+        const waitMs = Number(options.waitMs) || 20000;
+        const payload = { wait_ms: waitMs };
+        if (sanitizedUid)
+            payload.uid = sanitizedUid;
+        return this.queuedQuery(ctx, '/api/v1/games/rocom/ingame/home/pet-data', payload, options, {
+            queuedNoTaskId: '家园精灵查询任务已入队，但未返回 task_id',
+            stillQueued: (taskId) => `家园精灵查询任务仍在排队，请稍后重试（task_id: ${taskId}）`,
+        });
+    }
+    // 家园详情：批量或单只查询家园摆放精灵的完整 ingame 数据。
     // UID 参数名为 target_uin；单只查询需同时提供 pet_gid 和 npc_id。
     async ingamePetData(ctx, uid, extras = {}, options = {}) {
         const sanitizedUid = this.sanitizeUid(uid);
@@ -873,7 +909,7 @@ class RocomClient {
             params.name = options.name;
         return this.get(ctx, '/api/v1/games/rocom/pet/detail', this.wegameHeaders(), params);
     }
-    // ===== 新版 RoCom Wiki API（上游 v3.6.0）=====
+    // ===== 新版 RoCom Wiki API=====
     wikiPagedParams(q = '', pageNo = 1, pageSize = 10, filters = {}) {
         const params = {
             page_no: Math.max(Number(pageNo) || 1, 1),

package/lib/commands/egg.js

@@ -137,7 +137,7 @@ function register(deps) {
         const name = nameParts.join(' ');
         if (!name)
             return '请输入精灵名称。用法：洛克.查蛋 <精灵名>';
-        // 后端查蛋优先（上游 v3.8.0）：pet-groups → group-pets，接口不可用才回退 Wiki。
+        // 后端查蛋优先：pet-groups → group-pets，接口不可用才回退 Wiki。
         const userId = session?.userId || '';
         const eggCandidatesRes = await client.getEggPetGroups(ctx, name, 20, userId);
         if (eggCandidatesRes !== null) {

package/lib/commands/merchant.d.ts

@@ -1,2 +1,107 @@
 import { PluginDeps } from '../types';
+import { type ImageMetrics } from '../icon-metrics';
+type MerchantCategoryKey = 'normal' | 'round' | 'weekend';
+type MerchantProductForRender = {
+    name: string;
+    image: string;
+    time_label: string;
+    category: MerchantCategoryKey;
+    round_id: number | null;
+    is_active: boolean;
+    start_time: number | null;
+    end_time: number | null;
+    price: number | null;
+    limit: number | null;
+    item_category: string;
+    allDay: boolean;
+    goods_id: string;
+};
+type MerchantCardItem = {
+    goods_name: string;
+    iconUrl: string;
+    price: string | number;
+    num: string;
+    category: MerchantCategoryKey;
+    roundId: number;
+    isHot: boolean;
+    isEnded: boolean;
+    remainingStr: string;
+    top: number;
+};
+export declare function buildMerchantRenderParams(pageHeight: number): {
+    pageHeight: number;
+    renderWidth: number;
+    renderHeight: number;
+    renderBaseWidth: number;
+    renderBaseHeight: number;
+    renderScale: number;
+    renderZoom: number;
+    renderDeviceScaleFactor: number;
+    renderStroke11: number;
+    renderStroke10: number;
+    renderStrokeName: number;
+    renderOffset3: number;
+};
+export declare function buildMerchantCardItems(products: MerchantProductForRender[], options: {
+    includeEnded: boolean;
+    iconMetrics?: Map<string, ImageMetrics>;
+}): {
+    pageHeight: number;
+    renderWidth: number;
+    renderHeight: number;
+    renderBaseWidth: number;
+    renderBaseHeight: number;
+    renderScale: number;
+    renderZoom: number;
+    renderDeviceScaleFactor: number;
+    renderStroke11: number;
+    renderStroke10: number;
+    renderStrokeName: number;
+    renderOffset3: number;
+    goods: {
+        num: string;
+        top: number;
+        iconScale: number;
+        iconOffsetX: number;
+        iconOffsetY: number;
+        goods_name: string;
+        iconUrl: string;
+        price: string | number;
+        category: MerchantCategoryKey;
+        roundId: number;
+        isHot: boolean;
+        isEnded: boolean;
+        remainingStr: string;
+    }[];
+    bottomFrameTop: number;
+};
+/**
+ * 今日卡片按轮次分行：热销（roundId 0，全天/跨天在架）置顶，第 1~4 轮升序。
+ * 每件商品落在哪一轮由商品数据的 roundId 事先算好。
+ */
+export declare function buildTodayRows(goods: MerchantCardItem[], currentRoundId: number | null, iconMetrics?: Map<string, ImageMetrics>): {
+    roundId: number;
+    label: string;
+    timeLabel: string;
+    isCurrent: boolean;
+    top: number;
+    cellWidth: number;
+    iconSize: number;
+    items: {
+        iconScale: number;
+        iconOffsetX: number;
+        iconOffsetY: number;
+        goods_name: string;
+        iconUrl: string;
+        price: string | number;
+        num: string;
+        category: MerchantCategoryKey;
+        roundId: number;
+        isHot: boolean;
+        isEnded: boolean;
+        remainingStr: string;
+        top: number;
+    }[];
+}[];
 export declare function register(deps: PluginDeps): void;
+export {};