koishi-plugin-rocom 1.0.6 → 1.0.7

package/lib/client.d.ts

@@ -4,11 +4,14 @@ export declare class RocomClient {
     private apiKey;
     private timeout;
     private lastError;
+    private lastErrorBrief;
     constructor(baseUrl: string, apiKey: string, timeout?: number);
     private sanitizeUid;
     private wegameHeaders;
     private rocomHeaders;
     private formatHttpError;
+    private simplifyErrorMessage;
+    private shouldRetryIngameWithApiKey;
     private isSensitiveLogKey;
     private maskSensitiveValue;
     private sanitizeForLog;
@@ -32,6 +35,7 @@ export declare class RocomClient {
     getRole(ctx: Context, fwToken: string, accountType?: number, userIdentifier?: string): Promise<any>;
     getEvaluation(ctx: Context, fwToken: string, userIdentifier?: string): Promise<any>;
     getLastError(defaultMessage?: string): string;
+    getLastErrorBrief(defaultMessage?: string): string;
     private setLastError;
     getPetSummary(ctx: Context, fwToken: string, userIdentifier?: string): Promise<any>;
     getCollection(ctx: Context, fwToken: string, userIdentifier?: string): Promise<any>;

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