@sjtdev/koishi-plugin-dota2tracker 1.2.17 → 1.2.18-beta.1

package/lib/index.js

@@ -50,13 +50,13 @@ __export(utils_exports, {
   formatNumber: () => formatNumber,
   getFormattedMatchData: () => getFormattedMatchData,
   getImageUrl: () => getImageUrl,
+  init: () => init,
   playerisValid: () => playerisValid,
   query: () => query,
   queryHeroFromValve: () => queryHeroFromValve,
   readDirectoryFilesSync: () => readDirectoryFilesSync,
   roundToDecimalPlaces: () => roundToDecimalPlaces,
   sec2time: () => sec2time,
-  setHttp: () => setHttp,
   winRateColor: () => winRateColor
 });
 var import_fs = __toESM(require("fs"));
@@ -70,10 +70,10 @@ __export(queries_exports, {
   CURRENT_GAMEVERSION: () => CURRENT_GAMEVERSION,
   HERO_INFO: () => HERO_INFO,
   HERO_MATCHUP_WINRATE: () => HERO_MATCHUP_WINRATE,
-  MATCHES_FOR_DAILY: () => MATCHES_FOR_DAILY,
   MATCH_INFO: () => MATCH_INFO,
   PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD: () => PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD,
   PLAYERS_LASTMATCH_RANKINFO: () => PLAYERS_LASTMATCH_RANKINFO,
+  PLAYERS_MATCHES_FOR_DAILY: () => PLAYERS_MATCHES_FOR_DAILY,
   PLAYER_EXTRA_INFO: () => PLAYER_EXTRA_INFO,
   PLAYER_INFO_WITH_25_MATCHES: () => PLAYER_INFO_WITH_25_MATCHES,
   REQUEST_MATCH_DATA_ANALYSIS: () => REQUEST_MATCH_DATA_ANALYSIS,
@@ -221,10 +221,10 @@ function MATCH_INFO(matchId) {
 `;
 }
 __name(MATCH_INFO, "MATCH_INFO");
-function MATCHES_FOR_DAILY(steamAccountIds, seconds) {
+function PLAYERS_MATCHES_FOR_DAILY(steamAccountIds, seconds) {
   return `
   {
-    players(steamAccountIds:${JSON.stringify(steamAccountIds)}) {
+    players(steamAccountIds:[${steamAccountIds.join(",")}]) {
       steamAccount{id name avatar}
       matches(request:{startDateTime:${seconds} take:50}){
         id
@@ -246,7 +246,7 @@ function MATCHES_FOR_DAILY(steamAccountIds, seconds) {
   }
   `;
 }
-__name(MATCHES_FOR_DAILY, "MATCHES_FOR_DAILY");
+__name(PLAYERS_MATCHES_FOR_DAILY, "PLAYERS_MATCHES_FOR_DAILY");
 function VERIFYING_PLAYER(steamAccountId) {
   return `
     {
@@ -261,7 +261,7 @@ __name(VERIFYING_PLAYER, "VERIFYING_PLAYER");
 function PLAYERS_LASTMATCH_RANKINFO(steamAccountIds) {
   return `
     {
-        players(steamAccountIds:${JSON.stringify(steamAccountIds)}) {
+        players(steamAccountIds:[${steamAccountIds.join(",")}]) {
           steamAccount{
             id
             name
@@ -530,11 +530,12 @@ __name(REQUEST_MATCH_DATA_ANALYSIS, "REQUEST_MATCH_DATA_ANALYSIS");
 // src/utils.ts
 var CONFIGS = { STRATZ_API: { URL: "https://api.stratz.com/graphql", TOKEN: "" } };
 var http = null;
-function setHttp(newHttp) {
+function init(newHttp, setTimeout2) {
   http = newHttp;
+  setTimeout2 = setTimeout2;
 }
-__name(setHttp, "setHttp");
-async function query(query_str) {
+__name(init, "init");
+async function fetchData(query_str) {
   return await http.post(CONFIGS.STRATZ_API.URL, query_str, {
     responseType: "json",
     headers: {
@@ -544,6 +545,27 @@ async function query(query_str) {
     }
   });
 }
+__name(fetchData, "fetchData");
+async function query(query_func, ...args) {
+  if (query_func.name.startsWith("PLAYERS") && args[0].length > 5) {
+    const playerIds = args[0];
+    const chunkSize = 5;
+    let allPlayers = [];
+    for (let i = 0; i < playerIds.length; i += chunkSize) {
+      const chunk = playerIds.slice(i, i + chunkSize);
+      const query_str = query_func(chunk, ...args.slice(1));
+      const result = await new Promise((resolve) => setTimeout(() => resolve(fetchData(query_str)), 100));
+      if (result.data && result.data.players) {
+        allPlayers = allPlayers.concat(result.data.players);
+      }
+    }
+    return { data: { players: allPlayers } };
+  } else {
+    const query_str = query_func(...args);
+    const result = await fetchData(query_str);
+    return result || {};
+  }
+}
 __name(query, "query");
 async function queryHeroFromValve(heroId) {
   return (await http.get(`https://www.dota2.com/datafeed/herodata?language=schinese&hero_id=${heroId}`)).result.data.heroes[0];
@@ -1252,7 +1274,7 @@ var Config = import_koishi.Schema.intersect([
       import_koishi.Schema.object({
         rankBroadSwitch: import_koishi.Schema.const(true).required(),
         rankBroadStar: import_koishi.Schema.boolean().default(true).description("星级变动播报"),
-        rankBroadLeader: import_koishi.Schema.boolean().default(true).description("名词变动播报"),
+        rankBroadLeader: import_koishi.Schema.boolean().default(true).description("冠绝名次变动播报"),
         rankBroadFun: import_koishi.Schema.boolean().default(false).description("整活播报模板")
       }),
       import_koishi.Schema.object({})
@@ -1292,7 +1314,7 @@ var pendingMatches = [];
 var random = new import_koishi2.Random(() => Math.random());
 async function apply(ctx, config) {
   CONFIGS.STRATZ_API.TOKEN = config.STRATZ_API_TOKEN;
-  setHttp(ctx.http);
+  init(ctx.http, ctx.setTimeout);
   ctx.command("订阅本群", "订阅后还需玩家在本群绑定SteamID").usage("订阅后还需玩家在本群绑定SteamID，BOT将订阅本群中已绑定玩家的新比赛数据，在STRATZ比赛解析完成后将比赛数据生成为图片战报发布至本群中。").action(async ({ session }) => {
     if (session.guild) {
       let currentGuild = (await ctx.database.get("dt_subscribed_guilds", { guildId: session.event.channel.id, platform: session.event.platform }))[0];
@@ -1388,15 +1410,19 @@ async function apply(ctx, config) {
       }
       if (subscribedPlayers.length <= 20) {
         try {
-          const memberList = await session.bot.getGuildMemberList(session.event.channel.id);
+          let memberList;
+          try {
+            memberList = await session.bot?.getGuildMemberList(session.event.channel.id);
+          } catch (error) {
+          }
           async function getUsers(subscribedPlayers2, utils, queries, memberList2) {
             const playerSteamIds = subscribedPlayers2.map((player) => player.steamId);
-            const queryResult = await utils.query(queries.PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD(playerSteamIds));
+            const queryResult = await utils.query(queries.PLAYERS_INFO_WITH_10_MATCHES_FOR_GUILD, playerSteamIds);
             const playersInfo = queryResult.data.players;
             const users2 = [];
             for (const subscribedPlayer of subscribedPlayers2) {
               const queryPlayer = playersInfo.find((player) => player.steamAccount.id == subscribedPlayer.steamId);
-              const queryMember = memberList2.data.find((member) => member.user?.id == subscribedPlayer.userId);
+              const queryMember = memberList2?.data.find((member) => member.user?.id == subscribedPlayer.userId);
               users2.push({ ...subscribedPlayer, ...queryPlayer, ...queryMember });
             }
             return users2;
@@ -1419,7 +1445,7 @@ async function apply(ctx, config) {
         match = queryLocal[0].data;
         ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
       } else {
-        match = getFormattedMatchData((await query(MATCH_INFO(matchId))).data);
+        match = getFormattedMatchData((await query(MATCH_INFO, matchId)).data);
       }
       if (match && (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore((0, import_moment.default)().subtract(config.dataParsingTimeoutMinutes, "minutes")))) {
         session.send((ctx.config.urlInMessageType.some((type) => type == "match") ? "https://stratz.com/matches/" + matchId : "") + await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */)));
@@ -1441,7 +1467,6 @@ async function apply(ctx, config) {
       session.send("请输入比赛ID。");
       return;
     }
-    JSON.stringify;
     if (!/^\d{10}$/.test(match_id)) {
       session.send("比赛ID无效。");
       return;
@@ -1467,9 +1492,10 @@ async function apply(ctx, config) {
       let lastMatchId = 0;
       try {
         session.send("正在搜索对局详情，请稍后...");
-        lastMatchId = (await query(PLAYERS_LASTMATCH_RANKINFO(parseInt(flagBindedPlayer?.steamId ?? input_data)))).data.player.matches[0].id;
-      } catch {
+        lastMatchId = (await query(PLAYERS_LASTMATCH_RANKINFO, [parseInt(flagBindedPlayer?.steamId ?? input_data)])).data.players[0].matches[0].id;
+      } catch (error) {
         session.send("获取玩家最近比赛失败。");
+        ctx.logger.error(error);
         return;
       }
       queryMatchAndSend(session, lastMatchId);
@@ -1497,8 +1523,8 @@ async function apply(ctx, config) {
       let steamId = flagBindedPlayer?.steamId ?? input_data;
       let player;
       try {
-        player = (await query(PLAYER_INFO_WITH_25_MATCHES(steamId, hero?.id))).data.player;
-        let playerExtra = (await query(PLAYER_EXTRA_INFO(steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero?.id))).data.player;
+        player = (await query(PLAYER_INFO_WITH_25_MATCHES, steamId, hero?.id)).data.player;
+        let playerExtra = (await query(PLAYER_EXTRA_INFO, steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero?.id)).data.player;
         let filteredDotaPlus = {};
         playerExtra.dotaPlus.forEach((item) => {
           if (!filteredDotaPlus[item.heroId] || filteredDotaPlus[item.heroId].level < item.level) {
@@ -1646,7 +1672,7 @@ async function apply(ctx, config) {
         return;
       }
       try {
-        let heroStats = (await query(HERO_MATCHUP_WINRATE(hero.id))).data.heroStats;
+        let heroStats = (await query(HERO_MATCHUP_WINRATE, hero.id)).data.heroStats;
         let withTopFive = heroStats.matchUp[0].with.filter((item) => item.matchCount / heroStats.matchUp[0].matchCountWith > Math.max(0, Math.min(5, options.filter)) / 100).map((item) => {
           const winRate = item.winCount / item.matchCount;
           return { ...item, winRate: winRate.toFixed(3) };
@@ -1720,7 +1746,7 @@ async function apply(ctx, config) {
         const subscribedPlayersSteamIds = subscribedPlayersInGuild.map((player) => player.steamId).filter(function(value, index, self) {
           return self.indexOf(value) === index;
         });
-        const players = (await query(PLAYERS_LASTMATCH_RANKINFO(subscribedPlayersSteamIds))).data.players;
+        const players = (await query(PLAYERS_LASTMATCH_RANKINFO, subscribedPlayersSteamIds)).data.players;
         const lastMatches = players.map((player) => player.matches[0]).filter((item, index, self) => index === self.findIndex((t) => t.id === item.id)).filter((match) => import_moment.default.unix(match.startDateTime).isAfter((0, import_moment.default)().subtract(1, "days"))).filter((match) => !pendingMatches.some((pendingMatch) => pendingMatch.matchId == match.id));
         const sendedMatchesIds = (await ctx.database.get("dt_sended_match_id", { matchId: lastMatches.map((match) => match.id) }, ["matchId"])).map((match) => match.matchId);
         lastMatches.filter((match) => !sendedMatchesIds.includes(match.id)).forEach((match) => {
@@ -1735,7 +1761,7 @@ async function apply(ctx, config) {
             });
           });
           pendingMatches.push({ matchId: match.id, guilds: tempGuilds });
-          query(REQUEST_MATCH_DATA_ANALYSIS(match.id));
+          query(REQUEST_MATCH_DATA_ANALYSIS, match.id);
           ctx.logger.info(
             tempGuilds.map((guild) => `追踪到来自群组${guild.platform}:${guild.guildId}的用户${guild.players.map((player) => `[${player.nickName ?? ""}(${player.steamId})]`).join("、")}的尚未播报过的最新比赛 ${match.id}。`).join("")
           );
@@ -1763,7 +1789,6 @@ async function apply(ctx, config) {
                 if (prevRank.medal !== currRank.medal || prevRank.star !== currRank.star && config.rankBroadStar || prevRank.leader !== currRank.leader && config.rankBroadLeader) {
                   const guildMember = await ctx.bots.find((bot) => bot.platform == subPlayer.platform)?.getGuildMember?.(subPlayer.guildId, subPlayer.userId);
                   const name2 = subPlayer.nickName ?? guildMember?.nick ?? players.find((player) => player.steamAccount.id == subPlayer.steamId)?.steamAccount.name ?? subPlayer.steamId;
-                  const message = `群友 ${name2} 段位变动：${rank[prevRank.medal]}${prevRank.star} → ${rank[currRank.medal]}${currRank.star} `;
                   if (config.rankBroadFun === true) {
                     const img = await ctx.puppeteer.render(
                       genImageHTML(
@@ -1780,10 +1805,11 @@ async function apply(ctx, config) {
                     );
                     await ctx.broadcast([`${subPlayer.platform}:${subPlayer.guildId}`], img);
                   } else {
+                    const message = `群友 ${name2} 段位变动：${rank[prevRank.medal]}${prevRank.star} → ${rank[currRank.medal]}${currRank.star} `;
                     const img = await ctx.puppeteer.render(genImageHTML(currRank, "rank" + (config.rankBroadFun ? "2" : ""), "rank" /* Rank */));
                     await ctx.broadcast([`${subPlayer.platform}:${subPlayer.guildId}`], message + img);
                   }
-                  ctx.logger.info(`向${subPlayer.platform}:${subPlayer.guildId}发布段位变动播报信息。`);
+                  ctx.logger.info(`向 ${subPlayer.platform}:${subPlayer.guildId} 发布段位变动播报信息。`);
                 }
               }
             }
@@ -1800,7 +1826,7 @@ async function apply(ctx, config) {
           if (queryLocal.length > 0) {
             match = queryLocal[0].data;
             ctx.database.set("dt_previous_query_results", match.id, { queryTime: /* @__PURE__ */ new Date() });
-          } else match = getFormattedMatchData((await query(MATCH_INFO(pendingMatch.matchId))).data);
+          } else match = getFormattedMatchData((await query(MATCH_INFO, pendingMatch.matchId)).data);
           if (match.parsedDateTime || import_moment.default.unix(match.endDateTime).isBefore(now.subtract(config.dataParsingTimeoutMinutes, "minutes"))) {
             pendingMatches = pendingMatches.filter((item) => item.matchId != match.id);
             const img = await ctx.puppeteer.render(genImageHTML(match, config.template_match, "match" /* Match */));
@@ -1842,10 +1868,9 @@ KDA：${((player.kills + player.assists) / (player.deaths || 1)).toFixed(2)} [${
     const subscribedGuilds = await ctx.database.get("dt_subscribed_guilds", void 0);
     const subscribedPlayersInGuild = (await ctx.database.get("dt_subscribed_players", void 0)).filter((player) => subscribedGuilds.some((guild) => guild.guildId == player.guildId));
     const players = (await query(
-      MATCHES_FOR_DAILY(
-        subscribedPlayersInGuild.map((player) => player.steamId).filter((value, index, self) => self.indexOf(value) === index),
-        timeAgo
-      )
+      PLAYERS_MATCHES_FOR_DAILY,
+      subscribedPlayersInGuild.map((player) => player.steamId).filter((value, index, self) => self.indexOf(value) === index),
+      timeAgo
     )).data.players.filter((player) => player.matches.length > 0);
     const matches = players.map((player) => player.matches.map((match) => match)).flat().filter((item, index, self) => index === self.findIndex((t) => t.id === item.id));
     for (let subPlayer of subscribedPlayersInGuild) {
@@ -1936,6 +1961,7 @@ function genImageHTML(data, template, type) {
     dotaconstants: dotaconstants3,
     moment: import_moment.default,
     escapeHTML: /* @__PURE__ */ __name(function escapeHTML(str) {
+      if (str == null) return "";
       return str.replace(/[&<>"']/g, function(match) {
         const escape = {
           "&": "&amp;",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "koishi插件-追踪群友的DOTA2对局",
-  "version": "1.2.17",
+  "version": "1.2.18-beta.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

package/template/rank/temp.ejs

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>获取文件目录</title>
+    <script>
+        function showDirectory() {
+            // 获取当前页面的 URL
+            const url = window.location.href;
+            // 使用 URL 对象来解析当前 URL
+            const urlObj = new URL(url);
+            // 获取目录部分
+            const directory = urlObj.pathname.substring(0, urlObj.pathname.lastIndexOf('/'));
+            // 输出目录
+            document.getElementById('directory').innerText = directory;
+
+
+            console.log(directory)
+        }
+    </script>
+</head>
+<body onload="showDirectory()">
+    <h1>当前文件所在目录</h1>
+    <p id="directory"></p>
+</body>
+</html>

package/template/rank/rank2temp.html

@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Document</title>
-        <style>
-            * {
-                margin: 0;
-                padding: 0;
-            }
-            html {
-                width: 1024px;
-                height: 768px;
-            }
-            body.xi {
-                background: url(../images/xi.jpg) no-repeat center center / cover;
-            }
-            body.bei {
-                background: url(../images/bei.jpg) no-repeat center center / cover;
-            }
-            .wrapper {
-                padding: 80px;
-                padding-top: 180px;
-            }
-            .wrapper > p {
-                font-size: 32px;
-                line-height: 48px;
-                height: 48px;
-                text-align: center;
-            }
-            body.xi p.bei,
-            body.bei p.xi {
-                display: none;
-            }
-            .wrapper > p > span {
-                margin: 0 10px;
-            }
-            .wrapper > p > span.prev {
-                color: gray;
-            }
-            .wrapper > p > span.curr {
-                font-weight: bold;
-                color: red;
-            }
-
-            .wrapper > p > img {
-                width: 48px;
-                height: 48px;
-                vertical-align: middle;
-                line-height: 48px;
-            }
-
-            .ranks {
-                margin-top: 40px;
-                display: flex;
-                width: 100%;
-                height: 256px;
-                justify-content: space-evenly;
-            }
-
-            div.rank {
-                position: relative;
-                width: 256px;
-                height: 256px;
-            }
-
-            div.rank > img {
-                position: absolute;
-            }
-
-            div.rank.prev {
-                filter: grayscale(1);
-            }
-            div.rank.curr {
-                transform: scale(1.25);
-            }
-            div.rank p {
-                font-size: 36px;
-                bottom: 20px;
-                width: 100%;
-                text-align: center;
-                color: #fff;
-                position: absolute;
-            }
-        </style>
-    </head>
-    <body class="bei">
-        <div class="wrapper">
-            <p class="xi">热烈祝贺群友 <img src="" alt="" />12414124141 在天梯中再获进步，</p>
-            <p class="xi">由<span class="rank prev">先锋2</span>升为<span class="rank curr">先锋2</span>，再接再厉，再创辉煌！</p>
-            <p class="bei"><img src="" alt="" /></p>
-            <p class="bei">寄</p>
-            <div class="ranks">
-                <div class="rank prev">
-                    <img src="../images/medal_8.png" alt="" />
-                    <img src="../images/star_2.png" alt="" />
-                    <p>1111</p>
-                </div>
-                <div class="rank curr">
-                    <img src="../images/medal_8.png" alt="" />
-                    <img src="../images/star_1.png" alt="" />
-                    <p>1111</p>
-                </div>
-            </div>
-            <p style="text-align: right; margin-top: 40px;">—— 2024/11/11 00点00分</p>
-        </div>
-    </body>
-</html>