koishi-plugin-node-async-bot-all 2.7.0 → 2.9.0

package/lib/fun.d.ts

@@ -11,6 +11,5 @@ export declare function hostPing(host: string): Promise<{
     data?: any;
     ip?: string;
     alive?: boolean;
-    time?: string;
     packetLoss?: string;
 }>;

package/lib/index.d.ts

@@ -14,6 +14,7 @@ export declare const usage = "\u8FD9\u662F\u4E00\u4E2A\u79C1\u6709\u63D2\u4EF6\u
 export interface ConfigCxV2 {
     id: string;
     api: Array<string>;
+    note: Array<string>;
 }
 export interface Config {
     cxV2: Array<ConfigCxV2>;

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: { 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）。" } }, randomba: { description: "随机BA图。", messages: { wait: "{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}\n{avg}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } } } };
+    module2.exports = { commands: { cx: { 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➣ 请稍后重试。", 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）。" } }, randomba: { description: "随机BA图。", messages: { wait: "{time}\n请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{data}" } } } };
   }
 });
 
@@ -185,7 +185,6 @@ async function hostPing(host) {
       "success": true,
       "ip": tmp.numeric_host,
       "alive": tmp.alive,
-      "time": tmp.avg == "unknown" ? "请求超时。" : `平均延迟：${tmp.avg}ms`,
       "packetLoss": tmp.packetLoss.toString()
     };
   } catch (error) {
@@ -222,6 +221,7 @@ async function getServer(ctx, session) {
     let count = 0;
     let list = "";
     for (const item of api) {
+      const note = ctx.config.cxV2[index]["note"][count];
       count++;
       try {
         const response = await fetchWithTimeout(item, {}, ctx.config.timeout, log);
@@ -234,7 +234,7 @@ async function getServer(ctx, session) {
               "count": count,
               "players": data["players"],
               "version": data["version"],
-              "protocol": data["protocol"]
+              "note": note ?? "无"
             };
             log.info(`Server ${count}:`);
             log.info(temp);
@@ -245,7 +245,7 @@ async function getServer(ctx, session) {
               "players": data["players"],
               "version": data["version"],
               "list": data["list"].join(", "),
-              "protocol": data["protocol"]
+              "note": note ?? "无"
             };
             log.info(`Server ${count}:`);
             log.info(temp);
@@ -481,14 +481,13 @@ async function serverTest(ctx, session) {
     "host": host,
     "ip": tmp.ip,
     "alive": tmp.alive == true ? "正常" : "异常",
-    "packetLoss": tmp.packetLoss,
-    "avg": tmp.time
+    "packetLoss": tmp.packetLoss
   };
 }
 __name(serverTest, "serverTest");
 
 // package.json
-var version = "2.7.0";
+var version = "2.9.0";
 
 // src/index.ts
 var inject = ["database"];
@@ -502,7 +501,8 @@ var Config = import_koishi2.Schema.intersect([
     cxV2: import_koishi2.Schema.array(
       import_koishi2.Schema.object({
         id: import_koishi2.Schema.string().required().description("查询 群"),
-        api: import_koishi2.Schema.array(String).description("查询 API")
+        api: import_koishi2.Schema.array(String).description("查询 API"),
+        note: import_koishi2.Schema.array(String).description("查询 备注")
       })
     ).default([]).description("查询的 API 和 群")
   }).description("查询"),

package/package.json

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