koishi-plugin-ets2-tools-tmp 3.3.3 → 3.3.5

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/util/apiLog.js

@@ -4,6 +4,35 @@
 let logger = null
 let debugMode = false
 
+// 从异常对象中尽可能提取错误信息（错误名、消息、HTTP 状态码、错误码、底层原因、响应体）
+// 仅用 e.message 时，网络层异常可能只有空消息（如只显示 "Error"），需补充状态码等上下文
+function formatError(e) {
+    if (e == null) return '未知错误'
+    const parts = []
+    if (e.name && e.name !== 'Error') parts.push(e.name)
+    if (e.message) parts.push(e.message)
+    if (e.response && e.response.status != null) {
+        parts.push(`HTTP ${e.response.status}${e.response.statusText ? ` ${e.response.statusText}` : ''}`)
+    } else if (e.status != null) {
+        parts.push(`HTTP ${e.status}`)
+    }
+    if (e.code != null && e.code !== e.status && e.code !== e.response?.status) parts.push(`code=${e.code}`)
+    if (e.cause) parts.push(`cause=${e.cause.message || e.cause.code || String(e.cause)}`)
+    // 响应体中的错误信息（如网关返回的 JSON 错误内容）
+    const body = e.response && e.response.data
+    if (body != null) {
+        const text = typeof body === 'string' ? body : JSON.stringify(body)
+        if (text) parts.push(`响应体: ${text.slice(0, 300)}`)
+    }
+    if (!parts.length) {
+        // 兜底：枚举异常对象上的自定义属性（Error 标准属性不可枚举）
+        const props = {}
+        for (const key of Object.keys(e)) props[key] = e[key]
+        parts.push(Object.keys(props).length ? JSON.stringify(props) : String(e))
+    }
+    return parts.join(' | ')
+}
+
 module.exports = {
     /**
      * 初始化（在插件 apply 时调用）
@@ -29,7 +58,11 @@ module.exports = {
         }
     },
     /**
-     * 发起 GET 请求并记录日志，失败时记录错误日志后抛出异常（由调用方原有 catch 处理）
+     * 格式化异常信息（提取错误名、HTTP 状态码、错误码、底层原因等），供其他模块复用
+     */
+    formatError,
+    /**
+     * 发起 GET 请求并记录日志，失败时记录含错误码等详细信息的错误日志后抛出异常（由调用方原有 catch 处理）
      */
     async get(http, tag, url) {
         if (debugMode && logger) {
@@ -44,7 +77,11 @@ module.exports = {
             return result
         } catch (e) {
             if (logger) {
-                logger.error(`[TMP-BOT API] [${tag}] 请求失败: ${url} (${e.message || e})`)
+                logger.error(`[TMP-BOT API] [${tag}] 请求失败: ${url} (${formatError(e)})`)
+                // 调试模式下输出堆栈，便于定位异常来源
+                if (debugMode && e && e.stack) {
+                    logger.error(`[TMP-BOT API] [${tag}] 堆栈: ${e.stack}`)
+                }
             }
             throw e
         }

package/lib/util/baiduTranslate.js

@@ -1,5 +1,6 @@
 const md5 = require('js-md5');
 const translateCache = require('../database/translateCache');
+const apiLog = require('./apiLog');
 const TRANSLATE_API = 'https://fanyi-api.baidu.com/api/trans/vip/translate';
 module.exports = async (ctx, cfg, content, cache = true) => {
     if (!cfg.baiduTranslate.enable) {
@@ -18,7 +19,7 @@ module.exports = async (ctx, cfg, content, cache = true) => {
         result = await ctx.http.get(`${TRANSLATE_API}?q=${encodeURI(content)}&from=auto&to=zh&appid=${cfg.baiduTranslate.appId}&salt=${randomInt}&sign=${sign}`);
     } catch (error) {
         // 翻译失败时降级返回原文，不影响主流程
-        ctx.logger.error(`[TMP-BOT] 百度翻译请求失败: ${error.message || error}`);
+        ctx.logger.error(`[TMP-BOT] 百度翻译请求失败: ${apiLog.formatError(error)}`);
         return content;
     }
     if (result.error_code) {

package/package.json

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