koishi-plugin-rocom 1.0.4 → 1.0.6

package/lib/client.js

@@ -126,7 +126,7 @@ class RocomClient {
                 stack: err?.stack,
             } : undefined,
         };
-        console.warn(`[rocom-client] ${method} ${path} detailed failure\n${this.stringifyForLog(details)}`);
+        logger.warn(`${method} ${path} detailed failure\n${this.stringifyForLog(details)}`);
     }
     async get(ctx, path, headers, params, options) {
         try {

package/lib/commands/account.js

@@ -161,9 +161,26 @@ function register(deps) {
         .action(async ({ session }, index) => {
         if (!index)
             return '用法：洛克.切换 <序号>';
-        return userMgr.switchPrimary(session.userId, index)
-            ? `成功切换到序号 ${index} 账号。`
-            : '序号无效。';
+        const userId = session.userId;
+        if (!userMgr.switchPrimary(userId, index))
+            return '序号无效。';
+        const newPrimary = userMgr.getPrimaryBinding(userId);
+        if (newPrimary?.binding_id) {
+            const token = await (0, role_token_1.getRoleToken)(ctx, userId);
+            if (token && token.bindingId !== newPrimary.binding_id) {
+                const res = await client.refreshBinding(ctx, newPrimary.binding_id, userId);
+                if (res?.framework_token) {
+                    await (0, role_token_1.upsertRoleToken)(ctx, {
+                        userId,
+                        fwt: res.framework_token,
+                        bindingId: newPrimary.binding_id,
+                        roleId: newPrimary.role_id,
+                        loginType: newPrimary.login_type,
+                    });
+                }
+            }
+        }
+        return `成功切换到序号 ${index} 账号：${newPrimary?.nickname || '未知'}`;
     });
     ctx.command('洛克').subcommand('.解绑 <index:number>', '解绑账号')
         .alias('洛克解绑')
@@ -184,6 +201,27 @@ function register(deps) {
         if (userMgr.getUserBindings(session.userId).length === 0) {
             await (0, role_token_1.removeRoleToken)(ctx, session.userId);
         }
+        else {
+            const token = await (0, role_token_1.getRoleToken)(ctx, session.userId);
+            if (token?.bindingId === removed.binding_id) {
+                const newPrimary = userMgr.getPrimaryBinding(session.userId);
+                if (newPrimary?.binding_id) {
+                    const res = await client.refreshBinding(ctx, newPrimary.binding_id, session.userId);
+                    if (res?.framework_token) {
+                        await (0, role_token_1.upsertRoleToken)(ctx, {
+                            userId: session.userId,
+                            fwt: res.framework_token,
+                            bindingId: newPrimary.binding_id,
+                            roleId: newPrimary.role_id,
+                            loginType: newPrimary.login_type,
+                        });
+                    }
+                    else {
+                        await (0, role_token_1.removeRoleToken)(ctx, session.userId);
+                    }
+                }
+            }
+        }
         return `已解绑账号：${removed.nickname}`;
     });
     ctx.command('洛克').subcommand('.刷新', '刷新当前主账号凭证')

package/lib/commands/admin.js

@@ -53,19 +53,33 @@ function register(deps) {
         const allUsers = userMgr.getAllUsersBindings();
         let totalInvalid = 0;
         let totalValid = 0;
+        let totalSkipped = 0;
         for (const [userId, bindings] of Object.entries(allUsers)) {
             const token = await (0, role_token_1.getRoleToken)(ctx, userId);
             if (!token?.fwt) {
                 logger.warn(`用户 ${userId} 没有可用的 fwt，跳过失效检测`);
+                totalSkipped += bindings.length;
                 continue;
             }
-            const fwToken = token.fwt;
             const valid = [];
             for (const binding of bindings) {
-                const roleRes = await client.getRole(ctx, fwToken, undefined, userId);
+                const refreshRes = binding.binding_id
+                    ? await client.refreshBinding(ctx, binding.binding_id, userId)
+                    : null;
+                const fwt = refreshRes?.framework_token || token.fwt;
+                const roleRes = await client.getRole(ctx, fwt, undefined, userId);
                 if (roleRes?.role) {
                     valid.push(binding);
                     totalValid++;
+                    if (refreshRes?.framework_token) {
+                        await (0, role_token_1.upsertRoleToken)(ctx, {
+                            userId,
+                            fwt: refreshRes.framework_token,
+                            bindingId: binding.binding_id,
+                            roleId: binding.role_id,
+                            loginType: binding.login_type,
+                        });
+                    }
                     continue;
                 }
                 if (binding.binding_id) {
@@ -83,16 +97,24 @@ function register(deps) {
                 await (0, role_token_1.removeRoleToken)(ctx, userId);
             }
         }
-        return totalInvalid > 0
-            ? `清理完成：移除 ${totalInvalid} 个无效绑定，剩余 ${totalValid} 个有效绑定。`
+        const parts = [`清理完成：移除 ${totalInvalid} 个无效绑定，剩余 ${totalValid} 个有效绑定。`];
+        if (totalSkipped)
+            parts.push(`跳过 ${totalSkipped} 个（无可用凭证）。`);
+        return totalInvalid > 0 || totalSkipped > 0
+            ? parts.join('')
             : `所有绑定均有效，无需清理。共 ${totalValid} 个有效绑定。`;
     });
     if (config.autoRefreshEnabled) {
+        let lastRefreshKey = '';
         ctx.setInterval(async () => {
             const now = new Date();
             const timeStr = `${String(now.getHours()).padStart(2, '0')}:${String(now.getMinutes()).padStart(2, '0')}`;
             if (!config.autoRefreshTime.includes(timeStr))
                 return;
+            const refreshKey = `${now.toDateString()}-${timeStr}`;
+            if (refreshKey === lastRefreshKey)
+                return;
+            lastRefreshKey = refreshKey;
             const allUsers = userMgr.getAllUsersBindings();
             for (const [userId] of Object.entries(allUsers)) {
                 const binding = userMgr.getPrimaryBinding(userId);
@@ -114,6 +136,6 @@ function register(deps) {
                     logger.warn(`自动刷新用户 ${userId} 失败: ${e}`);
                 }
             }
-        }, 60000);
+        }, 30000);
     }
 }

