koishi-plugin-node-async-bot-all 2.20.2 → 2.21.0

package/lib/fun.d.ts

@@ -1,6 +1,17 @@
 import { HttpResponse } from "./index";
 import { Context } from "koishi";
 import { APIUserInfo } from "./commands";
+export type serverInfo = {
+    players: string;
+    protocol: number;
+    version: string;
+    bots: number;
+    port: number;
+    success: true;
+} | {
+    success: false;
+    error: any;
+};
 export declare function getSystemUsage(): Promise<Object>;
 export declare function getHongKongTime(): string;
 export declare function readInfoFile(ctx: Context): Promise<string>;
@@ -17,3 +28,4 @@ export declare function random(type: number | undefined, data: any, data2?: any)
 export declare function request<T = any>(url: string, options?: RequestInit, timeout?: number, log?: any): Promise<HttpResponse<T>>;
 export declare function readUserCardFile(userInfo: APIUserInfo): Promise<string>;
 export declare function readUserMsgFile(userName: string, userAvatar: string, msg: string): Promise<string>;
+export declare function queryA2S(host: string, log: any): Promise<serverInfo>;

package/lib/index.d.ts

@@ -20,13 +20,17 @@ 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 {
+export interface ConfigCxV3 {
     id: string;
-    api: Array<string>;
-    note: Array<string>;
+    server: Array<ConfigV3Server>;
+}
+export interface ConfigV3Server {
+    api: string;
+    note: string;
+    type: "mc" | "a2s" | null | undefined;
 }
 export interface Config {
-    cxV2: Array<ConfigCxV2>;
+    cxV3: Array<ConfigCxV3>;
     rwAPI: string;
     timeout: number;
     baAPI: string[];

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➣ 请稍后重试。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}", timeout: "请求超时。", timeout2: "响应超时。", 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请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{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}禁止套娃！" } } } };
+    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: "请求超时。", timeout2: "响应超时。", 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请等待图片上传（可能较慢）。" } }, servertest: { description: "Ping服务器。", messages: { msg: "{time}\n== Ping {host} ==\n状态：{alive}\n丢包率：{packetLoss}\n返回IP：{ip}", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\nPing 失败：{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}禁止套娃！" } } } };
   }
 });
 
@@ -57,6 +57,7 @@ var import_koishi2 = require("koishi");
 var import_os = __toESM(require("os"));
 var import_fs = __toESM(require("fs"));
 var import_ping = __toESM(require("ping"));
