koishi-plugin-ets2-tools-tmp 2.2.1 → 2.3.1

package/lib/api/evmOpenApi.js

@@ -1,136 +1,138 @@
-const BASE_API = 'https://da.vtcm.link';
+const BASE_API = 'https://da.vtcm.link'
+
 module.exports = {
     /**
      * 查询服务器列表
      */
     async serverList(http) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/server/list`);
-        }
-        catch {
+            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;
+            data.data = result.data
         }
-        return data;
+
+        return data
     },
     /**
      * 查询在线玩家
      */
     async mapPlayerList(http, serverId, ax, ay, bx, by) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/map/playerList?aAxisX=${ax}&aAxisY=${ay}&bAxisX=${bx}&bAxisY=${by}&serverId=${serverId}`);
-        }
-        catch {
+            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;
+            data.data = result.data
         }
-        return data;
+        return data
     },
     /**
      * 查询玩家信息
      */
     async playerInfo(http, tmpId) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/player/info?tmpId=${tmpId}`);
-        }
-        catch {
+            result = await http.get(`${BASE_API}/player/info?tmpId=${tmpId}`)
+        } catch {
             return {
                 error: true
-            };
+            }
         }
+
         // 拼接返回数据
         let data = {
             code: result.code,
             error: result.code !== 200
-        };
+        }
         if (!data.error) {
-            data.data = result.data;
+            data.data = result.data
         }
-        return data;
+        return data
     },
     /**
      * DLC列表
      */
     async dlcList(http, type) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/dlc/list?type=${type}`);
-        }
-        catch (e) {
+            result = await http.get(`${BASE_API}/dlc/list?type=${type}`)
+        } catch (e) {
             return {
                 error: true
-            };
+            }
         }
+
         // 拼接返回数据
         let data = {
             error: result.code !== 200
-        };
+        }
         if (!data.error) {
-            data.data = result.data;
+            data.data = result.data
         }