package/lib/commands/merchant.js

@@ -28,17 +28,25 @@ function formatProductWindow(product) {
     const end = normalizeTimestamp(product?.end_time);
     if (!start && !end)
         return '';
+    const formatDate = (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 formatTime = (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}`;
     };
-    if (start && end)
-        return `${formatTime(start)}-${formatTime(end)}`;
+    if (start && end) {
+        const datePart = formatDate(start);
+        return `${datePart} ${formatTime(start)} – ${formatTime(end)}`;
+    }
     if (start)
-        return `${formatTime(start)}+`;
-    return `${formatTime(end)}-`;
+        return `${formatDate(start)} ${formatTime(start)}+`;
+    return `${formatDate(end)} ${formatTime(end)}-`;
 }
 function getMerchantActivity(res) {
     const activities = res?.merchantActivities || res?.merchant_activities || [];
@@ -83,6 +91,7 @@ function getCurrentMerchantRound() {
     ].join('-');
     return {
         current: currentRound,
+        total: rounds.length,
         countdown: `${hours}\u5c0f\u65f6${mins}\u5206\u949f`,
         is_open: currentRound !== null,
         round_id: `${datePart}-${currentRound || 'closed'}`,
@@ -94,11 +103,16 @@ function parseMerchantSubscriptionArgs(args, defaultItems) {
     if (parts[0] === '1' || parts[0] === '0') {
         mentionAll = parts.shift() === '1';
     }
-    const items = parts.length ? parts : defaultItems;
+    const matchAll = parts.length === 1 && parts[0] === '全部';
+    if (matchAll)
+        parts.shift();
+    const items = matchAll ? [] : (parts.length ? parts : defaultItems);
+    const source = matchAll ? '全部商品' : (parts.length ? TEXT.customSource : TEXT.defaultSource);
     return {
         mention_all: mentionAll,
+        match_all: matchAll,
         items,
-        source: parts.length ? TEXT.customSource : TEXT.defaultSource,
+        source,
     };
 }
 function getSubscriptionTarget(session) {
@@ -114,37 +128,74 @@ function isBotAdmin(session, adminUserIds) {
 function sameStringArray(left, right) {
     return JSON.stringify(left) === JSON.stringify(right);
 }
+function buildMerchantRenderPayload(res) {
+    const products = getActiveProducts(res);
+    const roundInfo = getCurrentMerchantRound();
+    const activity = getMerchantActivity(res);
+    const data = {
+        background: '',
+        title: activity.name || TEXT.merchant,
+        subtitle: activity.start_date || '\u6bcf\u65e5 08:00 / 12:00 / 16:00 / 20:00 \u5237\u65b0',
+        titleIcon: true,
+        product_count: products.length,
+        round_info: roundInfo,
+        products: products.map((p) => ({
+            name: p.name || TEXT.unknown,
+            image: p.icon_url || '',
+            time_label: formatProductWindow(p),
+        })),
+    };
+    const fallback = products.length
+        ? `\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff1a${products.map((p) => p.name || TEXT.unknown).join('\u3001')}\n\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\n\u5269\u4f59\uff1a${roundInfo.countdown}`
+        : '\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002';
+    return { products, roundInfo, data, fallback };
+}
 async function checkMerchantSubscriptions(deps) {
-    const { ctx, client, merchantSubMgr } = 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 = getActiveProducts(res);
+    const { products, roundInfo, data, fallback } = buildMerchantRenderPayload(res);
     const productNames = products.map((p) => p.name || '').filter(Boolean);
-    const roundInfo = getCurrentMerchantRound();
+    const rendered = await renderer.renderHtml(ctx, 'yuanxing-shangren', data);
+    const renderedPng = rendered ? (0, send_image_1.compressPngImage)(rendered, config) : null;
     const subs = merchantSubMgr.getAll();
     let matchedCount = 0;
     let pushedCount = 0;
     for (const [key, sub] of Object.entries(subs)) {
-        const matched = sub.items.filter((item) => productNames.some(n => n.includes(item)));
-        if (!matched.length)
+        const matchAll = !!sub.match_all;
+        const matched = matchAll
+            ? productNames
+            : sub.items.filter((item) => productNames.some(n => n.includes(item)));
+        if (!matchAll && !matched.length)
             continue;
-        matchedCount++;
-        if (sub.last_push_round === roundInfo.round_id && sameStringArray(matched, sub.last_matched_items || []))
+        if (matchAll && !products.length)
             continue;
-        const msg = `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${matched.join('\u3001')}`;
+        matchedCount++;
+        if (matchAll) {
+            if (sub.last_push_round === roundInfo.round_id)
+                continue;
+        }
+        else {
+            if (sub.last_push_round === roundInfo.round_id && sameStringArray(matched, sub.last_matched_items || []))
+                continue;
+        }
+        const msg = matchAll
+            ? `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}`
+            : `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${matched.join('\u3001')}`;
         const platform = sub.platform || ctx.bots[0]?.platform;
         const channelId = sub.channel_id || sub.group_id || sub.user_id || key;
         if (!platform || !channelId) {
             logger.warn(`\u63a8\u9001\u5931\u8d25 ${key}: \u65e0\u6cd5\u786e\u5b9a\u5e73\u53f0\u6216\u9891\u9053`);
             continue;
         }
-        const sent = await (0, subscription_send_1.sendScheduledMessage)(ctx, {
+        const fallbackText = `${msg}\n${fallback}`;
+        const sent = await (0, subscription_send_1.sendScheduledImageWithFallback)(ctx, {
             platform,
             channelId,
             guildId: sub.group_id || '',
             userId: sub.user_id || '',
-        }, sub.mention_all ? `@\u5168\u4f53\n${msg}` : msg);
+        }, renderedPng, fallbackText, !!sub.mention_all);
         if (!sent)
             continue;
         pushedCount++;
@@ -163,25 +214,7 @@ function register(deps) {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
             return '\u83b7\u53d6\u8fdc\u884c\u5546\u4eba\u6570\u636e\u5931\u8d25\u3002';
-        const products = getActiveProducts(res);
-        const roundInfo = getCurrentMerchantRound();
-        const activity = getMerchantActivity(res);
-        const data = {
-            background: '',
-            title: activity.name || TEXT.merchant,
-            subtitle: activity.start_date || '\u6bcf\u65e5 08:00 / 12:00 / 16:00 / 20:00 \u5237\u65b0',
-            titleIcon: '',
-            product_count: products.length,
-            round_info: roundInfo,
-            products: products.map((p) => ({
-                name: p.name || TEXT.unknown,
-                image: p.icon_url || '',
-                time_label: formatProductWindow(p),
-            })),
-        };
-        const fallback = products.length
-            ? `\u8fdc\u884c\u5546\u4eba\u5f53\u524d\u5546\u54c1\uff1a${products.map((p) => p.name || TEXT.unknown).join('\u3001')}\n\u8f6e\u6b21\uff1a${roundInfo.current || TEXT.notOpen}\n\u5269\u4f59\uff1a${roundInfo.countdown}`
-            : '\u5f53\u524d\u8fdc\u884c\u5546\u4eba\u6682\u65e0\u5546\u54c1\u3002';
+        const { data, fallback } = buildMerchantRenderPayload(res);
         const png = await deps.renderer.renderHtml(ctx, 'yuanxing-shangren', data);
         await (0, send_image_1.sendImageWithFallback)(session, png, fallback, 'merchant:yuanxing-shangren', deps.config);
     });
@@ -201,12 +234,13 @@ function register(deps) {
             channel_id: target.channelId,
             platform: target.platform,
             items: parsed.items,
+            match_all: parsed.match_all,
             mention_all: target.privateChat ? false : parsed.mention_all,
             last_push_round: existing?.last_push_round ?? null,
             last_matched_items: existing?.last_matched_items ?? [],
             updated_by: session.userId,
         });
-        return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
+        return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.match_all ? '\u5168\u90e8\u5546\u54c1\uff08\u6bcf\u8f6e\u63a8\u9001\uff09' : parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
     });
     ctx.command(TEXT.viewSubscribe, '\u67e5\u770b\u5f53\u524d\u4f1a\u8bdd\u7684\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
         .action(async ({ session }) => {
@@ -216,8 +250,9 @@ function register(deps) {
         const sub = merchantSubMgr.get(target.key);
         const scopeName = target.privateChat ? '你' : '当前群组';
         if (!sub)
-            return `${scopeName}未订阅远行商人。\n用法：${TEXT.subscribe} [1/0] [商品名1] [商品名2] ...`;
-        return `${scopeName}订阅商品：${sub.items.join('、')}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
+            return `${scopeName}未订阅远行商人。\n用法：${TEXT.subscribe} [1/0] [商品名1] [商品名2] ...\n或：${TEXT.subscribe} 全部（每轮直接推送整张商人图）`;
+        const itemsText = sub.match_all ? '全部商品（每轮推送）' : sub.items.join('、');
+        return `${scopeName}订阅商品：${itemsText}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
     });
     ctx.command(TEXT.unsubscribe, '\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
         .action(async ({ session }) => {