koishi-plugin-node-async-bot-all 2.23.0 → 2.24.1

package/lib/fun.d.ts

@@ -1,5 +1,6 @@
 import { Context } from "koishi";
-import { APINews, APIUserInfo } from "./commands";
+import { APINews, APIUserInfo } from "./commands.ts";
+import { JavaStatusResponse } from 'minecraft-server-util';
 export type HttpResponse<T> = {
     success: true;
     data: T;
@@ -38,4 +39,12 @@ export declare function request<T = any>(url: string, options?: RequestInit, tim
 export declare function readUserCardFile(userInfo: APIUserInfo): Promise<string>;
 export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string): Promise<string>;
 export declare function queryA2S(host: string, log: any): Promise<serverInfo>;
-export declare function readNewsFile(info: APINews): Promise<string>;
+export declare function readNewsFile(info: APINews, log: any): Promise<string[]>;
+export declare function translateAPI(log: any, text: string): Promise<string>;
+export declare function slpInfo(log: any, host: string, port: number, timeout?: number): Promise<{
+    success: true;
+    data: JavaStatusResponse;
+} | {
+    success: false;
+    data: string;
+}>;

package/lib/index.js

@@ -34,7 +34,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/locales/zh-CN.yml
 var require_zh_CN = __commonJS({
   "src/locales/zh-CN.yml"(exports2, module2) {
-    module2.exports = { commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", listA2S: "【A2S 服务器 {count}】\n➣ {version}：{players}\n➣ 机器人：{bots}\n➣ 备注：{note}", listFailedA2S: "【A2S 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", error: "执行错误。", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, centerservertest: { description: "查看中心服务器状态。", messages: { msg: "{time}{list}", list: "== {name} ==\n状态：{status}\n存活率：{uptime}\n检测时间：{time}", listFailed: "== {name} ==\n查看失败：{data}", failed: "{time}\n查看失败：{data}" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } }, slnews: { description: "抓取 NorthWood 的 Steam 最新新闻。" } } };
+    module2.exports = { noApi: "未指定 API", noop: "无", unknownError: "未知错误。", commands: { cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", listA2S: "【A2S 服务器 {count}】\n➣ {version}：{players}\n➣ 机器人：{bots}\n➣ 备注：{note}", listFailedA2S: "【A2S 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", failed: "{time}\n状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成的随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{data}", failed: "{time}\n读取信息失败。" } }, rw: { description: "随机名言名句。", messages: { msg: "{time}\n{data}", failed: "{time}\n获取失败（{data}）。" } }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。" } }, centerservertest: { description: "查看中心服务器状态。", messages: { msg: "{time}{list}", list: "== {name} ==\n状态：{status}\n存活率：{uptime}\n检测时间：{time}", listFailed: "== {name} ==\n查看失败：{data}", failed: "{time}\n查看失败：{data}", statusLive: "✅ 正常", statusDie: "❌ 故障", dataFail: "未能获取到此服务器的状态信息。" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}", wait: "{quote}{time}\n请等待图片上传（可能较慢）。", failed: "{quote}{time}\n获取失败：{data}" } }, getqqinfo: { description: "获取 QQ 号的信息。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } }, slnews: { description: "抓取 NorthWood 的 Steam 最新新闻。" } } };
   }
 });
 
@@ -61,6 +61,8 @@ var import_koishi = require("koishi");
 var import_steam_server_query = require("steam-server-query");
 var import_html = __toESM(require("@bbob/html"));
 var import_preset_html5 = __toESM(require("@bbob/preset-html5"));
+var import_bing_translate_api = require("bing-translate-api");
+var import_minecraft_server_util = require("minecraft-server-util");
 function getSystemName() {
   return import_os.default.type() + " " + import_os.default.release();
 }
@@ -282,20 +284,62 @@ async function queryA2S(host, log) {
   }
 }
 __name(queryA2S, "queryA2S");
