@sjtdev/koishi-plugin-dota2tracker 1.1.5-beta.2 → 1.1.5-beta.3

package/lib/index.js

@@ -1323,12 +1323,12 @@ async function apply(ctx, config) {
       let steamId = flagBindedPlayer?.steamId ?? input_data;
       let player;
       try {
-        let queryRes = await query(PLAYER_INFO_WITH_25_MATCHES(steamId, hero.id));
+        let queryRes = await query(PLAYER_INFO_WITH_25_MATCHES(steamId, hero?.id));
         if (queryRes.status == 200) {
           player = queryRes.data.data.player;
         } else
           throw 0;
-        let queryRes2 = await query(PLAYER_EXTRA_INFO(steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero.id));
+        let queryRes2 = await query(PLAYER_EXTRA_INFO(steamId, player.matchCount, Object.keys(dotaconstants3.heroes).length, hero?.id));
         if (queryRes2.status == 200) {
           let playerExtra = queryRes2.data.data.player;
           let filteredDotaPlus = {};
@@ -1456,7 +1456,12 @@ async function apply(ctx, config) {
   function findingHero(input) {
     if (!input)
       return;
-    let dc_heroes = Object.values(dotaconstants3.heroes).map((hero) => ({ id: hero["id"], name: hero["name"], shortName: hero["name"].match(/^npc_dota_hero_(.+)$/)[1] }));
+    let dc_heroes = Object.values(dotaconstants3.heroes).map((hero) => ({
+      id: hero["id"],
+      name: hero["name"],
+      shortName: hero["name"].match(/^npc_dota_hero_(.+)$/)[1],
+      localized_name: hero["localized_name"].toLowerCase().replace(/\s+/g, "")
+    }));
     let cn_heroes = Object.keys(HEROES_CHINESE).map((key) => ({
       id: parseInt(key),
       names_cn: HEROES_CHINESE[key]
@@ -1475,34 +1480,95 @@ async function apply(ctx, config) {
     return heroes3.find((hero) => hero.names_cn.includes(input) || hero.shortName === input.toLowerCase() || hero.id == input);
   }
   __name(findingHero, "findingHero");
-  ctx.command("7.36 <input_data>", "查询7.36改动").usage("可查询英雄改动并生成图片返回").example("7.36 小松许").action(async ({ session }, input_data) => {
+  ctx.command("7.36 <input_data>", "查询7.36改动").option("refresh", "-f 重新获取数据").usage("可查询英雄改动并生成图片返回").example("7.36 小松许").action(async ({ session, options }, input_data) => {
+    if (!("dt_7_36" in ctx.database.tables) || options.refresh) {
+      session.send((!("dt_7_36" in ctx.database.tables) ? "初次使用，" : "") + "正在获取数据……");
+      await ctx.model.extend("dt_7_36", { id: "integer", data: "string" });
+      const page = await ctx.puppeteer.page();
+      await page.goto("https://www.dota2.com/patches/7.36");
+      await page.waitForSelector("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div:nth-of-type(1)");
+      await page.evaluate(() => {
+        const scripts = document.querySelectorAll("script");
+        scripts.forEach((script) => script.remove());
+      });
+      const result = await page.evaluate(() => {
+        const divs = document.querySelectorAll("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div");
+        const divArray = [];
+        divs.forEach((div) => {
+          const subDiv = div.querySelector("a > div");
+          const match = subDiv?.style.backgroundImage.match(/url\("https:\/\/cdn\.cloudflare\.steamstatic\.com\/apps\/dota2\/images\/dota_react\/heroes\/([^"]+)\.png"\)/);
+          divArray.push({ heroName: match[1], div: div.outerHTML });
+        });
+        document.querySelectorAll("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div:not(:first-of-type)").forEach((node) => node.remove());
+        document.querySelector("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div").classList.add("placeholder");
+        const remainingContent = document.documentElement.outerHTML;
+        return {
+          divArray,
+          remainingContent
+        };
+      });
+      const heroes3 = [];
+      result.divArray.forEach((hero) => {
+        const res = Object.values(dotaconstants3.heroes).find((Chero) => Chero.name.match(/^npc_dota_hero_(.+)$/)[1] == hero.heroName);
+        heroes3.push({ id: res.id, data: hero.div });
+      });
+      heroes3.push({ id: 0, data: result.remainingContent });
+      await ctx.database.upsert("dt_7_36", (row) => heroes3);
+      import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/remainingContent.html", result.remainingContent);
+      await session.send("数据获取完成。");
+      await page.close();
+    }
     if (input_data) {
       await session.send("正在查询，请耐心等待……");
       const page = await ctx.puppeteer.page();
-      await page.goto("https://www.dota2.com.cn/patches/7.36");
-      await page.waitForSelector("body > div:nth-of-type(3) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2) > div:nth-of-type(5) > div:nth-of-type(2) > div:nth-of-type(1)");
+      await page.setContent((await ctx.database.get("dt_7_36", [0]))[0].data);
+      await page.waitForSelector("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div:nth-of-type(1)");
       const hero = findingHero(input_data);
-      await page.evaluate((hero2) => {
-        const divs = document.querySelectorAll("body > div:nth-of-type(3) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2) > div:nth-of-type(5) > div:nth-of-type(2) > div");
-        for (const div of divs) {
-          const firstChild = div.firstElementChild;
-          if (firstChild && firstChild.tagName === "A" && firstChild.getAttribute("href") === "/hero/" + hero2.shortName) {
-            div.classList.add("selector");
-          }
-        }
-        return null;
-      }, hero);
-      const testE = await page.$("body > div:nth-of-type(3) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2) > div:nth-of-type(5) > div:nth-of-type(2) > div.selector");
+      const placeholder = await page.$("div.placeholder");
+      await page.waitForSelector("div.placeholder");
+      const newHeroHTML = (await ctx.database.get("dt_7_36", [hero.id]))[0].data;
+      await page.evaluate(
+        (element, html) => {
+          element.outerHTML = html;
+        },
+        placeholder,
+        newHeroHTML
+      );
+      await page.evaluate(async () => {
+        const images = Array.from(document.querySelectorAll("img"));
+        await Promise.all(
+          images.map((img) => {
+            if (img.complete) {
+              return Promise.resolve();
+            } else {
+              return new Promise((resolve, reject) => {
+                img.onload = resolve;
+                img.onerror = () => {
+                  const placeholderSrc = "https://cdn.cloudflare.steamstatic.com/apps/dota2/images/dota_react/icons/innate_icon.png";
+                  img.src = placeholderSrc;
+                  img.onload = resolve;
+                  img.onerror = resolve;
+                };
+              });
+            }
+          })
+        );
+      });
+      const testE = await page.$("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:nth-of-type(5) > div:nth-of-type(2) > div");
       const res = await testE.screenshot();
       const base64String = Buffer.from(res).toString("base64");
       const imgTag = `<img src="data:image/png;base64,${base64String}" alt="Image" />`;
       if (process.env.NODE_ENV === "development")
         import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/temp.png", res);
+      if (process.env.NODE_ENV === "development")
+        import_fs2.default.writeFileSync("./node_modules/@sjtdev/koishi-plugin-dota2tracker/temp.html", await page.content());
       session.send(imgTag);
+      page.close();
     } else
-      session.send("https://www.dota2.com.cn/patches/7.36");
+      session.send("https://www.dota2.com/patches/7.36");
   });
-  ctx.command("test <input_data>").action(async ({ session }, input_data) => {
+  ctx.command("test <input_data>").option("a", "a").action(async ({ session, options }, input_data) => {
+    console.log((await ctx.database.get("dt_7_36", [0]))[0].data);
   });
   ctx.on("ready", async () => {
     const tables = await ctx.database.tables;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sjtdev/koishi-plugin-dota2tracker",
   "description": "",
-  "version": "1.1.5-beta.2",
+  "version": "1.1.5-beta.3",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [