koishi-plugin-minecraft-notifier 1.9.0 → 1.10.0

package/lib/changelog-summarizer.d.ts

@@ -4,5 +4,4 @@ import { Config } from './index';
 export declare const minecraftSummaryTypeMap: Record<string, string>;
 export declare function checkNewVersionArticle(ctx: Context, cfg: Config): Promise<void>;
 export declare function processNewVersionArticle(ctx: Context, cfg: Config, version: string, isSnapshot: boolean): Promise<boolean>;
-export declare function generateArticleUrl(version: string, isSnapshot: boolean): string;
 export declare function fetchArticleContent(ctx: Context, version: string, isSnapshot: boolean): Promise<string>;

package/lib/helper/article-helper.d.ts

@@ -0,0 +1 @@
+export declare function generateArticleUrl(version: string, isSnapshot: boolean): string;

package/lib/index.cjs

@@ -35,12 +35,39 @@ __export(index_exports, {
   name: () => name
 });
 module.exports = __toCommonJS(index_exports);
-var import_axios4 = __toESM(require("axios"), 1);
 var import_fs = __toESM(require("fs"), 1);
 var import_koishi = require("koishi");
 var import_node_fs2 = require("node:fs");
 var import_node_path2 = __toESM(require("node:path"), 1);
 
+// src/helper/article-helper.ts
+function generateArticleUrl(version, isSnapshot) {
+  const cleanVersion = version.replace(/\s/g, "-").toLowerCase();
+  const baseUrl = "https://www.minecraft.net/zh-hans/article";
+  if (isSnapshot) {
+    return generateSnapshotUrl(baseUrl, version, cleanVersion);
+  }
+  return `${baseUrl}/minecraft-java-edition-${cleanVersion.replaceAll(".", "-")}`;
+}
+function generateSnapshotUrl(baseUrl, version, cleanVersion) {
+  if (version.includes("rc")) {
+    return buildReleaseUrl(baseUrl, version, "release-candidate");
+  }
+  if (version.includes("pre")) {
+    return buildReleaseUrl(baseUrl, version, "pre-release");
+  }
+  return `${baseUrl}/minecraft-snapshot-${cleanVersion}`;
+}
+function buildReleaseUrl(baseUrl, version, releaseType) {
+  const [mainVersion] = version.split("-");
+  const buildNumber = version.slice(-1);
+  const formattedVersion = mainVersion.replaceAll(".", "-");
+  return `${baseUrl}/minecraft-${formattedVersion}-${releaseType}-${buildNumber}`;
+}
+
+// src/version-checker.ts
+var import_axios4 = __toESM(require("axios"), 1);
+
 // src/changelog-summarizer.ts
 var import_koishi_plugin_adapter_onebot = require("@pynickle/koishi-plugin-adapter-onebot");
 var import_autocorrect_node2 = require("autocorrect-node");
@@ -48,7 +75,7 @@ var import_axios3 = __toESM(require("axios"), 1);
 var cheerio2 = __toESM(require("cheerio"), 1);
 var import_turndown = __toESM(require("turndown"), 1);
 
-// src/onebot-helper.ts
+// src/helper/onebot-helper.ts
 function createBotTextMsgNode(bot, content) {
   return {
     type: "node",
@@ -60,6 +87,44 @@ function createBotTextMsgNode(bot, content) {
   };
 }
 
+// src/helper/web-helper.ts
+var userAgents = [
+  // Chrome 桌面版本
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+  "Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
+  "Mozilla/5.0 (Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
+  // Firefox 桌面版本
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/121.0",
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/121.0",
+  "Mozilla/5.0 (X11; Linux i686; rv:109.0) Gecko/20100101 Firefox/121.0",
+  "Mozilla/5.0 (X11; Linux x86_64; rv:115.0) Gecko/20100101 Firefox/115.0",
+  // Safari 桌面和移动版本
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Safari/605.1.15",
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Safari/605.1.15",
+  "Mozilla/5.0 (iPhone; CPU iPhone OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Mobile/15E148 Safari/604.1",
+  "Mozilla/5.0 (iPad; CPU OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Mobile/15E148 Safari/604.1",
+  "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1",
+  // Edge 浏览器
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0",
+  "Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0",
+  // Android 移动设备
+  "Mozilla/5.0 (Linux; Android 13; SM-G998B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36",
+  "Mozilla/5.0 (Linux; Android 12; SM-A536B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36",
+  "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36",
+  "Mozilla/5.0 (Linux; Android 13; moto g(50) 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36",
+  // 其他浏览器
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
+  "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
+  "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36"
+];
+function getRandomUserAgent() {
+  const randomIndex = Math.floor(Math.random() * userAgents.length);
+  return userAgents[randomIndex];
+}
+
 // src/translation-fetcher.ts
 var import_axios = __toESM(require("axios"), 1);
 var cheerio = __toESM(require("cheerio"), 1);
@@ -366,50 +431,12 @@ As the Minecraft Update Log JSON Summary Specialist, you must adhere to the abov
 `;
 }
 
-// src/web_helper.ts
-var userAgents = [
-  // Chrome 桌面版本
-  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-  "Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36",
-  "Mozilla/5.0 (Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-  // Firefox 桌面版本
-  "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/121.0",
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/121.0",
-  "Mozilla/5.0 (X11; Linux i686; rv:109.0) Gecko/20100101 Firefox/121.0",
-  "Mozilla/5.0 (X11; Linux x86_64; rv:115.0) Gecko/20100101 Firefox/115.0",
-  // Safari 桌面和移动版本
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Safari/605.1.15",
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2 Safari/605.1.15",
-  "Mozilla/5.0 (iPhone; CPU iPhone OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Mobile/15E148 Safari/604.1",
-  "Mozilla/5.0 (iPad; CPU OS 17_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.1 Mobile/15E148 Safari/604.1",
-  "Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1",
-  // Edge 浏览器
-  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0",
-  "Mozilla/5.0 (Windows NT 11.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0",
-  // Android 移动设备
-  "Mozilla/5.0 (Linux; Android 13; SM-G998B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Mobile Safari/537.36",
-  "Mozilla/5.0 (Linux; Android 12; SM-A536B) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36",
-  "Mozilla/5.0 (Linux; Android 14; Pixel 8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Mobile Safari/537.36",
-  "Mozilla/5.0 (Linux; Android 13; moto g(50) 5G) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Mobile Safari/537.36",
-  // 其他浏览器
-  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 OPR/106.0.0.0",
-  "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36",
-  "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36"
-];
-function getRandomUserAgent() {
-  const randomIndex = Math.floor(Math.random() * userAgents.length);
-  return userAgents[randomIndex];
-}
-
 // src/xaml-generator.ts
 var import_autocorrect_node = require("autocorrect-node");
 var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"), 1);
 
-// src/git-platform-helper.ts
+// src/helper/git-platform-helper.ts
 var import_axios2 = __toESM(require("axios"), 1);
 var PLATFORM_CONFIG = {
   ["gitee" /* GITEE */]: {
@@ -976,29 +1003,6 @@ ${subList}`)
   );
   return true;
 }
-function generateArticleUrl(version, isSnapshot) {
-  const cleanVersion = version.replace(/\s/g, "-").toLowerCase();
-  const baseUrl = "https://www.minecraft.net/zh-hans/article";
-  if (isSnapshot) {
-    return generateSnapshotUrl(baseUrl, version, cleanVersion);
-  }
-  return `${baseUrl}/minecraft-java-edition-${cleanVersion.replaceAll(".", "-")}`;
-}
-function generateSnapshotUrl(baseUrl, version, cleanVersion) {
-  if (version.includes("rc")) {
-    return buildReleaseUrl(baseUrl, version, "release-candidate");
-  }
-  if (version.includes("pre")) {
-    return buildReleaseUrl(baseUrl, version, "pre-release");
-  }
-  return `${baseUrl}/minecraft-snapshot-${cleanVersion}`;
-}
-function buildReleaseUrl(baseUrl, version, releaseType) {
-  const [mainVersion] = version.split("-");
-  const buildNumber = version.slice(-1);
-  const formattedVersion = mainVersion.replaceAll(".", "-");
-  return `${baseUrl}/minecraft-${formattedVersion}-${releaseType}-${buildNumber}`;
-}
 var turndownService = new import_turndown.default({});
 async function fetchArticleContent(ctx, version, isSnapshot) {
   const url = generateArticleUrl(version, isSnapshot);
@@ -1009,10 +1013,15 @@ async function fetchArticleContent(ctx, version, isSnapshot) {
         "User-Agent": getRandomUserAgent()
       }
     });
