koishi-plugin-node-async-bot-all 2.4.0 → 2.5.1

package/lib/fun.d.ts

@@ -2,7 +2,7 @@ import { Context, FlatPick } from "koishi";
 import Analytics from "@koishijs/plugin-analytics";
 export declare function getSystemUsage(): Promise<Object>;
 export declare function getHongKongTime(): string;
-export declare function fetchWithTimeout(url: string, options: {}, timeout: number, log: any): Promise<Response>;
+export declare function fetchWithTimeout(url: string, options: {} | undefined, timeout: number | undefined, log: any): Promise<Response>;
 export declare function readInfoFile(ctx: Context): Promise<string>;
 export declare function formatTimestampDiff(start: number, end: number): string;
 export declare function getMsgCount(array: FlatPick<Analytics.Message, "type" | "count">[]): Object;

package/lib/index.d.ts

@@ -11,9 +11,12 @@ interface botDataTables {
 }
 export declare const name = "node-async-bot-all";
 export declare const usage = "\u8FD9\u662F\u4E00\u4E2A\u79C1\u6709\u63D2\u4EF6\u3002";
+export interface ConfigCxV2 {
+    id: string;
+    api: Array<string>;
+}
 export interface Config {
-    cxV2Group: Array<string>;
-    cxV2API: Array<string>;
+    cxV2: Array<ConfigCxV2>;
     rwAPI: string;
     timeout: number;
 }

package/lib/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -33,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: { cx: { description: "查询服务器当前人数。", messages: { msg: "{time}\n【MC服务器当前人数】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", msgNoPlayer: "{time}\n【MC服务器当前人数】\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--- 系统状态 ---\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}", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（2）。" } } } };
+    module2.exports = { commands: { cx: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", list: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}", listNoPlayer: "【MC 服务器 {count}】\n➣ {version}：{players}\n➣ 协议版本：{protocol}", listFailed: "【MC 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", unknown: "未知错误。", 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}", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（2）。" } } } };
   }
 });
 
@@ -128,6 +129,7 @@ async function fetchWithTimeout(url, options = {}, timeout = 5e3, log) {
     return response;
   } catch (error) {
     clearTimeout(timeoutId);
+    log.error(error);
     log.error(`${error.name}: ${error.message}`);
     if (error.name === "AbortError") {
       throw new Error("请求超时");
@@ -146,8 +148,8 @@ async function readInfoFile(ctx) {
       "&version;",
       (await ctx.database.get("botData", "version"))[0].data
     );
-  } catch (e) {
-    info = e.message;
+  } catch (error) {
+    info = error.message;
   }
   return info;
 }
@@ -177,98 +179,109 @@ __name(getMsgCount, "getMsgCount");
 // src/commands.ts
 async function getServer(ctx, session) {
   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}"}`);
+  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;
   let error;
   const time = getHongKongTime();
