koishi-plugin-rocom 1.0.12 → 1.0.13

package/lib/index.js

@@ -43,7 +43,10 @@ var import_node_path5 = __toESM(require("node:path"));
 // src/client.ts
 var import_koishi = require("koishi");
 var logger = new import_koishi.Logger("rocom-client");
-var RocomClient = class {
+var INGAME_PENDING_STATUSES = ["queued", "pending", "running", "processing", "accepted"];
+var INGAME_FAILED_STATUSES = ["failed", "error", "timeout", "cancelled", "canceled"];
+var INGAME_COMPLETED_STATUSES = ["done", "success", "succeeded", "completed", "finished"];
+var RocomClient = class _RocomClient {
   static {
     __name(this, "RocomClient");
   }
@@ -362,6 +365,97 @@ ${this.stringifyForLog(details)}`);
       { acceptedStatuses: [200, 202] }
     );
   }
+  static normalizeTaskStatus(value) {
+    return String(value ?? "").trim().toLowerCase();
+  }
+  static extractTaskId(payload) {
+    return String(payload?.task_id || payload?.taskId || payload?.taskID || "").trim();
+  }
+  // 判断一份 payload 是否为“已完成的业务结果”（而非排队占位）。
+  // 家园接口完成时返回 rows/home_info；玩家、商店完成时返回 source/title/rows。
+  static isCompletedGatewayPayload(payload) {
+    if (!payload || typeof payload !== "object") return false;
+    if (Array.isArray(payload.rows)) return true;
+    if (payload.home_info !== void 0) return true;
+    if (payload.source !== void 0) return true;
+    if (String(payload.title || "").trim()) return true;
+    return false;
+  }
+  static extractCompletedIngamePayload(payload) {
+    if (!payload || typeof payload !== "object") return null;
+    if (_RocomClient.isCompletedGatewayPayload(payload)) return payload;
+    if (_RocomClient.isCompletedGatewayPayload(payload.result)) return payload.result;
+    if (_RocomClient.isCompletedGatewayPayload(payload.data)) return payload.data;
+    return null;
+  }
+  static taskErrorMessage(payload, fallbackStatus = "") {
+    const candidates = [
+      payload?.message,
+      payload?.error,
+      payload?.error_message,
+      payload?.reason,
+      payload?.result?.message,
+      payload?.result?.error,
+      payload?.result?.error_message,
+      payload?.data?.message,
+      payload?.data?.error
+    ];
+    for (const candidate of candidates) {
+      const text = String(candidate ?? "").trim();
+      if (text && text.toLowerCase() !== "failed") return text;
+    }
+    return String(payload?.status || fallbackStatus || "").trim() || "任务执行失败";
+  }
+  // 排队等候轮询：把 ingame 接口提交后返回的 202（task_id/status=queued）轮询到出结果或超时。
+  // 入参 first 是首请求拿到的 { status, data, usedApiKey }。
+  async pollIngameTask(ctx, first, options, labels) {
+    const { status, data, usedApiKey } = first;
+    const initialCompletedPayload = _RocomClient.extractCompletedIngamePayload(data);
+    if (status !== null && initialCompletedPayload) return initialCompletedPayload;
+    const taskId = _RocomClient.extractTaskId(data);
+    if (!taskId) {
+      if (status === 202) this.setLastError(labels.queuedNoTaskId);
+      return status === null ? null : data;
+    }
+    if (typeof options.onQueued === "function") {
+      try {
+        await options.onQueued(taskId);
+      } catch (e) {
+        logger.warn(`ingame 排队提示回调失败: ${e}`);
+      }
+    }
+    const intervalMs = Math.max(300, Number(options.intervalMs) || 3e3);
+    const timeoutMs = Math.max(intervalMs, Number(options.timeoutMs) || 18e4);
+    const startedAt = Date.now();
+    let lastStatus = _RocomClient.normalizeTaskStatus(data?.status);
+    while (Date.now() - startedAt < timeoutMs) {
+      if (lastStatus && INGAME_FAILED_STATUSES.includes(lastStatus)) {
+        this.setLastError(_RocomClient.taskErrorMessage(data, lastStatus));
+        return null;
+      }
+      await new Promise((resolve) => setTimeout(resolve, intervalMs));
+      const task = await this.getIngameTask(ctx, taskId, usedApiKey);
+      if (task.status === null) return null;
+      const completedPayload = _RocomClient.extractCompletedIngamePayload(task.data);
+      if (completedPayload) return completedPayload;
+      lastStatus = _RocomClient.normalizeTaskStatus(task.data?.status);
+      if (INGAME_FAILED_STATUSES.includes(lastStatus)) {
+        this.setLastError(_RocomClient.taskErrorMessage(task.data, lastStatus));
+        return null;
+      }
+      if (INGAME_COMPLETED_STATUSES.includes(lastStatus)) {
+        this.setLastError(`Ingame 任务已完成但未返回可解析结果：${taskId}`);
+        return null;
+      }
+      if (lastStatus && !INGAME_PENDING_STATUSES.includes(lastStatus)) {
+        this.setLastError(`Ingame 任务状态异常：${lastStatus}`);
+        return null;
+      }
+      if (!_RocomClient.extractTaskId(task.data) && !lastStatus) return task.data;
+    }
+    this.setLastError(labels.stillQueued(taskId));
+    return null;
+  }
   async qqQrLogin(ctx, userIdentifier) {
     const params = { client_type: "bot", client_id: "koishi", provider: "rocom" };
     if (userIdentifier) params.user_identifier = this.sanitizeUid(userIdentifier);
@@ -503,7 +597,10 @@ ${this.stringifyForLog(details)}`);
     return this.get(ctx, "/api/v1/games/rocom/exchange/posters", this.wegameHeaders(fwToken, userIdentifier), params);
   }
   async getMerchantInfo(ctx, refresh = false) {
-    return this.get(ctx, "/api/v1/games/rocom/merchant/info", this.wegameHeaders(), { refresh: refresh ? "true" : "false" });
+    return this.get(ctx, "/api/v1/games/rocom/merchant/info", this.wegameHeaders(), {
+      refresh: refresh ? "true" : "false",
+      random_goods: "all"
+    });
   }
   async queryPetSize(ctx, diameter, weight, sameRideEgg = false, userIdentifier = "") {
     const params = this.scopedParams({ diameter, weight }, userIdentifier);
@@ -661,29 +758,20 @@ ${this.stringifyForLog(details)}`);
       this.scopedParams(params, userIdentifier)
     );
   }
-  async ingameHomeInfo(ctx, uid, waitMs = 5e3) {
+  async ingameHomeInfo(ctx, uid, options = {}) {
     const sanitizedUid = this.sanitizeUid(uid);
     if (!sanitizedUid) {
       this.setLastError("UID 不能为空");
       return null;
     }
+    const waitMs = Number(options.waitMs) || 5e3;
     const path6 = "/api/v1/games/rocom/ingame/home/info";
     const payload = { uid: sanitizedUid, wait_ms: waitMs };
-    const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path6, payload);
-    if (status === 200 && data && !(data.task_id || data.taskId || data.taskID)) return data;
-    const taskId = data?.task_id || data?.taskId || data?.taskID;
-    if (!taskId) {
-      if (status === 202) this.setLastError("家园查询任务已入队，但未返回 task_id");
-      return null;
-    }
-    for (let i = 0; i < 10; i++) {
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
-      const task = await this.getIngameTask(ctx, taskId, usedApiKey);
-      if (task.status === 200) return task.data;
-      if (task.status === null) return null;
-    }
-    this.setLastError(`Home query task is still queued, please retry later (task_id: ${taskId})`);
-    return null;
+    const first = await this.requestIngameWithFallback(ctx, path6, payload);
+    return this.pollIngameTask(ctx, first, options, {
+      queuedNoTaskId: "家园查询任务已入队，但未返回 task_id",
+      stillQueued: /* @__PURE__ */ __name((taskId) => `家园查询任务仍在排队，请稍后重试（task_id: ${taskId}）`, "stillQueued")
+    });
   }
   async ingameMerchantInfo(ctx, shopId) {
     const params = { shop_id: shopId };
@@ -1634,6 +1722,11 @@ var TEMPLATE_CAPTURE_PADDING = {
 var TEMPLATE_VIEWPORTS = {
   activities: { width: 1600, height: 1200, deviceScaleFactor: 2 }
 };
+var VISUAL_BOUNDS_TEMPLATES = /* @__PURE__ */ new Set([
+  "home",
+  "yuanxing-shangren/merchant",
+  "yuanxing-shangren/today"
+]);
 var DEFAULT_SCREENSHOT_OPTIONS = {
   type: "jpeg",
   quality: 82
@@ -1760,6 +1853,7 @@ var Renderer = class {
           ".student-perks-page",
           ".student-page",
           ".merchant-page",
+          ".page",
           ".home-page",
           ".pet-panel-page",
           ".pet-detail-page",
@@ -1776,16 +1870,17 @@ var Renderer = class {
         if (target) {
           const box = await target.boundingBox();
           if (box && box.width > 0 && box.height > 0) {
-            const elementMetrics = await page.evaluate((el) => {
+            const useVisualBounds = VISUAL_BOUNDS_TEMPLATES.has(templateName);
+            const elementMetrics = await page.evaluate((el, visualBounds) => {
               const rect = el.getBoundingClientRect();
               const element = el;
               return {
                 x: rect.left + window.scrollX,
                 y: rect.top + window.scrollY,
-                width: Math.max(rect.width, element.scrollWidth, element.offsetWidth),
-                height: Math.max(rect.height, element.scrollHeight, element.offsetHeight)
+                width: visualBounds ? rect.width : Math.max(rect.width, element.scrollWidth, element.offsetWidth),
+                height: visualBounds ? rect.height : Math.max(rect.height, element.scrollHeight, element.offsetHeight)
               };
-            }, target);
+            }, target, useVisualBounds);
             const capturePadding = TEMPLATE_CAPTURE_PADDING[templateName] || { left: 0, right: 0, top: 0, bottom: 0 };
             await page.setViewport({
               width: Math.max(Math.ceil(elementMetrics.x + elementMetrics.width + capturePadding.right) + 8, 200),
@@ -2434,15 +2529,14 @@ async function sendScheduledMessage(ctx, target, message) {
 }
 __name(sendScheduledMessage, "sendScheduledMessage");
 async function sendScheduledImageWithFallback(ctx, target, image, fallbackText, mentionAll = false) {
-  const prefix = mentionAll ? "@全体\n" : "";
+  const buildContent = /* @__PURE__ */ __name((body) => mentionAll ? (0, import_koishi7.h)("message", {}, (0, import_koishi7.h)("at", { type: "all" }), import_koishi7.h.text("\n"), body) : body, "buildContent");
   if (!image) {
-    return sendScheduledMessage(ctx, target, `${prefix}${fallbackText}`);
+    return sendScheduledMessage(ctx, target, buildContent(import_koishi7.h.text(fallbackText)));
   }
   const imageSegment = import_koishi7.h.image(image, detectImageMime(image));
-  const content = mentionAll ? `${prefix}${imageSegment}` : imageSegment;
-  const sent = await sendScheduledMessage(ctx, target, content);
+  const sent = await sendScheduledMessage(ctx, target, buildContent(imageSegment));
   if (sent) return true;
-  return sendScheduledMessage(ctx, target, `${prefix}${fallbackText}`);
+  return sendScheduledMessage(ctx, target, buildContent(import_koishi7.h.text(fallbackText)));
 }
 __name(sendScheduledImageWithFallback, "sendScheduledImageWithFallback");
 
@@ -3224,7 +3318,7 @@ function panelPetDetailData(uid, pet, updatedAtText) {
 }
 __name(panelPetDetailData, "panelPetDetailData");
 async function refreshPanelPets(deps, uid, userId = "") {
-  const res = await deps.client.ingameHomeInfo(deps.ctx, uid, 2e4);
+  const res = await deps.client.ingameHomeInfo(deps.ctx, uid, { waitMs: 2e4, timeoutMs: 3e4 });
   if (res) {
     const homeInfo = homeInfoPayload(res);
     const pets = buildPanelPetList(homeInfo);
@@ -3256,7 +3350,7 @@ function formatPanelUpdatedAt(ts) {
   return new Date(value * 1e3).toLocaleString("zh-CN");
 }
 __name(formatPanelUpdatedAt, "formatPanelUpdatedAt");
-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;
   const display = raw.display_info && typeof raw.display_info === "object" ? raw.display_info : {};
@@ -3268,6 +3362,7 @@ function extractHomePet(raw, index, guard = false) {
   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());
@@ -3295,7 +3390,9 @@ function extractHomePet(raw, index, guard = false) {
     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 || ""),
+    starIconUrl: [1, 8, 9].includes(mutationType) ? deps.renderer.resourceUrl(`render-templates/home/img/rocomuid/star_${mutationType}.png`) : "",
     badge: isGuard ? "守" : hasEgg ? "蛋" : "",
+    mutationType,
     isGuard,
     statusText,
     statusClass,
@@ -3410,13 +3507,13 @@ 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) guardPets.push(item);
     else 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) => {
@@ -3645,7 +3742,7 @@ async function checkHomeSubscriptions(deps) {
     if (!sub.uid || !["garden", "inspiration"].includes(sub.kind)) 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: 3e4 }));
     }
     const res = cache.get(sub.uid);
     if (!res) continue;
@@ -4083,7 +4180,17 @@ function register2(deps) {
       targetUid = String(binding?.role_id || "");
     }
     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: /* @__PURE__ */ __name(async () => {
+        if (queuedNotified) return;
+        queuedNotified = true;
+        await session?.send?.(`UID ${targetUid} 的家园查询已进入队列，正在等待游戏侧返回，请稍候…`);
+      }, "onQueued")
+    });
     if (!res) return `家园查询失败：${client.getLastErrorBrief()}`;
     await sendImage(deps, session, "home", buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);
   });
@@ -4187,6 +4294,7 @@ var import_koishi9 = require("koishi");
 var logger9 = new import_koishi9.Logger("rocom-merchant");
 var TEXT = {
   merchant: "远行商人",
+  todayMerchant: "今日远行商人",
   subscribe: "订阅远行商人",
   unsubscribe: "取消订阅远行商人",
   viewSubscribe: "查看远行商人订阅",
@@ -4201,6 +4309,12 @@ var CATEGORY_LABELS = {
   round: "常规商品",
   weekend: "周末限定"
 };
+var ROUND_WINDOWS = [
+  { id: 1, label: "08:00-12:00", startHour: 8, endHour: 12 },
+  { id: 2, label: "12:00-16:00", startHour: 12, endHour: 16 },
+  { id: 3, label: "16:00-20:00", startHour: 16, endHour: 20 },
+  { id: 4, label: "20:00-24:00", startHour: 20, endHour: 24 }
+];
 var CHINA_TIMEZONE = "Asia/Shanghai";
 var chinaPartsFormatter = new Intl.DateTimeFormat("zh-CN", {
   timeZone: CHINA_TIMEZONE,
@@ -4209,19 +4323,39 @@ var chinaPartsFormatter = new Intl.DateTimeFormat("zh-CN", {
   day: "2-digit",
   hour: "2-digit",
   minute: "2-digit",
+  second: "2-digit",
   hour12: false
 });
-function getChinaParts(timestampMs) {
+function getChinaParts(input = Date.now()) {
   const parts = {};
-  for (const item of chinaPartsFormatter.formatToParts(new Date(timestampMs))) {
+  const date = input instanceof Date ? input : new Date(input);
+  for (const item of chinaPartsFormatter.formatToParts(date)) {
     if (item.type !== "literal") parts[item.type] = item.value;
   }
   return {
+    year: Number(parts.year || "0"),
+    month: Number(parts.month || "0"),
+    day: Number(parts.day || "0"),
     hour: Number(parts.hour || "0"),
-    minute: Number(parts.minute || "0")
+    minute: Number(parts.minute || "0"),
+    second: Number(parts.second || "0")
   };
 }
 __name(getChinaParts, "getChinaParts");
+function padNumber(value) {
+  return String(value).padStart(2, "0");
+}
+__name(padNumber, "padNumber");
+function getChinaDateText(input = Date.now()) {
+  const parts = getChinaParts(input);
+  return `${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}`;
+}
+__name(getChinaDateText, "getChinaDateText");
+function getChinaDayStartMs(input = Date.now()) {
+  const parts = getChinaParts(input);
+  return (/* @__PURE__ */ new Date(`${parts.year}-${padNumber(parts.month)}-${padNumber(parts.day)}T00:00:00+08:00`)).getTime();
+}
+__name(getChinaDayStartMs, "getChinaDayStartMs");
 function classifyMerchantItem(item) {
   const start = normalizeTimestamp(item?.start_time);
   const end = normalizeTimestamp(item?.end_time);
@@ -4248,16 +4382,12 @@ function formatProductWindow(product) {
   const end = normalizeTimestamp(product?.end_time);
   if (!start && !end) return "";
   const formatDate2 = /* @__PURE__ */ __name((timestamp) => {
-    const date = new Date(timestamp);
-    const month = String(date.getMonth() + 1).padStart(2, "0");
-    const day = String(date.getDate()).padStart(2, "0");
-    return `${month}-${day}`;
+    const parts = getChinaParts(timestamp);
+    return `${padNumber(parts.month)}-${padNumber(parts.day)}`;
   }, "formatDate");
   const formatTime = /* @__PURE__ */ __name((timestamp) => {
-    const date = new Date(timestamp);
-    const hour = String(date.getHours()).padStart(2, "0");
-    const minute = String(date.getMinutes()).padStart(2, "0");
-    return `${hour}:${minute}`;
+    const parts = getChinaParts(timestamp);
+    return `${padNumber(parts.hour)}:${padNumber(parts.minute)}`;
   }, "formatTime");
   if (start && end) {
     const datePart = formatDate2(start);
@@ -4272,7 +4402,7 @@ function getMerchantActivity(res) {
   return activities[0] || {};
 }
 __name(getMerchantActivity, "getMerchantActivity");
-function getActiveProducts(res) {
+function getMerchantProducts(res) {
   const activity = getMerchantActivity(res);
   const groups = [];
   if (Array.isArray(activity?.products)) groups.push(activity.products);
@@ -4282,12 +4412,10 @@ function getActiveProducts(res) {
   if (Array.isArray(activity?.get_pets)) groups.push(activity.get_pets);
   const merged = [];
   const seen = /* @__PURE__ */ new Set();
-  const now = Date.now();
   for (const list of groups) {
     for (const item of list) {
       const start = normalizeTimestamp(item?.start_time) ?? 0;
       const end = normalizeTimestamp(item?.end_time) ?? Infinity;
-      if (now < start || now >= end) continue;
       const key = `${item?.id ?? ""}|${item?.name ?? ""}|${start}|${end === Infinity ? "inf" : end}`;
       if (seen.has(key)) continue;
       seen.add(key);
@@ -4296,35 +4424,60 @@ function getActiveProducts(res) {
   }
   return merged;
 }
-__name(getActiveProducts, "getActiveProducts");
-function getCurrentMerchantRound() {
-  const now = /* @__PURE__ */ new Date();
-  const hour = now.getHours();
-  const rounds = [8, 12, 16, 20];
-  let currentRound = null;
-  let nextRound = null;
-  for (let i = 0; i < rounds.length; i++) {
-    if (hour >= rounds[i] && (i === rounds.length - 1 || hour < rounds[i + 1])) {
-      currentRound = i + 1;
-      nextRound = i < rounds.length - 1 ? rounds[i + 1] : rounds[0];
-      break;
-    }
-  }
-  if (currentRound === null) nextRound = rounds[0];
-  const nextTime = new Date(now);
-  if (nextRound <= hour) nextTime.setDate(nextTime.getDate() + 1);
-  nextTime.setHours(nextRound, 0, 0, 0);
-  const diff = nextTime.getTime() - now.getTime();
+__name(getMerchantProducts, "getMerchantProducts");
+function isMerchantItemActive(item, now = Date.now()) {
+  const nowMs = now instanceof Date ? now.getTime() : now;
+  const start = normalizeTimestamp(item?.start_time);
+  const end = normalizeTimestamp(item?.end_time);
+  return (start === null || nowMs >= start) && (end === null || nowMs < end);
+}
+__name(isMerchantItemActive, "isMerchantItemActive");
+function isMerchantItemToday(item, now = Date.now()) {
+  const start = normalizeTimestamp(item?.start_time);
+  const end = normalizeTimestamp(item?.end_time);
+  if (start === null || end === null) return true;
+  const startOfDay = getChinaDayStartMs(now);
+  const endOfDay = startOfDay + 24 * 60 * 60 * 1e3;
+  return start < endOfDay && end > startOfDay;
+}
+__name(isMerchantItemToday, "isMerchantItemToday");
+function getRoundForItem(item, now = Date.now()) {
+  const start = normalizeTimestamp(item?.start_time);
+  if (start === null) return null;
+  const startParts = getChinaParts(start);
+  const nowParts = getChinaParts(now);
+  if (startParts.year !== nowParts.year || startParts.month !== nowParts.month || startParts.day !== nowParts.day) {
+    return null;
+  }
+  const startHour = startParts.hour + startParts.minute / 60;
+  const round = ROUND_WINDOWS.find((win) => startHour >= win.startHour && startHour < win.endHour);
+  return round?.id ?? null;
+}
+__name(getRoundForItem, "getRoundForItem");
+function getCurrentMerchantRound(now = /* @__PURE__ */ new Date()) {
+  const parts = getChinaParts(now);
+  const secondsOfDay = parts.hour * 3600 + parts.minute * 60 + parts.second;
+  const marketStartSeconds = 8 * 3600;
+  const marketEndSeconds = 24 * 3600;
+  const datePart = getChinaDateText(now);
+  if (secondsOfDay < marketStartSeconds || secondsOfDay >= marketEndSeconds) {
+    return {
+      current: null,
+      total: ROUND_WINDOWS.length,
+      countdown: TEXT.notOpen,
+      is_open: false,
+      round_id: `${datePart}-closed`
+    };
+  }
+  const currentWindow = ROUND_WINDOWS.find((win) => parts.hour >= win.startHour && parts.hour < win.endHour);
+  const currentRound = currentWindow?.id ?? null;
+  const roundEndSeconds = (currentWindow?.endHour ?? 24) * 3600;
+  const diff = Math.max(0, (roundEndSeconds - secondsOfDay) * 1e3);
   const hours = Math.floor(diff / 36e5);
   const mins = Math.floor(diff % 36e5 / 6e4);
-  const datePart = [
-    now.getFullYear(),
-    String(now.getMonth() + 1).padStart(2, "0"),
-    String(now.getDate()).padStart(2, "0")
-  ].join("-");
   return {
     current: currentRound,
-    total: rounds.length,
+    total: ROUND_WINDOWS.length,
     countdown: `${hours}小时${mins}分钟`,
     is_open: currentRound !== null,
     round_id: `${datePart}-${currentRound || "closed"}`
@@ -4365,66 +4518,258 @@ function sameStringArray(left, right) {
   return JSON.stringify(left) === JSON.stringify(right);
 }
 __name(sameStringArray, "sameStringArray");
-function buildMerchantRenderPayload(res) {
-  const products = getActiveProducts(res);
-  const roundInfo = getCurrentMerchantRound();
-  const activity = getMerchantActivity(res);
-  const renderedProducts = products.map((p) => ({
-    name: p.name || TEXT.unknown,
-    image: p.icon_url || "",
-    time_label: formatProductWindow(p),
-    category: classifyMerchantItem(p)
+function getRandomGoodsMaps(res) {
+  const priceMap = /* @__PURE__ */ new Map();
+  const limitMap = /* @__PURE__ */ new Map();
+  const randomGoods = Array.isArray(res?.random_goods) ? res.random_goods : Array.isArray(res?.randomGoods) ? res.randomGoods : [];
+  for (const item of randomGoods) {
+    const name2 = String(item?.goods_name || item?.name || "").trim();
+    if (!name2) continue;
+    if (item?.price !== void 0 && item?.price !== null && item.price !== "") priceMap.set(name2, item.price);
+    if (item?.buy_limit_num !== void 0 && item?.buy_limit_num !== null && item.buy_limit_num !== "") {
+      limitMap.set(name2, item.buy_limit_num);
+    }
+  }
+  return { priceMap, limitMap };
+}
+__name(getRandomGoodsMaps, "getRandomGoodsMaps");
+function normalizeMerchantProducts(res, now = /* @__PURE__ */ new Date()) {
+  return getMerchantProducts(res).map((item) => {
+    const name2 = String(item?.name || item?.goods_name || TEXT.unknown).trim() || TEXT.unknown;
+    return {
+      name: name2,
+      image: String(item?.icon_url || item?.iconUrl || ""),
+      time_label: formatProductWindow(item),
+      category: classifyMerchantItem(item),
+      round_id: getRoundForItem(item, now),
+      is_active: isMerchantItemActive(item, now),
+      start_time: normalizeTimestamp(item?.start_time),
+      end_time: normalizeTimestamp(item?.end_time)
+    };
+  });
+}
+__name(normalizeMerchantProducts, "normalizeMerchantProducts");
+function buildMerchantCardItems(products, res, options) {
+  const { priceMap, limitMap } = getRandomGoodsMaps(res);
+  const catOrder = { round: 0, normal: 1, weekend: 2 };
+  const startY = 592;
+  const cardHeight = 308;
+  const gap = 43;
+  const goodsAll = products.map((product) => {
+    const limit = limitMap.get(product.name);
+    const limitText = limit === void 0 || limit === null || limit === "" ? "--" : String(limit);
+    const isHot = product.category !== "round";
+    const isEnded = options.includeEnded ? !product.is_active : false;
+    const roundPrefix = product.round_id ? `第${product.round_id}轮·` : "";
+    const remainingStr = product.category === "normal" ? `本日限购${limitText}个` : product.category === "weekend" ? `活动期间限购${limitText}个` : `${isEnded ? roundPrefix : ""}本轮限购${limitText}个`;
+    return {
+      goods_name: product.name,
+      iconUrl: product.image,
+      price: priceMap.get(product.name) ?? 0,
+      num: "",
+      category: product.category,
+      roundId: product.round_id || 0,
+      isHot,
+      isEnded,
+      remainingStr,
+      top: 0
+    };
+  });
+  goodsAll.sort((a, b) => {
+    if (options.includeEnded && a.isEnded !== b.isEnded) return a.isEnded ? 1 : -1;
+    if (a.category !== b.category) return catOrder[a.category] - catOrder[b.category];
+    return Number(b.price || 0) - Number(a.price || 0);
+  });
+  const goods = goodsAll.map((item, index) => ({
+    ...item,
+    num: String(index + 1).padStart(2, "0"),
+    top: startY + index * (cardHeight + gap)
   }));
-  const categoryMap = {
-    normal: [],
-    round: [],
-    weekend: []
-  };
-  for (const product of renderedProducts) {
-    categoryMap[product.category].push(product);
+  const lastCardTop = goods.length > 0 ? goods[goods.length - 1].top : startY;
+  const bottomFrameTop = lastCardTop + 287;
+  const pageHeight = bottomFrameTop + 160;
+  return { goods, bottomFrameTop, pageHeight };
+}
+__name(buildMerchantCardItems, "buildMerchantCardItems");
+function getCurrentMerchantProducts(products, roundInfo) {
+  return products.filter((product) => {
+    if (!product.is_active) return false;
+    if (product.category === "round") return !!roundInfo.current && product.round_id === roundInfo.current;
+    return true;
+  });
+}
+__name(getCurrentMerchantProducts, "getCurrentMerchantProducts");
+function buildMerchantFallbackText(title, products, roundInfo) {
+  const fallbackLines = [title];
+  if (roundInfo) {
+    fallbackLines.push(`轮次：第 ${roundInfo.current || TEXT.notOpen} / ${roundInfo.total} 轮`);
+    fallbackLines.push(`剩余：${roundInfo.countdown}`);
+  }
+  fallbackLines.push("");
+  if (!products.length) {
+    fallbackLines.push(roundInfo ? "当前轮次暂无商品。" : "今日暂无已公布的远行商人商品。");
+    return fallbackLines.join("\n").trimEnd();
+  }
+  for (const key of CATEGORY_ORDER) {
+    const group = products.filter((product) => product.category === key);
+    if (!group.length) continue;
+    fallbackLines.push(`【${CATEGORY_LABELS[key]}】`);
+    group.forEach((product, index) => {
+      const tail = product.time_label ? ` (${product.time_label})` : "";
+      fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
+    });
+    fallbackLines.push("");
   }
-  const categories = CATEGORY_ORDER.filter((key) => categoryMap[key].length > 0).map((key) => ({
-    key,
-    label: CATEGORY_LABELS[key],
-    products: categoryMap[key]
+  return fallbackLines.join("\n").trimEnd();
+}
+__name(buildMerchantFallbackText, "buildMerchantFallbackText");
+function getMerchantActivityTitle(res) {
+  const activity = getMerchantActivity(res);
+  return String(activity?.name || TEXT.merchant).trim() || TEXT.merchant;
+}
+__name(getMerchantActivityTitle, "getMerchantActivityTitle");
+function getMerchantActivitySubtitle(res) {
+  const activity = getMerchantActivity(res);
+  return String(activity?.start_date || "每日 08:00 / 12:00 / 16:00 / 20:00 刷新").trim();
+}
+__name(getMerchantActivitySubtitle, "getMerchantActivitySubtitle");
+function getLegacyRoundGroups(now, roundInfo) {
+  return ROUND_WINDOWS.map((win) => ({
+    round_id: win.id,
+    label: `${padNumber(win.startHour)}:00 - ${padNumber(win.endHour)}:00`,
+    is_current: roundInfo.current === win.id,
+    products: []
   }));
+}
+__name(getLegacyRoundGroups, "getLegacyRoundGroups");
+function buildLegacyCategoryGroups(products, roundGroups) {
+  return CATEGORY_ORDER.map((key) => {
+    const groups = roundGroups.map((group) => ({
+      round_id: group.round_id,
+      label: group.label,
+      is_current: group.is_current,
+      products: group.products.filter((product) => product.category === key)
+    })).filter((group) => group.products.length > 0);
+    return {
+      key,
+      label: CATEGORY_LABELS[key],
+      roundGroups: groups,
+      product_count: groups.reduce((sum, group) => sum + group.products.length, 0)
+    };
+  }).filter((category) => category.product_count > 0);
+}
+__name(buildLegacyCategoryGroups, "buildLegacyCategoryGroups");
+function getMerchantDateStr(now = /* @__PURE__ */ new Date()) {
+  const parts = getChinaParts(now);
+  return `${parts.month}.${parts.day}`;
+}
+__name(getMerchantDateStr, "getMerchantDateStr");
+function buildMerchantRenderPayload(res, now = /* @__PURE__ */ new Date()) {
+  const allProducts = normalizeMerchantProducts(res, now);
+  const roundInfo = getCurrentMerchantRound(now);
+  const products = getCurrentMerchantProducts(allProducts, roundInfo);
+  const currentWindow = ROUND_WINDOWS.find((win) => win.id === roundInfo.current);
+  const timeRange = currentWindow ? `${padNumber(currentWindow.startHour)}:00-${padNumber(currentWindow.endHour)}:00` : "--:--~--:--";
+  const data = {
+    dateStr: getMerchantDateStr(now),
+    timeRange,
+    ...buildMerchantCardItems(products, res, { includeEnded: false })
+  };
+  const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
+  return { products, roundInfo, data, fallback };
+}
+__name(buildMerchantRenderPayload, "buildMerchantRenderPayload");
+function buildLegacyMerchantRenderPayload(res, now = /* @__PURE__ */ new Date()) {
+  const allProducts = normalizeMerchantProducts(res, now);
+  const roundInfo = getCurrentMerchantRound(now);
+  const products = getCurrentMerchantProducts(allProducts, roundInfo);
+  const roundGroups = getLegacyRoundGroups(now, roundInfo);
+  const currentGroup = roundGroups.find((group) => group.round_id === roundInfo.current) || roundGroups[0];
+  currentGroup.products.push(...products);
+  const categories = buildLegacyCategoryGroups(products, roundGroups);
   const data = {
     background: "",
-    title: activity.name || TEXT.merchant,
-    subtitle: activity.start_date || "每日 08:00 / 12:00 / 16:00 / 20:00 刷新",
-    titleIcon: true,
-    product_count: renderedProducts.length,
-    round_info: roundInfo,
+    title: getMerchantActivityTitle(res),
+    subtitle: getMerchantActivitySubtitle(res),
     categories,
-    products: renderedProducts
+    roundGroups,
+    total_products: products.length
   };
-  const fallbackLines = [];
-  if (renderedProducts.length) {
-    fallbackLines.push(`远行商人当前商品（共 ${renderedProducts.length} 件）`);
-    fallbackLines.push(`轮次：${roundInfo.current || TEXT.notOpen}，剩余：${roundInfo.countdown}`);
-    fallbackLines.push("");
-    for (const cat of categories) {
-      fallbackLines.push(`【${cat.label}】`);
-      cat.products.forEach((product, index) => {
-        const tail = product.time_label ? ` (${product.time_label})` : "";
-        fallbackLines.push(`  ${index + 1}. ${product.name}${tail}`);
-      });
-      fallbackLines.push("");
-    }
-  } else {
-    fallbackLines.push("当前远行商人暂无商品。");
-  }
-  const fallback = fallbackLines.join("\n").trimEnd();
-  return { products: renderedProducts, roundInfo, data, fallback };
+  const fallback = buildMerchantFallbackText(TEXT.merchant, products, roundInfo);
+  return { products, roundInfo, data, fallback };
+}
+__name(buildLegacyMerchantRenderPayload, "buildLegacyMerchantRenderPayload");
+function buildTodayMerchantRenderPayload(res, now = /* @__PURE__ */ new Date()) {
+  const products = normalizeMerchantProducts(res, now).filter((product) => {
+    const source = {
+      start_time: product.start_time,
+      end_time: product.end_time
+    };
+    return isMerchantItemToday(source, now);
+  });
+  const data = {
+    dateStr: getMerchantDateStr(now),
+    ...buildMerchantCardItems(products, res, { includeEnded: true })
+  };
+  const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, products);
+  return { products, data, fallback };
+}
+__name(buildTodayMerchantRenderPayload, "buildTodayMerchantRenderPayload");
+function buildLegacyTodayMerchantRenderPayload(res, now = /* @__PURE__ */ new Date()) {
+  const allProducts = normalizeMerchantProducts(res, now).filter((product) => {
+    const source = {
+      start_time: product.start_time,
+      end_time: product.end_time
+    };
+    return isMerchantItemToday(source, now);
+  });
+  const roundInfo = getCurrentMerchantRound(now);
+  const roundGroups = getLegacyRoundGroups(now, roundInfo);
+  for (const product of allProducts) {
+    const roundId = product.category === "round" ? product.round_id : null;
+    const group = roundId ? roundGroups.find((item) => item.round_id === roundId) : roundGroups[0];
+    if (group) group.products.push(product);
+  }
+  const categories = buildLegacyCategoryGroups(allProducts, roundGroups);
+  const data = {
+    background: "",
+    title: TEXT.todayMerchant,
+    subtitle: `${getChinaDateText(now)} · 每日 08:00 / 12:00 / 16:00 / 20:00 刷新`,
+    categories,
+    roundGroups,
+    total_products: allProducts.length
+  };
+  const fallback = buildMerchantFallbackText(`今日远行商人 (${getChinaDateText(now)})`, allProducts);
+  return { products: allProducts, data, fallback };
 }
-__name(buildMerchantRenderPayload, "buildMerchantRenderPayload");
+__name(buildLegacyTodayMerchantRenderPayload, "buildLegacyTodayMerchantRenderPayload");
+function useLegacyMerchantUi(deps) {
+  return deps.config.merchantUiStyle === "old";
+}
+__name(useLegacyMerchantUi, "useLegacyMerchantUi");
+function buildConfiguredMerchantRenderPayload(deps, res, now = /* @__PURE__ */ new Date()) {
+  const payload = useLegacyMerchantUi(deps) ? buildLegacyMerchantRenderPayload(res, now) : buildMerchantRenderPayload(res, now);
+  return {
+    ...payload,
+    templateName: useLegacyMerchantUi(deps) ? "yuanxing-shangren" : "yuanxing-shangren/merchant"
+  };
+}
+__name(buildConfiguredMerchantRenderPayload, "buildConfiguredMerchantRenderPayload");
+function buildConfiguredTodayMerchantRenderPayload(deps, res, now = /* @__PURE__ */ new Date()) {
+  const payload = useLegacyMerchantUi(deps) ? buildLegacyTodayMerchantRenderPayload(res, now) : buildTodayMerchantRenderPayload(res, now);
+  return {
+    ...payload,
+    templateName: useLegacyMerchantUi(deps) ? "yuanxing-shangren" : "yuanxing-shangren/today"
+  };
+}
+__name(buildConfiguredTodayMerchantRenderPayload, "buildConfiguredTodayMerchantRenderPayload");
 async function checkMerchantSubscriptions(deps) {
   const { ctx, client, merchantSubMgr, renderer, config } = deps;
   const res = await client.getMerchantInfo(ctx, true);
   if (!res) return { subscriptions: 0, matched: 0, pushed: 0 };
-  const { products, roundInfo, data, fallback } = buildMerchantRenderPayload(res);
+  const { products, roundInfo, data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
   const productNames = products.map((p) => p.name || "").filter(Boolean);
-  const rendered = await renderer.renderHtml(ctx, "yuanxing-shangren", data);
+  const rendered = await renderer.renderHtml(ctx, templateName, data);
   const renderedImage = rendered ? compressPngImage(rendered, config) : null;
   const subs = merchantSubMgr.getAll();
   let matchedCount = 0;
@@ -4474,10 +4819,17 @@ function register3(deps) {
   ctx.command(TEXT.merchant, "查看远行商人商品").action(async ({ session }) => {
     const res = await client.getMerchantInfo(ctx, true);
     if (!res) return `获取远行商人数据失败：${client.getLastErrorBrief()}`;
-    const { data, fallback } = buildMerchantRenderPayload(res);
-    const png = await deps.renderer.renderHtml(ctx, "yuanxing-shangren", data);
+    const { data, fallback, templateName } = buildConfiguredMerchantRenderPayload(deps, res);
+    const png = await deps.renderer.renderHtml(ctx, templateName, data);
     await sendImageWithFallback(session, png, fallback, "merchant:yuanxing-shangren", deps.config);
   });
+  ctx.command(TEXT.todayMerchant, "查看今日远行商人全部商品").action(async ({ session }) => {
+    const res = await client.getMerchantInfo(ctx, true);
+    if (!res) return `获取今日远行商人数据失败：${client.getLastErrorBrief()}`;
+    const { data, fallback, templateName } = buildConfiguredTodayMerchantRenderPayload(deps, res);
+    const png = await deps.renderer.renderHtml(ctx, templateName, data);
+    await sendImageWithFallback(session, png, fallback, "merchant:yuanxing-shangren:today", deps.config);
+  });
   ctx.command(`${TEXT.subscribe} [args:text]`, "订阅远行商人商品提醒").action(async ({ session }, args) => {
     const target = getSubscriptionTarget(session);
     if (!target.privateChat && !isBotAdmin2(session, config.adminUserIds)) return "此指令仅限管理员使用。";
@@ -5374,13 +5726,19 @@ var Config = import_koishi12.Schema.intersect([
   import_koishi12.Schema.object({
     merchantSubscriptionEnabled: import_koishi12.Schema.boolean().default(true).description("启用远行商人订阅"),
     merchantSubscriptionItems: import_koishi12.Schema.array(String).default(["国王球", "棱镜球", "炫彩精灵蛋"]).description("默认订阅商品"),
+    merchantUiStyle: import_koishi12.Schema.union(["new", "old"]).default("new").description("远行商人 UI 样式：new 为新版大图卡片，old 为旧版列表卡片"),
     merchantCheckMode: import_koishi12.Schema.union(["interval", "times"]).default("interval").description("商人检查模式：interval 定期轮询 / times 指定时间点"),
     merchantCheckInterval: import_koishi12.Schema.number().default(3e5).description("商人检查间隔，单位毫秒（仅 interval 模式生效）"),
     merchantCheckTimes: import_koishi12.Schema.array(String).default([]).description("商人定时检查时间点（HH:MM 格式，如 08:00，仅 times 模式生效）"),
     merchantPrivateSubscriptionEnabled: import_koishi12.Schema.boolean().default(true).description("允许个人私聊订阅远行商人推送"),
     homeSubscriptionEnabled: import_koishi12.Schema.boolean().default(true).description("启用家园菜园和灵感订阅推送"),
     homeSubscriptionIntervalMinutes: import_koishi12.Schema.number().default(5).description("家园订阅检查间隔，单位分钟")
-  }).description("订阅推送设置")
+  }).description("订阅推送设置"),
+  import_koishi12.Schema.object({
+    homeQueryWaitMs: import_koishi12.Schema.number().default(5e3).description("家园查询服务端同步等待毫秒（long-poll，超过此时间未出结果则转入排队）"),
+    homeQueryPollIntervalMs: import_koishi12.Schema.number().default(3e3).description("家园查询进入排队后的轮询间隔，单位毫秒"),
+    homeQueryTimeoutMs: import_koishi12.Schema.number().default(18e4).description("家园查询排队等候的总超时，单位毫秒，超时后提示稍后重试")
+  }).description("家园查询排队设置")
 ]);
 function apply(ctx, config) {
   setupRoleTokenModel(ctx);