koishi-plugin-ets2-tools-tmp 3.3.4 → 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/package.json

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