-  if (ctx.config.cxV2Group.includes(session.event.guild.id)) {
-    try {
-      const api = ctx.config.cxV2API[ctx.config.cxV2Group.indexOf(session.event.guild.id)];
-      if (api == void 0) {
-        msg = {
-          "time": time,
-          "data": "未指定查询 API",
-          "success": 1
-        };
-        log.info("Sent:");
-        log.info(msg);
-        return msg;
-      }
-      const response = await fetchWithTimeout(api, {}, ctx.config.timeout, log);
-      if (response.ok) {
-        data = await response.text();
-        log.info("Server data: " + data);
-        data = JSON.parse(data);
-        if (data["list"] == null) {
-          msg = {
-            "time": time,
-            "players": data["players"],
-            "version": data["version"],
-            "protocol": data["protocol"],
-            "success": 3
-          };
-          log.info("Sent:");
-          log.info(msg);
-        } else {
-          msg = {
-            "time": time,
-            "players": data["players"],
-            "version": data["version"],
-            "list": data["list"].join(", "),
-            "protocol": data["protocol"],
-            "success": 0
-          };
-          log.info("Sent:");
-          log.info(msg);
-        }
-      } else {
-        dataError = await response.text();
-        try {
-          const vError = JSON.parse(dataError);
-          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");
-          } 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节点请求源服务器超时")) {
-            error = session.text(".timeout");
-          } else {
-            error = session.text(".unknown");
-          }
-        }
-        log.error(`Error fetching data: ${dataError}`);
-        msg = {
-          "time": time,
-          "data": error,
-          "success": 1
-        };
-        log.info("Sent:");
-        log.info(msg);
-      }
-    } catch (err) {
-      log.error(`Request error:  ${err.message}`);
+  const index = ctx.config.cxV2.findIndex((item) => item.id === session.event.guild?.id);
+  if (index !== -1) {
+    const api = ctx.config.cxV2[index]["api"];
+    if (api == void 0) {
       msg = {
         "time": time,
-        "data": session.text(".error"),
-        "success": 1
+        "data": "未指定查询 API",
+        "success": 2
       };
       log.info("Sent:");
       log.info(msg);
+      return msg;
     }
+    let count = 0;
+    let list = "";
+    for (const item of api) {
+      count++;
+      try {
+        const response = await fetchWithTimeout(item, {}, ctx.config.timeout, log);
+        if (response.ok) {
+          data = await response.text();
+          log.info("Server data: " + data);
+          data = JSON.parse(data);
+          if (data["list"] == null) {
+            const temp = {
+              "count": count,
+              "players": data["players"],
+              "version": data["version"],
+              "protocol": data["protocol"]
+            };
+            log.info(`Server ${count}:`);
+            log.info(temp);
+            list = list + "\n" + session.text(".listNoPlayer", temp);
+          } else {
+            const temp = {
+              "count": count,
+              "players": data["players"],
+              "version": data["version"],
+              "list": data["list"].join(", "),
+              "protocol": data["protocol"]
+            };
+            log.info(`Server ${count}:`);
+            log.info(temp);
+            list = list + "\n" + session.text(".list", temp);
+          }
+        } else {
+          dataError = await response.text();
+          try {
+            const vError = JSON.parse(dataError);
+            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");
+            } 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节点请求源服务器超时")) {
+              error = session.text(".timeout");
+            } else {
+              error = session.text(".unknown");
+            }
+          }
+          log.error(`Error fetching data: ${dataError}`);
+          const temp = {
+            "count": count,
+            "data": error
+          };
+          log.info(`Server ${count}:`);
+          log.info(temp);
+          list = list + "\n" + session.text(".listFailed", temp);
+        }
+      } catch (err) {
+        log.error(`Request error:  ${err.message}`);
+        const temp = {
+          "count": count,
+          "data": session.text(".error")
+        };
+        log.info(`Server ${count}:`);
+        log.info(temp);
+        list = list + "\n" + session.text(".listFailed", temp);
+      }
+    }
+    msg = {
+      "time": time,
+      "list": list,
+      "success": 0
+    };
   } else {
     msg = {
       "time": time,
-      "success": 2
+      "success": 1
     };
     log.info("Sent:");
     log.info(msg);
@@ -278,7 +291,7 @@ async function getServer(ctx, session) {
 __name(getServer, "getServer");
 async function getStatus(ctx, session) {
   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}"}`);
+  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();
@@ -312,7 +325,7 @@ async function getStatus(ctx, session) {
 __name(getStatus, "getStatus");
 async function getRandom(ctx, session, min, max) {
   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}"}`);
+  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;
@@ -335,7 +348,7 @@ async function getRandom(ctx, session, min, max) {
 __name(getRandom, "getRandom");
 async function getInfo(ctx, session) {
   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}"}`);
+  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(ctx);
@@ -361,7 +374,7 @@ async function getInfo(ctx, session) {
 __name(getInfo, "getInfo");
 async function getRW(ctx, session) {
   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}"}`);
+  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();
@@ -401,7 +414,7 @@ async function getRW(ctx, session) {
 __name(getRW, "getRW");
 
 // package.json
-var version = "2.4.0";
+var version = "2.5.1";
 
 // src/index.ts
 var inject = ["database"];
@@ -412,8 +425,12 @@ var Config = import_koishi2.Schema.intersect([
     timeout: import_koishi2.Schema.number().default(8e3).description("超时时间（毫秒）")
   }).description("基础"),
   import_koishi2.Schema.object({
-    cxV2Group: import_koishi2.Schema.array(String).description("查询 群，对应 API"),
-    cxV2API: import_koishi2.Schema.array(String).description("查询 API，对应 群")
+    cxV2: import_koishi2.Schema.array(
+      import_koishi2.Schema.object({
+        id: import_koishi2.Schema.string().required().description("查询 群"),
+        api: import_koishi2.Schema.array(String).description("查询 API")
+      })
+    ).default([]).description("查询的 API 和 群")
   }).description("查询"),
   import_koishi2.Schema.object({
     rwAPI: import_koishi2.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")
@@ -436,43 +453,41 @@ function apply(ctx) {
   ctx.command("cx").action(async ({ session }) => {
     const cx = await getServer(ctx, session);
     if (cx["success"] == 0) {
-      return session.text(".msg", cx);
+      return session?.text(".msg", cx);
     } else if (cx["success"] == 1) {
-      return session.text(".failed", cx);
+      return session?.text(".forbidden", cx);
     } else if (cx["success"] == 2) {
-      return session.text(".forbidden", cx);
-    } else if (cx["success"] == 3) {
-      return session.text(".msgNoPlayer", cx);
+      return session?.text(".failed", cx);
     }
   });
   ctx.command("status").action(async ({ session }) => {
     const status = await getStatus(ctx, session);
     if (status["success"] == 0) {
-      return session.text(".msg", status);
+      return session?.text(".msg", status);
     } else {
-      return session.text(".failed", status);
+      return session?.text(".failed", status);
     }
   });
   ctx.command("random [最小数:number] [最大数:number]").action(async ({ session }, min, max) => {
     const random = await getRandom(ctx, session, min, max);
-    return session.text(".msg", random);
+    return session?.text(".msg", random);
   });
   ctx.command("info").action(async ({ session }) => {
     const info = await getInfo(ctx, session);
     if (info["success"] == 0) {
-      return session.text(".msg", info);
+      return session?.text(".msg", info);
     } else {
-      return session.text(".failed", info);
+      return session?.text(".failed", info);
     }
   });
   ctx.command("rw").action(async ({ session }) => {
     const rw = await getRW(ctx, session);
     if (rw["success"] == 0) {
-      return session.text(".msg", rw);
+      return session?.text(".msg", rw);
     } else if (rw["success"] == 1) {
-      return session.text(".failed1", rw);
+      return session?.text(".failed1", rw);
     } else {
-      return session.text(".failed2", rw);
+      return session?.text(".failed2", rw);
     }
   });
 }

package/package.json

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