koishi-plugin-rocom 1.0.5 → 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

@@ -103,11 +103,16 @@ function parseMerchantSubscriptionArgs(args, defaultItems) {
     if (parts[0] === '1' || parts[0] === '0') {
         mentionAll = parts.shift() === '1';
     }
-    const items = parts.length ? parts : defaultItems;
+    const matchAll = parts.length === 1 && parts[0] === '全部';
+    if (matchAll)
+        parts.shift();
+    const items = matchAll ? [] : (parts.length ? parts : defaultItems);
+    const source = matchAll ? '全部商品' : (parts.length ? TEXT.customSource : TEXT.defaultSource);
     return {
         mention_all: mentionAll,
+        match_all: matchAll,
         items,
-        source: parts.length ? TEXT.customSource : TEXT.defaultSource,
+        source,
     };
 }
 function getSubscriptionTarget(session) {
@@ -158,13 +163,26 @@ async function checkMerchantSubscriptions(deps) {
     let matchedCount = 0;
     let pushedCount = 0;
     for (const [key, sub] of Object.entries(subs)) {
-        const matched = sub.items.filter((item) => productNames.some(n => n.includes(item)));
-        if (!matched.length)
+        const matchAll = !!sub.match_all;
+        const matched = matchAll
+            ? productNames
+            : sub.items.filter((item) => productNames.some(n => n.includes(item)));
+        if (!matchAll && !matched.length)
             continue;
-        matchedCount++;
-        if (sub.last_push_round === roundInfo.round_id && sameStringArray(matched, sub.last_matched_items || []))
+        if (matchAll && !products.length)
             continue;
-        const msg = `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${matched.join('\u3001')}`;
+        matchedCount++;
+        if (matchAll) {
+            if (sub.last_push_round === roundInfo.round_id)
+                continue;
+        }
+        else {
+            if (sub.last_push_round === roundInfo.round_id && sameStringArray(matched, sub.last_matched_items || []))
+                continue;
+        }
+        const msg = matchAll
+            ? `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}`
+            : `\ud83d\udd14 \u8fdc\u884c\u5546\u4eba\u5237\u65b0\u63d0\u9192\n\u5f53\u524d\u5546\u54c1\uff1a${productNames.join('\u3001')}\n\u5339\u914d\u8ba2\u9605\uff1a${matched.join('\u3001')}`;
         const platform = sub.platform || ctx.bots[0]?.platform;
         const channelId = sub.channel_id || sub.group_id || sub.user_id || key;
         if (!platform || !channelId) {
@@ -195,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);
@@ -216,12 +234,13 @@ function register(deps) {
             channel_id: target.channelId,
             platform: target.platform,
             items: parsed.items,
+            match_all: parsed.match_all,
             mention_all: target.privateChat ? false : parsed.mention_all,
             last_push_round: existing?.last_push_round ?? null,
             last_matched_items: existing?.last_matched_items ?? [],
             updated_by: session.userId,
         });
-        return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
+        return `\u2705 \u5df2\u8ba2\u9605\u8fdc\u884c\u5546\u4eba\u5546\u54c1\uff1a${parsed.match_all ? '\u5168\u90e8\u5546\u54c1\uff08\u6bcf\u8f6e\u63a8\u9001\uff09' : parsed.items.join('\u3001')}\uff08${parsed.source}\uff09\uff1b${target.privateChat ? '个人订阅' : (parsed.mention_all ? '\u547d\u4e2d\u540e\u4f1a @\u5168\u4f53' : '\u547d\u4e2d\u540e\u4e0d @\u5168\u4f53')}`;
     });
     ctx.command(TEXT.viewSubscribe, '\u67e5\u770b\u5f53\u524d\u4f1a\u8bdd\u7684\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
         .action(async ({ session }) => {
@@ -231,8 +250,9 @@ function register(deps) {
         const sub = merchantSubMgr.get(target.key);
         const scopeName = target.privateChat ? '你' : '当前群组';
         if (!sub)
-            return `${scopeName}未订阅远行商人。\n用法：${TEXT.subscribe} [1/0] [商品名1] [商品名2] ...`;
-        return `${scopeName}订阅商品：${sub.items.join('、')}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
+            return `${scopeName}未订阅远行商人。\n用法：${TEXT.subscribe} [1/0] [商品名1] [商品名2] ...\n或：${TEXT.subscribe} 全部（每轮直接推送整张商人图）`;
+        const itemsText = sub.match_all ? '全部商品（每轮推送）' : sub.items.join('、');
+        return `${scopeName}订阅商品：${itemsText}\n提醒方式：${target.privateChat ? '私聊提醒' : (sub.mention_all ? '@全体' : '普通提醒')}`;
     });
     ctx.command(TEXT.unsubscribe, '\u53d6\u6d88\u8fdc\u884c\u5546\u4eba\u8ba2\u9605')
         .action(async ({ session }) => {