koishi-plugin-tmp-bot 1.14.0 → 1.14.2

package/lib/api/evmOpenApi.js

@@ -0,0 +1,49 @@
+const BASE_API = 'https://open-api.vtcm.link'
+
+module.exports = {
+  /**
+   * 查询服务器列表
+   */
+  async serverList (http) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/server/list`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: result.code !== 200
+    }
+    if (!data.error) {
+      data.data = result.data
+    }
+
+    return data
+  },
+  /**
+   * 查询在线玩家
+   */
+  async mapPlayerList(http, serverId, ax, ay, bx, by) {
+    let result = null
+    try {
+      result = await http.get(`${BASE_API}/map/playerList?aAxisX=${ax}&aAxisY=${ay}&bAxisX=${bx}&bAxisY=${by}&serverId=${serverId}`)
+    } catch {
+      return {
+        error: true
+      }
+    }
+
+    // 拼接返回数据
+    let data = {
+      error: result.code !== 200
+    }
+    if (!data.error) {
+      data.data = result.data
+    }
+    return data
+  }
+}

package/lib/command/tmpPosition.js

@@ -3,7 +3,7 @@ const { resolve } = require('path')
 const guildBind = require('../database/guildBind')
 const truckyAppApi = require('../api/truckyAppApi')
 const truckersMpApi = require('../api/truckersMpApi')
-const truckersMpMapApi = require('../api/truckersMpMapApi')
+const evmOpenApi = require('../api/evmOpenApi')
 const baiduTranslate = require('../util/baiduTranslate')
 const common = require('../util/common')
 
@@ -41,7 +41,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     }
 
     // 查询周边玩家，并处理数据
-    let areaPlayersData = await truckersMpMapApi.area(ctx.http, playerMapInfo.data.server,
+    let areaPlayersData = await evmOpenApi.mapPlayerList(ctx.http, playerMapInfo.data.server,
         playerMapInfo.data.x - 4000,
         playerMapInfo.data.y + 2500,
         playerMapInfo.data.x + 4000,
@@ -50,16 +50,16 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     if (!areaPlayersData.error) {
       areaPlayerList = areaPlayersData.data
       let index = areaPlayerList.findIndex((player) => {
-        return player.MpId.toString() === tmpId.toString()
+        return player.tmpId.toString() === tmpId.toString()
       })
       if (index !== -1) {
         areaPlayerList.splice(index, 1)
       }
     }
     areaPlayerList.push({
-      X: playerMapInfo.data.x,
-      Y: playerMapInfo.data.y,
-      MpId: tmpId
+      axisX: playerMapInfo.data.x,
+      axisY: playerMapInfo.data.y,
+      tmpId
     })
 
     // promods服ID集合

package/lib/command/tmpServer.js

@@ -1,34 +1,32 @@
 const truckersMpApi = require('../api/truckersMpApi')
+const evmOpenApi = require('../api/evmOpenApi')
 
-module.exports = async (ctx, cfg, game) => {
+module.exports = async (ctx) => {
   // 查询服务器信息
-  let serverData = await truckersMpApi.servers(ctx.http)
+  let serverData = await evmOpenApi.serverList(ctx.http)
   if (serverData.error) {
     return '查询服务器失败，请稍后重试'
   }
 
-  // 过滤服务器
-  let etsServerList = serverData.data.filter(server => server.game === game)
-
   // 构建消息
   let message = ''
-  for (let server of etsServerList) {
+  for (let server of serverData.data) {
     // 如果前面有内容，换行
     if (message) {
       message += '\n\n'
     }
 
-    message += '服务器: ' + ( server.online ? '🟢' : '⚫' ) + server.name
-    message += `\n玩家人数: ${server.players}/${server.maxplayers}`
+    message += '服务器: ' + ( server.isOnline === 1 ? '🟢' : '⚫' ) + server.serverName
+    message += `\n玩家人数: ${server.playerCount}/${server.maxPlayer}`
     if (server.queue) {
-      message += ` (队列: ${server.queue})`
+      message += ` (队列: ${server.queueCount})`
     }
     // 服务器特性
     let characteristicList = []
-    if (!server.afkenabled) {
+    if (!(server.afkEnable === 1)) {
       characteristicList.push('⏱挂机')
     }
-    if (server.collisions) {
+    if (server.collisionsEnable === 1) {
       characteristicList.push('💥碰撞')
     }
     if (characteristicList && characteristicList.length > 0) {

package/lib/command/tmpTraffic/tmpTrafficMap.js

@@ -1,5 +1,5 @@
 const truckyAppApi = require('../../api/truckyAppApi')
-const truckersMpMapApi = require('../../api/truckersMpMapApi')
+const evmOpenApi = require('../../api/evmOpenApi')
 const baiduTranslate = require('../../util/baiduTranslate')
 const {resolve} = require("path");
 const common = require("../../util/common");
@@ -87,13 +87,13 @@ module.exports = async (ctx, cfg, serverName) => {
   }
 
   // 查询地图玩家数据
-  let mapData = await truckersMpMapApi.area(ctx.http, serverInfo.serverId, serverInfo.bounds[0][0], serverInfo.bounds[0][1], serverInfo.bounds[1][0], serverInfo.bounds[1][1])
+  let mapData = await evmOpenApi.mapPlayerList(ctx.http, serverInfo.serverId, serverInfo.bounds[0][0], serverInfo.bounds[0][1], serverInfo.bounds[1][0], serverInfo.bounds[1][1])
 
   // 构建路况数据
   let data = {
     mapType: serverInfo.mapType,
     trafficList: [],
-    playerCoordinateList: mapData.error && mapData.data ? [] : mapData.data.map(item => [item.X, item.Y])
+    playerCoordinateList: mapData.error && mapData.data ? [] : mapData.data.map(item => [item.axisX, item.axisY])
   }
   for (const traffic of trafficData.data) {
     data.trafficList.push({

package/lib/index.js

@@ -35,8 +35,7 @@ function apply(ctx, cfg) {
     model(ctx);
     // 注册指令
     ctx.command('tmpquery <tmpId>').action(async ({ session }, tmpId) => await tmpQuery(ctx, cfg, session, tmpId));
-    ctx.command('tmpserverats').action(async () => await tmpServer(ctx, cfg, 'ATS'));
-    ctx.command('tmpserverets').action(async () => await tmpServer(ctx, cfg, 'ETS2'));
+    ctx.command('tmpserverets').action(async () => await tmpServer(ctx));
     ctx.command('tmpbind <tmpId>').action(async ({ session }, tmpId) => await tmpBind(ctx, cfg, session, tmpId));
     ctx.command('tmptraffic <serverName>').action(async ({ session }, serverName) => await tmpTraffic(ctx, cfg, serverName));
     ctx.command('tmpposition <tmpId>').action(async ({ session }, tmpId) => await tmpPosition(ctx, cfg, session, tmpId));

package/lib/resource/position.html

@@ -205,13 +205,13 @@
       document.getElementsByClassName('real-name')[0].innerText = data.realName
 
       for (let player of data.playerList) {
-        L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.X, player.Y), 8), {
+        L.circleMarker(map.unproject(mapConfig[data.mapType].calculateMapCoordinate(player.axisX, player.axisY), 8), {
           color: '#2f2f2f',       // 标记点边框颜色
           weight: 2,              // 标记点边框大小
-          fillColor: data.currentPlayerId.toString() === player.MpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
+          fillColor: data.currentPlayerId.toString() === player.tmpId.toString() ? '#1cb715' : '#158cfb',   // 标记点填充颜色
           fillOpacity: 1,         // 标记点填充不透明度（0到1之间的值）
           radius: 5,              // 标记点半径（以像素为单位）
-          zIndex: data.currentPlayerId.toString() === player.MpId.toString() ? 1000 : undefined
+          zIndex: data.currentPlayerId.toString() === player.tmpId.toString() ? 1000 : undefined
         }).addTo(map);
       }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-tmp-bot",
   "description": "欧洲卡车模拟2 TMP查询插件，不会部署的可以直接使用此机器人->QQ:3523283907",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://github.com/79887143/koishi-plugin-tmp-bot",