koishi-plugin-node-async-bot-all 1.9.5 → 1.11.0

package/lib/fun.d.ts

@@ -1,7 +1,6 @@
-import { Context } from "koishi";
 export declare function getSystemUsage(): Promise<object>;
 export declare function getHongKongTime(): string;
-export declare function fetchWithTimeout(url: string, options: {}, timeout: number, ctx: Context): Promise<Response>;
+export declare function fetchWithTimeout(url: string, options: {}, timeout: number, log: any): Promise<Response>;
 export declare function readInfoFile(): Promise<string>;
 export declare function getAudioPath(name: string): Promise<string>;
 export declare function getAudioList(): Promise<string[]>;

package/lib/index.js

@@ -33,7 +33,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: { cx: { description: "查询服务器当前人数。", messages: { msg: "{time}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", msgNoPlayer: "{time}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}\n请稍后重试。", timeout: "请求超时。", close: "服务器已关闭。", error: "执行错误。", unknown: "未知错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}", 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}", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（2）。" } }, cassie: { description: "发送 C.A.S.S.I.E. 语音。", usage: "缺少参数时返回语音列表。\n使用示例：", examples: "cassie mtfSpawn 播放当机动特遣队重生并且SCP还活着时的语音。", messages: { msg: "{time}\n【播放列表】\n{data}", failed: "{time}\n发送失败，请稍后重试。", unknown: "{time}\n未知语音，发送 /cassie 查看播放列表。" } } } };
+    module2.exports = { commands: { cx: { description: "查询服务器当前人数。", messages: { msg: "{time}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", msgNoPlayer: "{time}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}\n请稍后重试。", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", unknown: "未知错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}", 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}", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（2）。" } }, cassie: { description: "发送 C.A.S.S.I.E. 语音。", usage: "缺少参数时返回语音列表。\n使用示例：", examples: "cassie mtfSpawn 播放当机动特遣队重生并且SCP还活着时的语音。", messages: { msg: "{time}\n【播放列表】\n{data}", failed: "{time}\n发送失败，请稍后重试。", unknown: "{time}\n未知语音，发送 /cassie 查看播放列表。" } } } };
   }
 });
 
@@ -51,7 +51,7 @@ var import_koishi = require("koishi");
 var import_os = __toESM(require("os"));
 
 // package.json
-var version = "1.9.4";
+var version = "1.11.0";
 
 // src/fun.ts
 var import_fs = __toESM(require("fs"));
@@ -112,7 +112,7 @@ function getHongKongTime() {
   ].join(":");
 }
 __name(getHongKongTime, "getHongKongTime");
