koishi-plugin-rocom 1.0.6 → 1.0.8

package/lib/client.js

@@ -8,6 +8,7 @@ class RocomClient {
     apiKey;
     timeout;
     lastError = '接口异常';
+    lastErrorBrief = '接口异常';
     constructor(baseUrl, apiKey, timeout = 15000) {
         this.baseUrl = baseUrl.replace(/\/$/, '');
         this.apiKey = apiKey;
@@ -53,6 +54,56 @@ class RocomClient {
         }
         return err?.message || String(e);
     }
+    simplifyErrorMessage(message) {
+        const raw = String(message || '').replace(/\s+/g, ' ').trim();
+        if (!raw)
+            return '接口异常';
+        if (/ETIMEDOUT|request timeout|timeout/i.test(raw)) {
+            return '请求超时，请稍后重试';
+        }
+        if (/ENOTFOUND|EAI_AGAIN|ECONNRESET|ECONNREFUSED|socket hang up|fetch failed|network error/i.test(raw)) {
+            return '网络连接异常，请稍后重试';
+        }
+        if (/底层凭证已失效|WeGame 凭证已失效|凭证已失效|token expired|framework token/i.test(raw)) {
+            return '登录凭证已失效，请重新登录';
+        }
+        if (/HTTP\s*5\d\d/i.test(raw)) {
+            return '服务暂时不可用，请稍后重试';
+        }
+        if (/HTTP\s*401/i.test(raw)) {
+            return '登录状态失效，请重新登录';
+        }
+        if (/API[\s_-]*Key/i.test(raw) && /未声明|默认拒绝访问|not declared|not allowed/i.test(raw)) {
+            return '接口权限受限，请稍后重试';
+        }
+        if (/HTTP\s*403/i.test(raw) && !/凭证|登录|token/i.test(raw)) {
+            return '权限不足，暂时无法访问该接口';
+        }
+        const stripped = raw
+            .replace(/^HTTP\s*\d+\s*:\s*/i, '')
+            .replace(/^(Error|RequestError)\s*:\s*/i, '')
+            .trim();
+        if (!stripped)
+            return '接口异常';
+        return stripped.length > 120 ? `${stripped.slice(0, 117)}...` : stripped;
+    }
+    shouldRetryIngameWithApiKey(errorMessage) {
+        if (!this.apiKey)
+            return false;
+        const message = String(errorMessage || '').trim();
+        if (!message)
+            return true;
+        if (/未声明\s*API\s*Key\s*权限|默认拒绝访问|API\s*Key.*not declared|API\s*Key.*not allowed/i.test(message)) {
+            return false;
+        }
+        if (/缺少\s*API\s*Key|API\s*Key.*required|missing\s+api\s*key/i.test(message)) {
+            return true;
+        }
+        if (/HTTP\s*(401|403)/i.test(message)) {
+            return true;
+        }
+        return false;
+    }
     isSensitiveLogKey(key) {
         return /api[-_]?key|authorization|cookie|framework[-_]?token|password|secret|ticket|token/i.test(key);
     }
@@ -275,7 +326,7 @@ class RocomClient {
         let result = await requestOnce(false, Boolean(this.apiKey));
         if (result.status !== null)
             return { ...result, usedApiKey: false };
-        if (this.apiKey) {
+        if (this.shouldRetryIngameWithApiKey(this.getLastError())) {
             result = await requestOnce(true, false);
             if (result.status !== null)
                 return { ...result, usedApiKey: true };
@@ -339,8 +390,12 @@ class RocomClient {
     getLastError(defaultMessage = '接口异常') {
         return this.lastError || defaultMessage;
     }
+    getLastErrorBrief(defaultMessage = '接口异常') {
+        return this.lastErrorBrief || defaultMessage;
+    }
     setLastError(message) {
         this.lastError = message || '接口异常';
+        this.lastErrorBrief = this.simplifyErrorMessage(message);
     }
     async getPetSummary(ctx, fwToken, userIdentifier = '') {
         return this.get(ctx, '/api/v1/games/rocom/profile/pet-summary', this.rocomHeaders(fwToken, userIdentifier));

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/merchant.js

@@ -213,7 +213,7 @@ function register(deps) {
         .action(async ({ session }) => {
         const res = await client.getMerchantInfo(ctx, true);
         if (!res)
-            return '\u83b7\u53d6\u8fdc\u884c\u5546\u4eba\u6570\u636e\u5931\u8d25\u3002';
+            return `\u83b7\u53d6\u8fdc\u884c\u5546\u4eba\u6570\u636e\u5931\u8d25\uff1a${client.getLastErrorBrief()}`;
         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);