koishi-plugin-node-async-bot-all 2.24.0 → 2.24.2

package/lib/commands.d.ts

@@ -76,7 +76,7 @@ export declare function getQQInfo(ctx: Context, session: Session, qq: string): P
 export declare function getMsg(ctx: Context, session: Session): Promise<number>;
 export declare function getNewsMsg(ctx: Context, type: number): Promise<{
     success: boolean;
-    data: string;
-    msg?: string;
+    data?: Buffer;
+    msg: string;
 }>;
 export {};

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: "请求超时。", 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 最新新闻。" } } };
   }
 });
 
@@ -353,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:");
@@ -375,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);
@@ -383,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,
@@ -405,7 +405,7 @@ async function getServer(ctx, session) {
               "count": count,
               "players": serverInfo.data.players.online + "/" + serverInfo.data.players.max,
               "version": serverInfo.data.version.name,
-              "note": note ?? "无"
+              "note": note ?? session.text("noop")
             };
             log.info(`Server ${count}:`);
             log.info(temp);
@@ -416,7 +416,7 @@ async function getServer(ctx, session) {
               "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 ?? "无"
+              "note": note ?? session.text("noop")
             };
             log.info(`Server ${count}:`);
             log.info(temp);
@@ -553,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:");
@@ -592,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 }));
@@ -628,7 +628,7 @@ 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 status2 = 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,
@@ -639,7 +639,7 @@ async function centerServerTest(ctx, session) {
       } else {
         list = list + "\n" + session.text(".listFailed", {
           "name": server.name,
-          "data": "未能获取到此服务器的状态信息。"
+          "data": session.text(".dataFail")
         });
       }
     }
@@ -858,10 +858,10 @@ async function getNewsMsg(ctx, type) {
   if (response.success) {
     if ((await ctx.database.get("botData", "newsId"))[0]?.data == response.data.appnews.newsitems[0].gid && type != 1) {
       log.debug("无新闻");
-      return { success: false, data: "" };
+      return { success: false, msg: "无可用新闻" };
     }
     const html = await readNewsFile(response.data, log);
-    if (html[1]) return { success: false, data: `渲染图片失败` };
+    if (html[1]) return { success: false, msg: `渲染图片失败` };
     const page = await ctx.puppeteer.page();
     try {
       await page.setViewport({
@@ -884,21 +884,21 @@ 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: image, msg: "NorthWood 发布了一个新闻（原文+机翻）：" + response.data.appnews.newsitems[0].title };
     } catch (err) {
       log.error("图片渲染失败:", err);
-      return { success: false, data: "图片渲染失败" };
+      return { success: false, msg: "图片渲染失败" };
     } finally {
       if (page && !page.isClosed()) await page.close();
     }
   } else {
-    return { success: false, data: "请求 Steam API 失败" };
+    return { success: false, msg: "请求 Steam API 失败" };
   }
 }
 __name(getNewsMsg, "getNewsMsg");
 
 // package.json
-var version = "2.24.0";
+var version = "2.24.2";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer", "cron"];
@@ -967,13 +967,12 @@ function apply(ctx) {
   ctx.command("slnews").action(async () => {
     const log = ctx.logger("slnews");
     const outMsg = await getNewsMsg(ctx, 1);
-    if (outMsg.success) {
+    if (outMsg.data) {
       return `${outMsg.msg}
-${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` })}`;
+${import_koishi3.h.image(outMsg.data, "image/png")}`;
     } else {
       log.warn(outMsg);
-      if (outMsg.data == "") return "无可用新闻";
-      return outMsg.data;
+      return outMsg.msg;
     }
   });
   ctx.cron("0 * * * *", async () => {
@@ -984,12 +983,12 @@ ${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` }
   });
   ctx.on("node-async/news", async () => {
     const outMsg = await getNewsMsg(ctx, 0);
-    if (outMsg.success) {
+    if (outMsg.data) {
       await ctx.broadcast(ctx.config.slNews, `${outMsg.msg}
-${(0, import_koishi3.h)("image", { url: `data:image/jpg;base64,${outMsg.data}` })}`);
+${import_koishi3.h.image(outMsg.data, "image/png")}`);
     } else {
-      if (outMsg.data == "") return;
-      await ctx.broadcast(ctx.config.slNews, outMsg.data);
+      if (outMsg.msg == "") return;
+      await ctx.broadcast(ctx.config.slNews, outMsg.msg);
     }
   });
   ctx.command("cxGame").action(async ({ session }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.24.0",
+  "version": "2.24.2",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [