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

package/lib/fun.d.ts

@@ -1,11 +1,10 @@
-import { Context, FlatPick } from "koishi";
-import Analytics from "@koishijs/plugin-analytics";
+import { Context } from "koishi";
 export declare function getSystemUsage(): Promise<Object>;
 export declare function getHongKongTime(): string;
 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;
+export declare function getMsgCount(ctx: Context): Promise<Object>;
 export declare function hostPing(host: string): Promise<{
     success: boolean;
     data?: any;
@@ -13,3 +12,4 @@ export declare function hostPing(host: string): Promise<{
     alive?: boolean;
     packetLoss?: string;
 }>;
+export declare function random(type: number | undefined, data: any, data2?: any): number;

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➣ 备注：{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}" } } } };
+    module2.exports = { commands: { cxmc: { 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}", error: "执行错误。", failed1: "{time}\n获取失败（1）。", failed2: "{time}\n获取失败（{data}）。" } }, 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}" } } } };
   }
 });
 
@@ -48,16 +48,17 @@ __export(src_exports, {
   usage: () => usage
 });
 module.exports = __toCommonJS(src_exports);
-var import_koishi2 = require("koishi");
+var import_koishi3 = require("koishi");
 
 // src/commands.ts
-var import_koishi = require("koishi");
+var import_koishi2 = require("koishi");
 
 // src/fun.ts
 var import_os = __toESM(require("os"));
 var import_fs = __toESM(require("fs"));
 var import_ping = __toESM(require("ping"));
 var import_path = __toESM(require("path"));
+var import_koishi = require("koishi");
 function getSystemName() {
   return import_os.default.type() + " " + import_os.default.release();
 }