-    const html = response.data;
-    const $ = cheerio2.load(html);
-    const content = $("div.article-text").html().trim();
-    return turndownService.turndown(content.trim());
+    if (response.status === 200) {
+      const html = response.data;
+      const $ = cheerio2.load(html);
+      const content = $("div.article-text").html().trim();
+      return turndownService.turndown(content.trim());
+    }
+    ctx.logger("minecraft-notifier").warn(
+      `Wrong response status (${response.status}) when fetching article: ${url}`
+    );
   } catch (error) {
     if (error.response && error.response.status === 404) {
       ctx.logger("minecraft-notifier").warn(`Article not found: ${url}`);
@@ -1026,6 +1035,92 @@ async function fetchArticleContent(ctx, version, isSnapshot) {
   }
 }
 
+// src/version-checker.ts
+var loadData = async (ctx) => {
+  const record = (await ctx.database.get("minecraft_notifier", 1))[0];
+  if (record) {
+    return {
+      lastRelease: record.lastRelease,
+      lastSnapshot: record.lastSnapshot
+    };
+  }
+  return { lastRelease: "", lastSnapshot: "" };
+};
+var saveData = async (ctx, data) => {
+  await ctx.database.upsert("minecraft_notifier", [
+    {
+      id: 1,
+      lastRelease: data.lastRelease,
+      lastSnapshot: data.lastSnapshot
+    }
+  ]);
+};
+var getLatestVersions = async () => {
+  let retries = 0;
+  while (retries <= 3) {
+    try {
+      const response = await import_axios4.default.get(
+        "https://launchermeta.mojang.com/mc/game/version_manifest.json",
+        {
+          timeout: 1e4
+        }
+      );
+      const data = response.data;
+      return {
+        release: data.latest.release,
+        snapshot: data.latest.snapshot
+      };
+    } catch (error) {
+      retries++;
+      if (retries <= 3) {
+        await new Promise(
+          (resolve) => setTimeout(resolve, Math.pow(2, retries) * 1e3)
+        );
+      }
+    }
+  }
+};
+var notifyReleaseVersion = async (ctx, cfg, version) => {
+  const bot = ctx.bots[0];
+  for (const channel of cfg.notifyChannel) {
+    await bot.sendMessage(
+      channel,
+      `\u{1F4E2} Minecraft \u65B0\u6B63\u5F0F\u7248\u53D1\u5E03\u4E86\uFF1A${version}`
+    );
+  }
+};
+var notifySnapshotVersion = async (ctx, cfg, version) => {
+  const bot = ctx.bots[0];
+  for (const channel of cfg.notifyChannel) {
+    await bot.sendMessage(
+      channel,
+      `\u{1F389} Minecraft \u65B0\u5FEB\u7167\u7248\u53D1\u5E03\u4E86\uFF1A${version}`
+    );
+  }
+};
+var checkMinecraftVersion = async (ctx, cfg) => {
+  try {
+    const versionData = await loadData(ctx);
+    const latest = await getLatestVersions();
+    let updatedData = { ...versionData };
+    if (versionData.lastRelease !== latest.release) {
+      await notifyReleaseVersion(ctx, cfg, latest.release);
+      updatedData.lastRelease = latest.release;
+    }
+    if (versionData.lastSnapshot !== latest.snapshot && versionData.lastRelease != latest.snapshot) {
+      await notifySnapshotVersion(ctx, cfg, latest.snapshot);
+      updatedData.lastSnapshot = latest.snapshot;
+    }
+    await saveData(ctx, updatedData);
+    await checkNewVersionArticle(ctx, cfg);
+  } catch (error) {
+    ctx.logger("minecraft-notifier").error(
+      "Error checking Minecraft versions:",
+      error
+    );
+  }
+};
+
 // src/index.ts
 var name = "minecraft-notifier";
 var inject = ["database", "server"];
@@ -1076,45 +1171,6 @@ function apply(ctx, cfg) {
     },
     { primary: "id" }
   );
-  let lastRelease = "";
-  let lastSnapshot = "";
-  const loadData = async () => {
-    const record = (await ctx.database.get("minecraft_notifier", 1))[0];
-    if (record) {
-      lastRelease = record.lastRelease;
-      lastSnapshot = record.lastSnapshot;
-    }
-  };
-  const saveData = async () => {
-    await ctx.database.upsert("minecraft_notifier", [
-      { id: 1, lastRelease, lastSnapshot }
-    ]);
-  };
-  const getLatestVersions = async () => {
-    let retries = 0;
-    while (retries <= 3) {
-      try {
-        const response = await import_axios4.default.get(
-          "https://launchermeta.mojang.com/mc/game/version_manifest.json",
-          {
-            timeout: 1e4
-          }
-        );
-        const data = response.data;
-        return {
-          release: data.latest.release,
-          snapshot: data.latest.snapshot
-        };
-      } catch (error) {
-        retries++;
-        if (retries <= 3) {
-          await new Promise(
-            (resolve) => setTimeout(resolve, Math.pow(2, retries) * 1e3)
-          );
-        }
-      }
-    }
-  };
   const xamlPath = import_node_path2.default.join(
     ctx.baseDir,
     "data",
@@ -1144,43 +1200,28 @@ function apply(ctx, cfg) {
       Title: "Minecraft \u66F4\u65B0\u6458\u8981"
     });
   });
