koishi-plugin-rocom 1.0.7 → 1.0.9

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);
                 }

package/lib/commands/account.d.ts

@@ -1,5 +1,5 @@
 import { PluginDeps } from '../types';
 export declare function getPrimaryToken(deps: PluginDeps, userId: string): Promise<string>;
 export declare function notLoggedInHint(): string;
-export declare function saveBindingWithRoleInfo(deps: PluginDeps, session: any, fwToken: string, loginType: string, userId: string): Promise<void>;
+export declare function saveBindingWithRoleInfo(deps: PluginDeps, session: any, fwToken: string, loginType: string, userId: string, preMessageIds?: string[]): Promise<void>;
 export declare function register(deps: PluginDeps): void;

package/lib/commands/account.js

@@ -7,6 +7,21 @@ exports.register = register;
 const koishi_1 = require("koishi");
 const role_token_1 = require("../role-token");
 const send_image_1 = require("../send-image");
+const logger = new koishi_1.Logger('rocom-account');
+async function recallMessages(session, messageIds) {
+    if (!session?.bot?.deleteMessage || !session.channelId)
+        return;
+    for (const id of messageIds) {
+        if (!id)
+            continue;
+        try {
+            await session.bot.deleteMessage(session.channelId, id);
+        }
+        catch (err) {
+            logger.warn(`撤回消息 ${id} 失败：${err}`);
+        }
+    }
+}
 async function getPrimaryToken(deps, userId) {
     const token = await (0, role_token_1.getRoleToken)(deps.ctx, userId);
     return token?.fwt || '';
@@ -29,16 +44,29 @@ function formatLoginType(loginType) {
     };
     return typeMap[loginType] || loginType || '未知';
 }
-async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId) {
+async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId, preMessageIds = []) {
     const { ctx, client, userMgr } = deps;
-    await session.send('登录成功，正在调用绑定接口...');
+    const intermediateMessageIds = [...preMessageIds];
+    const sendIntermediate = async (content) => {
+        const result = await session.send(content);
+        if (Array.isArray(result)) {
+            for (const id of result) {
+                if (id)
+                    intermediateMessageIds.push(String(id));
+            }
+        }
+        else if (result) {
+            intermediateMessageIds.push(String(result));
+        }
+    };
+    await sendIntermediate('登录成功，正在调用绑定接口...');
     const bindRes = await client.createBinding(ctx, fwToken, userId);
     const bindingId = String(bindRes?.binding?.id || fwToken || '').trim();
     if (!bindRes?.binding || !bindingId) {
         await session.send('绑定接口调用失败，请稍后重试。');
         return;
     }
-    await session.send('绑定成功，正在获取角色信息...');
+    await sendIntermediate('绑定成功，正在获取角色信息...');
     const roleRes = await client.getRole(ctx, fwToken, undefined, userId);
     if (!roleRes?.role) {
         await session.send('绑定成功，但获取角色信息失败，请尝试重新登录。');
@@ -61,6 +89,7 @@ async function saveBindingWithRoleInfo(deps, session, fwToken, loginType, userId
         roleId: binding.role_id,
         loginType,
     });
+    await recallMessages(session, intermediateMessageIds);
     await session.send(`绑定成功！当前账号：${binding.nickname} (ID: ${binding.role_id})`);
 }
 function register(deps) {
@@ -75,7 +104,10 @@ function register(deps) {
         const fwToken = qrData.frameworkToken;
         const qrB64 = qrData.qr_image;
         const imgData = qrB64.includes(',') ? qrB64.split(',')[1] : qrB64;
-        await session.send((0, koishi_1.h)('message', {}, koishi_1.h.at(userId), koishi_1.h.text('\n请使用 QQ 扫描二维码登录（有效时间 2 分钟）\n注意需要双设备扫码。\n'), koishi_1.h.image(`data:image/png;base64,${imgData}`)));
+        const qrSendResult = await session.send((0, koishi_1.h)('message', {}, koishi_1.h.at(userId), koishi_1.h.text('\n请使用 QQ 扫描二维码登录（有效时间 2 分钟）\n注意需要双设备扫码。\n'), koishi_1.h.image(`data:image/png;base64,${imgData}`)));
+        const qrMessageIds = Array.isArray(qrSendResult)
+            ? qrSendResult.filter(Boolean).map(String)
+            : qrSendResult ? [String(qrSendResult)] : [];
         const startTime = Date.now();
         while (Date.now() - startTime < 115000) {
             await new Promise(r => setTimeout(r, 3000));
@@ -83,7 +115,7 @@ function register(deps) {
             if (!status)
                 continue;
             if (status.status === 'done') {
-                await saveBindingWithRoleInfo(deps, session, fwToken, 'qq', userId);
+                await saveBindingWithRoleInfo(deps, session, fwToken, 'qq', userId, qrMessageIds);
                 return;
             }
             if (['expired', 'failed', 'canceled'].includes(status.status))
@@ -100,7 +132,10 @@ function register(deps) {
             return '获取微信登录链接失败。';
         const fwToken = qrData.frameworkToken;
         const qrUrl = qrData.qr_image;
-        await session.send(`请使用微信打开以下链接扫码登录（有效时间 2 分钟）\n注意需要双设备扫码。\n${qrUrl}`);
+        const qrSendResult = await session.send(`请使用微信打开以下链接扫码登录（有效时间 2 分钟）\n注意需要双设备扫码。\n${qrUrl}`);
+        const qrMessageIds = Array.isArray(qrSendResult)
+            ? qrSendResult.filter(Boolean).map(String)
+            : qrSendResult ? [String(qrSendResult)] : [];
         const startTime = Date.now();
         while (Date.now() - startTime < 115000) {
             await new Promise(r => setTimeout(r, 3000));
@@ -108,7 +143,7 @@ function register(deps) {
             if (!status)
                 continue;
             if (status.status === 'done') {
-                await saveBindingWithRoleInfo(deps, session, fwToken, 'wechat', userId);
+                await saveBindingWithRoleInfo(deps, session, fwToken, 'wechat', userId, qrMessageIds);
                 return;
             }
             if (['expired', 'failed'].includes(status.status))

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}`,
@@ -1334,7 +1327,6 @@ function register(deps) {
         if (!fwToken)
             return (0, account_1.notLoggedInHint)();
         const userIdentifier = session.userId;
-        await session.send('正在获取洛克王国数据...');
         const [roleRes, evalRes, sumRes, collRes, boRes, blRes] = await Promise.all([
             client.getRole(ctx, fwToken, undefined, userIdentifier),
             client.getEvaluation(ctx, fwToken, userIdentifier),
@@ -1781,7 +1773,6 @@ function register(deps) {
             return '请提供 UID，或先绑定账号后再使用 洛克.刷新面板。';
         if (!/^\d+$/.test(targetUid))
             return '请输入正确的 UID 格式。';
-        await session?.send?.(`正在刷新 UID ${targetUid} 的精灵面板，请稍候...`);
         const record = await refreshPanelPets(deps, targetUid, session?.userId || '');
         if (!record)
             return panelRefreshErrorHint(client);

package/lib/index.js

@@ -96,7 +96,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>