@@ -66,19 +67,29 @@ function getMemoryUsage() {
   const totalMemory = import_os.default.totalmem();
   const freeMemory = import_os.default.freemem();
   const usedMemory = totalMemory - freeMemory;
-  return Math.round(usedMemory / totalMemory * 100);
+  return Math.round(usedMemory / totalMemory * 1e4) / 100;
 }
 __name(getMemoryUsage, "getMemoryUsage");
 async function getCpuUsage() {
-  const startUsage = process.cpuUsage();
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      const endUsage = process.cpuUsage(startUsage);
-      const totalUsage = endUsage.user + endUsage.system;
-      const percentage = totalUsage / (1e3 * 1e3);
-      resolve(Math.round(percentage * 100));
-    }, 1e3);
-  });
+  const cpus1 = import_os.default.cpus();
+  await new Promise((resolve) => setTimeout(resolve, 100));
+  const cpus2 = import_os.default.cpus();
+  let totalIdle = 0;
+  let totalTick = 0;
+  for (let i = 0; i < cpus1.length; i++) {
+    const cpu1 = cpus1[i];
+    const cpu2 = cpus2[i];
+    const idle1 = cpu1.times.idle;
+    const total1 = Object.values(cpu1.times).reduce((acc, time) => acc + time, 0);
+    const idle2 = cpu2.times.idle;
+    const total2 = Object.values(cpu2.times).reduce((acc, time) => acc + time, 0);
+    const idleDiff = idle2 - idle1;
+    const totalDiff = total2 - total1;
+    totalIdle += idleDiff;
+    totalTick += totalDiff;
+  }
+  const usage2 = 100 - 100 * totalIdle / totalTick;
+  return Math.round(usage2 * 100) / 100;
 }
 __name(getCpuUsage, "getCpuUsage");
 async function getSystemUsage() {
@@ -101,30 +112,38 @@ async function getSystemUsage() {
 __name(getSystemUsage, "getSystemUsage");
 function getHongKongTime() {
   const now = /* @__PURE__ */ new Date();
-  const hkOffset = 8 * 60;
-  const hkTime = new Date(now.getTime() + (hkOffset + now.getTimezoneOffset()) * 6e4);
-  return [
-    hkTime.getFullYear(),
-    (hkTime.getMonth() + 1).toString().padStart(2, "0"),
-    hkTime.getDate().toString().padStart(2, "0")
-  ].join("-") + " " + [
-    hkTime.getHours().toString().padStart(2, "0"),
-    hkTime.getMinutes().toString().padStart(2, "0"),
-    hkTime.getSeconds().toString().padStart(2, "0")
-  ].join(":");
+  const formatter = new Intl.DateTimeFormat("zh-CN", {
+    timeZone: "Asia/Hong_Kong",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: false
+  });
+  const parts = formatter.formatToParts(now);
+  const dateObj = {};
+  parts.forEach((part) => {
+    if (part.type !== "literal") {
+      dateObj[part.type] = part.value;
+    }
+  });
+  return `${dateObj.year}-${dateObj.month}-${dateObj.day} ${dateObj.hour}:${dateObj.minute}:${dateObj.second}`;
 }
 __name(getHongKongTime, "getHongKongTime");
 async function fetchWithTimeout(url, options = {}, timeout = 5e3, log) {
   const controller = new AbortController();
+  const { signal } = controller;
+  const fetchOptions = {
+    ...options,
+    signal
+  };
   const timeoutId = setTimeout(() => {
     controller.abort();
   }, timeout);
   try {
-    const response = await fetch(url, {
-      ...options,
-      signal: controller.signal
-      // 绑定终止信号
-    });
+    const response = await fetch(url, fetchOptions);
     clearTimeout(timeoutId);
     log.info(`Fetch code: ${response.status}`);
     return response;
@@ -133,7 +152,7 @@ async function fetchWithTimeout(url, options = {}, timeout = 5e3, log) {
     log.error(error);
     log.error(`${error.name}: ${error.message}`);
     if (error.name === "AbortError") {
-      throw new Error("请求超时");
+      throw new Error(`请求超时。(${timeout}ms)`);
     } else {
       throw error;
     }
@@ -163,7 +182,9 @@ function formatTimestampDiff(start, end) {
   return `${hours} 时 ${minutes} 分 ${seconds} 秒`;
 }
 __name(formatTimestampDiff, "formatTimestampDiff");
-function getMsgCount(array) {
+async function getMsgCount(ctx) {
+  const array = await ctx.database.get("analytics.message", { date: import_koishi.Time.getDateNumber() - 1 }, ["type", "count"]);
+  ctx.logger.info(import_koishi.Time.getDateNumber() - 1);
   let receive = 0;
   let send = 0;
   array.forEach((item) => {
@@ -195,6 +216,20 @@ async function hostPing(host) {
   }
 }
 __name(hostPing, "hostPing");
+function random(type = 0, data, data2) {
+  const random2 = new import_koishi.Random(() => Math.random());
+  switch (type) {
+    case 0:
+      return random2.int(data, data2);
+    case 1:
+      return random2.real(data, data2);
+    case 2:
+      return random2.pick(data);
+    default:
+      return 0;
+  }
+}
+__name(random, "random");
 
 // src/commands.ts
 async function getServer(ctx, session) {
@@ -284,10 +319,10 @@ async function getServer(ctx, session) {
           list = list + "\n" + session.text(".listFailed", temp);
         }
       } catch (err) {
-        log.error(`Request error:  ${err.message}`);
+        log.error(`Request error: ${err.message}`);
         const temp = {
           "count": count,
-          "data": session.text(".error")
+          "data": err.name === "AbortError" ? session.text(".error") : err.message
         };
         log.info(`Server ${count}:`);
         log.info(temp);
@@ -324,7 +359,7 @@ async function getStatus(ctx, session) {
       "success": 1
     };
   } else {
-    const msgCount = getMsgCount(await ctx.database.get("analytics.message", { date: import_koishi.Time.getDateNumber() - 1 }, ["type", "count"]));
+    const msgCount = await getMsgCount(ctx);
     msg = {
       "time": time,
       "name": vMsg["name"],
@@ -425,6 +460,7 @@ async function getRW(ctx, session) {
     log.error(`Request error:  ${err.message}`);
     msg = {
       "time": time,
+      "data": err.name === "AbortError" ? session.text(".error") : err.message,
       "success": 2
     };
     log.info("Sent:");
@@ -436,14 +472,13 @@ __name(getRW, "getRW");
 async function getBA(ctx, session) {
   const log = ctx.logger("ba");
   log.info(`Got: {"form":"${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
-  const random = new import_koishi.Random(() => Math.random());
   const time = getHongKongTime();
   const vid = await session.send(session.text(".wait", { "time": time }));
-  const ms = random.int(0, 1500);
-  const link = random.pick(ctx.config.baAPI) + `?cacheBuster=${random.real(1, 2147483647)}`;
+  const ms = random(0, 0, 1500);
+  const link = random(2, ctx.config.baAPI) + `?cacheBuster=${random(1, 1, 2147483647)}`;
   log.info(`Link: ${link}`);
-  await (0, import_koishi.sleep)(ms);
-  await session.send(import_koishi.h.image(link));
+  await (0, import_koishi2.sleep)(ms);
+  await session.send(import_koishi2.h.image(link));
   await session.bot.deleteMessage(session.event.guild?.id, vid[0]);
   return 0;
 }
@@ -487,33 +522,33 @@ async function serverTest(ctx, session) {
 __name(serverTest, "serverTest");
 
 // package.json
-var version = "2.9.0";
+var version = "2.10.0";
 
 // src/index.ts
 var inject = ["database"];
 var name = "node-async-bot-all";
 var usage = "这是一个私有插件。";
-var Config = import_koishi2.Schema.intersect([
-  import_koishi2.Schema.object({
-    timeout: import_koishi2.Schema.number().default(8e3).description("超时时间（毫秒）")
+var Config = import_koishi3.Schema.intersect([
+  import_koishi3.Schema.object({
+    timeout: import_koishi3.Schema.number().default(8e3).description("超时时间（毫秒）")
   }).description("基础"),
-  import_koishi2.Schema.object({
-    cxV2: import_koishi2.Schema.array(
-      import_koishi2.Schema.object({
-        id: import_koishi2.Schema.string().required().description("查询 群"),
-        api: import_koishi2.Schema.array(String).description("查询 API"),
-        note: import_koishi2.Schema.array(String).description("查询 备注")
+  import_koishi3.Schema.object({
+    cxV2: 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("查询 备注")
       })
     ).default([]).description("查询的 API 和 群")
   }).description("查询"),
-  import_koishi2.Schema.object({
-    rwAPI: import_koishi2.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")
+  import_koishi3.Schema.object({
+    rwAPI: import_koishi3.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")
   }).description("随机文本"),
-  import_koishi2.Schema.object({
-    baAPI: import_koishi2.Schema.array(String).default(["https://rba.kanostar.top/portrait"]).description("随机BA图 API")
+  import_koishi3.Schema.object({
+    baAPI: import_koishi3.Schema.array(String).default(["https://rba.kanostar.top/portrait"]).description("随机BA图 API")
   }).description("随机BA图"),
-  import_koishi2.Schema.object({
-    serverPing: import_koishi2.Schema.dict(String).role("table").description("键：群号；值：Host")
+  import_koishi3.Schema.object({
+    serverPing: import_koishi3.Schema.dict(String).role("table").description("键：群号；值：Host")
   }).description("服之测测（Ping）")
 ]).description("基础设置");
 function apply(ctx) {
@@ -530,7 +565,7 @@ function apply(ctx) {
       { id: "version", data: version }
     ]);
   });
-  ctx.command("cx").action(async ({ session }) => {
+  ctx.command("cxMc").action(async ({ session }) => {
     const cx = await getServer(ctx, session);
     if (cx["success"] == 0) {
       return session?.text(".msg", cx);
@@ -549,8 +584,8 @@ function apply(ctx) {
     }
   });
   ctx.command("random [最小数:number] [最大数:number]").alias("随机数").action(async ({ session }, min, max) => {
-    const random = await getRandom(ctx, session, min, max);
-    return session?.text(".msg", random);
+    const random2 = await getRandom(ctx, session, min, max);
+    return session?.text(".msg", random2);
   });
   ctx.command("info").action(async ({ session }) => {
     const info = await getInfo(ctx, session);
@@ -570,7 +605,7 @@ function apply(ctx) {
       return session?.text(".failed2", rw);
     }
   });
-  ctx.command("randomBA").alias("随机BA图").action(async ({ session }) => {
+  ctx.command("randomBA").alias("随机ba图").action(async ({ session }) => {
     await getBA(ctx, session);
   });
   ctx.command("serverTest").alias("服之测测").action(async ({ session }) => {

package/package.json

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