koishi-plugin-node-async-bot-all 1.4.3 → 1.5.1

package/lib/fun.d.ts

@@ -1,4 +1,4 @@
-export declare function getSystemUsage(): Promise<string>;
+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 readInfoFile(): Promise<string>;

package/lib/index.js

@@ -5,6 +5,9 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name2 in all)
     __defProp(target, name2, { get: all[name2], enumerable: true });
@@ -27,6 +30,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// 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）。" } } } };
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -39,10 +49,7 @@ module.exports = __toCommonJS(src_exports);
 var import_os = __toESM(require("os"));
 
 // package.json
-var version = "1.4.3";
-
-// res/i18n.yaml
-var i18n_default = { rw: { failed1: "获取失败（1）。", failed2: "获取失败（2）。" }, cx: { forbidden: "此指令不允许在本群使用。", notice: "进服指南请在群公告中查看。", players: "服务器当前人数", failed: "查询失败：", timeout: "请求超时。", later: "请稍后重试。", unknown: "未知错误。", close: "服务器已关闭。" }, status: { failed: "状态获取失败。", name: "系统名称：", cpu: "CPU使用率：", memory: "内存使用率：" }, random: { sc: "生成的随机数：" }, info: { failed: "读取信息失败。" } };
+var version = "1.5.1";
 
 // src/fun.ts
 function getSystemName() {
@@ -71,11 +78,17 @@ __name(getCpuUsage, "getCpuUsage");
 async function getSystemUsage() {
   let info;
   try {
-    info = `${i18n_default.status.name}${getSystemName()}
-${i18n_default.status.cpu}${await getCpuUsage()}%
-${i18n_default.status.memory}${getMemoryUsage()}%`;
+    info = {
+      "name": getSystemName(),
+      "cpu": await getCpuUsage() + "%",
+      "memory": getMemoryUsage() + "%",
+      "success": 0
+    };
   } catch (error) {
-    info = error.message;
+    info = {
+      "data": error.message,
+      "success": 1
+    };
   }
   return info;
 }
@@ -149,43 +162,55 @@ async function getServer(ctx, session) {
         data = await response.text();
         ctx.logger.info("Server data: " + data);
         data = JSON.parse(data);
-        msg = `${time}
-【${i18n_default.cx.players}】
-  ➣ ${data["version"]}：${data["players"]}
-${i18n_default.cx.notice}`;
-        ctx.logger.info("Sent: " + msg);
+        msg = {
+          "time": time,
+          "players": data["players"],
+          "version": data["version"],
+          "success": 0
+        };
+        ctx.logger.info("Sent:");
+        ctx.logger.info(msg);
       } else {
         dataError = await response.text();
         try {
           const vError = JSON.parse(dataError);
           error = vError["data"];
           if (error.includes("Connection refused")) {
-            error = i18n_default.cx.close;
+            error = session.text(".close");
           }
         } catch (e) {
           if (dataError.includes("CDN节点请求源服务器超时")) {
-            error = i18n_default.cx.timeout;
+            error = session.text(".timeout");
           } else {
-            error = i18n_default.cx.unknown;
+            error = session.text(".unknown");
           }
         }
         ctx.logger.error(`Error fetching data: ${dataError}`);
-        msg = `${time}
-${i18n_default.cx.failed}${error}
-${i18n_default.cx.later}`;
-        ctx.logger.info("Sent: " + msg);
+        msg = {
+          "time": time,
+          "data": error,
+          "success": 1
+        };
+        ctx.logger.info("Sent:");
+        ctx.logger.info(msg);
       }
     } catch (err) {
       ctx.logger.error(`Request error:  ${err.message}`);
-      msg = `${time}
-${i18n_default.cx.failed}${i18n_default.cx.timeout}
-${i18n_default.cx.later}`;
-      ctx.logger.info("Sent: " + msg);
+      msg = {
+        "time": time,
+        "data": session.text(".error"),
+        "success": 1
+      };
+      ctx.logger.info("Sent:");
+      ctx.logger.info(msg);
     }
   } else {
-    msg = `${time}
-${i18n_default.cx.forbidden}`;
-    ctx.logger.info("Sent: " + msg);
+    msg = {
+      "time": time,
+      "success": 2
+    };
+    ctx.logger.info("Sent:");
+    ctx.logger.info(msg);
   }
   return msg;
 }
@@ -195,15 +220,24 @@ async function getStatus(ctx, session) {
   const time = getHongKongTime();
   let msg;
   const vMsg = await getSystemUsage();
-  if (!vMsg.includes("系统名称")) {
+  if (vMsg["success"] == 1) {
     ctx.logger.error(vMsg);
-    msg = `${time}
-${i18n_default.status.failed}`;
+    msg = {
+      "time": time,
+      "data": vMsg["data"],
+      "success": 1
+    };
   } else {
-    msg = `${time}
-` + vMsg;
+    msg = {
+      "time": time,
+      "name": vMsg["name"],
+      "cpu": vMsg["cpu"],
+      "memory": vMsg["memory"],
+      "success": 0
+    };
   }
-  ctx.logger.info("Sent: " + msg);
+  ctx.logger.info("Sent:");
+  ctx.logger.info(msg);
   return msg;
 }
 __name(getStatus, "getStatus");
@@ -211,30 +245,46 @@ 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 time = getHongKongTime();
   let msg;
+  let data;
   if (min == void 0 || max == void 0) {
     min = 0;
     max = 1e4;
   }
   min = Math.ceil(min);
   max = Math.floor(max);
-  msg = `${time}
-${i18n_default.random.sc}` + (Math.floor(Math.random() * (max - min + 1)) + min) + `（${min},${max}）`;
-  ctx.logger.info("Sent: " + msg);
+  data = Math.floor(Math.random() * (max - min + 1)) + min + `（${min},${max}）`;
+  msg = {
+    "time": time,
+    "data": data,
+    "success": 0
+  };
+  ctx.logger.info("Sent:");
+  ctx.logger.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 time = getHongKongTime();
-  let msg = await readInfoFile();
-  if (!msg.includes("基沃托斯·工业革命")) {
-    ctx.logger.error("Error: " + msg);
-    msg = `${time}
-${i18n_default.info.failed}`;
+  let msg;
+  let data = await readInfoFile();
+  if (!data.includes("基沃托斯·工业革命")) {
+    ctx.logger.error("Error: " + data);
+    msg = {
+      "time": time,
+      "data": data,
+      "success": 1
+    };
   } else {
-    msg = msg.replace("&time;", time);
+    data = data.replace("&time;", time);
+    msg = {
+      "time": time,
+      "data": data,
+      "success": 0
+    };
   }
-  ctx.logger.info("Sent: " + msg);
+  ctx.logger.info("Sent:");
+  ctx.logger.info(msg);
   return msg;
 }
 __name(getInfo, "getInfo");
@@ -248,40 +298,76 @@ async function getRW(ctx, session) {
     if (response.ok) {
       data = await response.text();
       ctx.logger.info("Server data: " + data);
-      msg = `${time}
-${data}`;
-      ctx.logger.info("Sent: " + msg);
+      msg = {
+        "time": time,
+        "data": data,
+        "success": 0
+      };
+      ctx.logger.info("Sent:");
+      ctx.logger.info(msg);
     } else {
       data = await response.text();
       ctx.logger.error(`Error fetching data: ${data}`);
-      msg = `${time}
-${i18n_default.rw.failed1}`;
-      ctx.logger.info("Sent: " + msg);
+      msg = {
+        "time": time,
+        "success": 1
+      };
+      ctx.logger.info("Sent:");
+      ctx.logger.info(msg);
     }
   } catch (err) {
     ctx.logger.error(`Request error:  ${err.message}`);
-    msg = `${time}
-${i18n_default.rw.failed2}`;
-    ctx.logger.info("Sent: " + msg);
+    msg = {
+      "time": time,
+      "success": 2
+    };
+    ctx.logger.info("Sent:");
+    ctx.logger.info(msg);
   }
   return msg;
 }
 __name(getRW, "getRW");
 function apply(ctx) {
-  ctx.command("cx", "查询服务器当前人数。").action(({ session }) => {
-    return getServer(ctx, session);
+  ctx.i18n.define("zh-CN", require_zh_CN());
+  ctx.command("cx").action(async ({ session }) => {
+    const cx = await getServer(ctx, session);
+    if (cx["success"] == 0) {
+      return session.text(".msg", cx);
+    } else if (cx["success"] == 1) {
+      return session.text(".failed", cx);
+    } else {
+      return session.text(".forbidden", cx);
+    }
   });
-  ctx.command("status", "查询机器人状态。").action(({ session }) => {
-    return getStatus(ctx, session);
+  ctx.command("status").action(async ({ session }) => {
+    const status = await getStatus(ctx, session);
+    if (status["success"] == 0) {
+      return session.text(".msg", status);
+    } else {
+      return session.text(".failed", status);
+    }
   });
-  ctx.command("random [最小数:number] [最大数:number]", "随机数生成器。").usage("缺少参数时默认生成 0-10000 的随机数。").example("random 1 128 生成1到128范围的随机数").action(({ session }, min, max) => {
-    return getRandom(ctx, session, min, max);
+  ctx.command("random [最小数:number] [最大数:number]").action(async ({ session }, min, max) => {
+    const random = await getRandom(ctx, session, min, max);
+    return session.text(".msg", random);
   });
-  ctx.command("info", "机器人信息").action(({ session }) => {
-    return getInfo(ctx, session);
+  ctx.command("info").action(async ({ session }) => {
+    const info = await getInfo(ctx, session);
+    if (info["success"] == 0) {
+      return session.text(".msg", info);
+    } else {
+      return session.text(".failed", info);
+    }
   });
-  ctx.command("rw", "随机名言名句").action(({ session }) => {
-    return getRW(ctx, session);
+  ctx.command("rw").action(async ({ session }) => {
+    const rw = await getRW(ctx, session);
+    if (rw["success"] == 0) {
+      return session.text(".msg", rw);
+    } else if (rw["success"] == 1) {
+      return session.text(".failed1", rw);
+    } else {
+      return session.text(".failed2", rw);
+    }
   });
 }
 __name(apply, "apply");

package/package.json

@@ -1,15 +1,19 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "1.4.3",
+  "version": "1.5.1",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
+  "contributors": [
+    "ccd2s <tasaedem@outlook.com>"
+  ],
   "files": [
     "lib",
     "dist",
     "res"
   ],
   "license": "AGPL-3.0",
+  "homepage": "https://www.tasaed.top",
   "keywords": [
     "chatbot",
     "koishi",
@@ -21,13 +25,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ccd2s/node-async-bot-all"
+    "url": "https://github.com/ccd2s/node-async-bot-all"
   },
   "devDependencies": {
     "@koishijs/client": "^5.30.4"
   },
   "peerDependencies": {
-    "@koishijs/plugin-console": "^5.30.4",
     "@koishijs/plugin-help": "^2.4.5",
     "koishi": "^4.18.7"
   }

package/res/i18n.yaml

@@ -1,21 +0,0 @@
-rw:
-  failed1: 获取失败（1）。
-  failed2: 获取失败（2）。
-cx:
-  forbidden: 此指令不允许在本群使用。
-  notice: 进服指南请在群公告中查看。
-  players: 服务器当前人数
-  failed: 查询失败：
-  timeout: 请求超时。
-  later: 请稍后重试。
-  unknown: 未知错误。
-  close: 服务器已关闭。
-status:
-  failed: 状态获取失败。
-  name: 系统名称：
-  cpu: CPU使用率：
-  memory: 内存使用率：
-random:
-  sc: 生成的随机数：
-info:
-  failed: 读取信息失败。