koishi-plugin-ets2-tools-tmp 2.4.1 → 2.5.1

package/lib/command/ets-app/resetPassword.js

@@ -234,11 +234,19 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
                     if (!teamId) return "未找到您的信息，请联系管理员";
                 } else {
                     // 有目标编号时验证权限
+                    log(`用户 ${currentUserQQ} 尝试重置车队编号 ${targetTeamId} 的密码`);
                     const userInfo = await getUserInfo({ teamId: targetTeamId });
-                    if (!isAdmin && userInfo.qq !== currentUserQQ) {
+                    
+                    if (!isAdmin && String(userInfo.qq) !== String(currentUserQQ)) {
                         return "您没有权限重置其他成员的密码，请联系管理员";
                     }
+                    
                     teamId = targetTeamId;
+                    if (isAdmin) {
+                        log(`管理员 ${currentUserQQ} 重置车队编号 ${targetTeamId} 的密码`);
+                    } else {
+                        log(`验证通过，车队编号 ${targetTeamId} 对应的QQ ${userInfo.qq} 与当前用户QQ ${currentUserQQ} 一致`);
+                    }
                 }
             } else {
                 // 非私聊场景（仅管理员可操作）
@@ -246,7 +254,7 @@ module.exports = async (ctx, cfg, session, targetTeamId, password) => {
                 
                 teamId = targetTeamId;
                 log(`管理员 ${currentUserQQ} 重置车队: ${teamId} 密码`);
-                await getUserInfo({ teamId }); // 验证车队存在性
+                await getUserInfo({ teamId });
             }
         }
 

package/lib/command/tmpPosition.js

@@ -44,7 +44,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     // 查询玩家信息
     let playerInfo = await truckersMpApi.player(ctx.http, tmpId)
     if (playerInfo.error) {
-      return '查询玩家信息失败，请重试'
+      return '查询玩家位置信息失败，请重试'
     }
 
     // 查询线上信息

package/lib/command/tmpVersionCheck.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VersionCheckService = void 0;
+
+const koishi_1 = require("koishi");
+
+class VersionCheckService {
+    constructor(ctx, config) {
+        this.ctx = ctx;
+        this.cfg = config;
+        this.currentVersion = null;
+        this.timers = [];
+        this.logger = this.initLogger();
+    }
+
+    initLogger() {
+        return {
+            debug: (message, ...args) => {
+                if (this.cfg.debugMode) {
+                    this.ctx.logger.debug(`[TMP-BOT DEBUG] ${message}`, ...args);
+                }
+            },
+            info: (message, ...args) => {
+                this.ctx.logger.info(`[TMP-BOT] ${message}`, ...args);
+            },
+            warn: (message, ...args) => {
+                this.ctx.logger.warn(`[TMP-BOT WARN] ${message}`, ...args);
+            },
+            error: (message, ...args) => {
+                this.ctx.logger.error(`[TMP-BOT ERROR] ${message}`, ...args);
+            },
+            api: (message, data) => {
+                if (this.cfg.debug?.logApiResponses) {
+                    this.ctx.logger.info(`[TMP-BOT API] ${message}`, data ? JSON.stringify(data, null, 2) : "");
+                }
+            }
+        };
+    }
+
+    start() {
+        this.setupVersionCheck();
+        this.ctx.on("dispose", () => this.cleanup());
+    }
+
+    setupVersionCheck() {
+        this.logger.info("设置TMP版本检查服务");
+        
+        this.logger.debug("启动时立即检查版本");
+        this.checkVersion();
+
+        const checkInterval = this.cfg.checkInterval * 60 * 1000;
+        this.logger.info(`设置定时版本检查，间隔: ${this.cfg.checkInterval} 分钟`);
+        
+        const intervalTimer = setInterval(async () => {
+            this.logger.debug("执行定时版本检查");
+            await this.checkVersion();
+        }, checkInterval);
+        this.timers.push(intervalTimer);
+    }
+
+    async checkVersion() {
+        try {
+            const apiUrl = "https://api.truckersmp.com/v2/version";
+            this.logger.api(`请求TMP版本API: ${apiUrl}`);
+
+            const startTime = Date.now();
+            const response = await this.ctx.http.get(apiUrl, { timeout: 10000 });
+            const duration = Date.now() - startTime;
+            this.logger.api(`TMP版本API响应耗时: ${duration}ms`);
+
+            if (response && response.name) {
+                const versionInfo = {
+                    name: response.name,
+                    time: this.convertToUTC8(response.time),
+                    supported_game_version: response.supported_game_version,
+                    supported_ats_game_version: response.supported_ats_game_version
+                };
+
+                this.logger.info(`获取到TMP版本信息: ${versionInfo.name} (${versionInfo.time})`);
+
+                if (this.currentVersion && this.currentVersion.name !== versionInfo.name) {
+                    this.logger.info(`检测到版本更新: ${this.currentVersion.name} -> ${versionInfo.name}`);
+                    await this.sendVersionUpdateNotification(this.currentVersion, versionInfo);
+                }
+
+                this.currentVersion = versionInfo;
+            } else {
+                this.logger.error("TMP版本API返回的数据格式不正确");
+            }
+        } catch (error) {
+            this.logger.error("检查TMP版本失败:", error.message);
+        }
+    }
+
+    convertToUTC8(utcTimeString) {
+        try {
+            const utcDate = new Date(utcTimeString);
+            const utc8Date = new Date(utcDate.getTime() + 8 * 60 * 60 * 1000);
+            const year = utc8Date.getFullYear();
+            const month = String(utc8Date.getMonth() + 1).padStart(2, '0');
+            const day = String(utc8Date.getDate()).padStart(2, '0');
+            const hours = String(utc8Date.getHours()).padStart(2, '0');
+            const minutes = String(utc8Date.getMinutes()).padStart(2, '0');
+            const seconds = String(utc8Date.getSeconds()).padStart(2, '0');
+            return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        } catch (error) {
+            this.logger.error("转换UTC时间失败:", error.message);
+            return utcTimeString;
+        }
+    }
+
+    async sendVersionUpdateNotification(oldVersion, newVersion) {
+        const message = `📢 TMP版本更新通知
+
+旧版本: ${oldVersion.name}
+新版本: ${newVersion.name}
+
+更新时间: ${newVersion.time}（UTC+8）
+欧卡支持版本: ${newVersion.supported_game_version}
+美卡支持版本: ${newVersion.supported_ats_game_version}`;
+
+        this.logger.info(`发送版本更新通知到 ${this.cfg.groups.length} 个群组`);
+
+        for (const groupId of this.cfg.groups) {
+            try {
+                await this.sendToGroup(groupId, message);
+                this.logger.info(`已发送版本更新通知到群组 ${groupId}`);
+            } catch (error) {
+                this.logger.error(`发送版本更新通知到群组 ${groupId} 失败:`, error.message);
+            }
+        }
+    }
+
+    async sendToGroup(groupId, message) {
+        const onebotBots = this.ctx.bots.filter((bot) => {
+            return bot.platform === "onebot";
+        });
+
+        if (onebotBots.length === 0) {
+            throw new Error("请启用onebot适配器以发送群消息");
+        }
+
+        let lastError = null;
+        this.logger.debug(`尝试通过 ${onebotBots.length} 个onebot适配器发送消息到群组 ${groupId}`);
+
+        for (const bot of onebotBots) {
+            try {
+                await bot.sendMessage(groupId, message);
+                this.logger.debug(`已通过 ${bot.platform} 适配器发送消息到群组 ${groupId}`);
+                return;
+            } catch (error) {
+                lastError = error;
+                this.logger.warn(`通过 ${bot.platform} 适配器发送消息失败: ${error.message}`);
+            }
+        }
+
+        throw lastError || new Error(`所有onebot适配器都无法发送消息到群组 ${groupId}`);
+    }
+
+    cleanup() {
+        this.logger.debug("插件卸载，开始清理版本检查服务资源");
+        this.timers.forEach((timer) => {
+            clearTimeout(timer);
+            clearInterval(timer);
+        });
+        this.timers.length = 0;
+    }
+}
+
+exports.VersionCheckService = VersionCheckService;

package/lib/index.js

