koishi-plugin-ets2-tools-tmp 2.5.91 → 2.6.0

package/lib/command/tmpDlcMap.js

@@ -11,7 +11,7 @@ module.exports = async (ctx, session) => {
     let page;
     try {
         page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 1000, height: 1000 });
+        await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 });
         await page.goto(`file:///${resolve(__dirname, '../resource/dlc.html')}`);
         await page.evaluate(`setData(${JSON.stringify(dlcData.data)})`);
         await page.waitForNetworkIdle();

package/lib/command/tmpFootprint.js

@@ -122,7 +122,7 @@ module.exports = async (ctx, session, serverType, tmpId, date) => {
   let page
   try {
     page = await ctx.puppeteer.page()
-    await page.setViewport({ width: 1000, height: 1000 })
+    await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 })
     await page.goto(`file:///${resolve(__dirname, '../resource/footprint.html')}`)
     await page.evaluate(`init(${JSON.stringify(data)})`)
     await common.sleep(100)

package/lib/command/tmpMileageRanking.js

@@ -33,7 +33,7 @@ module.exports = async (ctx, session, rankingType) => {
     let page;
     try {
         page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 1000, height: 1000 });
+        await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 });
         await page.goto(`file:///${resolve(__dirname, '../resource/mileage-leaderboard.html')}`);
         await page.evaluate(`setData(${JSON.stringify(data)})`);
         await page.waitForNetworkIdle();

package/lib/command/tmpPosition.js

@@ -98,7 +98,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     let page
     try {
       page = await ctx.puppeteer.page()
-      await page.setViewport({ width: 1000, height: 1000 })
+      await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 })
       await page.goto(`file:///${resolve(__dirname, '../resource/position.html')}`)
       await page.evaluate(`setData(${JSON.stringify(data)})`)
       await common.sleep(100)

package/lib/command/tmpServer/tmpServer.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(ctx: any, cfg: any): Promise<string | import("koishi").Element>;
+export = _exports;

package/lib/command/tmpServer/tmpServer.js

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

package/lib/command/tmpServer/tmpServerImg.d.ts

@@ -0,0 +1,3 @@
+declare function _exports(ctx: any): Promise<segment | "渲染异常，请重试" | "未启用 puppeteer 服务" | "查询服务器失败，请稍后重试">;
+export = _exports;
+import { segment } from "@koishijs/core";

package/lib/command/tmpServer/tmpServerImg.js

@@ -0,0 +1,35 @@
+const evmOpenApi = require('../../api/evmOpenApi');
+const { resolve } = require("path");
+const common = require("../../util/common");
+const { segment } = require("koishi");
+module.exports = async (ctx) => {
+    if (!ctx.puppeteer) {
+        return '未启用 puppeteer 服务';
+    }
+    // 查询服务器信息
+    let serverData = await evmOpenApi.serverList(ctx.http);
+    if (serverData.error) {
+        return '查询服务器失败，请稍后重试';
+    }
+    let page;
+    try {
+        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 common.sleep(100);
+        await page.waitForNetworkIdle();
+        const element = await page.$("#container");
+        return (segment.image(await element.screenshot({
+            encoding: "binary"
+        }), "image/jpg"));
+    }
+    catch {
+        return '渲染异常，请重试';
+    }
+    finally {
+        if (page) {
+            await page.close();
+        }
+    }
+};

package/lib/command/tmpServer/tmpServerText.d.ts

@@ -0,0 +1,2 @@
+declare function _exports(ctx: any): Promise<string>;
+export = _exports;

package/lib/command/tmpServer/tmpServerText.js

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

package/lib/command/tmpTraffic/tmpTrafficMap.js

