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

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/resource/package/ets-map.js

@@ -1,6 +1,6 @@
 let mapConfig = {
   ets: {
-    tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
     multipliers: {
       x: 70272,
       y: 76157
@@ -26,7 +26,7 @@ let mapConfig = {
     }
   },
   promods: {
-    tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+    tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
     multipliers: {
       x: 51953,
       y: 76024

package/lib/resource/position.html

@@ -121,7 +121,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: {
           x: 70272,
           y: 76157
@@ -147,7 +147,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: {
           x: 51953,
           y: 76024

package/lib/resource/query.html

@@ -351,6 +351,13 @@
       width: 100%;
       height: 180px;
       border-radius: 0 0 16px 16px;
+      /* 未加载到瓦片的区域使用卡片同款深蓝底色，避免白底突兀 */
+      background: #0f1439;
+    }
+
+    /* 瓦片暗色化：部分反转（0.6）让底色为浅中灰，色相回转 + 提饱和保持黄色道路鲜亮 */
+    .map-section .leaflet-tile-pane {
+      filter: invert(0.78) hue-rotate(180deg) saturate(1.35) brightness(2);
     }
 
     /* ===== SPONSOR SECTION ===== */
@@ -585,7 +592,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 70272, y: 76157 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -596,7 +603,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 51953, y: 76024 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -774,7 +781,7 @@
         map.unproject([mapConfig[mapType].bounds.x, 0], mapConfig[mapType].maxZoom)
       ));
       L.circleMarker(map.unproject(mapConfig[mapType].calculateMapCoordinate(x, y), 8), {
-        color: '#2f2f2f', weight: 2, fillColor: '#1cb715', fillOpacity: 1, radius: 5, zIndex: 1000
+        color: '#e2e8f0', weight: 2, fillColor: '#22c55e', fillOpacity: 1, radius: 5, zIndex: 1000
       }).addTo(map);
       map.setView(map.unproject(mapConfig[mapType].calculateMapCoordinate(x, y), 8), 5);
     }

package/lib/resource/traffic.html

@@ -246,7 +246,7 @@
   <script>
     let mapConfig = {
       ets: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/ets2/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-ets-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 70272, y: 76157 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },
@@ -256,7 +256,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets_tiles.cnly.top/20260903/tmp-promods-yellow/Tiles/{z}/{x}/{y}.png',
         multipliers: { x: 51953, y: 76024 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },

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.5",
+  "version": "3.3.61",
   "contributors": [
     "opwop <slhp1013@qq.com>",
     "bot_actions <168329908@qq.com>"