@@ -77,7 +77,8 @@ exports.Config = koishi_1.Schema.intersect([
             tmpFootprint: koishi_1.Schema.boolean().default(true).description('是否启用今日足迹'),
             mainSettings: koishi_1.Schema.boolean().default(false).description('是否启用车队平台积分查询功能'),
             resetPassword: koishi_1.Schema.boolean().default(false).description('是否启用车队平台重置密码功能'),
-            tmpActivityService: koishi_1.Schema.boolean().default(false).description('是否启用车队活动查询')
+            tmpActivityService: koishi_1.Schema.boolean().default(false).description('是否启用车队活动查询'),
+            tmpVersionCheck: koishi_1.Schema.boolean().default(false).description('是否启用TMP版本更新查询')
         }).description('指令配置'),
         baiduTranslate: koishi_1.Schema.object({
             enable: koishi_1.Schema.boolean().default(false).description('是否启用百度翻译'),
@@ -98,6 +99,10 @@ exports.Config = koishi_1.Schema.intersect([
                 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([])
+        }).description("TMP版本更新查询配置"),
         mainSettings: koishi_1.Schema.object({
             settings: koishi_1.Schema.object({
                 Name: koishi_1.Schema.string().description("车队名称"),
@@ -189,7 +194,9 @@ function logDisabledCommands(ctx, cfg) {
         { key: 'tmpVtc', label: 'vtc查询' },
         { key: 'tmpFootprint', label: '足迹查询' },
         { key: 'resetPassword', label: '重置密码' },
-        { key: 'mainSettings', label: '查询积分' }
+        { key: 'mainSettings', label: '查询积分' },
+        { key: 'tmpActivityService', label: '车队活动查询' },
+        { key: 'tmpVersionCheck', label: 'TMP版本更新查询' }
     ];
     for (const item of commandList) {
         if (commandFlags[item.key] !== false) enabled.push(item.label);
@@ -361,6 +368,20 @@ function apply(ctx, cfg) {
     } else if (cfg.debugMode) {
         ctx.logger.debug("[TMP-BOT] 活动查询功能已禁用");
     }
+
+    if (cfg.commands?.tmpVersionCheck) {
+        const { VersionCheckService } = require('./command/tmpVersionCheck');
+        const versionCheckConfig = {
+            checkInterval: cfg.tmpVersionCheck.checkInterval,
+            groups: cfg.tmpVersionCheck.groups,
+            debugMode: cfg.debugMode,
+            debug: cfg.tmpActivityService?.debug
+        };
+        const versionCheckService = new VersionCheckService(ctx, versionCheckConfig);
+        versionCheckService.start();
+    } else if (cfg.debugMode) {
+        ctx.logger.debug("[TMP-BOT] TMP版本更新查询功能已禁用");
+    }
 }
 __name(apply, "apply");
 0 && (module.exports = {

package/lib/resource/position.html

@@ -14,14 +14,14 @@
       font-family: "微软雅黑", serif;
     }
     #container {
-      width: 500px;
-      height: 320px;
+      width: 720px;
+      height: 500px;
       position: relative;
     }
     .map {
       width: 100%;
       height: 100%;
-      background-color: #5d5d5d;
+      background: linear-gradient(135deg, #1f2f54, #0f2c2a);
     }
     .user-info-box {
       width: 100%;
@@ -29,7 +29,7 @@
       position: absolute;
       bottom: 0;
       z-index: 999;
-      background-color: rgba(100, 100, 100, 0.4);
+      background-color: rgba(0, 0, 0, 0.4);
       backdrop-filter: blur(6px);
       display: flex;
       flex-direction: row;
@@ -44,23 +44,23 @@
     }
     .user {
       height: 56px;
-      width: 220px;
+      flex: 1;
+      margin-left: 10px;
+      box-sizing: border-box;
+      font-size: 16px;
+      color: #eeeeee;
       display: flex;
       flex-direction: column;
       justify-content: center;
     }
-    .user {
-      font-size: 16px;
-      color: #eeeeee;
-      margin-left: 10px;
-      box-sizing: border-box;
-    }
     .user .server-name-box {
       display: flex;
       align-items: center;
       margin-top: 4px;
+      opacity: 0.85;
     }
     .user .username {
+      font-weight: 600;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -75,7 +75,7 @@
       box-sizing: border-box;
     }
     .location-box {
-      flex-grow: 1;
+      flex: 1;
       color: #eeeeee;
       font-size: 16px;
       height: 56px;
@@ -88,11 +88,17 @@
       justify-content: center;
     }
     .location-box>* {
-      width: 174px;
+      max-width: 100%;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
     }
+    .location-box .country {
+      font-weight: 600;
+    }
+    .location-box .real-name {
+      opacity: 0.85;
+    }
   </style>
 </head>
 <body>

package/package.json

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

package/readme.md

@@ -14,6 +14,7 @@
 - **游戏资源查询**：地图DLC价格、TMP版本信息一键获取
 - **排行与积分**：总里程/今日里程排行榜、车队平台积分查询
 - **VTC与规则**：支持指定VTC ID查询，提供TruckersMP官方规则快速链接
+- **TMP版本更新通知**：支持TMP版本更新通知
 
 ### 🚚 车队活动管理
 - **双数据源支持**：同时对接车队平台和TruckersMP API获取活动数据
@@ -114,6 +115,7 @@
 ## 📝 使用方法
 
 ### 自动功能
+- TMP更新时通知
 - 每日凌晨2点自动重置活动数据
 - 按配置时间自动检查活动数据与档位状态
 - 向管理群发送档位上传状态提醒