@@ -102,7 +102,7 @@ module.exports = async (ctx, cfg, serverName) => {
             let page;
             try {
                 page = await ctx.puppeteer.page();
-                await page.setViewport({ width: 1000, height: 1000 });
+                await page.setViewport({ width: 1000, height: 1000, deviceScaleFactor: 2 });
                 await page.goto(`file:///${resolve(__dirname, '../../resource/traffic.html')}`);
                 await page.evaluate(`setData(${JSON.stringify(data)})`);
                 await common.sleep(100);

package/lib/index.js

@@ -10,7 +10,7 @@ const { MileageRankingType } = require('./util/constant');
 
 const commands = {
     tmpQuery: require('./command/tmpQuery/tmpQuery'),
-    tmpServer: require('./command/tmpServer'),
+    tmpServer: require('./command/tmpServer/tmpServer'),
     tmpBind: require('./command/tmpBind'),
     tmpTraffic: require('./command/tmpTraffic/tmpTraffic'),
     tmpPosition: require('./command/tmpPosition'),
@@ -101,6 +101,13 @@ exports.Config = koishi_1.Schema.intersect([
                 koishi_1.Schema.const(2).description('热力图')
             ]).default(1).description('路况信息展示方式'),
         }).description('路况查询配置'),
+        tmpServer: koishi_1.Schema.object({
+            type: koishi_1.Schema.union([
+                koishi_1.Schema.const(1).description('文字'),
+                koishi_1.Schema.const(2).description('图片')
+            ]).default(1).description('服务器信息展示方式'),
+        }).description('服务器查询配置'),
+
         tmpVersionCheck: koishi_1.Schema.object({
             checkInterval: koishi_1.Schema.number().description("版本检查间隔（分钟）").default(30),
             groups: koishi_1.Schema.array(koishi_1.Schema.string()).role("table").description("接收版本更新通知的群组ID列表").default([])

package/lib/resource/dlc.html

@@ -112,4 +112,4 @@
     }
   </script>
 </body>
-</html>
+</html>

package/lib/resource/footprint.html

@@ -150,7 +150,7 @@
 
               let dist = calculateDistance(prev, curr);
               dist = dist * 19;
-              const isDistJump = dist > 50000; // > 50km
+              const isDistJump = dist > 30000; // > 30km
 
               let timeDiff = 0;
               try {
@@ -238,4 +238,4 @@
     }
   </script>
 </body>
-</html>
+</html>

package/lib/resource/position.html

@@ -226,4 +226,4 @@
     }
   </script>
 </body>
-</html>
+</html>

package/lib/resource/server-list.html

@@ -0,0 +1,298 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="UTF-8">
+  <title>Server List</title>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+      box-sizing: border-box;
+    }
+    body {
+      font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif;
+      background-color: #0b1120;
+    }
+    #container {
+      width: 380px;
+      background: linear-gradient(180deg, #0f1a2e 0%, #0b1120 100%);
+      padding: 0 0 6px 0;
+    }
+
+    /* Header */
+    .header {
+      height: 42px;
+      background-color: rgba(0, 0, 0, 0.3);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      box-shadow: 0 2px 12px rgba(0, 0, 0, 0.4);
+    }
+    .header .title {
+      color: #8bafff;
+      font-size: 14px;
+      font-weight: 600;
+      letter-spacing: 1px;
+    }
+
+    /* Server list */
+    .server-list {
+      padding: 6px 10px 0 10px;
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+    }
+
+    /* Server card */
+    .server-card {
+      background: rgba(22, 33, 55, 0.8);
+      border-radius: 6px;
+      border: 1px solid rgba(139, 175, 255, 0.08);
+      overflow: hidden;
+    }
+
+    /* Card info */
+    .server-info {
+      padding: 7px 12px 5px 12px;
+    }
+    .server-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .server-left {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+      flex: 1;
+      min-width: 0;
+    }
+    .status-indicator {
+      width: 6px;
+      height: 6px;
+      border-radius: 50%;
+      flex-shrink: 0;
+    }
+    .status-indicator.online {
+      background-color: #34d058;
+      box-shadow: 0 0 5px rgba(52, 208, 88, 0.5);
+    }
+    .status-indicator.offline {
+      background-color: #484f58;
+    }
+    .server-name {
+      color: #e6edf3;
+      font-size: 13px;
+      font-weight: 600;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 200px;
+    }
+    .player-count {
+      color: #6e7a8a;
+      font-size: 11px;
+      white-space: nowrap;
+      flex-shrink: 0;
+      margin-left: 6px;
+    }
+    .player-count .num {
+      color: #c9d1d9;
+      font-weight: 700;
+      font-size: 12px;
+    }
+
+    /* Features row */
+    .features {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      margin-top: 3px;
+    }
+    .feature {
+      font-size: 10px;
+      color: #5a6572;
+      white-space: nowrap;
+    }
+
+    /* Queue badge */
+    .queue-badge {
+      color: #f0883e;
+      font-size: 10px;
+      margin-left: 6px;
+    }
+
+    /* Chart area */
+    .chart-area {
+      position: relative;
+      height: 38px;
+    }
+    .chart-area svg {
+      display: block;
+      width: 100%;
+      height: 100%;
+    }
+
+  </style>
+</head>
+<body>
+<div id="container">
+  <div class="header">
+    <div class="title">TruckersMP 服务器状态</div>
+  </div>
+
+  <div class="server-list" id="server-list"></div>
+
+</div>
+
+<script>
+/**
+ * 构建 SVG 面积折线图
+ * maxPlayer 的 50% 作为余量，上限不超过 maxPlayer
+ */
+function buildChartSVG(data, width, height, maxPlayer) {
+  const padTop = 2;
+  const padBottom = 0;
+  const chartW = width;
+  const chartH = height - padTop - padBottom;
+
+  const dataMax = Math.max(...data, 1);
+  const max = Math.min(maxPlayer, maxPlayer * 0.12 + dataMax);
+  const step = chartW / (data.length - 1);
+
+  const points = data.map((v, i) => {
+    const x = i * step;
+    const y = padTop + chartH - (v / max) * chartH;
+    return [x, y];
+  });
+
+  const lineD = points.map((p, i) => (i === 0 ? `M${p[0]},${p[1]}` : `L${p[0]},${p[1]}`)).join(' ');
+  const areaD = lineD
+    + ` L${points[points.length - 1][0]},${padTop + chartH}`
+    + ` L${points[0][0]},${padTop + chartH} Z`;
+
+  const gid = 'g' + Math.random().toString(36).slice(2, 8);
+
+  return `
+    <svg viewBox="0 0 ${width} ${height}" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg">
+      <defs>
+        <linearGradient id="${gid}" x1="0" y1="0" x2="0" y2="1">
+          <stop offset="0%" stop-color="rgba(79,139,255,0.4)"/>
+          <stop offset="100%" stop-color="rgba(79,139,255,0.02)"/>
+        </linearGradient>
+      </defs>
+      <path d="${areaD}" fill="url(#${gid})"/>
+      <path d="${lineD}" fill="none" stroke="#4f8bff" stroke-width="1.5" stroke-linejoin="round"/>
+    </svg>`;
+}
+
+/**
+ * 将 playerHistory 标准化为 288 个点（24h，每5分钟一个点）
+ * 缺失的时间段填充为 0
+ * @param {Array<{updateTime: string, playerCount: number}>} playerHistory
+ */
+function normalizeHistory(playerHistory) {
+  const SLOT_COUNT = 288;
+  const SLOT_MS = 300000;
+
+  if (!playerHistory || playerHistory.length === 0) return [];
+
+  // API 返回的是北京时间(UTC+8)，用 Date.UTC 生成时间戳再减去8小时偏移
+  function parseTime(str) {
+    const [datePart, timePart] = str.trim().replace('T', ' ').split(' ');
+    const [y, m, d] = datePart.split('-').map(Number);
+    const parts = timePart.split(':').map(Number);
+    const h = parts[0] || 0, min = parts[1] || 0;
+    return Date.UTC(y, m - 1, d, h, min, 0) - 8 * 3600000;
+  }
+
+  const now = Date.now();
+  const currentSlot = Math.floor(now / SLOT_MS) * SLOT_MS;
+
+  const dataMap = {};
+  for (const item of playerHistory) {
+    const ts = parseTime(item.updateTime);
+    if (isNaN(ts)) continue;
+    const slot = Math.floor(ts / SLOT_MS) * SLOT_MS;
+    dataMap[slot] = item.playerCount;
+  }
+
+  const result = [];
+  for (let i = 0; i < SLOT_COUNT; i++) {
+    const slotTime = currentSlot - (SLOT_COUNT - 1 - i) * SLOT_MS;
+    result.push(dataMap[slotTime] !== undefined ? dataMap[slotTime] : 0);
+  }
+
+  return result;
+}
+
+/**
+ * 渲染一个服务器卡片
+ */
+function createServerCard(server) {
+  const card = document.createElement('div');
+  card.className = 'server-card';
+
+  // 只展示存在的特性
+  let featuresHTML = '';
+  if (server.collisionsEnable === 1) {
+    featuresHTML += '<span class="feature">💥 碰撞</span>';
+  }
+  if (server.afkEnable === 0) {
+    featuresHTML += '<span class="feature">💤 挂机</span>';
+  }
+  if (server.policeCarEnable === 1) {
+    featuresHTML += '<span class="feature">🚓 警车</span>';
+  }
+  if (server.speedLimiterEnable === 1) {
+    featuresHTML += '<span class="feature">🐢 限速</span>';
+  }
+
+  // 队列
+  let queueText = '';
+  if (server.queueCount > 0) {
+    queueText = `<span class="queue-badge">队列 ${server.queueCount}</span>`;
+  }
+
+  card.innerHTML = `
+    <div class="server-info">
+      <div class="server-row">
+        <div class="server-left">
+          <span class="status-indicator ${server.isOnline === 1 ? 'online' : 'offline'}"></span>
+          <span class="server-name">${server.serverName}</span>
+        </div>
+        <span class="player-count"><span class="num">${server.playerCount}</span> / ${server.maxPlayer}${queueText}</span>
+      </div>
+      ${featuresHTML ? '<div class="features">' + featuresHTML + '</div>' : ''}
+    </div>
+    <div class="chart-area">
+      ${server.isOnline === 1 && server.playerHistory && server.playerHistory.length > 0
+        ? (() => {
+            const normalized = normalizeHistory(server.playerHistory);
+            return normalized.length > 0 ? buildChartSVG(normalized, 380, 38, server.maxPlayer) : '';
+          })()
+        : ''}
+    </div>`;
+
+  return card;
+}
+
+/**
+ * 主渲染函数
+ */
+function setData(apiData) {
+  if (!apiData || !apiData.data) return;
+
+  const servers = apiData.data;
+  const listEl = document.getElementById('server-list');
+
+  listEl.innerHTML = '';
+
+  servers.forEach(server => {
+    listEl.appendChild(createServerCard(server));
+  });
+}
+
+</script>
+</body>
+</html>

package/lib/resource/traffic.html

@@ -204,4 +204,4 @@
     }
   </script>
 </body>
-</html>
+</html>

package/package.json

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