koishi-plugin-rocom 1.0.18 → 1.0.19

package/lib/commands/query.js

@@ -9,63 +9,18 @@ const account_1 = require("./account");
 const send_image_1 = require("../send-image");
 const subscription_send_1 = require("../subscription-send");
 const pet_data_service_1 = require("../pet-data-service");
+const player_service_1 = require("../player-service");
+const merchant_service_1 = require("../merchant-service");
+const permissions_1 = require("../permissions");
+const render_1 = require("../render");
+const subscription_runner_1 = require("../subscription-runner");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const logger = new koishi_1.Logger('rocom-query');
-async function sendImage(deps, session, templateName, data, fallback) {
-    const png = await deps.renderer.renderHtml(deps.ctx, templateName, data);
+async function sendImage(deps, session, templateName, data, fallback, options) {
+    const png = await deps.renderer.renderPages(deps.ctx, templateName, data, options);
     await (0, send_image_1.sendImageWithFallback)(session, png, fallback, `query:${templateName}`, deps.config);
 }
-function cleanPlayerFieldValue(field, value) {
-    const text = String(value ?? '').trim().replace(/^'+|'+$/g, '');
-    if (!text || ['<0B>', '<0b>', '<0B >', '<0b >'].includes(text))
-        return '未设置';
-    if (['is_online', 'online', 'chat_top_unlock', 'is_friend', 'is_black', 'is_black_role', 'is_chat_node_unlock'].includes(field)) {
-        return ['1', 'true', 'True', '是'].includes(text) ? '是' : '否';
-    }
-    if (['sex', 'gender'].includes(field)) {
-        return { '0': '未知', '1': '男', '2': '女' }[text] || text;
-    }
-    if (field === 'friend_type') {
-        return { '0': '默认', '1': '特殊' }[text] || text;
-    }
-    if (field === 'battle_state') {
-        return { '0': '空闲', '1': '对战中' }[text] || text;
-    }
-    return text;
-}
-function parseIngamePlayerPayload(payload, uid) {
-    const rows = payload?.rows || [];
-    const rowMap = {};
-    const labelMap = {};
-    for (const row of rows) {
-        const field = String(row.field || '');
-        if (!field)
-            continue;
-        rowMap[field] = String(row.value ?? '');
-        labelMap[field] = String(row.label || field);
-    }
-    const playerUid = cleanPlayerFieldValue('uin', rowMap.uin || uid);
-    const signature = cleanPlayerFieldValue('signature', rowMap.signature || '');
-    return {
-        title: String(payload?.title || '玩家搜索'),
-        nickname: cleanPlayerFieldValue('name', rowMap.name || '-'),
-        uid: playerUid,
-        level: cleanPlayerFieldValue('level', rowMap.level || '-'),
-        signature: signature === '未设置' ? '' : signature,
-        rowMap,
-        labelMap,
-    };
-}
-function playerField(parsed, field, defaultValue = '未设置') {
-    if (!parsed)
-        return defaultValue;
-    const raw = parsed.rowMap[field];
-    if (raw == null || raw === '')
-        return defaultValue;
-    const value = cleanPlayerFieldValue(field, raw);
-    return value && value !== '-' && value !== '未设置' ? value : defaultValue;
-}
 function tryParseJson(text) {
     try {
         return JSON.parse(text);
@@ -1112,8 +1067,8 @@ function buildHomeRenderData(deps, res, uid) {
         updatedAt: new Date(createdAt ? createdAt * 1000 : Date.now()).toLocaleString('zh-CN'),
     };
 }
-function buildPlayerSearchRenderData(payload, uid) {
-    const parsed = parseIngamePlayerPayload(payload, uid);
+function buildPlayerSearchRenderData(payload, uid, cardImageUrl = '') {
+    const parsed = (0, player_service_1.parseIngamePlayerPayload)(payload, uid);
     const pack = (title, pairs) => {
         const items = pairs
             .filter(([, value]) => value && value !== '-' && value !== '未设置')
@@ -1123,27 +1078,27 @@ function buildPlayerSearchRenderData(payload, uid) {
     const sections = [
         pack('核心档案', [
             ['等级', parsed.level],
-            ['在线状态', playerField(parsed, 'online', playerField(parsed, 'is_online'))],
-            ['性别', playerField(parsed, 'gender', playerField(parsed, 'sex'))],
-            ['世界等级', playerField(parsed, 'world_level')],
-            ['图鉴收集', playerField(parsed, 'card_handbook_collect_num')],
-            ['最后离线', playerField(parsed, 'last_logout_time')],
+            ['在线状态', (0, player_service_1.playerField)(parsed, 'online', (0, player_service_1.playerField)(parsed, 'is_online'))],
+            ['性别', (0, player_service_1.playerField)(parsed, 'gender', (0, player_service_1.playerField)(parsed, 'sex'))],
+            ['世界等级', (0, player_service_1.playerField)(parsed, 'world_level')],
+            ['图鉴收集', (0, player_service_1.playerField)(parsed, 'card_handbook_collect_num')],
+            ['最后离线', (0, player_service_1.playerField)(parsed, 'last_logout_time')],
         ]),
         pack('家园信息', [
-            ['家园名称', playerField(parsed, 'home_name')],
-            ['家园等级', playerField(parsed, 'home_level')],
-            ['家园经验', playerField(parsed, 'home_experience')],
-            ['舒适度', playerField(parsed, 'home_comfort_level')],
-            ['访客数量', playerField(parsed, 'visitor_num')],
+            ['家园名称', (0, player_service_1.playerField)(parsed, 'home_name')],
+            ['家园等级', (0, player_service_1.playerField)(parsed, 'home_level')],
+            ['家园经验', (0, player_service_1.playerField)(parsed, 'home_experience')],
+            ['舒适度', (0, player_service_1.playerField)(parsed, 'home_comfort_level')],
+            ['访客数量', (0, player_service_1.playerField)(parsed, 'visitor_num')],
         ]),
     ].filter(Boolean);
     const summaryCards = [
         { label: '等级', value: parsed.level },
-        { label: '在线状态', value: playerField(parsed, 'online', playerField(parsed, 'is_online')) },
-        { label: '世界等级', value: playerField(parsed, 'world_level') },
-        { label: '图鉴收集', value: playerField(parsed, 'card_handbook_collect_num') },
-        { label: '家园等级', value: playerField(parsed, 'home_level') },
-        { label: '舒适度', value: playerField(parsed, 'home_comfort_level') },
+        { label: '在线状态', value: (0, player_service_1.playerField)(parsed, 'online', (0, player_service_1.playerField)(parsed, 'is_online')) },
+        { label: '世界等级', value: (0, player_service_1.playerField)(parsed, 'world_level') },
+        { label: '图鉴收集', value: (0, player_service_1.playerField)(parsed, 'card_handbook_collect_num') },
+        { label: '家园等级', value: (0, player_service_1.playerField)(parsed, 'home_level') },
+        { label: '舒适度', value: (0, player_service_1.playerField)(parsed, 'home_comfort_level') },
     ].filter(item => item.value && item.value !== '-');
     const signature = parsed.signature && parsed.signature !== '未设置' ? parsed.signature : '';
     return {
@@ -1155,7 +1110,10 @@ function buildPlayerSearchRenderData(payload, uid) {
         signature,
         showSignature: Boolean(signature),
         sections,
-        commandHint: '洛克.玩家 <UID>',
+        cardImageUrl: cardImageUrl || '',
+        collectedShining: (0, player_service_1.playerField)(parsed, 'collected_shining_pet_count', '未知'),
+        collectedGlass: (0, player_service_1.playerField)(parsed, 'collected_glass_pet_count', '未知'),
+        commandHint: '洛克.玩家 [UID]',
         copyright: 'Koishi & WeGame Locke Kingdom Plugin',
     };
 }
@@ -1163,7 +1121,27 @@ function buildShopRenderData(payload, shopId) {
     const sections = [];
     const detailItems = [];
     const summaryCards = [{ label: '商店 ID', value: shopId }];
-    if (Array.isArray(payload?.rows)) {
+    const shop = payload?.shop || {};
+    if (Array.isArray(payload?.goods)) {
+        const items = (0, merchant_service_1.normalizeLiveMerchant)(payload);
+        summaryCards.push({ label: '商品数量', value: String(items.length) });
+        const shopName = String(shop.name || shop.title || '').trim();
+        if (shopName)
+            summaryCards.push({ label: '商店名称', value: shopName });
+        sections.push({
+            title: '商品列表',
+            cards: items.map((item) => ({
+                title: item.name,
+                image: item.icon,
+                meta: [
+                    item.price !== null ? { label: '价格', value: String(item.price) } : null,
+                    item.limit !== null ? { label: '限购', value: String(item.limit) } : null,
+                    item.active ? null : { label: '状态', value: '非在售' },
+                ].filter(Boolean),
+            })),
+        });
+    }
+    else if (Array.isArray(payload?.rows)) {
         detailItems.push(...payload.rows.filter((row) => Number(row.level || 0) === 0).map((row) => ({
             label: row.label || row.field || '-',
             value: stringifyInspectValue(row.value),
@@ -1171,6 +1149,8 @@ function buildShopRenderData(payload, shopId) {
     }
     else {
         for (const [key, value] of Object.entries(payload || {})) {
+            if (['_source', 'goods', 'shop', 'meta', '_goods_mapping', 'goods_mapping'].includes(key))
+                continue;
             if (Array.isArray(value)) {
                 summaryCards.push({ label: key, value: String(value.length) });
                 sections.push({
@@ -1194,12 +1174,12 @@ function buildShopRenderData(payload, shopId) {
         title: '洛克商店',
         subtitle: `shop_id = ${shopId}`,
         heroTitle: '商店查询',
-        heroValue: detailItems.find(item => ['name', 'title', '名称', '标题'].includes(item.label))?.value || shopId,
+        heroValue: String(shop.name || shop.title || '') || detailItems.find(item => ['name', 'title', '名称', '标题'].includes(item.label))?.value || shopId,
         heroSubvalue: `shop_id = ${shopId}`,
         summaryCards: summaryCards.slice(0, 3),
         sections,
         detailItems: detailItems.slice(0, 18),
-        commandHint: '洛克.商店 <shop_id>',
+        commandHint: '洛克.商店 [shop_id]',
         copyright: 'Koishi & WeGame Locke Kingdom Plugin',
     };
 }
@@ -1274,7 +1254,7 @@ function sessionTarget(session) {
     return {
         platform: session?.platform || session?.bot?.platform || '',
         channelId: session?.channelId || session?.guildId || '',
-        userId: session?.guildId ? '' : (session?.userId || ''),
+        userId: (0, permissions_1.isDirectSession)(session) ? (session?.userId || '') : '',
     };
 }
 function homeSubscriptionKey(session, uid, kind) {
@@ -1284,6 +1264,9 @@ function homeSubscriptionKey(session, uid, kind) {
 function isBotAdmin(session, adminUserIds) {
     return adminUserIds.includes(session?.userId || '');
 }
+function canManageGroupSubscription(deps, session) {
+    return (0, permissions_1.canManageSubscription)(deps.config, session);
+}
 async function resolveHomeUid(deps, session, uid = '') {
     const targetUid = String(uid || '').trim();
     if (targetUid)
@@ -1312,22 +1295,27 @@ const HOME_SUB_TEXT = {
 };
 async function subscribeHome(deps, session, uid, kind) {
     const target = sessionTarget(session);
-    if (!target.userId && !isBotAdmin(session, deps.config.adminUserIds))
-        return '此指令仅限管理员使用。';
+    if (!target.userId && !canManageGroupSubscription(deps, session))
+        return '此指令仅限群管理员或机器人管理员使用。';
     const targetUid = await resolveHomeUid(deps, session, uid);
     if (!targetUid)
         return HOME_SUB_TEXT[kind].needUidHint;
     const key = homeSubscriptionKey(session, targetUid, kind);
+    const own = deps.userMgr.getUserBindings(session?.userId || '').find(binding => binding.role_id === targetUid);
+    const existing = deps.homeSubMgr.getAll()[key];
     deps.homeSubMgr.upsert(key, {
         key,
         kind,
         uid: targetUid,
+        notify_user_id: own ? session.userId : '',
+        nickname: own?.nickname || '',
         platform: target.platform,
+        self_id: session?.selfId || session?.bot?.selfId || '',
         channel_id: target.channelId,
         guild_id: session?.guildId || '',
         user_id: target.userId,
         updated_by: session?.userId || '',
-        notify_state: {},
+        notify_state: existing?.notify_state || {},
         updated_at: Math.floor(Date.now() / 1000),
     });
     return `已订阅 UID ${targetUid} ${HOME_SUB_TEXT[kind].subscribedHint}`;
@@ -1359,18 +1347,24 @@ function homeSubscriptionMessage(uid, kind, level, totalCount, readyItems, names
         names.length ? `已完成：${names.slice(0, 8).join('、')}` : '',
     ].filter(Boolean).join('\n');
 }
-async function checkHomeSubscriptions(deps) {
+async function checkHomeSubscriptions(deps, signal) {
     const subs = deps.homeSubMgr.getAll();
     const cache = new Map();
     let checkedCount = 0;
     let pushedCount = 0;
     for (const [key, sub] of Object.entries(subs)) {
+        if (signal?.aborted)
+            break;
         if (!sub.uid || !['garden', 'inspiration', 'egg'].includes(sub.kind))
             continue;
         checkedCount++;
         if (!cache.has(sub.uid)) {
-            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid, { timeoutMs: 30000 }));
+            cache.set(sub.uid, await deps.client.ingameHomeInfo(deps.ctx, sub.uid, { timeoutMs: 30000, signal }));
         }
+        if (signal?.aborted)
+            break;
+        if (JSON.stringify(deps.homeSubMgr.getAll()[key]) !== JSON.stringify(sub))
+            continue;
         const res = cache.get(sub.uid);
         if (!res)
             continue;
@@ -1379,7 +1373,7 @@ async function checkHomeSubscriptions(deps) {
         const totalCount = items.length;
         if (totalCount <= 0)
             continue;
-        const notifyState = sub.notify_state || {};
+        const notifyState = { ...sub.notify_state };
         const pushLevels = [];
         if (!readyItems.length) {
             notifyState.first = false;
@@ -1397,15 +1391,19 @@ async function checkHomeSubscriptions(deps) {
             deps.homeSubMgr.upsert(key, { ...sub, notify_state: notifyState });
             continue;
         }
-        const messages = pushLevels.map(level => homeSubscriptionMessage(sub.uid, sub.kind, level, totalCount, readyItems, names));
+        const owned = deps.userMgr.getUserBindings(sub.updated_by).find(binding => binding.role_id === sub.uid);
+        const label = owned?.nickname || sub.uid;
+        const notifyUser = owned && sub.notify_user_id === sub.updated_by ? sub.notify_user_id : '';
+        const messages = pushLevels.map(level => homeSubscriptionMessage(label, sub.kind, level, totalCount, readyItems, names));
         try {
             const sent = await (0, subscription_send_1.sendScheduledMessage)(deps.ctx, {
                 platform: sub.platform,
                 channelId: sub.channel_id || sub.guild_id || sub.user_id || '',
                 guildId: sub.guild_id || '',
                 userId: sub.user_id || '',
-            }, messages.join('\n\n'));
-            if (!sent)
+                selfId: sub.self_id || '',
+            }, !sub.user_id && notifyUser ? [koishi_1.h.at(notifyUser), koishi_1.h.text('\n' + messages.join('\n\n'))] : messages.join('\n\n'), signal);
+            if (!sent || signal?.aborted || JSON.stringify(deps.homeSubMgr.getAll()[key]) !== JSON.stringify(sub))
                 continue;
         }
         catch (e) {
@@ -1421,6 +1419,7 @@ async function checkHomeSubscriptions(deps) {
 }
 function register(deps) {
     const { ctx, client } = deps;
+    const homeRunner = (0, subscription_runner_1.createRunner)(ctx);
     ctx.command('洛克').subcommand('.档案', '查看个人档案')
         .alias('洛克档案')
         .action(async ({ session }) => {
@@ -1444,28 +1443,30 @@ function register(deps) {
         const cl = collRes || {};
         const bo = boRes || {};
         const recentBattle = blRes?.battles?.[0];
-        const playerSearchRes = role?.id ? await client.ingamePlayerSearch(ctx, String(role.id)) : null;
-        const playerSearchData = parseIngamePlayerPayload(playerSearchRes, String(role.id || ''));
+        const auth = { fwToken, userIdentifier };
+        const playerSearchRes = role?.id ? await client.ingamePlayerSearch(ctx, String(role.id), { auth }) : null;
+        const playerCardRes = role?.id ? await client.ingamePlayerCard(ctx, String(role.id), { auth }).catch(() => null) : null;
+        const playerSearchData = (0, player_service_1.parseIngamePlayerPayload)((0, player_service_1.mergePlayerPayloads)(playerSearchRes, playerCardRes), String(role.id || ''));
         const profileSignature = playerSearchData?.signature || '';
         const profileHeadTags = playerSearchData ? [
-            { label: '在线', value: playerField(playerSearchData, 'online', '未知') },
-            { label: '性别', value: playerField(playerSearchData, 'gender', playerField(playerSearchData, 'sex', '未知')) },
-            { label: '世界等级', value: playerField(playerSearchData, 'world_level') },
-            { label: '家园等级', value: playerField(playerSearchData, 'home_level') },
+            { label: '在线', value: (0, player_service_1.playerField)(playerSearchData, 'online', '未知') },
+            { label: '性别', value: (0, player_service_1.playerField)(playerSearchData, 'gender', (0, player_service_1.playerField)(playerSearchData, 'sex', '未知')) },
+            { label: '世界等级', value: (0, player_service_1.playerField)(playerSearchData, 'world_level') },
+            { label: '家园等级', value: (0, player_service_1.playerField)(playerSearchData, 'home_level') },
         ].filter((item) => item.value && item.value !== '-' && item.value !== '未设置').slice(0, 4) : [];
         const profileHomeItems = playerSearchData ? [
-            { label: '家园名称', value: playerField(playerSearchData, 'home_name') },
-            { label: '家园等级', value: playerField(playerSearchData, 'home_level') },
-            { label: '家园经验', value: playerField(playerSearchData, 'home_experience') },
-            { label: '舒适度', value: playerField(playerSearchData, 'home_comfort_level') },
-            { label: '访客数量', value: playerField(playerSearchData, 'visitor_num') },
+            { label: '家园名称', value: (0, player_service_1.playerField)(playerSearchData, 'home_name') },
+            { label: '家园等级', value: (0, player_service_1.playerField)(playerSearchData, 'home_level') },
+            { label: '家园经验', value: (0, player_service_1.playerField)(playerSearchData, 'home_experience') },
+            { label: '舒适度', value: (0, player_service_1.playerField)(playerSearchData, 'home_comfort_level') },
+            { label: '访客数量', value: (0, player_service_1.playerField)(playerSearchData, 'visitor_num') },
         ].filter((item) => item.value && item.value !== '-' && item.value !== '未设置') : [];
         const profileCardItems = playerSearchData ? [
-            { label: '名片皮肤', value: playerField(playerSearchData, 'card_skin_selected') },
-            { label: '名片头像', value: playerField(playerSearchData, 'card_icon_selected') },
+            { label: '名片皮肤', value: (0, player_service_1.playerField)(playerSearchData, 'card_skin_selected') },
+            { label: '名片头像', value: (0, player_service_1.playerField)(playerSearchData, 'card_icon_selected') },
         ].filter((item) => item.value && item.value !== '-' && item.value !== '未设置') : [];
-        const profileCardImage = playerSearchData ? playerField(playerSearchData, 'card_bussiness_card_url', '') : '';
-        const profileStatusText = playerSearchData ? playerField(playerSearchData, 'online', '未知') : '未知';
+        const profileCardImage = playerSearchData ? (0, player_service_1.resourceUrl)((0, player_service_1.playerField)(playerSearchData, 'card_bussiness_card_url', ''), deps.config.apiBaseUrl) : '';
+        const profileStatusText = playerSearchData ? (0, player_service_1.playerField)(playerSearchData, 'online', '未知') : '未知';
         const hasExtraProfileData = Boolean(profileSignature || profileHomeItems.length || profileCardItems.length || profileCardImage);
         let degraded = false;
         if (!sm) {
@@ -1838,15 +1839,33 @@ function register(deps) {
         };
         await sendImage(deps, session, 'exchange-hall', data, `【交换大厅】第${page}页`);
     });
-    ctx.command('洛克').subcommand('.玩家 <uid:string>', '通过 ingame 接口查询玩家基础资料')
+    ctx.command('洛克').subcommand('.玩家 [uid:string]', '通过 ingame 接口查询玩家资料')
         .alias('洛克玩家')
-        .action(async ({ session }, uid) => {
-        if (!uid)
-            return '请提供玩家 UID。用法：洛克.玩家 <UID>';
-        const res = await client.ingamePlayerSearch(ctx, uid);
-        if (!res)
+        .action(async ({ session }, uid = '') => {
+        const userId = session.userId;
+        const explicitUid = String(uid || '').trim();
+        const binding = deps.userMgr.getPrimaryBinding(userId);
+        const targetUid = explicitUid || String(binding?.role_id || '');
+        const fwToken = await (0, account_1.getPrimaryToken)(deps, userId);
+        if (!targetUid && !fwToken) {
+            return '请提供玩家 UID，或先使用“洛克.QQ登录 / 洛克.微信登录”完成绑定。用法：洛克.玩家 [UID]';
+        }
+        const auth = { fwToken, userIdentifier: userId };
+        const search = await client.ingamePlayerSearch(ctx, targetUid, { auth });
+        if (!search)
             return `玩家搜索失败：${client.getLastErrorBrief()}`;
-        await sendImage(deps, session, 'player-search', buildPlayerSearchRenderData(res, uid), `【洛克玩家】UID ${uid}`);
+        // 显式 UID 与搜索返回 UID 不一致时不合并名片，避免混用两个角色数据。
+        const returnedUid = String(search?.player_info?.uin ?? search?.player_info?.uid ?? search?.uin ?? search?.uid ?? '');
+        const uidConsistent = !explicitUid || !returnedUid || returnedUid === explicitUid;
+        let card = uidConsistent
+            ? await client.ingamePlayerCard(ctx, targetUid, { auth }).catch(() => null)
+            : null;
+        const cardUid = (0, player_service_1.playerPayloadUid)(card);
+        if (cardUid && (targetUid || returnedUid) && cardUid !== (targetUid || returnedUid))
+            card = null;
+        const view = (0, player_service_1.buildPlayerView)(search, card, targetUid, deps.config.apiBaseUrl);
+        const merged = (0, player_service_1.mergePlayerPayloads)(search, card);
+        await sendImage(deps, session, 'player-search', buildPlayerSearchRenderData(merged, targetUid || view.parsed.uid, view.cardImageUrl), (0, player_service_1.buildPlayerText)(merged, targetUid || view.parsed.uid));
     });
     ctx.command('洛克').subcommand('.家园 [uid:string]', '通过 UID 查询家园菜园、守卫和室内精灵')
         .alias('洛克家园')
@@ -1856,10 +1875,12 @@ function register(deps) {
             const binding = deps.userMgr.getPrimaryBinding(session.userId);
             targetUid = String(binding?.role_id || '');
         }
-        if (!targetUid)
+        const fwToken = await (0, account_1.getPrimaryToken)(deps, session.userId);
+        if (!targetUid && !fwToken)
             return '请提供玩家 UID，或先完成绑定后使用 洛克.家园。';
         let queuedNotified = false;
         const res = await client.ingameHomeInfo(ctx, targetUid, {
+            auth: { fwToken, userIdentifier: session.userId },
             waitMs: deps.config.homeQueryWaitMs,
             intervalMs: deps.config.homeQueryPollIntervalMs,
             timeoutMs: deps.config.homeQueryTimeoutMs,
@@ -1958,7 +1979,10 @@ function register(deps) {
         fallbackLines.push('');
         fallbackLines.push('若服务器带宽过小导致生成超时，请在配置项打开低带宽模式。');
         fallbackLines.push('低带宽模式开启后，家园详情将不再加载技能图标。');
-        await sendImage(deps, session, 'pet-data', data, fallbackLines.join('\n'));
+        await sendImage(deps, session, 'pet-data', data, fallbackLines.join('\n'), {
+            ...(lowBandwidth ? render_1.lowBandwidthRenderOptions : {}),
+            timeoutMs: deps.config.renderTimeout || 30000,
+        });
     });
     ctx.command('洛克').subcommand('.刷新面板 [uid:string]', '刷新指定 UID 的精灵面板缓存')
         .alias('洛克刷新面板')
@@ -2041,15 +2065,16 @@ function register(deps) {
         const fallback = panelPetDetailFallback(targetUid, selected, updatedAtText);
         await sendImage(deps, session, 'pet-panel-detail', data, fallback);
     });
-    ctx.command('洛克').subcommand('.商店 <shopId:string>', '通过 ingame 接口查询商店信息')
+    ctx.command('洛克').subcommand('.商店 [shopId:string]', '通过 ingame 接口查询商店信息，默认商店 3009')
         .alias('洛克商店')
-        .action(async ({ session }, shopId) => {
-        if (!shopId)
-            return '请提供商店 ID。用法：洛克.商店 <shop_id>';
-        const res = await client.ingameMerchantInfo(ctx, shopId);
+        .action(async ({ session }, shopId = '3009') => {
+        const targetShopId = String(shopId || '3009').trim() || '3009';
+        if (!/^\d+$/.test(targetShopId))
+            return '商店 ID 必须是数字。用法：洛克.商店 [shop_id]，默认 3009';
+        const res = await client.ingameMerchantInfo(ctx, targetShopId);
         if (!res)
             return `商店查询失败：${client.getLastErrorBrief()}`;
-        await sendImage(deps, session, 'ingame-shop', buildShopRenderData(res, shopId), `【洛克商店】shop_id=${shopId}`);
+        await sendImage(deps, session, 'ingame-shop', buildShopRenderData(res, targetShopId), `【洛克商店】shop_id=${targetShopId}`);
     });
     ctx.command('洛克').subcommand('.好友关系 <userIds:string>', '查询好友关系')
         .alias('洛克好友关系')
@@ -2065,16 +2090,20 @@ function register(deps) {
         await sendImage(deps, session, 'friendship', buildFriendshipRenderData(res, userIds), `【好友关系】${userIds}`);
     });
     ctx.command('订阅家园菜园 [uid:string]', '订阅指定 UID 的家园菜园成熟提醒')
+        .userFields(['authority'])
         .action(async ({ session }, uid = '') => subscribeHome(deps, session, uid, 'garden'));
     ctx.command('订阅家园灵感 [uid:string]', '订阅指定 UID 的家园精灵灵感完成提醒')
+        .userFields(['authority'])
         .action(async ({ session }, uid = '') => subscribeHome(deps, session, uid, 'inspiration'));
     ctx.command('订阅家园生蛋 [uid:string]', '订阅指定 UID 的家园精灵生蛋提醒')
+        .userFields(['authority'])
         .action(async ({ session }, uid = '') => subscribeHome(deps, session, uid, 'egg'));
     ctx.command('取消订阅家园 [kind:string] [uid:string]', '取消当前会话的家园订阅')
+        .userFields(['authority'])
         .action(async ({ session }, kind = '全部', uid = '') => {
         const target = sessionTarget(session);
-        if (!target.userId && !isBotAdmin(session, deps.config.adminUserIds))
-            return '此指令仅限管理员使用。';
+        if (!target.userId && !canManageGroupSubscription(deps, session))
+            return '此指令仅限群管理员或机器人管理员使用。';
         const kindMap = { '菜园': 'garden', '灵感': 'inspiration', '生蛋': 'egg', '全部': '', all: '', garden: 'garden', inspiration: 'inspiration', egg: 'egg' };
         const deleted = deps.homeSubMgr.deleteMatching(target, kindMap[String(kind || '全部')] ?? '', String(uid || '').trim());
         return deleted ? `已取消 ${deleted} 条家园订阅。` : '当前会话没有匹配的家园订阅。';
@@ -2084,10 +2113,12 @@ function register(deps) {
         .action(async ({ session }) => {
         if (!isBotAdmin(session, deps.config.adminUserIds))
             return '此指令仅限管理员使用。';
-        const result = await checkHomeSubscriptions(deps);
+        const result = await homeRunner(signal => checkHomeSubscriptions(deps, signal));
+        if (!result)
+            return '订阅检查正在运行或插件已停止。';
         return `家园订阅检查完成：订阅 ${result.subscriptions} 条，检查 ${result.checked} 条，推送 ${result.pushed} 档提醒。`;
     });
     if (deps.config.homeSubscriptionEnabled) {
-        ctx.setInterval(() => checkHomeSubscriptions(deps).catch(err => logger.warn(`家园订阅检查失败: ${err}`)), Math.max(1, deps.config.homeSubscriptionIntervalMinutes || 5) * 60000);
+        ctx.setInterval(() => homeRunner(signal => checkHomeSubscriptions(deps, signal)).catch(err => logger.warn(`家园订阅检查失败: ${err}`)), Math.max(1, deps.config.homeSubscriptionIntervalMinutes || 5) * 60000);
     }
 }

package/lib/commands/ranking.d.ts

@@ -0,0 +1,2 @@
+import { PluginDeps } from '../types';
+export declare function register(deps: PluginDeps): void;

package/lib/commands/ranking.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.register = register;
+const send_image_1 = require("../send-image");
+const ranking_service_1 = require("../ranking-service");
+function register(deps) {
+    const { ctx, client, userMgr, renderer, config } = deps;
+    for (const [label, kind] of [['异色', 'shining'], ['炫彩', 'glass']]) {
+        ctx.command(`${label}排行榜 [args:text]`, `查询${label}精灵收集排行榜`)
+            .alias(`${label}榜`)
+            .alias(`洛克${label}排行榜`)
+            .action(async ({ session }, args = '') => {
+            if (!session)
+                return;
+            const primaryUid = String(userMgr.getPrimaryBinding(session.userId)?.role_id || '');
+            let parsed;
+            try {
+                parsed = (0, ranking_service_1.parseRankingArgs)(args, primaryUid);
+            }
+            catch (error) {
+                return error.message;
+            }
+            const payload = await client.getPetCollectionRanking(ctx, kind, parsed.limit, parsed.uid, { userIdentifier: session.userId });
+            if (payload === null)
+                return `排行榜查询失败：${client.getLastErrorBrief()}`;
+            const data = (0, ranking_service_1.buildRankingView)(payload, kind, config.apiBaseUrl.replace(/\/$/, ''), parsed.uid);
+            const image = await renderer.renderPages(ctx, 'pet-ranking', data, { maxPageHeight: 3500 });
+            await (0, send_image_1.sendImageWithFallback)(session, image, (0, ranking_service_1.buildRankingText)(data), 'ranking', config);
+        });
+    }
+}

package/lib/commands/share-code.d.ts

@@ -0,0 +1,2 @@
+import { PluginDeps } from '../types';
+export declare function register(deps: PluginDeps): void;

package/lib/commands/share-code.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.register = register;
+const send_image_1 = require("../send-image");
+const share_code_service_1 = require("../share-code-service");
+function register(deps) {
+    const { ctx, client, renderer, config } = deps;
+    const baseUrl = config.apiBaseUrl.replace(/\/$/, '');
+    const send = async (session, template, data, fallback) => {
+        const image = await renderer.renderPages(ctx, template, data);
+        await (0, send_image_1.sendImageWithFallback)(session, image, fallback, `share-code:${template}`, config);
+    };
+    const command = ctx.command('阵容码', '阵容分享码工具');
+    command.subcommand('解析 <input:text>', '解析分享码或链接')
+        .alias('阵容码解析')
+        .action(async ({ session }, input) => {
+        if (!session)
+            return;
+        let code = '';
+        try {
+            code = (0, share_code_service_1.extractShareCode)(input || '');
+        }
+        catch (error) {
+            return error.message;
+        }
+        if (!code)
+            return '请提供分享码或包含 shareData 的链接。用法：阵容码 解析 <分享码或链接>';
+        const payload = await client.parseShareCode(ctx, code, session.userId);
+        if (!payload)
+            return `分享码解析失败：${client.getLastErrorBrief()}`;
+        const data = (0, share_code_service_1.buildShareCodeView)(payload, 'parse', undefined, baseUrl);
+        if (!data.teams.length)
+            return '分享码中没有可展示的精灵数据。';
+        await send(session, 'share-code-team', data, (0, share_code_service_1.buildShareCodeText)(data));
+    });
+    command.subcommand('查询 <input:text>', '查询分享码历史记录')
+        .alias('阵容码查询')
+        .action(async ({ session }, input) => {
+        if (!session)
+            return;
+        let code = '';
+        try {
+            code = (0, share_code_service_1.extractShareCode)(input || '');
+        }
+        catch (error) {
+            return error.message;
+        }
+        if (!code)
+            return '请提供分享码。用法：阵容码 查询 <分享码>';
+        const res = await client.getShareCodeRecords(ctx, { shareCode: code, pageNo: 1, pageSize: 1 }, session.userId);
+        if (!res)
+            return `分享码记录查询失败：${client.getLastErrorBrief()}`;
+        const record = Array.isArray(res.items) ? res.items[0] : null;
+        if (!record)
+            return '未找到该分享码的解析记录，请先使用：阵容码 解析 <分享码或链接>';
+        let data = (0, share_code_service_1.buildShareCodeView)(record, 'record', record, baseUrl);
+        if (!data.teams.length) {
+            const parsed = await client.parseShareCode(ctx, code, session.userId);
+            if (parsed)
+                data = (0, share_code_service_1.buildShareCodeView)(parsed, 'record', record, baseUrl);
+        }
+        if (!data.teams.length)
+            return '已找到分享码记录，但无法还原阵容详情，请稍后重试。';
+        await send(session, 'share-code-team', data, (0, share_code_service_1.buildShareCodeText)(data));
+    });
+}