koishi-plugin-ets2-tools-tmp 3.3.4 → 3.3.6

package/lib/api/evmOpenApi.js

@@ -223,4 +223,34 @@ module.exports = {
         }
         return data
     },
+    /**
+     * 查询 Steam 游戏时长（ETS2 227300 / ATS 270880）
+     * 通过代理访问 Steam IPlayerService，返回格式化后的 { ets2, ats } 字符串
+     * 未配置 apiKey 或请求失败时对应字段为 null
+     */
+    async steamGameTime(http, steamApiKey, steamId) {
+        if (!steamApiKey || !steamId) {
+            return { ets2: null, ats: null }
+        }
+        const path = `/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${encodeURIComponent(steamApiKey)}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`
+        let response
+        try {
+            response = await apiLog.get(http, 'evm.steam.gameTime', `${BASE_APIS[0]}${path}`)
+        } catch {
+            return { ets2: null, ats: null }
+        }
+        const result = { ets2: null, ats: null }
+        if (response?.response?.game_count > 0 && Array.isArray(response.response.games)) {
+            for (const game of response.response.games) {
+                const minutes = game.playtime_forever
+                if (minutes == null) continue
+                const h = Math.floor(minutes / 60)
+                const m = minutes % 60
+                const playtime = `${h}小时${m}分钟`
+                if (game.appid === 227300) result.ets2 = playtime
+                else if (game.appid === 270880) result.ats = playtime
+            }
+        }
+        return result
+    },
 }

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -161,28 +161,12 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     data.ets2GameTime = null;
     data.atsGameTime = null;
     if (cfg.commands?.tmpQueryGameTime) {
-        try {
-            const steamApiKey = cfg.steamApi?.key;
-            if (steamApiKey) {
-                const steamId = playerInfo.data.steamId;
-                const url = `https://evmapi.cxnnn.cn/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
-                const response = await ctx.http.get(url);
-                if (response.response && response.response.game_count > 0) {
-                    for (const game of response.response.games) {
-                        const playtimeMinutes = game.playtime_forever;
-                        const hours = Math.floor(playtimeMinutes / 60);
-                        const minutes = playtimeMinutes % 60;
-                        const playtime = `${hours}小时${minutes}分钟`;
-                        if (game.appid === 227300) {
-                            data.ets2GameTime = playtime;
-                        } else if (game.appid === 270880) {
-                            data.atsGameTime = playtime;
-                        }
-                    }
-                }
-            }
-        } catch (error) {
-            ctx.logger.error(`查询Steam游戏时长出错: ${error}`);
+        const steamApiKey = cfg.steamApi?.key;
+        if (steamApiKey) {
+            const steamId = playerInfo.data.steamId;
+            const gameTimes = await evmOpenApi.steamGameTime(ctx.http, steamApiKey, steamId);
+            data.ets2GameTime = gameTimes.ets2;
+            data.atsGameTime = gameTimes.ats;
         }
     }
     let page;

package/lib/command/tmpQuery/tmpQueryText.js

@@ -184,35 +184,11 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     
     // 查询Steam游戏时长
     async function getSteamGameTimes(steamId) {
-        try {
-            const steamApiKey = cfg.steamApi?.key;
-            if (!steamApiKey) {
-                return { ets2: null, ats: null };
-            }
-            const url = `https://evmapi.cxnnn.cn/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
-            const response = await ctx.http.get(url);
-            const result = { ets2: null, ats: null };
-            
-            if (response.response && response.response.game_count > 0) {
-                for (const game of response.response.games) {
-                    const playtimeMinutes = game.playtime_forever;
-                    const hours = Math.floor(playtimeMinutes / 60);
-                    const minutes = playtimeMinutes % 60;
-                    const playtime = `${hours}小时${minutes}分钟`;
-                    
-                    if (game.appid === 227300) {
-                        result.ets2 = playtime;
-                    } else if (game.appid === 270880) {
-                        result.ats = playtime;
-                    }
-                }
-            }
-            
-            return result;
-        } catch (error) {
-            ctx.logger.error(`查询Steam游戏时长出错: ${error}`);
+        const steamApiKey = cfg.steamApi?.key;
+        if (!steamApiKey) {
             return { ets2: null, ats: null };
         }
+        return evmOpenApi.steamGameTime(ctx.http, steamApiKey, steamId);
     }
     
     // 获取欧卡和美卡游戏时长

package/lib/index.js

@@ -67,7 +67,8 @@ exports.inject = {
 
 exports.Config = koishi_1.Schema.intersect([
     koishi_1.Schema.object({
-        debugMode: koishi_1.Schema.boolean().default(false).description('启用调试模式（输出详细日志）')
+        debugMode: koishi_1.Schema.boolean().default(false).description('启用调试模式（输出详细日志）'),
+        apiRetryCount: koishi_1.Schema.number().default(2).min(0).max(10).step(1).description('API请求失败时的重试次数（0=不重试，默认2次）')
     }).description('基本配置'),
     koishi_1.Schema.object({
         commands: koishi_1.Schema.object({
@@ -439,7 +440,7 @@ function registerBaseCommands(ctx, cfg) {
 
 function apply(ctx, cfg) {
     // 初始化 API 请求日志（调试模式开启后，truckersmp/trucky 等接口会输出请求与错误日志）
-    apiLog.init(ctx, cfg.debugMode);
+    apiLog.init(ctx, cfg.debugMode, cfg.apiRetryCount);
 
     try {
         model(ctx);

package/lib/util/apiLog.js

@@ -3,6 +3,11 @@
 // 请求失败日志始终输出，便于排查接口异常
 let logger = null
 let debugMode = false
+let retryCount = 2
+
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms))
+}
 
 // 从异常对象中尽可能提取错误信息（错误名、消息、HTTP 状态码、错误码、底层原因、响应体）
 // 仅用 e.message 时，网络层异常可能只有空消息（如只显示 "Error"），需补充状态码等上下文
@@ -37,9 +42,10 @@ module.exports = {
     /**
      * 初始化（在插件 apply 时调用）
      */
-    init(ctx, enabled) {
+    init(ctx, enabled, retries) {
         logger = ctx.logger
         debugMode = !!enabled
+        retryCount = retries != null ? Math.max(0, retries) : 2
     },
     /**
      * 记录调试日志（仅调试模式开启时输出）
@@ -62,28 +68,43 @@ module.exports = {
      */
     formatError,
     /**
-     * 发起 GET 请求并记录日志，失败时记录含错误码等详细信息的错误日志后抛出异常（由调用方原有 catch 处理）
+     * 发起 GET 请求并记录日志，失败时自动重试（重试次数由配置控制），最终失败抛出异常
+     * 重试间隔递增：500ms、1000ms、1500ms...
      */
     async get(http, tag, url) {
         if (debugMode && logger) {
             logger.info(`[TMP-BOT API] [${tag}] GET ${url}`)
         }
-        const start = Date.now()
-        try {
-            const result = await http.get(url)
-            if (debugMode && logger) {
-                logger.info(`[TMP-BOT API] [${tag}] 响应成功, 耗时: ${Date.now() - start}ms`)
-            }
-            return result
-        } catch (e) {
-            if (logger) {
-                logger.error(`[TMP-BOT API] [${tag}] 请求失败: ${url} (${formatError(e)})`)
-                // 调试模式下输出堆栈，便于定位异常来源
-                if (debugMode && e && e.stack) {
-                    logger.error(`[TMP-BOT API] [${tag}] 堆栈: ${e.stack}`)
+        const maxAttempts = retryCount + 1
+        let lastError = null
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            const start = Date.now()
+            try {
+                const result = await http.get(url)
+                if (debugMode && logger) {
+                    logger.info(`[TMP-BOT API] [${tag}] 响应成功, 耗时: ${Date.now() - start}ms${attempt > 1 ? ` (第${attempt}次尝试)` : ''}`)
+                }
+                return result
+            } catch (e) {
+                lastError = e
+                const isLast = attempt >= maxAttempts
+                if (logger) {
+                    if (isLast) {
+                        // 最终失败，输出错误日志 + 堆栈
+                        logger.error(`[TMP-BOT API] [${tag}] 请求失败(已重试${retryCount}次): ${url} (${formatError(e)})`)
+                        if (debugMode && e && e.stack) {
+                            logger.error(`[TMP-BOT API] [${tag}] 堆栈: ${e.stack}`)
+                        }
+                    } else {
+                        // 中间失败，输出警告（始终可见，便于观察重试情况）
+                        logger.warn(`[TMP-BOT API] [${tag}] 第${attempt}/${maxAttempts}次请求失败, 将重试: ${formatError(e)}`)
+                    }
+                }
+                if (!isLast) {
+                    await sleep(500 * attempt)
                 }
             }
-            throw e
         }
+        throw lastError
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ets2-tools-tmp",
   "description": "欧卡2 TruckersMP信息查询、车队平台查询及活动提醒",
-  "version": "3.3.4",
+  "version": "3.3.6",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"