koishi-plugin-rocom 1.0.8 → 1.0.10

package/lib/client.d.ts

@@ -51,8 +51,10 @@ export declare class RocomClient {
     ingameHomeInfo(ctx: Context, uid: string, waitMs?: number): Promise<any>;
     ingameMerchantInfo(ctx: Context, shopId: string | number): Promise<any>;
     getFriendship(ctx: Context, fwToken: string, userIds: string, userIdentifier?: string): Promise<any>;
-    getStudentState(ctx: Context, fwToken: string, accountType?: number, userIdentifier?: string): Promise<any>;
-    getStudentPerks(ctx: Context, fwToken: string, area?: number, accountType?: number, userIdentifier?: string): Promise<any>;
     searchWikiPet(ctx: Context, query: string, limit?: number): Promise<any>;
     searchWikiSkill(ctx: Context, query: string, limit?: number): Promise<any>;
+    getWikiPetDetail(ctx: Context, options: {
+        id?: number;
+        name?: string;
+    }): Promise<any>;
 }

package/lib/client.js

@@ -99,6 +99,9 @@ class RocomClient {
         if (/缺少\s*API\s*Key|API\s*Key.*required|missing\s+api\s*key/i.test(message)) {
             return true;
         }
+        if (/请提供有效的认证凭证|有效的?认证凭证|valid\s+credentials?\s+required|X-API-Key|Authorization\s*:\s*Bearer|X-Anonymous-Token/i.test(message)) {
+            return true;
+        }
         if (/HTTP\s*(401|403)/i.test(message)) {
             return true;
         }
@@ -280,7 +283,11 @@ class RocomClient {
             const status = Number(response?.status ?? response?.statusCode ?? 200);
             const body = response?.data !== undefined ? response.data : response;
             if (body?.code !== undefined && body.code !== 0) {
-                this.setLastError(body.message || body.msg || '接口返回异常');
+                const rawMessage = body.message || body.msg || '接口返回异常';
+                const message = !acceptedStatuses.includes(status)
+                    ? `HTTP ${status}: ${rawMessage}`
+                    : rawMessage;
+                this.setLastError(message);
                 if (!options.silentFailureDetails) {
                     this.logRequestFailureDetails(method, path, headers, options.params, options.json, body);
                 }
@@ -509,25 +516,19 @@ class RocomClient {
     async getFriendship(ctx, fwToken, userIds, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/social/friendship', this.rocomHeaders(fwToken, userIdentifier), { user_ids: userIds });
     }
-    async getStudentState(ctx, fwToken, accountType, userIdentifier = '') {
-        const params = {};
-        if (accountType !== undefined)
-            params.account_type = accountType;
-        return this.get(ctx, '/api/v1/games/rocom/activity/student-state', this.rocomHeaders(fwToken, userIdentifier), params);
-    }
-    async getStudentPerks(ctx, fwToken, area, accountType, userIdentifier = '') {
-        const params = {};
-        if (area !== undefined)
-            params.area = area;
-        if (accountType !== undefined)
-            params.account_type = accountType;
-        return this.get(ctx, '/api/v1/games/rocom/activity/perks', this.rocomHeaders(fwToken, userIdentifier), params);
-    }
     async searchWikiPet(ctx, query, limit = 10) {
-        return this.get(ctx, '/api/v1/games/rocom/wiki/pet', this.wegameHeaders(), { q: query, limit });
+        return this.get(ctx, '/api/v1/games/rocom/pet/list', this.wegameHeaders(), { q: query, page_size: limit });
     }
     async searchWikiSkill(ctx, query, limit = 10) {
-        return this.get(ctx, '/api/v1/games/rocom/wiki/skill', this.wegameHeaders(), { q: query, limit });
+        return this.get(ctx, '/api/v1/games/rocom/pet/skill-users', this.wegameHeaders(), { skill: query, limit });
+    }
+    async getWikiPetDetail(ctx, options) {
+        const params = {};
+        if (options.id !== undefined)
+            params.id = options.id;
+        if (options.name)
+            params.name = options.name;
+        return this.get(ctx, '/api/v1/games/rocom/pet/detail', this.wegameHeaders(), params);
     }
 }
 exports.RocomClient = RocomClient;

package/lib/commands/query.js

@@ -1058,12 +1058,6 @@ function buildPlayerSearchRenderData(payload, uid) {
             ['舒适度', playerField(parsed, 'home_comfort_level')],
             ['访客数量', playerField(parsed, 'visitor_num')],
         ]),
-        pack('名片信息', [
-            ['名片皮肤', playerField(parsed, 'card_skin_selected')],
-            ['名片头像', playerField(parsed, 'card_icon_selected')],
-            ['首标签', playerField(parsed, 'card_label_first_selected')],
-            ['尾标签', playerField(parsed, 'card_label_last_selected')],
-        ]),
     ].filter(Boolean);
     const summaryCards = [
         { label: '等级', value: parsed.level },
@@ -1076,7 +1070,6 @@ function buildPlayerSearchRenderData(payload, uid) {
     const signature = parsed.signature && parsed.signature !== '未设置' ? parsed.signature : '';
     return {
         title: '洛克玩家',
-        subtitle: parsed.title,
         heroTitle: '玩家信息',
         heroValue: parsed.nickname,
         heroSubvalue: `UID ${parsed.uid}`,
@@ -1160,45 +1153,6 @@ function buildFriendshipRenderData(payload, userIds) {
         copyright: 'Koishi & WeGame Locke Kingdom Plugin',
     };
 }
-function buildStudentRenderData(statePayload, perksPayload, area, accountType) {
-    const school = statePayload?.school || statePayload?.school_name || '未返回';
-    const certified = String(statePayload?.certified) === '1';
-    const cards = perksPayload?.cards || [];
-    return {
-        title: '洛克学生',
-        subtitle: `大区：${area}  账号类型：${accountTypeText(accountType)}`,
-        heroTitle: '学生信息总览',
-        heroValue: certified ? '已通过' : '未认证',
-        heroSubvalue: school,
-        summaryCards: [
-            { label: '认证状态', value: certified ? '已认证' : '未认证' },
-            { label: '学校', value: school },
-            { label: '奖励数量', value: String(cards.length) },
-        ],
-        stateItems: [
-            { label: '学生认证', value: certified ? '是' : '否' },
-            { label: '游戏内认证', value: String(statePayload?.game_certified) === '1' ? '是' : '否' },
-            { label: '学校', value: school },
-            { label: '上游状态', value: statePayload?.result?.error_message || 'WG_COMM_SUCC' },
-            { label: '上游错误码', value: stringifyInspectValue(statePayload?.result?.error_code || 0) },
-        ],
-        perkCards: cards.map((card) => ({
-            name: card.name || `奖励 #${card.id || '-'}`,
-            count: card.count || 0,
-            desc: card.desc || '暂无说明',
-            icon: card.icon || '',
-            id: stringifyInspectValue(card.id),
-            stateText: `状态码 ${stringifyInspectValue(card.state)}`,
-        })),
-        detailItems: Object.entries(perksPayload || {})
-            .filter(([key, value]) => !['cards', 'result'].includes(key) && (value === null || typeof value !== 'object'))
-            .map(([key, value]) => ({ label: key.replace(/_/g, ' '), value: stringifyInspectValue(value) })),
-        stateResult: statePayload?.result?.error_message || 'WG_COMM_SUCC',
-        perksResult: perksPayload?.result?.error_message || 'WG_COMM_SUCC',
-        commandHint: '洛克.学生 [area] [account_type]',
-        copyright: 'Koishi & WeGame Locke Kingdom Plugin',
-    };
-}
 function sessionTarget(session) {
     return {
         platform: session?.platform || session?.bot?.platform || '',
@@ -1873,23 +1827,6 @@ function register(deps) {
             return `好友关系查询失败：${client.getLastErrorBrief()}`;
         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)
-            return (0, account_1.notLoggedInHint)();
-        const userIdentifier = session.userId;
-        const [stateRes, perksRes] = await Promise.all([
-            client.getStudentState(ctx, fwToken, accountType, userIdentifier),
-            client.getStudentPerks(ctx, fwToken, area, accountType, userIdentifier),
-        ]);
-        if (!stateRes)
-            return `学生认证状态查询失败：${client.getLastErrorBrief()}`;
-        if (!perksRes)
-            return `学生活动福利查询失败：${client.getLastErrorBrief()}`;
-        await sendImage(deps, session, 'student', buildStudentRenderData(stateRes, perksRes, area, accountType), '【洛克学生】认证与福利信息');
-    });
     ctx.command('订阅家园菜园 [uid:string]', '订阅指定 UID 的家园菜园成熟提醒')
         .action(async ({ session }, uid = '') => subscribeHome(deps, session, uid, 'garden'));
     ctx.command('订阅家园灵感 [uid:string]', '订阅指定 UID 的家园精灵灵感完成提醒')

package/lib/index.js

@@ -51,7 +51,6 @@ const MENU_GROUPS = [
             { cmd: '洛克.家园', desc: '查询家园菜园' },
             { cmd: '洛克.商店', desc: '查询 ingame 商店' },
             { cmd: '洛克.好友关系', desc: '查询好友关系' },
-            { cmd: '洛克.学生', desc: '查询学生认证与福利' },
         ],
     },
     {
@@ -96,7 +95,7 @@ function buildMenuFallbackText() {
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
         apiBaseUrl: koishi_1.Schema.string().default('https://wegame.shallow.ink').description('API 基础地址'),
-        wegameApiKey: koishi_1.Schema.string().default('').description('WeGame API Key'),
+        wegameApiKey: koishi_1.Schema.string().default('').description('WeGame API Key（获取 key 查看 Github：https://github.com/Entropy-Increase-Team/koishi-plugin-rocom ）'),
         qqLoginDebugMode: koishi_1.Schema.boolean().default(false).description('QQ 扫码登录调试模式，仅调试时开启'),
         adminUserIds: koishi_1.Schema.array(String).default([]).description('管理员用户 ID 列表'),
         autoRefreshEnabled: koishi_1.Schema.boolean().default(false).description('启用自动刷新凭证'),

package/lib/render-templates/player-search/index.html

@@ -1,60 +1,68 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=1200, initial-scale=1">
-  <link rel="stylesheet" href="{{_res_path}}render/player-search/style.css">
-</head>
-<body>
-  <div class="player-search-page player-page">
-    <div class="page-header">
-      <div class="page-title">{{title}}</div>
-      <div class="page-subtitle">{{subtitle}}</div>
-    </div>
-
-    <div class="hero-card">
-      <div class="hero-title">{{heroTitle}}</div>
-      <div class="hero-value">{{heroValue}}</div>
-      <div class="hero-subvalue">{{heroSubvalue}}</div>
-    </div>
-
-    <div class="summary-grid">
-      {{each summaryCards item}}
-      <div class="summary-card">
-        <div class="summary-label">{{item.label}}</div>
-        <div class="summary-value">{{item.value}}</div>
-      </div>
-      {{/each}}
-    </div>
-
-    {{if showSignature}}
-    <div class="panel-card signature-panel">
-      <div class="section-title">个性签名</div>
-      <div class="signature-box">{{signature}}</div>
-    </div>
-    {{/if}}
-
-    <div class="section-grid">
-      {{each sections section}}
-      <div class="panel-card info-panel">
-        <div class="section-title">{{section.title}}</div>
-        <div class="detail-card">
-          {{each section["items"] item}}
-          <div class="detail-row">
-            <div class="detail-label">{{item.label}}</div>
-            <div class="detail-value">{{item.value}}</div>
-          </div>
-          {{/each}}
-        </div>
-      </div>
-      {{/each}}
-    </div>
-
-    {{if commandHint}}
-    <div class="command-hint">{{commandHint}}</div>
-    {{/if}}
-
-    <div class="footer">{{copyright}}</div>
-  </div>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=1280, initial-scale=1">
+  <link rel="stylesheet" href="{{_res_path}}render/player-search/style.css">
+</head>
+<body>
+  <div class="player-search-page player-page">
+    <div class="page-bg"></div>
+
+    <header class="page-header">
+      <div class="page-title">{{title}}</div>
+      <div class="page-title-ghost">ROCOM PLAYER</div>
+    </header>
+
+    <section class="profile-strip">
+      <div class="profile-main">
+        <div class="profile-name-row">
+          <span class="player-name">{{heroValue}}</span>
+          <span class="uid-pill">{{heroSubvalue}}</span>
+        </div>
+      </div>
+    </section>
+
+    <section class="summary-strip">
+      {{each summaryCards item}}
+      <div class="summary-item">
+        <div class="summary-label">{{item.label}}</div>
+        <div class="summary-value">{{item.value}}</div>
+      </div>
+      {{/each}}
+    </section>
+
+    {{if showSignature}}
+    <section class="signature-strip">
+      <div class="signature-label">个性签名</div>
+      <div class="signature-text">{{signature}}</div>
+    </section>
+    {{/if}}
+
+    <main class="content-grid">
+      {{each sections section}}
+      <section class="panel">
+        <div class="panel-head">
+          <h2>{{section.title}}</h2>
+        </div>
+        <div class="detail-list">
+          {{each section["items"] item}}
+          <div class="detail-row">
+            <span class="detail-label">{{item.label}}</span>
+            <span class="detail-value">{{item.value}}</span>
+          </div>
+          {{/each}}
+        </div>
+      </section>
+      {{/each}}
+    </main>
+
+    <footer class="page-footer">
+      {{if commandHint}}
+      <div class="command-hint">用法：{{commandHint}}</div>
+      {{/if}}
+      <div class="copyright">{{copyright}}</div>
+    </footer>
+  </div>
+</body>
+</html>