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

package/lib/api/evmOpenApi.js

@@ -1,10 +1,15 @@
+const apiLog = require('../util/apiLog')
 const BASE_APIS = ['https://evmapi.cxnnn.cn']
 
 async function requestWithFallback(http, path) {
     let lastError = null
     for (const baseUrl of BASE_APIS) {
         try {
-            const result = await http.get(`${baseUrl}${path}`)
+            const result = await apiLog.get(http, `evm${path}`, `${baseUrl}${path}`)
+            // 业务层错误码日志（如 10001 玩家不存在等，仅调试模式输出）
+            if (result && result.code !== undefined && result.code !== 200) {
+                apiLog.debug(`evm${path}`, `业务响应错误码: code=${result.code}, msg=${result.msg || '无'}`)
+            }
             return result
         } catch (e) {
             lastError = e
@@ -21,7 +26,7 @@ module.exports = {
         let result = null
         try {
             result = game === 'ATS'
-                ? await http.get(`${BASE_APIS[0]}/proxy/truckersmp/servers`)
+                ? await apiLog.get(http, 'evm.proxy.truckersmp.servers', `${BASE_APIS[0]}/proxy/truckersmp/servers`)
                 : await requestWithFallback(http, `/server/list`)
         } catch {
             return {

package/lib/api/truckersMpApi.js

@@ -1,5 +1,17 @@
+const apiLog = require('../util/apiLog');
 const BASE_API = 'https://evmapi.cxnnn.cn/proxy/truckersmp';
 // const BASE_API = 'https://api.truckersmp.com/v2';
+
+// 解析 TMP 接口的 error 字段；响应结构异常时记录日志并按错误处理，避免 JSON.parse 直接崩溃
+function parseError(result, tag) {
+    try {
+        return !!JSON.parse(result?.error)
+    } catch {
+        apiLog.error(tag, `响应结构异常: ${JSON.stringify(result).slice(0, 300)}`)
+        return true
+    }
+}
+
 module.exports = {
     /**
      * 查询玩家信息
@@ -7,7 +19,7 @@ module.exports = {
     async player(http, tmpId) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/player/${tmpId}`);
+            result = await apiLog.get(http, 'tmp.player', `${BASE_API}/player/${tmpId}`);
         }
         catch {
             return {
@@ -16,7 +28,7 @@ module.exports = {
         }
         // 拼接返回数据
         let data = {
-            error: JSON.parse(result.error)
+            error: parseError(result, 'tmp.player')
         };
         if (!data.error) {
             data.data = result.response;
@@ -29,7 +41,7 @@ module.exports = {
     async servers(http) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/servers`);
+            result = await apiLog.get(http, 'tmp.servers', `${BASE_API}/servers`);
         }
         catch {
             return {
@@ -38,7 +50,7 @@ module.exports = {
         }
         // 拼接返回数据
         let data = {
-            error: JSON.parse(result.error)
+            error: parseError(result, 'tmp.servers')
         };
         if (!data.error) {
             data.data = result.response;
@@ -51,7 +63,7 @@ module.exports = {
     async bans(http, tmpId) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/bans/${tmpId}`);
+            result = await apiLog.get(http, 'tmp.bans', `${BASE_API}/bans/${tmpId}`);
         }
         catch {
             return {
@@ -60,7 +72,7 @@ module.exports = {
         }
         // 拼接返回数据
         let data = {
-            error: JSON.parse(result.error)
+            error: parseError(result, 'tmp.bans')
         };
         if (!data.error) {
             data.data = result.response;
@@ -73,7 +85,7 @@ module.exports = {
     async version(http) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/version`);
+            result = await apiLog.get(http, 'tmp.version', `${BASE_API}/version`);
         }
         catch {
             return {
@@ -92,7 +104,7 @@ module.exports = {
     async vtcMember(http, vtcId, memberId) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/vtc/${vtcId}/member/${memberId}`);
+            result = await apiLog.get(http, 'tmp.vtcMember', `${BASE_API}/vtc/${vtcId}/member/${memberId}`);
         }
         catch {
             return {
@@ -101,7 +113,7 @@ module.exports = {
         }
         // 拼接返回数据
         let data = {
-            error: JSON.parse(result.error)
+            error: parseError(result, 'tmp.vtcMember')
         };
         if (!data.error) {
             data.data = result.response;
@@ -114,7 +126,7 @@ module.exports = {
     async vtc(http, vtcId) {
         let result = null
         try {
-            result = await http.get(`${BASE_API}/vtc/${vtcId}`)
+            result = await apiLog.get(http, 'tmp.vtc', `${BASE_API}/vtc/${vtcId}`)
         } catch {
             return {
                 error: true
@@ -123,7 +135,7 @@ module.exports = {
 
         // 拼接返回数据
         let data = {
-            error: JSON.parse(result.error)
+            error: parseError(result, 'tmp.vtc')
         }
         if (!data.error) {
             data.data = result.response

package/lib/api/truckersMpMapApi.js

@@ -1,3 +1,4 @@
+const apiLog = require('../util/apiLog');
 const BASE_API = 'https://evmapi.cxnnn.cn/proxy/ets2map';
 // const BASE_API = 'https://tracker.ets2map.com';
 module.exports = {
@@ -7,7 +8,7 @@ module.exports = {
     async area(http, serverId, x1, y1, x2, y2) {
         let result = null;
         try {
-            result = await http.get(`${BASE_API}/v3/area?x1=${x1}&y1=${y1}&x2=${x2}&y2=${y2}&server=${serverId}`);
+            result = await apiLog.get(http, 'ets2map.area', `${BASE_API}/v3/area?x1=${x1}&y1=${y1}&x2=${x2}&y2=${y2}&server=${serverId}`);
         }
         catch {
             return {

package/lib/api/truckyAppApi.js

@@ -1,3 +1,4 @@
+const apiLog = require('../util/apiLog')
 const BASE_API = 'https://evmapi.cxnnn.cn/proxy/trucky'
 // const BASE_API = 'https://api.codetabs.com/v1/proxy/?quest=https://api.truckyapp.com'
 
@@ -8,7 +9,7 @@ module.exports = {
   async online (http, tmpId) {
     let result = null
     try {
-      result = await http.get(`${BASE_API}/v3/map/online?playerID=${tmpId}`)
+      result = await apiLog.get(http, 'trucky.online', `${BASE_API}/v3/map/online?playerID=${tmpId}`)
     } catch {
       return {
         error: true
@@ -30,7 +31,7 @@ module.exports = {
   async trafficTop (http, serverName) {
     let result = null
     try {
-      result = await http.get(`${BASE_API}/v2/traffic/top?game=ets2&server=${serverName}`)
+      result = await apiLog.get(http, 'trucky.trafficTop', `${BASE_API}/v2/traffic/top?game=ets2&server=${serverName}`)
     } catch {
       return {
         error: true

package/lib/index.js

@@ -28,6 +28,7 @@ const commands = {
     tmpFootprint: require('./command/tmpFootprint')
 };
 const { ActivityService } = require('./command/tmpActivityService');
+const apiLog = require('./util/apiLog');
 
 const __defProp = Object.defineProperty;
 const __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -437,6 +438,9 @@ function registerBaseCommands(ctx, cfg) {
 }
 
 function apply(ctx, cfg) {
+    // 初始化 API 请求日志（调试模式开启后，truckersmp/trucky 等接口会输出请求与错误日志）
+    apiLog.init(ctx, cfg.debugMode);
+
     try {
         model(ctx);
         if (cfg.debugMode) {

package/lib/util/apiLog.js

@@ -0,0 +1,52 @@
+// API 请求日志工具：为各 API 模块提供统一的调试/错误日志
+// debug 日志（请求地址、耗时）仅在插件开启调试模式时输出；
+// 请求失败日志始终输出，便于排查接口异常
+let logger = null
+let debugMode = false
+
+module.exports = {
+    /**
+     * 初始化（在插件 apply 时调用）
+     */
+    init(ctx, enabled) {
+        logger = ctx.logger
+        debugMode = !!enabled
+    },
+    /**
+     * 记录调试日志（仅调试模式开启时输出）
+     */
+    debug(tag, message) {
+        if (debugMode && logger) {
+            logger.info(`[TMP-BOT API] [${tag}] ${message}`)
+        }
+    },
+    /**
+     * 记录接口业务层错误日志（始终输出）
+     */
+    error(tag, message) {
+        if (logger) {
+            logger.error(`[TMP-BOT API] [${tag}] ${message}`)
+        }
+    },
+    /**
+     * 发起 GET 请求并记录日志，失败时记录错误日志后抛出异常（由调用方原有 catch 处理）
+     */
+    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} (${e.message || e})`)
+            }
+            throw e
+        }
+    }
+}

package/lib/util/baiduTranslate.js

@@ -13,8 +13,16 @@ module.exports = async (ctx, cfg, content, cache = true) => {
     }
     let randomInt = Math.floor(Math.random() * 10000);
     let sign = md5(cfg.baiduTranslate.appId + content + randomInt + cfg.baiduTranslate.key);
-    let result = await ctx.http.get(`${TRANSLATE_API}?q=${encodeURI(content)}&from=auto&to=zh&appid=${cfg.baiduTranslate.appId}&salt=${randomInt}&sign=${sign}`);
+    let result;
+    try {
+        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}`);
+        return content;
+    }
     if (result.error_code) {
+        ctx.logger.error(`[TMP-BOT] 百度翻译返回错误: error_code=${result.error_code}, error_msg=${result.error_msg || '无'}`);
         return content;
     }
     if (cfg.baiduTranslate.enableCache && cache) {

package/package.json

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