koishi-plugin-ets2-tools-tmp 3.1.4 → 3.1.6

package/lib/api/evmOpenApi.js

@@ -17,16 +17,42 @@ module.exports = {
     /**
      * 查询服务器列表
      */
-    async serverList(http) {
+    async serverList(http, game) {
         let result = null
         try {
-            result = await requestWithFallback(http, '/server/list')
+            result = game === 'ATS'
+                ? await http.get('https://api.114512.xyz/truckersmp/servers')
+                : await requestWithFallback(http, '/server/list')
         } catch {
             return {
                 error: true
             }
         }
 
+        if (game === 'ATS') {
+            const servers = result?.response
+            const isError = result?.error === true || !Array.isArray(servers)
+            return {
+                error: isError,
+                ...(isError ? {} : {
+                    data: servers
+                        .filter(server => server.game === 'ATS')
+                        .map(server => ({
+                            serverName: server.name,
+                            isOnline: server.online ? 1 : 0,
+                            playerCount: server.players,
+                            maxPlayer: server.maxplayers,
+                            queueCount: server.queue || 0,
+                            afkEnable: server.afkenabled ? 1 : 0,
+                            collisionsEnable: server.collisions ? 1 : 0,
+                            policeCarEnable: server.policecarsforplayers ? 1 : 0,
+                            speedLimiterEnable: server.speedlimiter > 0 ? 1 : 0,
+                            playerHistory: []
+                        }))
+                })
+            }
+        }
+
         // 拼接返回数据
         let data = {
             error: result.code !== 200

package/lib/command/tmpServer/tmpServer.js

@@ -3,12 +3,12 @@ const tmpServerImg = require("./tmpServerImg");
 /**
  * 查询服务器列表
  */
-module.exports = async (ctx, cfg) => {
+module.exports = async (ctx, cfg, game) => {
     switch (cfg.tmpServer?.type) {
         case 1:
-            return await tmpServerText(ctx);
+            return await tmpServerText(ctx, game);
         case 2:
-            return await tmpServerImg(ctx);
+            return await tmpServerImg(ctx, game);
         default:
             return '指令配置错误';
     }

package/lib/command/tmpServer/tmpServerImg.js

@@ -2,12 +2,12 @@ const evmOpenApi = require('../../api/evmOpenApi');
 const { resolve } = require("path");
 const common = require("../../util/common");
 const { segment } = require("koishi");
-module.exports = async (ctx) => {
+module.exports = async (ctx, game) => {
     if (!ctx.puppeteer) {
         return '未启用 puppeteer 服务';
     }
     // 查询服务器信息
-    let serverData = await evmOpenApi.serverList(ctx.http);
+    let serverData = await evmOpenApi.serverList(ctx.http, game);
     if (serverData.error) {
         return '查询服务器失败，请稍后重试';
     }
@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
         page = await ctx.puppeteer.page();
         await page.setViewport({ width: 380, height: 1000, deviceScaleFactor: 1.5 });
         await page.goto(`file:///${resolve(__dirname, '../../resource/server-list.html')}`);
-        await page.evaluate(`setData(${JSON.stringify(serverData)})`);
+        await page.evaluate(`setData(${JSON.stringify({ ...serverData, game })})`);
         await common.sleep(100);
         await page.waitForNetworkIdle();
         const element = await page.$("#container");

package/lib/command/tmpServer/tmpServerText.js

@@ -1,7 +1,7 @@
 const evmOpenApi = require('../../api/evmOpenApi');
-module.exports = async (ctx) => {
+module.exports = async (ctx, game) => {
     // 查询服务器信息
-    let serverData = await evmOpenApi.serverList(ctx.http);
+    let serverData = await evmOpenApi.serverList(ctx.http, game);
     if (serverData.error) {
         return '查询服务器失败，请稍后重试';
     }
@@ -14,7 +14,7 @@ module.exports = async (ctx) => {
         }
         message += '服务器: ' + (server.isOnline === 1 ? '🟢' : '⚫') + server.serverName;
         message += `\n玩家人数: ${server.playerCount}/${server.maxPlayer}`;
-        if (server.queue) {
+        if (server.queueCount > 0) {
             message += ` (队列: ${server.queueCount})`;
         }
         // 服务器特性
@@ -25,6 +25,9 @@ module.exports = async (ctx) => {
         if (server.collisionsEnable === 1) {
             characteristicList.push('💥碰撞');
         }
+        if (server.speedLimiterEnable === 1) {
+            characteristicList.push('🐢限速');
+        }
         if (characteristicList && characteristicList.length > 0) {
             message += '\n服务器特性: ' + characteristicList.join(' ');
         }

package/lib/resource/server-list.html

@@ -82,6 +82,13 @@
       text-shadow: 0 0 10px rgba(0, 200, 255, 0.4);
     }
 
+    .header .title span.game-title {
+      margin-left: 4px;
+      color: #e0f0ff;
+      text-shadow: none;
+      letter-spacing: 1px;
+    }
+
     .header-stats {
       margin-left: auto;
       display: flex;
@@ -307,7 +314,7 @@
 
   <div class="header">
     <span class="header-icon">📡</span>
-    <div class="title">TRUCKERS<span>MP</span> 服务器</div>
+    <div class="title">TRUCKERS<span>MP</span> <span class="game-title" id="game-title">服务器</span></div>
     <div class="header-stats">
       <div class="header-stat">
         <div class="header-stat-value" id="total-online">-</div>
@@ -436,6 +443,7 @@ function setData(apiData) {
   const servers = apiData.data;
   const listEl = document.getElementById('server-list');
   listEl.innerHTML = '';
+  document.getElementById('game-title').textContent = apiData.game === 'ATS' ? '美卡服务器' : '欧卡服务器';
 
   // Total online count
   const totalOnline = servers.reduce((sum, s) => sum + (s.playerCount || 0), 0);

package/lib/resource/traffic.html

@@ -256,7 +256,7 @@
         }
       },
       promods: {
-        tileUrl: 'https://ets6-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
+        tileUrl: 'https://ets-map.oss-cn-beijing.aliyuncs.com/promods/05102019/{z}/{x}/{y}.png',
         multipliers: { x: 51953, y: 76024 },
         breakpoints: { uk: { x: -31056.8, y: -5832.867 } },
         bounds: { y: 131072, x: 131072 },

package/package.json

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