koishi-plugin-rocom 1.0.11 → 1.0.13

package/lib/commands/query.js

@@ -258,16 +258,28 @@ function normalizeDurationSeconds(value) {
 function formatHomeRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
     if (!targetTs)
         return '未开始';
-    const remain = Math.max(0, targetTs - nowTs);
-    if (remain <= 0)
+    if (nowTs >= targetTs)
         return '已完成';
-    const hours = Math.floor(remain / 3600);
+    const remain = Math.max(0, targetTs - nowTs);
+    const days = Math.floor(remain / 86400);
+    const hours = Math.floor((remain % 86400) / 3600);
     const minutes = Math.floor((remain % 3600) / 60);
-    if (hours >= 24)
-        return `${Math.floor(hours / 24)}天${hours % 24}小时`;
+    const seconds = remain % 60;
+    if (days > 0)
+        return hours > 0 ? `${days}天${hours}小时` : `${days}天`;
     if (hours > 0)
         return `${hours}小时${minutes}分钟`;
-    return `${minutes}分钟`;
+    if (minutes > 0)
+        return `${minutes}分${seconds}秒`;
+    return `${seconds}秒`;
+}
+function formatEggRemaining(targetTs, nowTs = Math.floor(Date.now() / 1000)) {
+    if (!targetTs || nowTs >= targetTs)
+        return '0分钟';
+    const remain = Math.max(0, targetTs - nowTs);
+    const totalHours = Math.floor(remain / 3600);
+    const minutes = Math.floor((remain % 3600) / 60);
+    return `${totalHours}小时${minutes}分钟`;
 }
 function homeInfoPayload(res) {
     const payload = res || {};
@@ -815,7 +827,7 @@ function panelPetDetailData(uid, pet, updatedAtText) {
     };
 }
 async function refreshPanelPets(deps, uid, userId = '') {
-    const res = await deps.client.ingameHomeInfo(deps.ctx, uid, 20000);
+    const res = await deps.client.ingameHomeInfo(deps.ctx, uid, { waitMs: 20000, timeoutMs: 30000 });
     if (res) {
         const homeInfo = homeInfoPayload(res);
         const pets = buildPanelPetList(homeInfo);
@@ -848,7 +860,7 @@ function formatPanelUpdatedAt(ts) {
         return new Date().toLocaleString('zh-CN');
     return new Date(value * 1000).toLocaleString('zh-CN');
 }
-function extractHomePet(raw, index, guard = false) {
+function extractHomePet(deps, raw, index, guard = false) {
     if (!raw || typeof raw !== 'object')
         return null;
     const homePet = raw.home_pet_info && typeof raw.home_pet_info === 'object' ? raw.home_pet_info : raw;
@@ -856,31 +868,64 @@ function extractHomePet(raw, index, guard = false) {
     const petId = homePet.pet_cfg_id || homePet.pet_id || homePet.pet_base_id || raw.pet_cfg_id || raw.pet_id || raw.id;
     if (['', '0'].includes(String(petId || '0')) && !guard)
         return null;
-    const feedInfo = homePet.feed_info && typeof homePet.feed_info === 'object' ? homePet.feed_info : {};
-    const beginTime = normalizeEpochSeconds(feedInfo.begin_time);
-    const timeCost = normalizeDurationSeconds(feedInfo.time_cost);
-    let readyAt = normalizeEpochSeconds(homePet.pet_rip_time || raw.pet_rip_time || raw.rip_time);
-    if (!readyAt && beginTime && timeCost)
-        readyAt = beginTime + timeCost;
     const nowTs = Math.floor(Date.now() / 1000);
-    const hasInspiration = Boolean(readyAt);
-    const inspireReady = hasInspiration && nowTs >= readyAt;
-    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(raw.status).toLowerCase());
-    const statusText = isGuard && !hasInspiration ? '守卫中' : inspireReady ? '灵感已完成' : hasInspiration ? '灵感收集中' : '未喂食';
-    const statusClass = isGuard && !hasInspiration ? 'guard' : inspireReady ? 'ready' : hasInspiration ? 'progress' : 'idle';
+    const hasEgg = Boolean(raw.have_egg);
+    const predictedEggTime = normalizeEpochSeconds(raw.predicted_egg_time);
+    const eggReady = hasEgg || (predictedEggTime > 0 && nowTs >= predictedEggTime);
+    const feedRound = Number(homePet.feed_round || raw.feed_round || 0) || 0;
+    const gender = Number(display.gender || raw.gender || 0) || 0;
+    const mutationType = Number(display.mutation_type || raw.mutation_type || homePet.mutation_type || 0) || 0;
+    const isMale = gender === 1;
+    const status = homePet.status ?? raw.status;
+    const isGuard = guard || Boolean(raw.is_guard || raw.guard) || ['2', 'guard', '守卫'].includes(String(status).toLowerCase());
+    const hasInspiration = feedRound > 0;
+    const inspireReady = hasInspiration;
+    const statusText = isGuard && !hasInspiration ? '守卫中'
+        : (inspireReady ? '可收取灵感'
+            : (hasInspiration ? '灵感收集中'
+                : '未喂食'));
+    const statusClass = isGuard && !hasInspiration ? 'guard'
+        : (eggReady ? 'ready'
+            : (inspireReady ? 'progress'
+                : (hasInspiration ? 'progress'
+                    : 'idle')));
+    let note;
+    if (isGuard && String(petId) === '0') {
+        note = '家园守卫位';
+    }
+    else if (eggReady) {
+        note = '可收取';
+    }
+    else if (predictedEggTime > 0) {
+        note = `${formatEggRemaining(predictedEggTime, nowTs)}后生蛋`;
+    }
+    else if (feedRound > 0) {
+        note = isMale ? '' : '等待生蛋';
+    }
+    else if (isGuard) {
+        note = '家园守卫位';
+    }
+    else {
+        note = '未喂食';
+    }
     return {
         id: String(petId || ''),
         pos: raw.pos || raw.position || index + 1,
         name: String(homePet.name || homePet.pet_name || raw.name || raw.pet_name || `精灵 ${petId || ''}`),
         level: display.level || raw.level || homePet.level || '--',
         iconUrl: homePetIcon(petId, raw.icon_url || raw.pet_img_url || raw.petIcon || ''),
-        badge: isGuard ? '守' : '',
+        starIconUrl: [1, 8, 9].includes(mutationType)
+            ? deps.renderer.resourceUrl(`render-templates/home/img/rocomuid/star_${mutationType}.png`)
+            : '',
+        badge: isGuard ? '守' : (hasEgg ? '蛋' : ''),
+        mutationType,
         isGuard,
         statusText,
         statusClass,
-        note: hasInspiration ? formatHomeRemaining(readyAt, nowTs) : (isGuard ? '家园守卫位' : '暂无灵感倒计时'),
-        inspireReady,
-        readyAt,
+        note,
+        inspireReady: eggReady,
+        readyAt: predictedEggTime || 0,
+        gender,
     };
 }
 function homePetSources(homeInfo) {
@@ -998,7 +1043,7 @@ function buildHomeRenderData(deps, res, uid) {
     const indoorPets = [];
     const guardPets = [];
     indoorSources.forEach((raw, index) => {
-        const item = extractHomePet(raw, index);
+        const item = extractHomePet(deps, raw, index);
         if (!item)
             return;
         if (item.isGuard)
@@ -1007,10 +1052,22 @@ function buildHomeRenderData(deps, res, uid) {
             indoorPets.push(item);
     });
     guardSources.forEach((raw, index) => {
-        const item = extractHomePet(raw, index, true);
+        const item = extractHomePet(deps, raw, index, true);
         if (item)
             guardPets.push(item);
     });
+    indoorPets.sort((a, b) => {
+        if (a.gender === 2 && b.gender !== 2)
+            return -1;
+        if (a.gender !== 2 && b.gender === 2)
+            return 1;
+        if (a.gender === 2) {
+            const ta = a.readyAt || Number.MAX_SAFE_INTEGER;
+            const tb = b.readyAt || Number.MAX_SAFE_INTEGER;
+            return ta - tb;
+        }
+        return 0;
+    });
     const gardenPlots = extractHomePlants(deps, homeInfo);
     const createdAt = normalizeEpochSeconds(res?.meta?.created_at);
     return {
@@ -1268,7 +1325,7 @@ async function checkHomeSubscriptions(deps) {
             continue;
         checkedCount++;
         if (!cache.has(sub.uid)) {
-            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid));
+            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid, { timeoutMs: 30000 }));
         }
         const res = cache.get(sub.uid);
         if (!res)
@@ -1757,7 +1814,18 @@ function register(deps) {
         }
         if (!targetUid)
             return '请提供玩家 UID，或先完成绑定后使用 洛克.家园。';
-        const res = await client.ingameHomeInfo(ctx, targetUid);
+        let queuedNotified = false;
+        const res = await client.ingameHomeInfo(ctx, targetUid, {
+            waitMs: deps.config.homeQueryWaitMs,
+            intervalMs: deps.config.homeQueryPollIntervalMs,
+            timeoutMs: deps.config.homeQueryTimeoutMs,
+            onQueued: async () => {
+                if (queuedNotified)
+                    return;
+                queuedNotified = true;
+                await session?.send?.(`UID ${targetUid} 的家园查询已进入队列，正在等待游戏侧返回，请稍候…`);
+            },
+        });
         if (!res)
             return `家园查询失败：${client.getLastErrorBrief()}`;
         await sendImage(deps, session, 'home', buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);

package/lib/index.d.ts

@@ -12,12 +12,16 @@ 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;
+    homeQueryWaitMs: number;
+    homeQueryPollIntervalMs: number;
+    homeQueryTimeoutMs: number;
     imageCompressionEnabled: boolean;
     imageCompressionMinBytes: number;
     imageCompressionLevel: number;