koishi-plugin-ets2-tools-tmp 3.2.0 → 3.3.0

package/lib/api/evmOpenApi.js

@@ -1,4 +1,4 @@
-const BASE_APIS = ['https://evmapi.114512.xyz']
+const BASE_APIS = ['https://evmapi.cxnnn.cn']
 
 async function requestWithFallback(http, path) {
     let lastError = null
@@ -21,8 +21,8 @@ module.exports = {
         let result = null
         try {
             result = game === 'ATS'
-                ? await http.get('https://api.114512.xyz/truckersmp/servers')
-                : await requestWithFallback(http, '/server/list')
+                ? await http.get(`${BASE_APIS[0]}/proxy/truckersmp/servers`)
+                : await requestWithFallback(http, `/server/list`)
         } catch {
             return {
                 error: true
@@ -195,5 +195,27 @@ module.exports = {
             data.data = result.data
         }
         return data
-    }
+    },
+    /**
+     * VTC在线成员
+     */
+    async vtcOnlineList(http, vtcId) {
+        let result = null
+        try {
+            result = await requestWithFallback(http, `/vtc/memberOnline?vtcId=${vtcId}`)
+        } catch (e) {
+            return {
+                error: true
+            }
+        }
+
+        // 拼接返回数据
+        let data = {
+            error: result.code !== 200
+        }
+        if (!data.error) {
+            data.data = result.data
+        }
+        return data
+    },
 }

package/lib/api/truckersMpApi.js

@@ -1,4 +1,4 @@
-const BASE_API = 'https://evmapi.114512.xyz/proxy/truckersmp';
+const BASE_API = 'https://evmapi.cxnnn.cn/proxy/truckersmp';
 // const BASE_API = 'https://api.truckersmp.com/v2';
 module.exports = {
     /**

package/lib/api/truckersMpMapApi.js

@@ -1,4 +1,4 @@
-const BASE_API = 'https://evmapi.114512.xyz/proxy/ets2map';
+const BASE_API = 'https://evmapi.cxnnn.cn/proxy/ets2map';
 // const BASE_API = 'https://tracker.ets2map.com';
 module.exports = {
     /**

package/lib/api/truckyAppApi.js

@@ -1,4 +1,4 @@
-const BASE_API = 'https://evmapi.114512.xyz/proxy/trucky'
+const BASE_API = 'https://evmapi.cxnnn.cn/proxy/trucky'
 // const BASE_API = 'https://api.codetabs.com/v1/proxy/?quest=https://api.truckyapp.com'
 
 module.exports = {

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -165,7 +165,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             const steamApiKey = cfg.steamApi?.key;
             if (steamApiKey) {
                 const steamId = playerInfo.data.steamId;
-                const url = `https://evmapi.114512.xyz/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
+                const url = `https://evmapi.cxnnn.cn/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
                 const response = await ctx.http.get(url);
                 if (response.response && response.response.game_count > 0) {
                     for (const game of response.response.games) {

package/lib/command/tmpQuery/tmpQueryText.js

@@ -189,7 +189,7 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             if (!steamApiKey) {
                 return { ets2: null, ats: null };
             }
-            const url = `https://api.114512.xyz/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
+            const url = `https://evmapi.cxnnn.cn/proxy/steam/IPlayerService/GetOwnedGames/v1?key=${steamApiKey}&steamid=${steamId}&appids_filter[0]=227300&appids_filter[1]=270880&include_played_free_games=1`;
             const response = await ctx.http.get(url);
             const result = { ets2: null, ats: null };
             

package/lib/command/tmpVtcOnline/tmpVtcOnlineImg.js

@@ -1,6 +1,7 @@
 const { segment } = require('koishi');
 const { resolve } = require('path');
 const common = require('../../util/common');
+const evmOpenApi = require('../../api/evmOpenApi');
 
 module.exports = async (ctx, cfg) => {
   const vtcId = cfg.tmpActivityService?.api?.vtcId;
@@ -10,12 +11,12 @@ module.exports = async (ctx, cfg) => {
 
   let result;
   try {
-    result = await ctx.http.get(`https://www.cnly.top/api/player_online/api?vtcId=${encodeURIComponent(vtcId)}`);
+    result = await evmOpenApi.vtcOnlineList(ctx.http, vtcId);
   } catch {
     return '查询车队在线成员失败，请稍后重试';
   }
 
-  if (!result || result.code !== 200 || !Array.isArray(result.data)) {
+  if (result.error || !Array.isArray(result.data)) {
     return '查询车队在线成员失败，请稍后重试';
   }
 

package/lib/command/tmpVtcOnline/tmpVtcOnlineText.js

@@ -1,3 +1,4 @@
+const evmOpenApi = require('../../api/evmOpenApi');
 module.exports = async (ctx, cfg) => {
   const vtcId = cfg.tmpActivityService?.api?.vtcId;
   if (!vtcId) {
@@ -6,12 +7,12 @@ module.exports = async (ctx, cfg) => {
 
   let result;
   try {
-    result = await ctx.http.get(`https://www.cnly.top/api/player_online/api?vtcId=${encodeURIComponent(vtcId)}`);
+    result = await evmOpenApi.vtcOnlineList(ctx.http, vtcId);
   } catch {
     return '查询车队在线成员失败，请稍后重试';
   }
 
-  if (!result || result.code !== 200 || !Array.isArray(result.data)) {
+  if (result.error || !Array.isArray(result.data)) {
     return '查询车队在线成员失败，请稍后重试';
   }
 

package/package.json

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