-async function readNewsFile(info) {
+async function readNewsFile(info, log) {
   let html;
   try {
     const aPath = import_path.default.resolve(__dirname, "..") + import_path.default.sep + "res" + import_path.default.sep + "slNews.html";
     html = await import_fs.default.promises.readFile(aPath, "utf8");
-    const content = (0, import_html.default)(info.appnews.newsitems[0].contents, (0, import_preset_html5.default)());
+    const content = info.appnews.newsitems[0].contents.replace("[spoiler]", "").replace("[/spoiler]", "").replace(/\r\n/g, "\n").replace(/\n{3,}/g, "\n\n").split("\n\n").map((p) => p.trim()).filter(Boolean);
+    const bilingualParagraphs = [];
+    for (const paragraph of content) {
+      const zh = await translateAPI(log, paragraph);
+      bilingualParagraphs.push(
+        paragraph,
+        zh,
+        ""
+        // 空行用于分隔段落
+      );
+    }
+    const finalText = bilingualParagraphs.join("<br />").replace(/<br \/>{2,}/g, "<br />");
+    const contentHtml = (0, import_html.default)(finalText, (0, import_preset_html5.default)());
     const date = Number(info.appnews.newsitems[0].date + "000");
-    html = html.toString().replace("{date}", new Date(date).toLocaleString()).replace("{title}", info.appnews.newsitems[0].title).replace("{content}", content);
+    html = html.toString().replace("{date}", new Date(date).toLocaleString()).replace("{title}", info.appnews.newsitems[0].title).replace("{content}", contentHtml);
   } catch (error) {
-    html = error.message;
+    log.error(error);
+    log.error(error.message);
+    return [error, error.message];
   }
-  return html;
+  return [html];
 }
 __name(readNewsFile, "readNewsFile");
+async function translateAPI(log, text) {
+  const ms = random(0, 0, 250);
+  await (0, import_koishi.sleep)(ms);
+  await (0, import_bing_translate_api.translate)(text, "en", "zh-Hans").then((result) => {
+    text = result?.translation;
+  }).catch((err) => {
+    log.error(err);
+  });
+  return text;
+}
+__name(translateAPI, "translateAPI");
+async function slpInfo(log, host, port, timeout) {
+  try {
+    const info = await (0, import_minecraft_server_util.status)(host, port, { timeout });
+    log.info(info);
+    return {
+      "success": true,
+      "data": info
+    };
+  } catch (error) {
+    log.error(error);
+    return {
+      "success": false,
+      "data": error.message
+    };
+  }
+}
+__name(slpInfo, "slpInfo");
 
 // src/commands.ts
 async function getServer(ctx, session) {
@@ -309,7 +353,7 @@ async function getServer(ctx, session) {
     if (server == void 0) {
       msg = {
         "time": time,
-        "data": "未指定查询 服务器",
+        "data": session.text("noApi"),
         "success": 2
       };
       log.warn("Sent:");
@@ -331,7 +375,7 @@ async function getServer(ctx, session) {
             "players": info.players,
             "version": info.version,
             "bots": info.bots,
-            "note": note ?? "无"
+            "note": note ?? session.text("noop")
           };
           log.info(`Server ${count}:`);
           log.info(temp);
@@ -339,9 +383,9 @@ async function getServer(ctx, session) {
         } else {
           let err;
           if (info.error.toString().includes("Timeout reached. Possible reasons: You are being rate limited; Timeout too short; Wrong server host configured")) {
-            err = "请求超时。";
+            err = session.text(".timeout");
           } else {
-            err = "未知错误。";
+            err = session.text("unknown");
           }
           const temp = {
             "count": count,
@@ -353,14 +397,15 @@ async function getServer(ctx, session) {
           list = list + "\n" + session.text(".listFailedA2S", temp);
         }
       } else {
-        const response = await request(api, {}, ctx.config.timeout, log);
-        if (response.success) {
-          if (response.data.list == null) {
+        const host = api.split(":");
+        const serverInfo = await slpInfo(log, host[0], Number(host[1]), ctx.config.timeout);
+        if (serverInfo.success) {
+          if (serverInfo.data.players.sample == null) {
             const temp = {
               "count": count,
-              "players": response.data.players,
-              "version": response.data.version,
-              "note": note ?? "无"
+              "players": serverInfo.data.players.online + "/" + serverInfo.data.players.max,
+              "version": serverInfo.data.version.name,
+              "note": note ?? session.text("noop")
             };
             log.info(`Server ${count}:`);
             log.info(temp);
@@ -368,32 +413,27 @@ async function getServer(ctx, session) {
           } else {
             const temp = {
               "count": count,
-              "players": response.data.players,
-              "version": response.data.version,
-              "list": response.data.list.join(", "),
-              "note": note ?? "无"
+              "players": serverInfo.data.players.online + "/" + serverInfo.data.players.max,
+              "version": serverInfo.data.version.name,
+              "list": serverInfo.data.players.sample.map((item2) => item2.name).join(", "),
+              "note": note ?? session.text("noop")
             };
             log.info(`Server ${count}:`);
             log.info(temp);
             list = list + "\n" + session.text(".list", temp);
           }
         } else {
-          let err;
-          if (response.code) {
-            err = response.isJson ? response.error["data"] : response.error;
-            if (err.includes("Connection refused")) {
-              err = session.text(".close");
-            } else if (err.includes("No route to host")) {
-              err = session.text(".host");
-            } else if (err.includes("Connection timed out")) {
-              err = session.text(".timeout");
-            } else if (err.includes("Server returned too few data")) {
-              err = session.text(".fewData");
-            } else if (err.includes("Server read timed out")) {
-              err = session.text(".timeout2");
-            }
-          } else {
-            err = response.error.message;
+          let err = serverInfo.data;
+          if (err.includes("connect ECONNREFUSED") || err.includes("Server is offline or unreachable")) {
+            err = session.text(".close");
+          } else if (err.includes("connect EHOSTUNREACH")) {
+            err = session.text(".host");
+          } else if (err.includes("connect ETIMEDOUT")) {
+            err = session.text(".timeout");
+          } else if (err.includes("Ping payload did not match received payload")) {
+            err = session.text(".fewData");
+          } else if (err.includes("Expected server to send packet type")) {
+            err = session.text(".fewData");
           }
           const temp = {
             "count": count,
@@ -513,7 +553,7 @@ async function getRandomWord(ctx, session) {
   if (ctx.config.rwAPI == void 0) {
     msg = {
       "time": time,
-      "data": "未指定 API",
+      "data": session.text("noApi"),
       "success": 2
     };
     log.warn("Sent:");
@@ -552,7 +592,7 @@ async function getBlueArchive(ctx, session) {
   log.debug(`Got: {"form":"${session.platform}:${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   const time = getHongKongTime();
   if (ctx.config.baAPI == void 0) {
-    await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": "未指定 API" }));
+    await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": session.text("noApi") }));
     return 1;
   }
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
@@ -560,8 +600,8 @@ async function getBlueArchive(ctx, session) {
   const link = random(2, ctx.config.baAPI) + `?cacheBuster=${random(1, 1, 2147483647)}`;
   log.info(`Link: ${link}`);
   await (0, import_koishi2.sleep)(ms);
-  const status = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
-  if (!status) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
+  const status2 = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
+  if (!status2) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(link) }));
   await session.bot.deleteMessage(session.event.guild?.id, vid[0]);
   return 0;
 }
@@ -588,18 +628,18 @@ async function centerServerTest(ctx, session) {
       const lastTime = response.data.heartbeatList[server.id].at(-1);
       if (lastTime) {
         const uptime24 = (response.data.uptimeList[server.id + "_24"] * 100).toFixed(2) + "%";
-        const status = lastTime?.status == 1 ? "正常" : "故障";
+        const status2 = lastTime?.status == 1 ? session.text(".statusLive") : session.text(".statusDie");
         const testTime = timeFormatter.format(/* @__PURE__ */ new Date(lastTime?.time.replace(" ", "T") + "Z"));
         list = list + "\n" + session.text(".list", {
           "name": server.name,
-          "status": status,
+          "status": status2,
           "uptime": uptime24,
           "time": testTime
         });
       } else {
         list = list + "\n" + session.text(".listFailed", {
           "name": server.name,
-          "data": "未能获取到此服务器的状态信息。"
+          "data": session.text(".dataFail")
         });
       }
     }
@@ -670,8 +710,8 @@ async function getMeme(ctx, session, count) {
     log.warn("Sent:");
     log.warn(msg);
   }
-  const status = await session.send(session.text(msg["success"], msg));
-  if (!status) await session.send(session.text(msg["success"], msg));
+  const status2 = await session.send(session.text(msg["success"], msg));
+  if (!status2) await session.send(session.text(msg["success"], msg));
   return 0;
 }
 __name(getMeme, "getMeme");
@@ -687,8 +727,8 @@ async function getCat(ctx, session) {
   const response = await request(ctx.config.catAPI, {}, ctx.config.timeout, log);
   if (response.success) {
     log.debug(response.data);
-    const status = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
-    if (!status) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
+    const status2 = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
+    if (!status2) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
     log.debug("Sent:");
     log.debug(response.data[0].url);
   } else {
@@ -820,15 +860,16 @@ async function getNewsMsg(ctx, type) {
       log.debug("无新闻");
       return { success: false, data: "" };
     }
+    const html = await readNewsFile(response.data, log);
+    if (html[1]) return { success: false, data: `渲染图片失败` };
     const page = await ctx.puppeteer.page();
-    const html = await readNewsFile(response.data);
     try {
       await page.setViewport({
         width: 800,
         height: 800,
         deviceScaleFactor: 2
       });
-      await page.setContent(html, { waitUntil: "networkidle0" });
+      await page.setContent(html[0], { waitUntil: "networkidle0" });
       const { width, height } = await page.evaluate(() => ({
         width: document.body.scrollWidth,
         height: document.body.scrollHeight
@@ -843,7 +884,7 @@ async function getNewsMsg(ctx, type) {
       if (type == 0) await ctx.database.upsert("botData", [
         { id: "newsId", data: response.data.appnews.newsitems[0].gid }
       ]);
-      return { success: true, data: Buffer.from(image).toString("base64"), msg: "NorthWood 发布了一个新闻（原文英语）：" + response.data.appnews.newsitems[0].title };
+      return { success: true, data: Buffer.from(image).toString("base64"), msg: "NorthWood 发布了一个新闻（原文+机翻）：" + response.data.appnews.newsitems[0].title };
     } catch (err) {
       log.error("图片渲染失败:", err);
       return { success: false, data: "图片渲染失败" };
@@ -857,7 +898,7 @@ async function getNewsMsg(ctx, type) {
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.23.0";
+var version = "2.24.1";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -924,11 +965,13 @@ function apply(ctx) {
     ]);
   });
   ctx.command("slnews").action(async () => {
+    const log = ctx.logger("slnews");
     const outMsg = await getNewsMsg(ctx, 1);
     if (outMsg.success) {
       return `${outMsg.msg}
 ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` })}`;
     } else {
+      log.warn(outMsg);
       if (outMsg.data == "") return "无可用新闻";
       return outMsg.data;
     }
@@ -960,11 +1003,11 @@ ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` }
     }
   });
   ctx.command("status").alias("stats").alias("状态").action(async ({ session }) => {
-    const status = await getStatus(ctx, session);
-    if (status["success"] == 0) {
-      return session?.text(".msg", status);
+    const status2 = await getStatus(ctx, session);
+    if (status2["success"] == 0) {
+      return session?.text(".msg", status2);
     } else {
-      return session?.text(".failed", status);
+      return session?.text(".failed", status2);
     }
   });
   ctx.command("random [最小数:number] [最大数:number]").alias("随机数").action(async ({ session }, min, max) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.23.0",
+  "version": "2.24.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -35,11 +35,14 @@
     "@koishijs/plugin-help": "^2.4.5",
     "@koishijs/plugin-market": "^2.11.8",
     "koishi": "^4.18.7",
-    "koishi-plugin-puppeteer": "^3.9.0"
+    "koishi-plugin-puppeteer": "^3.9.0",
+    "koishi-plugin-cron": "^3.1.0"
   },
   "dependencies": {
     "@bbob/html": "^4.3.1",
     "@bbob/preset-html5": "^4.3.1",
+    "bing-translate-api": "^4.2.0",
+    "minecraft-server-util": "^5.4.4",
     "steam-server-query": "^1.1.3"
   }
 }