@sjtdev/koishi-plugin-dota2tracker 1.1.9 → 1.1.10-hotfix

package/lib/index.js

@@ -1419,7 +1419,7 @@ async function apply(ctx, config) {
           await ctx.database.upsert("dt_constants_abilities_cn", (row) => [{ id: 1, data: AbilitiesConstantsCN, gameVersionId: queryConstants.gameVersions[0].id, gameVersionName: queryConstants.gameVersions[0].name }]);
         }
         let hero = (await query(HERO_INFO(fhero.id))).data.constants.hero;
-        hero.talents.forEach((talent) => talent.name_cn = AbilitiesConstantsCN.data.abilities.find((item) => item.id == talent.abilityId).language.displayName);
+        hero.talents.forEach((talent) => talent.name_cn = AbilitiesConstantsCN.data.abilities?.find((item) => item.id == talent.abilityId)?.language?.displayName);
         await session.send(await ctx.puppeteer.render(genImageHTML(hero, config.template_hero, "hero" /* Hero */)));
       } catch (error) {
         ctx.logger.error(error);
@@ -1488,95 +1488,149 @@ async function apply(ctx, config) {
   }
   __name(findingHero, "findingHero");
   ctx.command("7.36 <input_data>", "查询7.36改动").option("refresh", "-r 重新获取数据").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) ? "初次使用，" : "") + "正在获取数据……");
+    if (!("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.setExtraHTTPHeaders({
-        "Accept-Language": "zh-CN,zh;q=0.9"
-      });
-      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 });
+    const tem = await ctx.database.get("dt_7_36", void 0, ["id"]);
+    if (!tem.length || options.refresh) {
+      try {
+        session.send((!tem.length ? "初次使用，" : "") + "正在获取数据……");
+        await ctx.model.extend("dt_7_36", { id: "integer", data: "string" });
+        const page = await ctx.puppeteer.page();
+        await page.setExtraHTTPHeaders({
+          "Accept-Language": "zh-CN,zh;q=0.9"
         });
-        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);
-      await session.send("数据获取完成。");
-      await page.close();
-    }
-    if (input_data) {
-      const hero = findingHero(input_data);
-      if (!hero) {
-        session.send("英雄参数输入有误，请检查后重试。");
+        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(() => {
+          try {
+            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");
+              console.log(subDiv);
+              const match = subDiv?.style.backgroundImage.match(/\/apps\/dota2\/images\/dota_react\/heroes\/([^"]+)\.png"\)/);
+              console.log(match);
+              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 prepareToRemovesNodes = [
+              document.querySelector("body > div:first-of-type"),
+              document.querySelector("body > div:nth-of-type(2) > div:first-of-type > div:first-of-type"),
+              document.querySelector("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(1)"),
+              document.querySelector("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(2)"),
+              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(1)"),
+              ...document.querySelectorAll("body > div:nth-of-type(2) > div:first-of-type > div:nth-of-type(2) > div:nth-of-type(3) > div:not(:last-of-type)")
+            ];
+            prepareToRemovesNodes.forEach((node) => node?.remove());
+            const remainingContent = document.documentElement.outerHTML;
+            return {
+              divArray,
+              remainingContent
+            };
+          } catch (error) {
+            console.error(error);
+          }
+        });
+        page.close();
+        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);
+        await session.send("数据获取完成。");
+      } catch (error) {
+        ctx.logger.error(error);
+        session.send("数据获取失败。");
         return;
       }
-      session.send("正在查询，请耐心等待……");
-      const page = await ctx.puppeteer.page();
-      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 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;
-                };
-              });
-            }
-          })
+    }
+    if (input_data) {
+      try {
+        const hero = findingHero(input_data);
+        if (!hero) {
+          session.send("英雄参数输入有误，请检查后重试。");
+          return;
+        }
+        session.send("正在查询，请耐心等待……");
+        const page = await ctx.puppeteer.page();
+        await page.setRequestInterception(false);
+        const [wrapperHTML, newHeroHTML] = (await ctx.database.get("dt_7_36", [0, hero.id])).map((data) => data.data);
+        await page.setContent(wrapperHTML);
+        await page.waitForSelector("div.placeholder");
+        const placeholder = await page.$("div.placeholder");
+        await page.waitForSelector("div.placeholder");
+        await page.evaluate(
+          (element, html) => {
+            element.outerHTML = html;
+          },
+          placeholder,
+          newHeroHTML
         );
-      });
-      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();
+        await page.evaluate(async () => {
+          const images = Array.from(document.querySelectorAll("img"));
+          const backgroundImages = Array.from(document.querySelectorAll("*")).filter((element) => {
+            const bg = window.getComputedStyle(element).backgroundImage;
+            return bg && bg !== "none";
+          });
+          await Promise.all([
+            ...images.map((img) => {
+              if (img.complete)
+                return Promise.resolve();
+              else {
+                return new Promise((resolve) => {
+                  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;
+                  };
+                });
+              }
+            }),
+            ...backgroundImages.map((element) => {
+              const bg = window.getComputedStyle(element).backgroundImage;
+              const urlMatch = bg.match(/url\(["']?([^"')]+)["']?\)/);
+              if (urlMatch && urlMatch[1]) {
+                const src = urlMatch[1];
+                return new Promise((resolve) => {
+                  const img = new Image();
+                  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;
+                  };
+                  img.src = src;
+                });
+              } else
+                return Promise.resolve();
+            })
+          ]);
+          await new Promise((resolve) => setTimeout(resolve, 500));
+        });
+        const testE = await page.$("body > div > div > div > div > div > div > 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();
+      } catch (error) {
+        ctx.logger.error(error);
+        session.send("查询改动失败。");
+      }
     } else
       session.send("https://www.dota2.com/patches/7.36");
   });

package/package.json

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