-        return data;
+        return data
     },
     /**
      * 玩家里程排行
      */
     async mileageRankingList(http, rankingType, tmpId) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/statistics/mileageRankingList?rankingType=${rankingType}&tmpId=${tmpId || ''}&rankingCount=10`);
-        }
-        catch (e) {
+            result = await http.get(`${BASE_API}/statistics/mileageRankingList?rankingType=${rankingType}&tmpId=${tmpId || ''}&rankingCount=10`)
+        } catch (e) {
             return {
                 error: true
-            };
+            }
         }
+
         // 拼接返回数据
         let data = {
             error: result.code !== 200
-        };
+        }
         if (!data.error) {
-            data.data = result.data;
+            data.data = result.data
         }
-        return data;
+        return data
     },
     /**
      * 查询玩家历史数据
      */
     async mapPlayerHistory(http, tmpId, serverId, startTime, endTime) {
-        let result = null;
+        let result = null
         try {
-            result = await http.get(`${BASE_API}/map/playerHistory?tmpId=${tmpId}&serverId=${serverId}&startTime=${startTime}&endTime=${endTime}`);
-        }
-        catch {
+            result = await http.get(`${BASE_API}/map/playerHistory?tmpId=${tmpId || ''}&serverId=${serverId || ''}&startTime=${startTime || ''}&endTime=${endTime || ''}`)
+        } catch {
             return {
                 error: true
-            };
+            }
         }
+
         // 拼接返回数据
         let data = {
             error: result.code !== 200
-        };
+        }
         if (!data.error) {
-            data.data = result.data;
+            data.data = result.data
         }
-        return data;
+        return data
     }
-};
+}

package/lib/command/tmpFootprint.js

@@ -1,68 +1,109 @@
-const { segment } = require('koishi');
-const dayjs = require('dayjs');
-const { resolve } = require('path');
-const common = require('../util/common');
-const { ServerAliasToId, PromodsIds } = require('../util/constant');
-const evmOpenApi = require('../api/evmOpenApi');
-const guildBind = require('../database/guildBind');
-module.exports = async (ctx, session, serverName) => {
+const { segment } = require('koishi')
+const dayjs = require('dayjs')
+const { resolve } = require('path')
+const common = require('../util/common')
+const { PromodsIds, ServerType } = require('../util/constant')
+const evmOpenApi = require('../api/evmOpenApi')
+const guildBind = require('../database/guildBind')
+
+module.exports = async (ctx, session, serverType, tmpId) => {
     if (!ctx.puppeteer) {
-        return '未启用 puppeteer 服务';
+        return '未启用 puppeteer 服务'
     }
-    // 转换服务器别名到ID
-    let serverId = ServerAliasToId[serverName];
-    if (!serverId) {
-        return '请输入正确的服务器名称 (s1, s2, p, a)';
+
+    if (tmpId && tmpId.startsWith("<at ")) {
+        if (tmpId.startsWith('<at ')) {
+            queryQQ = tmpId.replace('<at ', '');
+        }
+        let id = '';
+        const idStart = queryQQ.indexOf('id="');
+        if (idStart !== -1) {
+            const valueStart = idStart + 4;
+            const valueEnd = queryQQ.indexOf('"', valueStart);
+            if (valueEnd !== -1) {
+                id = queryQQ.substring(valueStart, valueEnd);
+            }
+        }
+        queryQQ = id;
+        let guildBindData = await guildBind.get(ctx.database, session.platform, queryQQ);
+        if (!guildBindData) {
+            return `该用户没有绑定玩家编号`;
+        }
+        tmpId = guildBindData.tmp_id;
     }
-    // 尝试从数据库查询绑定信息
-    let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId);
-    if (!guildBindData) {
-        return `请先绑定玩家编号`;
+
+    if (tmpId && isNaN(tmpId)) {
+        return `请输入正确的玩家编号，或绑定玩家编号`
     }
-    let tmpId = guildBindData.tmp_id;
+
+    // 如果没有传入tmpId，尝试从数据库查询绑定信息
+    if (!tmpId) {
+        let guildBindData = await guildBind.get(ctx.database, session.platform, session.userId)
+        if (!guildBindData) {
+            return `请输入正确的玩家编号，或绑定玩家编号`
+        }
+        tmpId = guildBindData.tmp_id
+    }
+
     // 查询玩家信息
-    let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId);
+    let playerInfo = await evmOpenApi.playerInfo(ctx.http, tmpId)
     if (playerInfo.error && playerInfo.code === 10001) {
-        return '玩家不存在';
-    }
-    else if (playerInfo.error) {
-        return '查询玩家信息失败，请重试';
+        return '玩家不存在'
+    } else if (playerInfo.error) {
+        return '查询玩家信息失败，请重试'
     }
+
     // 查询当日历史位置数据
     const startTime = dayjs().startOf('day').format('YYYY-MM-DD HH:mm:ss');
     const endTime = dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss');
-    let mapPlayerHistory = await evmOpenApi.mapPlayerHistory(ctx.http, tmpId, serverId, startTime, endTime);
-    if (mapPlayerHistory.data.length === 0) {
-        return `当日暂无数据`;
+    let mapPlayerHistory = await evmOpenApi.mapPlayerHistory(ctx.http, tmpId, null, startTime, endTime)
+    if (mapPlayerHistory.error) {
+        return '查询玩家历史位置数据失败，请稍后重试'
     }
+
+    // 过滤非对应服务器数据
+    const promodsIdSet = new Set(PromodsIds)
+    const mapPlayerHistoryArr = mapPlayerHistory.data.filter(item => {
+        if (ServerType.ets === serverType) {
+            return !promodsIdSet.has(item.serverId)
+        } else if (ServerType.promods === serverType) {
+            return promodsIdSet.has(item.serverId)
+        }
+        return false
+    })
+    if (mapPlayerHistoryArr.length === 0) {
+        return `当日暂无数据`
+    }
+
     // 拼接数据
     let data = {
-        mapType: PromodsIds.indexOf(serverId) !== -1 ? 'promods' : 'ets',
+        mapType: ServerType.promods === serverType ? 'promods' : 'ets',
         name: playerInfo.data.name,
         smallAvatarUrl: playerInfo.data.smallAvatarUrl,
         todayMileage: playerInfo.data.todayMileage,
         points: mapPlayerHistory.data
-    };
-    let page;
+    }
+
+    let page
     try {
-        page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 1000, height: 1000 });
-        await page.goto(`file:///${resolve(__dirname, '../resource/footprint.html')}`);
-        await page.evaluate(`init(${JSON.stringify(data)})`);
-        await common.sleep(100);
-        await page.waitForNetworkIdle();
+        page = await ctx.puppeteer.page()
+        await page.setViewport({ width: 1000, height: 1000 })
+        await page.goto(`file:///${resolve(__dirname, '../resource/footprint.html')}`)
+        await page.evaluate(`init(${JSON.stringify(data)})`)
+        await common.sleep(100)
+        await page.waitForNetworkIdle()
         const element = await page.$("#container");
-        return (segment.image(await element.screenshot({
-            encoding: "binary"
-        }), "image/jpg"));
-    }
-    catch (e) {
-        return '渲染异常，请重试';
-    }
-    finally {
+        return (
+            segment.image(await element.screenshot({
+                encoding: "binary"
+            }), "image/jpg")
+        )
+    } catch (e) {
+        return '渲染异常，请重试'
+    } finally {
         if (page) {
-            await page.close();
+            await page.close()
         }
     }
-    return `OK: ` + playerInfo.data.name;
-};
+    return `OK: ` + playerInfo.data.name
+}

package/lib/command/tmpQuery/tmpQueryText.js

@@ -22,6 +22,7 @@ const userGroup = {
  * 查询玩家信息
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
+    const { vtcId } = cfg.tmpActivityService?.api || {};
     if (tmpId && tmpId.startsWith("<at ")) {
         if (tmpId.startsWith('<at ')) {
             queryQQ = tmpId.replace('<at ', '');
@@ -79,26 +80,41 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             }
         }
         message += '\n🚚车队角色: ' + playerInfo.data.vtcRole;
-        if (playerInfo.data.vtcId == 86009) {
+        if (playerInfo.data.vtcId == vtcId) {
             const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
-            if ((platformVersion || "v1").toLowerCase() === "v2") {
-                message += "\n车队平台V2.0暂不支持积分查询";
-            } else {
+            const platform = (platformVersion || "v1").toLowerCase();
             try {
-                if (logOutput) {
-                    ctx.logger.info(`tmpQuery：开始查询TmpID ${tmpId} 的积分`);
+                let rewardPoints = 0;
+                if (platform === "v2") {
+                    const baseUrl = url;
+                    const userInfoUrl = `https://${baseUrl}/members/get?token=${token}&tmpId=${tmpId}`;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的V2.0积分`);
+                        ctx.logger.info(`[TMP_BOT] 请求V2.0用户信息: ${userInfoUrl}`);
+                    }
+                    const userInfoResponse = await ctx.http.get(userInfoUrl);
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] V2.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+                    }
+                    if (userInfoResponse.code === 200 && userInfoResponse.data) {
+                        rewardPoints = userInfoResponse.data.point || 0;
+                    }
+                } else {
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的V1.0积分`);
+                    }
+                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] 请求V1.0用户信息: ${userInfoUrl}`);
+                    }
+                    const userInfoResponse = await ctx.http.post(userInfoUrl);
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] V1.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+                    }
+                    const userList = userInfoResponse.page?.list || [];
+                    const userInfo = userList[0];
+                    rewardPoints = userInfo.rewardPoints || 0;
                 }
-                const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
-                if (logOutput) {
-                    ctx.logger.info(`请求用户信息: ${userInfoUrl}`);
-                }
-                const userInfoResponse = await ctx.http.post(userInfoUrl);
-                if (logOutput) {
-                    ctx.logger.info(`用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-                }
-                const userList = userInfoResponse.page?.list || [];
-                const userInfo = userList[0];
-                const rewardPoints = userInfo.rewardPoints || 0;
                 message += `\n⭐ 当前车队积分: ${rewardPoints}`;
             } catch (error) {
                 ctx.logger.error(`积分查询过程出错: ${error}`);
@@ -106,7 +122,6 @@ module.exports = async (ctx, cfg, session, tmpId) => {
                     message += '查询出错';
                 }
             }
-            }
         }
     }
     message += '\n\n🚫是否封禁: ' + (playerInfo.data.isBan ? '是' : '否');

package/lib/index.js

@@ -5,7 +5,7 @@ exports.apply = apply;
 
 const koishi_1 = require("koishi");
 const model = require('./database/model');
-const { MileageRankingType } = require('./util/constant');
+const { ServerType } = require('./util/constant')
 
 const commands = {
     tmpQuery: require('./command/tmpQuery/tmpQuery'),
@@ -262,10 +262,17 @@ function registerBaseCommands(ctx, cfg) {
     }
 
     if (cfg.commands?.tmpFootprint) {
-        ctx.command('今日足迹 <serverName>')
-            .usage("查询今日足迹")
-            .example("今日足迹 s1")
-            .action(async ({ session }, serverName) => await commands.tmpFootprint(ctx, session, serverName));
+        ctx.command('今日足迹 [tmpId:string]')
+            .usage("查询ETS服务器今日足迹")
+            .example("今日足迹")
+            .example("今日足迹 12345")
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.ets, tmpId));
+
+        ctx.command('今日足迹p [tmpId:string]')
+            .usage("查询Promods服务器今日足迹")
+            .example("今日足迹p")
+            .example("今日足迹p 12345")
+            .action(async ({ session }, tmpId) => await commands.tmpFootprint(ctx, session, ServerType.promods, tmpId));
     }
 
     if (cfg.commands?.resetPassword) {

package/lib/resource/dlc.html

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

package/lib/resource/footprint.html

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

package/lib/resource/position.html

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

package/lib/resource/traffic.html

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

package/lib/util/constant.js

@@ -1,29 +1,36 @@
 module.exports = {
-    /**
-     * 路况信息展示方式
-     */
-    TmpTrafficType: {
-        text: 1, // 文本
-        heatMap: 2, // 热力图
-    },
-    /**
-     * 里程排行榜类型
-     */
-    MileageRankingType: {
-        total: 1,
-        today: 2
-    },
-    /**
-     * 服务器别名映射ID
-     */
-    ServerAliasToId: {
-        's1': 2,
-        's2': 41,
-        'p': 50,
-        'a': 7
-    },
-    /**
-     * P服务器ID集合
-     */
-    PromodsIds: [50, 51]
-};
+  /**
+   * 路况信息展示方式
+   */
+  TmpTrafficType: {
+    text: 1, // 文本
+    heatMap: 2, // 热力图
+  },
+  /**
+   * 里程排行榜类型
+   */
+  MileageRankingType: {
+    total: 1,
+    today: 2
+  },
+  /**
+   * 服务器别名映射ID
+   */
+  ServerAliasToId: {
+    's1': 2,
+    's2': 41,
+    'p': 50,
+    'a': 7
+  },
+  /**
+   * P服务器ID集合
+   */
+  PromodsIds: [50, 51],
+  /**
+   * 服务器类型
+   */
+  ServerType: {
+    ets: 1,
+    promods: 2
+  }
+}

package/package.json

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