-async function fetchWithTimeout(url, options = {}, timeout = 5e3, ctx) {
+async function fetchWithTimeout(url, options = {}, timeout = 5e3, log) {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => {
     controller.abort();
@@ -124,11 +124,11 @@ async function fetchWithTimeout(url, options = {}, timeout = 5e3, ctx) {
       // 绑定终止信号
     });
     clearTimeout(timeoutId);
-    ctx.logger.info(`Fetch code: ${response.status}`);
+    log.info(`Fetch code: ${response.status}`);
     return response;
   } catch (error) {
     clearTimeout(timeoutId);
-    ctx.logger.error(`${error.name}: ${error.message}`);
+    log.error(`${error.name}: ${error.message}`);
     if (error.name === "AbortError") {
       throw new Error("请求超时");
     } else {
@@ -165,7 +165,8 @@ var import_fs2 = __toESM(require("fs"));
 var inject = ["silk"];
 var name = "node-async-bot-all";
 async function getServer(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("cx");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   let msg;
   let dataError;
   let data;
@@ -173,10 +174,10 @@ async function getServer(ctx, session) {
   const time = getHongKongTime();
   if (session.event.guild.id == "757729218" || session.event.guild.id == "1047732162") {
     try {
-      const response = await fetchWithTimeout("https://api.tasaed.top/get/minecraftServer/", {}, 8e3, ctx);
+      const response = await fetchWithTimeout("https://api.tasaed.top/get/minecraftServer/", {}, 8e3, log);
       if (response.ok) {
         data = await response.text();
-        ctx.logger.info("Server data: " + data);
+        log.info("Server data: " + data);
         data = JSON.parse(data);
         if (data["list"] == null) {
           msg = {
@@ -186,8 +187,8 @@ async function getServer(ctx, session) {
             "protocol": data["protocol"],
             "success": 3
           };
-          ctx.logger.info("Sent:");
-          ctx.logger.info(msg);
+          log.info("Sent:");
+          log.info(msg);
         } else {
           msg = {
             "time": time,
@@ -197,8 +198,8 @@ async function getServer(ctx, session) {
             "protocol": data["protocol"],
             "success": 0
           };
-          ctx.logger.info("Sent:");
-          ctx.logger.info(msg);
+          log.info("Sent:");
+          log.info(msg);
         }
       } else {
         dataError = await response.text();
@@ -211,6 +212,10 @@ async function getServer(ctx, session) {
             error = session.text(".host");
           } else if (error.includes("Connection timed out")) {
             error = session.text(".timeout");
+          } else if (error.includes("Server returned too few data")) {
+            error = session.text(".fewData");
+          } else if (error.includes("Server read timed out")) {
+            error = session.text(".timeout2");
           }
         } catch (e) {
           if (dataError.includes("CDN节点请求源服务器超时")) {
@@ -219,43 +224,44 @@ async function getServer(ctx, session) {
             error = session.text(".unknown");
           }
         }
-        ctx.logger.error(`Error fetching data: ${dataError}`);
+        log.error(`Error fetching data: ${dataError}`);
         msg = {
           "time": time,
           "data": error,
           "success": 1
         };
-        ctx.logger.info("Sent:");
-        ctx.logger.info(msg);
+        log.info("Sent:");
+        log.info(msg);
       }
     } catch (err) {
-      ctx.logger.error(`Request error:  ${err.message}`);
+      log.error(`Request error:  ${err.message}`);
       msg = {
         "time": time,
         "data": session.text(".error"),
         "success": 1
       };
-      ctx.logger.info("Sent:");
-      ctx.logger.info(msg);
+      log.info("Sent:");
+      log.info(msg);
     }
   } else {
     msg = {
       "time": time,
       "success": 2
     };
-    ctx.logger.info("Sent:");
-    ctx.logger.info(msg);
+    log.info("Sent:");
+    log.info(msg);
   }
   return msg;
 }
 __name(getServer, "getServer");
 async function getStatus(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("status");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg;
   const vMsg = await getSystemUsage();
   if (vMsg["success"] == 1) {
-    ctx.logger.error(vMsg);
+    log.error(vMsg);
     msg = {
       "time": time,
       "data": vMsg["data"],
@@ -270,13 +276,14 @@ async function getStatus(ctx, session) {
       "success": 0
     };
   }
-  ctx.logger.info("Sent:");
-  ctx.logger.info(msg);
+  log.info("Sent:");
+  log.info(msg);
   return msg;
 }
 __name(getStatus, "getStatus");
 async function getRandom(ctx, session, min, max) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("random");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg;
   let data;
@@ -292,18 +299,19 @@ async function getRandom(ctx, session, min, max) {
     "data": data,
     "success": 0
   };
-  ctx.logger.info("Sent:");
-  ctx.logger.info(msg);
+  log.info("Sent:");
+  log.info(msg);
   return msg;
 }
 __name(getRandom, "getRandom");
 async function getInfo(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("info");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   const time = getHongKongTime();
   let msg;
   let data = await readInfoFile();
   if (!data.includes("&time;")) {
-    ctx.logger.error("Error: " + data);
+    log.error("Error: " + data);
     msg = {
       "time": time,
       "data": data,
@@ -317,52 +325,54 @@ async function getInfo(ctx, session) {
       "success": 0
     };
   }
-  ctx.logger.info("Sent:");
-  ctx.logger.info(msg);
+  log.info("Sent:");
+  log.info(msg);
   return msg;
 }
 __name(getInfo, "getInfo");
 async function getRW(ctx, session) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("rw");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   let msg;
   let data;
   const time = getHongKongTime();
   try {
-    const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3, ctx);
+    const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3, log);
     if (response.ok) {
       data = await response.text();
-      ctx.logger.info("Server data: " + data);
+      log.info("Server data: " + data);
       msg = {
         "time": time,
         "data": data,
         "success": 0
       };
-      ctx.logger.info("Sent:");
-      ctx.logger.info(msg);
+      log.info("Sent:");
+      log.info(msg);
     } else {
       data = await response.text();
-      ctx.logger.error(`Error fetching data: ${data}`);
+      log.error(`Error fetching data: ${data}`);
       msg = {
         "time": time,
         "success": 1
       };
-      ctx.logger.info("Sent:");
-      ctx.logger.info(msg);
+      log.info("Sent:");
+      log.info(msg);
     }
   } catch (err) {
-    ctx.logger.error(`Request error:  ${err.message}`);
+    log.error(`Request error:  ${err.message}`);
     msg = {
       "time": time,
       "success": 2
     };
-    ctx.logger.info("Sent:");
-    ctx.logger.info(msg);
+    log.info("Sent:");
+    log.info(msg);
   }
   return msg;
 }
 __name(getRW, "getRW");
 async function getCASSIE(ctx, session, name2) {
-  ctx.logger.info(`Got: {"command":"${session.text(".message")}","form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
+  const log = ctx.logger("cassie");
+  log.info(`Got: {"form":"${session.event.guild.id}","user":"${session.event.user.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message.id}"}`);
   let msg;
   const time = getHongKongTime();
   const list = await getAudioList();
@@ -372,26 +382,26 @@ async function getCASSIE(ctx, session, name2) {
       "data": list.map((fruit, index) => `${index + 1}. ${fruit}`).join("\n"),
       "success": 1
     };
-    ctx.logger.info("Sent: .msg");
-    ctx.logger.info(msg);
+    log.info("Sent: .msg");
+    log.info(msg);
     return msg;
   } else if (list.includes(name2)) {
     const fullPath = await getAudioPath(name2);
     try {
       const fileBuffer = await import_fs2.default.promises.readFile(fullPath);
-      ctx.logger.info(fullPath);
+      log.info(fullPath);
       const bufferToSend = Buffer.from(fileBuffer);
       if (!ctx.silk.isSilk(fileBuffer)) {
         msg = {
           "time": time,
           "success": 2
         };
-        ctx.logger.error("发送失败：非 .slk 文件");
-        ctx.logger.info("Sent: .failed");
-        ctx.logger.info(msg);
+        log.error("发送失败：非 .slk 文件");
+        log.info("Sent: .failed");
+        log.info(msg);
       } else {
         const base64Data = bufferToSend.toString("base64");
-        ctx.logger.info("Sent: A audio file.");
+        log.info("Sent: A audio file.");
         msg = {
           "time": time,
           "data": base64Data,
@@ -404,9 +414,9 @@ async function getCASSIE(ctx, session, name2) {
         "time": time,
         "success": 2
       };
-      ctx.logger.error("发送失败：" + e.message);
-      ctx.logger.info("Sent: .failed");
-      ctx.logger.info(msg);
+      log.error("发送失败：" + e.message);
+      log.info("Sent: .failed");
+      log.info(msg);
       return msg;
     }
   } else {
@@ -414,8 +424,8 @@ async function getCASSIE(ctx, session, name2) {
       "time": time,
       "success": 3
     };
-    ctx.logger.info("Sent: .unknown");
-    ctx.logger.info(msg);
+    log.info("Sent: .unknown");
+    log.info(msg);
     return msg;
   }
 }

package/package.json

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