koishi-plugin-rocom 1.0.3 → 1.0.5

package/lib/client.d.ts

@@ -14,12 +14,12 @@ export declare class RocomClient {
     private sanitizeForLog;
     private headersForLog;
     private stringifyForLog;
-    private isApiKeyPermissionUndeclaredError;
     private logRequestFailureDetails;
     private get;
     private post;
     private delete;
     private requestWithStatus;
+    private requestIngameWithFallback;
     private getIngameTask;
     qqQrLogin(ctx: Context, userIdentifier: string): Promise<any>;
     qqQrStatus(ctx: Context, fwToken: string, userIdentifier: string): Promise<any>;

package/lib/client.js

@@ -99,11 +99,6 @@ class RocomClient {
             return String(value);
         }
     }
-    isApiKeyPermissionUndeclaredError(message) {
-        if (!message)
-            return false;
-        return /未声明\s*api\s*key\s*权限|api\s*key\s*permission|api key 权限/i.test(message);
-    }
     logRequestFailureDetails(method, path, headers, params, body, errorOrResponse) {
         const err = errorOrResponse;
         const response = err?.response;
@@ -131,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 {
@@ -235,23 +230,58 @@ class RocomClient {
             const body = response?.data !== undefined ? response.data : response;
             if (body?.code !== undefined && body.code !== 0) {
                 this.setLastError(body.message || body.msg || '接口返回异常');
-                this.logRequestFailureDetails(method, path, headers, options.params, options.json, body);
+                if (!options.silentFailureDetails) {
+                    this.logRequestFailureDetails(method, path, headers, options.params, options.json, body);
+                }
                 return { status: null, data: null };
             }
             const data = body?.code !== undefined ? (body.data ?? {}) : (body ?? {});
             if (!acceptedStatuses.includes(status)) {
                 this.setLastError(`HTTP ${status}`);
-                this.logRequestFailureDetails(method, path, headers, options.params, options.json, response);
+                if (!options.silentFailureDetails) {
+                    this.logRequestFailureDetails(method, path, headers, options.params, options.json, response);
+                }
+                return { status: null, data: null };
             }
             return { status, data };
         }
         catch (e) {
             const message = this.formatHttpError(e);
             this.setLastError(message);
-            this.logRequestFailureDetails(method, path, headers, options.params, options.json, e);
+            if (!options.silentFailureDetails) {
+                this.logRequestFailureDetails(method, path, headers, options.params, options.json, e);
+            }
             return { status: null, data: null };
         }
     }
+    async requestIngameWithFallback(ctx, path, payload, options = {}) {
+        const acceptedStatuses = options.acceptedStatuses || [200, 202];
+        const requestOnce = async (includeApiKey, silentFailureDetails) => {
+            const headers = this.wegameHeaders('', '', '', '', includeApiKey);
+            let result = await this.requestWithStatus(ctx, 'POST', path, headers, {
+                json: payload,
+                acceptedStatuses,
+                silentFailureDetails,
+            });
+            if (result.status === null) {
+                result = await this.requestWithStatus(ctx, 'GET', path, headers, {
+                    params: payload,
+                    acceptedStatuses,
+                    silentFailureDetails,
+                });
+            }
+            return result;
+        };
+        let result = await requestOnce(false, Boolean(this.apiKey));
+        if (result.status !== null)
+            return { ...result, usedApiKey: false };
+        if (this.apiKey) {
+            result = await requestOnce(true, false);
+            if (result.status !== null)
+                return { ...result, usedApiKey: true };
+        }
+        return { status: null, data: null, usedApiKey: false };
+    }
     async getIngameTask(ctx, taskId, includeApiKey = true) {
         return this.requestWithStatus(ctx, 'GET', `/api/v1/games/rocom/ingame/tasks/${taskId}`, this.wegameHeaders('', '', '', '', includeApiKey), { acceptedStatuses: [200, 202] });
     }
@@ -339,52 +369,14 @@ class RocomClient {
     async ingamePlayerSearch(ctx, uid) {
         const sanitizedUid = this.sanitizeUid(uid);
         if (!sanitizedUid) {
-            this.setLastError('UID 涓嶈兘涓虹┖');
+            this.setLastError('UID 不能为空');
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/player/search';
-        let includeApiKey = true;
-        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: 5000 };
-        let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
-            json: payload,
-            acceptedStatuses: [200, 202],
-        });
+        const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path, payload);
         if (status === 200 && data && this.isIngamePlayerPayload(data))
             return data;
-        if (status === null) {
-            const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                params: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = fallback.status;
-            data = fallback.data;
-            if (status === 200 && data && this.isIngamePlayerPayload(data))
-                return data;
-        }
-        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/player/search rejected X-API-Key, retrying without API key');
-            includeApiKey = false;
-            headers = this.wegameHeaders('', '', '', '', false);
-            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
-                json: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = retry.status;
-            data = retry.data;
-            if (status === 200 && data && this.isIngamePlayerPayload(data))
-                return data;
-            if (status === null) {
-                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                    params: payload,
-                    acceptedStatuses: [200, 202],
-                });
-                status = fallback.status;
-                data = fallback.data;
-                if (status === 200 && data && this.isIngamePlayerPayload(data))
-                    return data;
-            }
-        }
         if (!data)
             return null;
         if (this.isIngamePlayerPayload(data))
@@ -397,7 +389,7 @@ class RocomClient {
         }
         for (let i = 0; i < 8; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+            const task = await this.getIngameTask(ctx, taskId, usedApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -429,52 +421,14 @@ class RocomClient {
     async ingameHomeInfo(ctx, uid, waitMs = 5000) {
         const sanitizedUid = this.sanitizeUid(uid);
         if (!sanitizedUid) {
-            this.setLastError('UID 涓嶈兘涓虹┖');
+            this.setLastError('UID 不能为空');
             return null;
         }
         const path = '/api/v1/games/rocom/ingame/home/info';
-        let includeApiKey = true;
-        let headers = this.wegameHeaders();
         const payload = { uid: sanitizedUid, wait_ms: waitMs };
-        let { status, data } = await this.requestWithStatus(ctx, 'POST', path, headers, {
-            json: payload,
-            acceptedStatuses: [200, 202],
-        });
+        const { status, data, usedApiKey } = await this.requestIngameWithFallback(ctx, path, payload);
         if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
             return data;
-        if (status === null) {
-            const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                params: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = fallback.status;
-            data = fallback.data;
-            if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
-                return data;
-        }
-        if (status === null && includeApiKey && this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/home/info rejected X-API-Key, retrying without API key');
-            includeApiKey = false;
-            headers = this.wegameHeaders('', '', '', '', false);
-            const retry = await this.requestWithStatus(ctx, 'POST', path, headers, {
-                json: payload,
-                acceptedStatuses: [200, 202],
-            });
-            status = retry.status;
-            data = retry.data;
-            if (status === 200 && data && !(data.task_id || data.taskId || data.taskID))
-                return data;
-            if (status === null) {
-                const fallback = await this.requestWithStatus(ctx, 'GET', path, headers, {
-                    params: payload,
-                    acceptedStatuses: [200, 202],
-                });
-                status = fallback.status;
-                data = fallback.data;
-                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)
@@ -483,7 +437,7 @@ class RocomClient {
         }
         for (let i = 0; i < 10; i++) {
             await new Promise(resolve => setTimeout(resolve, 1000));
-            const task = await this.getIngameTask(ctx, taskId, includeApiKey);
+            const task = await this.getIngameTask(ctx, taskId, usedApiKey);
             if (task.status === 200)
                 return task.data;
             if (task.status === null)
@@ -494,22 +448,8 @@ class RocomClient {
     }
     async ingameMerchantInfo(ctx, shopId) {
         const params = { shop_id: shopId };
-        let headers = this.wegameHeaders();
-        const data = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
-        if (data)
-            return data;
-        const postData = await this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
-        if (postData)
-            return postData;
-        if (this.apiKey && this.isApiKeyPermissionUndeclaredError(this.getLastError(''))) {
-            logger.warn('ingame/merchant/info rejected X-API-Key, retrying without API key');
-            headers = this.wegameHeaders('', '', '', '', false);
-            const fallbackData = await this.get(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params, { silentFailureDetails: true });
-            if (fallbackData)
-                return fallbackData;
-            return this.post(ctx, '/api/v1/games/rocom/ingame/merchant/info', headers, params);
-        }
-        return null;
+        const { status, data } = await this.requestIngameWithFallback(ctx, '/api/v1/games/rocom/ingame/merchant/info', params);
+        return status === null ? null : data;
     }
     async getFriendship(ctx, fwToken, userIds, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/social/friendship', this.rocomHeaders(fwToken, userIdentifier), { user_ids: userIds });

package/lib/commands/account.js

@@ -66,6 +66,7 @@ async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId
 function register(deps) {
     const { ctx, client, userMgr } = deps;
     ctx.command('洛克').subcommand('.QQ登录', 'QQ 扫码登录')
+        .alias('洛克QQ登录')
         .action(async ({ session }) => {
         const userId = session.userId;
         const qrData = await client.qqQrLogin(ctx, userId);
@@ -91,6 +92,7 @@ function register(deps) {
         return '登录超时或失败，请重试。';
     });
     ctx.command('洛克').subcommand('.微信登录', '微信扫码登录')
+        .alias('洛克微信登录')
         .action(async ({ session }) => {
         const userId = session.userId;
         const qrData = await client.wechatQrLogin(ctx, userId);
@@ -115,6 +117,7 @@ function register(deps) {
         return '登录超时或失败，请重试。';
     });
     ctx.command('洛克').subcommand('.导入 <tgpId:string> <tgpTicket:string>', '导入 WeGame 凭证')
+        .alias('洛克导入')
         .action(async ({ session }, tgpId, tgpTicket) => {
         if (!tgpId || !tgpTicket)
             return '用法：洛克.导入 <tgp_id> <tgp_ticket>';
@@ -125,6 +128,7 @@ function register(deps) {
         await saveBindingWithRoleInfo(deps, session, res.frameworkToken, 'manual', userId);
     });
     ctx.command('洛克').subcommand('.绑定列表', '查看已绑定账号')
+        .alias('洛克绑定列表')
         .action(async ({ session }) => {
         const bindings = userMgr.getUserBindings(session.userId);
         if (!bindings.length)
@@ -153,14 +157,33 @@ function register(deps) {
         await (0, send_image_1.sendImageWithFallback)(session, png, fallbackLines.join('\n'), 'account:bind-list', deps.config);
     });
     ctx.command('洛克').subcommand('.切换 <index:number>', '切换主账号')
+        .alias('洛克切换')
         .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('洛克解绑')
         .action(async ({ session }, index) => {
         if (!index)
             return '用法：洛克.解绑 <序号>';
@@ -178,9 +201,31 @@ 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('.刷新', '刷新当前主账号凭证')
+        .alias('洛克刷新')
         .action(async ({ session }) => {
         const userId = session.userId;
         const binding = userMgr.getPrimaryBinding(userId);

package/lib/commands/admin.js

@@ -10,6 +10,7 @@ function register(deps) {
         return config.adminUserIds.includes(userId);
     }
     ctx.command('洛克').subcommand('.刷新所有凭证', '刷新所有用户凭证（管理员）')
+        .alias('洛克刷新所有凭证')
         .action(async ({ session }) => {
         if (!isAdmin(session.userId))
             return '此指令仅限管理员使用。';
@@ -44,6 +45,7 @@ function register(deps) {
         return `刷新完成：成功 ${success}，失败 ${fail}`;
     });
     ctx.command('洛克').subcommand('.删除失效绑定', '清理失效绑定（管理员）')
+        .alias('洛克删除失效绑定')
         .action(async ({ session }) => {
         if (!isAdmin(session.userId))
             return '此指令仅限管理员使用。';
@@ -51,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) {
@@ -81,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);
@@ -112,6 +136,6 @@ function register(deps) {
                     logger.warn(`自动刷新用户 ${userId} 失败: ${e}`);
                 }
             }
-        }, 60000);
+        }, 30000);
     }
 }

package/lib/commands/egg.js

@@ -48,6 +48,7 @@ async function sendEggImage(deps, session, templateName, data, fallback) {
 function register(deps) {
     const { ctx, client, eggService } = deps;
     ctx.command('洛克').subcommand('.查蛋 [arg1:string] [arg2:string]', '查询精灵蛋组')
+        .alias('洛克查蛋')
         .action(async ({ session }, arg1, arg2) => {
         if (!arg1) {
             return [
@@ -143,6 +144,7 @@ function register(deps) {
         await sendEggImage(deps, session, 'searcheggs', data, hint + eggService.buildSearchText(pet));
     });
     ctx.command('洛克').subcommand('.配种 <nameA:string> [nameB:string]', '配种查询')
+        .alias('洛克配种')
         .action(async ({ session }, nameA, nameB) => {
         if (!nameA) {
             return [

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'}`,
@@ -114,14 +123,37 @@ 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;
@@ -139,12 +171,13 @@ async function checkMerchantSubscriptions(deps) {
             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 +196,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);
     });
@@ -228,6 +243,7 @@ function register(deps) {
         return '\u2705 \u5df2\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605\u3002';
     });
     ctx.command('洛克').subcommand('.调试远行商人订阅', '立即执行一次远行商人订阅检查')
+        .alias('洛克调试远行商人订阅')
         .action(async ({ session }) => {
         if (!isBotAdmin(session, config.adminUserIds))
             return '此指令仅限管理员使用。';

package/lib/commands/query.js

@@ -777,6 +777,7 @@ async function checkHomeSubscriptions(deps) {
 function register(deps) {
     const { ctx, client } = deps;
     ctx.command('洛克').subcommand('.档案', '查看个人档案')
+        .alias('洛克档案')
         .action(async ({ session }) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -952,6 +953,7 @@ function register(deps) {
         await sendImage(deps, session, 'personal-card', data, fallback);
     });
     ctx.command('洛克').subcommand('.战绩 [page:number]', '查看对战战绩')
+        .alias('洛克战绩')
         .action(async ({ session }, _page = 1) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -999,6 +1001,7 @@ function register(deps) {
         await sendImage(deps, session, 'record', data, `【${role.name}的战绩】胜率:${bo.win_rate || 0}% 场次:${bo.total_match || 0}`);
     });
     ctx.command('洛克').subcommand('.背包 [arg1:string] [arg2:string]', '查看精灵背包')
+        .alias('洛克背包')
         .action(async ({ session }, arg1, arg2) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1058,6 +1061,7 @@ function register(deps) {
         await sendImage(deps, session, 'package', data, `【背包 - ${category}精灵】共${petRes.total || 0}只`);
     });
     ctx.command('洛克').subcommand('.阵容 [arg1:string] [arg2:string]', '查看阵容推荐')
+        .alias('洛克阵容')
         .action(async ({ session }, arg1, arg2) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1147,6 +1151,7 @@ function register(deps) {
         await sendImage(deps, session, 'lineup-detail', data, fallback);
     });
     ctx.command('洛克').subcommand('.交换大厅 [page:number]', '查看交换大厅')
+        .alias('洛克交换大厅')
         .action(async ({ session }, page = 1) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1187,6 +1192,7 @@ function register(deps) {
         await sendImage(deps, session, 'exchange-hall', data, `【交换大厅】第${page}页`);
     });
     ctx.command('洛克').subcommand('.玩家 <uid:string>', '通过 ingame 接口查询玩家基础资料')
+        .alias('洛克玩家')
         .action(async ({ session }, uid) => {
         if (!uid)
             return '请提供玩家 UID。用法：洛克.玩家 <UID>';
@@ -1196,6 +1202,7 @@ function register(deps) {
         await sendImage(deps, session, 'player-search', buildPlayerSearchRenderData(res, uid), `【洛克玩家】UID ${uid}`);
     });
     ctx.command('洛克').subcommand('.家园 [uid:string]', '通过 UID 查询家园菜园、守卫和室内精灵')
+        .alias('洛克家园')
         .action(async ({ session }, uid = '') => {
         let targetUid = String(uid || '').trim();
         if (!targetUid) {
@@ -1210,6 +1217,7 @@ function register(deps) {
         await sendImage(deps, session, 'home', buildHomeRenderData(deps, res, targetUid), `【洛克家园】UID ${targetUid}`);
     });
     ctx.command('洛克').subcommand('.商店 <shopId:string>', '通过 ingame 接口查询商店信息')
+        .alias('洛克商店')
         .action(async ({ session }, shopId) => {
         if (!shopId)
             return '请提供商店 ID。用法：洛克.商店 <shop_id>';
@@ -1219,6 +1227,7 @@ function register(deps) {
         await sendImage(deps, session, 'ingame-shop', buildShopRenderData(res, shopId), `【洛克商店】shop_id=${shopId}`);
     });
     ctx.command('洛克').subcommand('.好友关系 <userIds:string>', '查询好友关系')
+        .alias('洛克好友关系')
         .action(async ({ session }, userIds) => {
         if (!userIds)
             return '请提供要查询的用户 ID 列表。用法：洛克.好友关系 <id1,id2>';
@@ -1231,6 +1240,7 @@ function register(deps) {
         await sendImage(deps, session, 'friendship', buildFriendshipRenderData(res, userIds), `【好友关系】${userIds}`);
     });
     ctx.command('洛克').subcommand('.学生 [area:number] [accountType:number]', '查询学生认证状态与学生活动福利')
+        .alias('洛克学生')
         .action(async ({ session }, area = 101, accountType = 0) => {
         const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
         if (!fwToken)
@@ -1260,6 +1270,7 @@ function register(deps) {
         return deleted ? `已取消 ${deleted} 条家园订阅。` : '当前会话没有匹配的家园订阅。';
     });
     ctx.command('洛克').subcommand('.调试家园订阅', '立即执行一次家园订阅检查')
+        .alias('洛克调试家园订阅')
         .action(async ({ session }) => {
         if (!isBotAdmin(session, deps.config.adminUserIds))
             return '此指令仅限管理员使用。';