koishi-plugin-node-async-bot-all 1.8.2 → 1.9.0

package/lib/fun.d.ts

@@ -1,6 +1,7 @@
+import { Context } from "koishi";
 export declare function getSystemUsage(): Promise<object>;
 export declare function getHongKongTime(): string;
-export declare function fetchWithTimeout(url: string, options?: {}, timeout?: number): Promise<Response>;
+export declare function fetchWithTimeout(url: string, options: {}, timeout: number, ctx: Context): 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进服指南请在群公告中查看。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}\n请稍后重试。", timeout: "请求超时。", close: "服务器已关闭。", error: "执行错误。", unknown: "未知错误。" } }, 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进服指南请在群公告中查看。", 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 查看播放列表。" } } } };
   }
 });
 
@@ -51,7 +51,7 @@ var import_koishi = require("koishi");
 var import_os = __toESM(require("os"));
 
 // package.json
-var version = "1.8.2";
+var version = "1.9.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) {
+async function fetchWithTimeout(url, options = {}, timeout = 5e3, ctx) {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => {
     controller.abort();
@@ -124,9 +124,11 @@ async function fetchWithTimeout(url, options = {}, timeout = 5e3) {
       // 绑定终止信号
     });
     clearTimeout(timeoutId);
+    ctx.logger.info(`Fetch code: ${response.status}`);
     return response;
   } catch (error) {
     clearTimeout(timeoutId);
+    ctx.logger.error(`${error.name}: ${error.message}`);
     if (error.name === "AbortError") {
       throw new Error("请求超时");
     } else {
@@ -171,7 +173,7 @@ 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);
+      const response = await fetchWithTimeout("https://api.tasaed.top/get/minecraftServer/", {}, 8e3, ctx);
       if (response.ok) {
         data = await response.text();
         ctx.logger.info("Server data: " + data);
@@ -180,6 +182,8 @@ async function getServer(ctx, session) {
           "time": time,
           "players": data["players"],
           "version": data["version"],
+          "list": data["list"].join(", "),
+          "protocol": data["protocol"],
           "success": 0
         };
         ctx.logger.info("Sent:");
@@ -191,6 +195,10 @@ async function getServer(ctx, session) {
           error = vError["data"];
           if (error.includes("Connection refused")) {
             error = session.text(".close");
+          } else if (error.includes("No route to host")) {
+            error = session.text(".host");
+          } else if (error.includes("Connection timed out")) {
+            error = session.text(".timeout");
           }
         } catch (e) {
           if (dataError.includes("CDN节点请求源服务器超时")) {
@@ -308,7 +316,7 @@ async function getRW(ctx, session) {
   let data;
   const time = getHongKongTime();
   try {
-    const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3);
+    const response = await fetchWithTimeout("https://api.tasaed.top/rw/", {}, 8e3, ctx);
     if (response.ok) {
       data = await response.text();
       ctx.logger.info("Server data: " + data);

package/package.json

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