-  ctx.command("mc.trigger", "\u624B\u52A8\u89E6\u53D1 AI \u66F4\u65B0\u65E5\u5FD7\u603B\u7ED3\u751F\u6210", {
+  ctx.command("mc.trigger", "\u624B\u52A8\u89E6\u53D1\u68C0\u67E5 Minecraft \u7248\u672C\u66F4\u65B0", {
     authority: 4
-  }).action(async () => {
-    await checkNewVersionArticle(ctx, cfg);
-  });
-  ctx.setInterval(async () => {
-    try {
-      await loadData();
-      const latest = await getLatestVersions();
-      const bot = ctx.bots[0];
-      if (lastRelease !== latest.release) {
-        for (const channel of cfg.notifyChannel) {
-          await bot.sendMessage(
-            channel,
-            `Minecraft \u65B0\u6B63\u5F0F\u7248\u53D1\u5E03\u4E86\uFF1A${latest.release}`
-          );
-        }
-        lastRelease = latest.release;
-      }
-      if (lastSnapshot !== latest.snapshot && lastRelease != latest.snapshot) {
-        for (const channel of cfg.notifyChannel) {
-          await bot.sendMessage(
-            channel,
-            `Minecraft \u65B0\u5FEB\u7167\u7248\u53D1\u5E03\u4E86\uFF1A${latest.snapshot}`
-          );
-        }
-        lastSnapshot = latest.snapshot;
+  }).action(async () => await checkMinecraftVersion(ctx, cfg));
+  ctx.setInterval(
+    async () => await checkMinecraftVersion(ctx, cfg),
+    6e4 * cfg.checkInterval
+  );
+  ctx.command("mc.version", "\u67E5\u8BE2\u5F53\u524D\u5DF2\u8BB0\u5F55\u7684 Minecraft \u7248\u672C\u4FE1\u606F").action(
+    async () => {
+      const record = (await ctx.database.get("minecraft_notifier", 1))[0];
+      if (!record) {
+        return "\u274C \u5F53\u524D\u6682\u65E0\u5DF2\u8BB0\u5F55\u7684\u7248\u672C\u4FE1\u606F\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002";
       }
-      await saveData();
-      await checkNewVersionArticle(ctx, cfg);
-    } catch (error) {
-      ctx.logger("minecraft-notifier").error(
-        "\u68C0\u67E5 Minecraft \u7248\u672C\u65F6\u51FA\u9519\uFF1A",
-        error
-      );
+      return `\u{1F4E2} \u5F53\u524D\u5DF2\u8BB0\u5F55\u7684\u6700\u65B0 Minecraft \u7248\u672C\u4FE1\u606F\uFF1A
+            
+\u{1F4E2} \u6B63\u5F0F\u7248\uFF1A${record.lastRelease}
+\u{1F31F} \u6B63\u5F0F\u7248\u66F4\u65B0\u65E5\u5FD7\uFF1A${generateArticleUrl(record.lastRelease, false)}
+
+\u{1F389} \u5FEB\u7167\u7248\uFF1A${record.lastSnapshot}
+\u{1F9EA} \u5FEB\u7167\u7248\u66F4\u65B0\u65E5\u5FD7\uFF1A${generateArticleUrl(record.lastSnapshot, true)}`;
     }
-  }, 6e4 * cfg.checkInterval);
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/index.d.ts

@@ -43,6 +43,4 @@ export interface Config {
     gitcodeRepo?: string;
 }
 export declare const Config: Schema<Config>;
-export declare function apply(ctx: Context, cfg: Config & {
-    articleTracker: any;
-}): void;
+export declare function apply(ctx: Context, cfg: Config): void;

package/lib/version-checker.d.ts

@@ -0,0 +1,3 @@
+import { Context } from 'koishi';
+import { Config } from './index';
+export declare const checkMinecraftVersion: (ctx: Context, cfg: Config) => Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-minecraft-notifier",
   "description": "A Minecraft new version notification plugin, also featuring a PCL homepage.",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "main": "lib/index.cjs",
   "typings": "lib/index.d.ts",
   "type": "module",