+var import_steam_server_query = require("steam-server-query");
 var import_path = __toESM(require("path"));
 var import_koishi = require("koishi");
 function getSystemName() {
@@ -281,6 +282,27 @@ async function readUserMsgFile(userName, userAvatar, msg) {
   return html;
 }
 __name(readUserMsgFile, "readUserMsgFile");
+async function queryA2S(host, log) {
+  try {
+    const playerResponse = await (0, import_steam_server_query.queryGameServerInfo)(host);
+    log?.info("Server Info:", playerResponse);
+    return {
+      players: playerResponse.players + "/" + playerResponse.maxPlayers,
+      protocol: playerResponse.protocol,
+      version: playerResponse.version,
+      bots: playerResponse.bots,
+      port: playerResponse.port,
+      success: true
+    };
+  } catch (e) {
+    log?.error("A2S Error:", e);
+    return {
+      error: e,
+      success: false
+    };
+  }
+}
+__name(queryA2S, "queryA2S");
 
 // src/commands.ts
 async function getServer(ctx, session) {
@@ -288,13 +310,13 @@ async function getServer(ctx, session) {
   log.debug(`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 index = ctx.config.cxV2.findIndex((item) => item.id === session.event.guild?.id);
+  const index = ctx.config.cxV3.findIndex((item) => item.id === session.event.guild?.id);
   if (index !== -1) {
-    const api = ctx.config.cxV2[index]["api"];
-    if (api == void 0) {
+    const server = ctx.config.cxV3[index].server;
+    if (server == void 0) {
       msg = {
         "time": time,
-        "data": "未指定查询 API",
+        "data": "未指定查询 服务器",
         "success": 2
       };
       log.warn("Sent:");
@@ -303,58 +325,92 @@ async function getServer(ctx, session) {
     }
     let count = 0;
     let list = "";
-    for (const item of api) {
-      const note = ctx.config.cxV2[index]["note"][count];
+    for (const item of server) {
+      const note = item.note;
+      const type = item.type;
+      const api = item.api;
       count++;
-      const response = await request(item, {}, ctx.config.timeout, log);
-      if (response.success) {
-        if (response.data.list == null) {
+      if (type == "a2s") {
+        const info = await queryA2S(api, log);
+        if (info.success) {
           const temp = {
             "count": count,
-            "players": response.data.players,
-            "version": response.data.version,
+            "players": info.players,
+            "version": info.version,
+            "bots": info.bots,
             "note": note ?? "无"
           };
           log.info(`Server ${count}:`);
           log.info(temp);
-          list = list + "\n" + session.text(".listNoPlayer", temp);
+          list = list + "\n" + session.text(".listA2S", temp);
         } 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 = "请求超时。";
+          } else {
+            err = "未知错误。";
+          }
           const temp = {
             "count": count,
-            "players": response.data.players,
-            "version": response.data.version,
-            "list": response.data.list.join(", "),
-            "note": note ?? "无"
+            "data": err,
+            "note": note
           };
-          log.info(`Server ${count}:`);
-          log.info(temp);
-          list = list + "\n" + session.text(".list", temp);
+          log.error(`Server ${count}:`);
+          log.error(temp);
+          list = list + "\n" + session.text(".listFailedA2S", temp);
         }
       } else {
-        let err;
-        if (response.code) {
-          err = response.isJson ? response.error["data"] : response.error;
-          if (err.includes("Connection refused")) {
-            err = session.text(".close");
-          } else if (err.includes("No route to host")) {
-            err = session.text(".host");
-          } else if (err.includes("Connection timed out")) {
-            err = session.text(".timeout");
-          } else if (err.includes("Server returned too few data")) {
-            err = session.text(".fewData");
-          } else if (err.includes("Server read timed out")) {
-            err = session.text(".timeout2");
+        const response = await request(api, {}, ctx.config.timeout, log);
+        if (response.success) {
+          if (response.data.list == null) {
+            const temp = {
+              "count": count,
+              "players": response.data.players,
+              "version": response.data.version,
+              "note": note ?? "无"
+            };
+            log.info(`Server ${count}:`);
+            log.info(temp);
+            list = list + "\n" + session.text(".listNoPlayer", temp);
+          } else {
+            const temp = {
+              "count": count,
+              "players": response.data.players,
+              "version": response.data.version,
+              "list": response.data.list.join(", "),
+              "note": note ?? "无"
+            };
+            log.info(`Server ${count}:`);
+            log.info(temp);
+            list = list + "\n" + session.text(".list", temp);
           }
         } else {
-          err = response.error.message;
+          let err;
+          if (response.code) {
+            err = response.isJson ? response.error["data"] : response.error;
+            if (err.includes("Connection refused")) {
+              err = session.text(".close");
+            } else if (err.includes("No route to host")) {
+              err = session.text(".host");
+            } else if (err.includes("Connection timed out")) {
+              err = session.text(".timeout");
+            } else if (err.includes("Server returned too few data")) {
+              err = session.text(".fewData");
+            } else if (err.includes("Server read timed out")) {
+              err = session.text(".timeout2");
+            }
+          } else {
+            err = response.error.message;
+          }
+          const temp = {
+            "count": count,
+            "data": err,
+            "note": note
+          };
+          log.error(`Server ${count}:`);
+          log.error(temp);
+          list = list + "\n" + session.text(".listFailed", temp);
         }
-        const temp = {
-          "count": count,
-          "data": err
-        };
-        log.error(`Server ${count}:`);
-        log.error(temp);
-        list = list + "\n" + session.text(".listFailed", temp);
       }
     }
     msg = {
@@ -742,7 +798,7 @@ async function getMsg(ctx, session) {
 __name(getMsg, "getMsg");
 
 // package.json
-var version = "2.20.2";
+var version = "2.21.0";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer"];
@@ -753,13 +809,18 @@ var Config = import_koishi3.Schema.intersect([
     timeout: import_koishi3.Schema.number().default(8e3).description("超时时间（毫秒）")
   }).description("基础"),
   import_koishi3.Schema.object({
-    cxV2: import_koishi3.Schema.array(
+    cxV3: import_koishi3.Schema.array(
       import_koishi3.Schema.object({
-        id: import_koishi3.Schema.string().required().description("查询 群"),
-        api: import_koishi3.Schema.array(String).description("查询 API"),
-        note: import_koishi3.Schema.array(String).description("查询 备注")
+        id: import_koishi3.Schema.string().description("查询 群"),
+        server: import_koishi3.Schema.array(
+          import_koishi3.Schema.object({
+            api: import_koishi3.Schema.string().description("查询 API | HOST"),
+            note: import_koishi3.Schema.string().description("查询 备注"),
+            type: import_koishi3.Schema.union(["mc", "a2s"]).description("查询 类型")
+          })
+        ).description("查询 服务器")
       })
-    ).default([]).description("查询的 API 和 群")
+    ).default([]).description("查询的群")
   }).description("查询"),
   import_koishi3.Schema.object({
     rwAPI: import_koishi3.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.20.2",
+  "version": "2.21.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -33,9 +33,12 @@
   "peerDependencies": {
     "@koishijs/plugin-database-sqlite": "^4.6.0",
     "@koishijs/plugin-help": "^2.4.5",
+    "koishi-plugin-puppeteer": "^3.9.0",
+    "@koishijs/plugin-market": "^2.11.8",
     "koishi": "^4.18.7"
   },
   "dependencies": {
-    "ping": "^1.0.0"
+    "ping": "^1.0.0",
+    "steam-server-query": "^1.1.3"
   }
 }