koishi-plugin-rocom 1.0.11 → 1.0.13

package/lib/render-templates/yuanxing-shangren/today.style.css

@@ -0,0 +1,366 @@
+/* 今日远行商人样式 - 从today.html中提取 */
+
+@font-face {
+    font-family: "fzlant";
+    src: url("../../ttf/fzlant.D5FI9Et0.ttf");
+}
+
+@font-face {
+    font-family: "dundun";
+    src: url("../../ttf/dundun.xHd_Ee5-.woff2");
+}
+
+* {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+:root {
+    --font-family: "fzlant", "Microsoft YaHei", "PingFang SC", sans-serif;
+    --font-family-accent: "dundun", "fzlant", "Microsoft YaHei", sans-serif;
+    --text-1: #332719;
+    --text-2: #6b5846;
+    --line: rgba(118, 97, 74, 0.22);
+    --panel-bg: rgba(243, 237, 227, 0.94);
+    --card-bg: rgba(255, 252, 247, 0.82);
+    --tag-bg: rgba(255, 214, 153, 0.4);
+    --tag-text: #9a5f19;
+    --round-current-bg: rgba(255, 214, 153, 0.25);
+    --round-current-border: rgba(200, 140, 40, 0.4);
+    --round-current-text: #b06800;
+    --accent-color: #a0631d;
+    --warning-color: #bf5f3f;
+    --border-color: rgba(179, 123, 45, 0.2);
+    --border-color-light: rgba(118, 97, 74, 0.12);
+    --weekend-color: #c04030;
+    --normal-color: #2a8040;
+    --round-color: #2a60b0;
+    --weekend-bg: rgba(220, 80, 60, 0.15);
+    --normal-bg: rgba(60, 160, 80, 0.15);
+    --round-bg: rgba(60, 120, 220, 0.15);
+}
+
+html,
+body {
+    width: 100%;
+    height: auto;
+    font-family: var(--font-family);
+    color: var(--text-1);
+    background: #ece3d3;
+}
+
+.merchant-page {
+    position: relative;
+    width: min(1040px, calc(100vw - 24px));
+    margin: 0 auto;
+    padding: 14px;
+    overflow: hidden;
+    background: #ece3d3;
+    border-radius: 30px;
+}
+
+.background {
+    position: absolute;
+    inset: 0;
+    background-size: cover;
+    background-position: center top;
+    background-repeat: no-repeat;
+    opacity: 0.24;
+    filter: saturate(0.9);
+}
+
+.content-container {
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    padding: 2px 0 4px;
+}
+
+.header {
+    display: flex;
+    justify-content: space-between;
+    gap: 16px;
+    padding: 20px 22px;
+    border: 1px solid var(--line);
+    border-radius: 24px;
+    background: linear-gradient(135deg, rgba(255,255,255,0.86), rgba(245,236,221,0.9));
+    box-shadow: 0 14px 36px rgba(58, 39, 21, 0.08);
+}
+
+.title-section {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
+}
+
+.title-main {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+}
+
+.title-badge {
+    width: 60px;
+    height: 60px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: transparent;
+    color: #fffaf0;
+    font-size: 28px;
+    font-weight: 900;
+}
+
+.title-badge img {
+    width: 60px;
+    height: 60px;
+    object-fit: contain;
+}
+
+.title-text {
+    font-family: var(--font-family-accent);
+    font-size: 36px;
+    font-weight: 900;
+    letter-spacing: 1px;
+}
+
+.subtitle {
+    color: var(--text-2);
+    font-size: 16px;
+}
+
+.header-side {
+    min-width: 200px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    justify-content: center;
+    gap: 12px;
+}
+
+.summary-chip {
+    padding: 9px 14px;
+    border-radius: 999px;
+    background: rgba(255,255,255,0.72);
+    border: 1px solid var(--border-color);
+    color: var(--text-2);
+    font-size: 16px;
+}
+
+.summary-chip strong {
+    font-family: var(--font-family-accent);
+    color: var(--accent-color);
+    font-size: 24px;
+    margin-left: 8px;
+}
+
+.category-section {
+    margin-top: 18px;
+}
+
+.category-header {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    margin-bottom: 12px;
+    padding: 0 4px;
+}
+
+.category-title {
+    font-family: var(--font-family-accent);
+    font-size: 24px;
+    font-weight: 800;
+    color: var(--text-1);
+}
+
+.category-count {
+    padding: 4px 10px;
+    border-radius: 999px;
+    font-size: 14px;
+    font-weight: 700;
+}
+
+.category-count.normal {
+    background: var(--normal-bg);
+    color: var(--normal-color);
+}
+
+.category-count.round {
+    background: var(--round-bg);
+    color: var(--round-color);
+}
+
+.category-count.weekend {
+    background: var(--weekend-bg);
+    color: var(--weekend-color);
+}
+
+.round-section {
+    padding: 14px 18px;
+    border: 1px solid var(--round-current-border);
+    border-radius: 16px;
+    background: linear-gradient(135deg, rgba(255,248,235,0.88), rgba(255,240,210,0.9));
+    box-shadow: 0 6px 22px rgba(180, 120, 20, 0.08);
+    margin-bottom: 10px;
+}
+
+.round-section:last-child {
+    margin-bottom: 0;
+}
+
+.round-section.is-current {
+    background: linear-gradient(135deg, rgba(255,248,235,1), rgba(255,240,210,1));
+    border-color: rgba(200, 140, 40, 0.6);
+    box-shadow: 0 6px 28px rgba(180, 120, 20, 0.12);
+}
+
+.round-header {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    margin-bottom: 10px;
+}
+
+.round-title {
+    font-family: var(--font-family-accent);
+    font-size: 18px;
+    font-weight: 700;
+    color: var(--text-2);
+}
+
+.round-badge {
+    padding: 3px 8px;
+    border-radius: 999px;
+    background: var(--tag-bg);
+    color: var(--tag-text);
+    font-size: 12px;
+    font-weight: 700;
+}
+
+.round-badge.current {
+    background: var(--round-current-bg);
+    color: var(--round-current-text);
+}
+
+.products-grid {
+    display: grid;
+    grid-template-columns: 1fr;
+    gap: 14px;
+}
+
+.product-card {
+    display: grid;
+    grid-template-columns: 80px 1fr auto;
+    gap: 14px;
+    align-items: center;
+    min-height: 96px;
+    padding: 12px 16px;
+    border: 1px solid rgba(200, 140, 40, 0.3);
+    border-radius: 16px;
+    background: linear-gradient(135deg, rgba(255,248,235,0.75), rgba(255,240,210,0.85));
+    box-shadow: 0 4px 14px rgba(180, 120, 20, 0.06);
+}
+
+.product-image-container {
+    width: 80px;
+    height: 80px;
+    border-radius: 12px;
+    background: radial-gradient(circle at 30% 30%, rgba(255,255,255,0.94), rgba(255,240,210,0.92));
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+}
+
+.product-image {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+}
+
+.product-main {
+    min-width: 0;
+}
+
+.product-name {
+    font-family: var(--font-family-accent);
+    font-size: 22px;
+    font-weight: 800;
+    line-height: 1.2;
+    word-break: break-word;
+}
+
+.product-time {
+    display: inline-flex;
+    margin-top: 8px;
+    padding: 5px 10px;
+    border-radius: 999px;
+    background: var(--tag-bg);
+    color: var(--tag-text);
+    font-size: 14px;
+    font-weight: 700;
+}
+
+.product-side {
+    align-self: stretch;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+
+.product-slot {
+    padding: 7px 10px;
+    border-radius: 12px;
+    background: rgba(255,255,255,0.72);
+    border: 1px solid var(--border-color);
+    color: var(--accent-color);
+    font-size: 14px;
+    font-weight: 700;
+}
+
+.round-empty {
+    text-align: center;
+    padding: 18px 14px;
+    border-radius: 14px;
+    border: 1px dashed rgba(200, 140, 40, 0.3);
+    color: #8b7a66;
+    font-size: 16px;
+    background: rgba(255,248,235,0.5);
+}
+
+.all-empty {
+    text-align: center;
+    padding: 40px 18px;
+    margin-top: 18px;
+    border-radius: 20px;
+    border: 1px dashed rgba(200, 140, 40, 0.35);
+    color: #5c4a37;
+    font-size: 20px;
+    background: rgba(255,248,235,0.6);
+}
+
+.category-label {
+    display: inline-flex;
+    padding: 3px 8px;
+    border-radius: 999px;
+    font-size: 12px;
+    font-weight: 700;
+    margin-left: 8px;
+    vertical-align: middle;
+}
+
+.category-label.weekend {
+    background: var(--weekend-bg);
+    color: var(--weekend-color);
+}
+
+.category-label.normal {
+    background: var(--normal-bg);
+    color: var(--normal-color);
+}
+
+.category-label.round {
+    background: var(--round-bg);
+    color: var(--round-color);
+}

package/lib/render.js

@@ -50,6 +50,11 @@ const TEMPLATE_CAPTURE_PADDING = {
 const TEMPLATE_VIEWPORTS = {
     activities: { width: 1600, height: 1200, deviceScaleFactor: 2 },
 };
+const VISUAL_BOUNDS_TEMPLATES = new Set([
+    'home',
+    'yuanxing-shangren/merchant',
+    'yuanxing-shangren/today',
+]);
 const DEFAULT_SCREENSHOT_OPTIONS = {
     type: 'jpeg',
     quality: 82,
@@ -177,6 +182,7 @@ class Renderer {
                     '.student-perks-page',
                     '.student-page',
                     '.merchant-page',
+                    '.page',
                     '.home-page',
                     '.pet-panel-page',
                     '.pet-detail-page',
@@ -194,16 +200,17 @@ class Renderer {
                 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),

package/lib/subscription-send.js

@@ -49,14 +49,13 @@ async function sendScheduledMessage(ctx, target, message) {
     return false;
 }
 async function sendScheduledImageWithFallback(ctx, target, image, fallbackText, mentionAll = false) {
-    const prefix = mentionAll ? '@全体\n' : '';
+    const buildContent = (body) => mentionAll ? (0, koishi_1.h)('message', {}, (0, koishi_1.h)('at', { type: 'all' }), koishi_1.h.text('\n'), body) : body;
     if (!image) {
-        return sendScheduledMessage(ctx, target, `${prefix}${fallbackText}`);
+        return sendScheduledMessage(ctx, target, buildContent(koishi_1.h.text(fallbackText)));
     }
     const imageSegment = koishi_1.h.image(image, (0, send_image_1.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(koishi_1.h.text(fallbackText)));
 }

package/lib/types.d.ts

@@ -12,12 +12,16 @@ export interface PluginConfig {
     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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-rocom",
   "description": "洛克王国查询与订阅插件",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/staytomorrow/koishi-plugin-rocom",