koishi-plugin-node-async-bot-all 2.18.1 → 2.19.0

package/lib/fun.d.ts

@@ -3,7 +3,6 @@ import { Context } from "koishi";
 import { APIUserInfo } from "./commands";
 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(ctx: Context): Promise<Object>;
@@ -15,10 +14,5 @@ export declare function hostPing(host: string): Promise<{
     packetLoss?: string;
 }>;
 export declare function random(type: number | undefined, data: any, data2?: any): number;
-export declare function getHttp(log: any, url: string, timeout: number): Promise<{
-    success: boolean;
-    data: object;
-    error?: boolean;
-}>;
 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>;

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: "执行错误。", failed1: "{time}\n获取失败（1）。", failed2: "{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 号不正确。" } } } };
+    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 号不正确。" } } } };
   }
 });
 
@@ -132,33 +132,6 @@ function getHongKongTime() {
   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, fetchOptions);
-    clearTimeout(timeoutId);
-    log.info(`Fetch code: ${response.status}`);
-    return response;
-  } catch (error) {
-    clearTimeout(timeoutId);
-    log.error(error);
-    log.error(`${error.name}: ${error.message}`);
-    if (error.name === "AbortError") {
-      throw new Error(`请求超时。(${timeout}ms)`);
-    } else {
-      throw error;
-    }
-  }
-}
-__name(fetchWithTimeout, "fetchWithTimeout");
 async function readInfoFile(ctx) {
   let info;
   try {
@@ -231,36 +204,6 @@ function random(type = 0, data, data2) {
   }
 }
 __name(random, "random");
-async function getHttp(log, url, timeout) {
-  let data;
-  try {
-    const response = await fetchWithTimeout(url, {}, timeout, log);
-    if (response.ok) {
-      data = await response.text();
-      log.info("Server data: " + data);
-      return {
-        "data": JSON.parse(data),
-        "success": true
-      };
-    } else {
-      data = await response.text();
-      log.error(`Error fetching data: ${data}`);
-      return {
-        "data": JSON.parse(data),
-        "error": false,
-        "success": false
-      };
-    }
-  } catch (err) {
-    log.error(`Request error:  ${err.message}`);
-    return {
-      "data": { "name": err.name, "message": err.message },
-      "error": true,
-      "success": false
-    };
-  }
-}
-__name(getHttp, "getHttp");
 async function request(url, options = {}, timeout = 8e3, log) {
   const signal = AbortSignal.timeout(timeout);
   try {
@@ -332,8 +275,6 @@ async function getServer(ctx, session) {
   const log = ctx.logger("cx");
   log.debug(`Got: {"form":"${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   let msg;
-  let data;
-  let error;
   const time = getHongKongTime();
   const index = ctx.config.cxV2.findIndex((item) => item.id === session.event.guild?.id);
   if (index !== -1) {
@@ -344,8 +285,8 @@ async function getServer(ctx, session) {
         "data": "未指定查询 API",
         "success": 2
       };
-      log.info("Sent:");
-      log.info(msg);
+      log.warn("Sent:");
+      log.warn(msg);
       return msg;
     }
     let count = 0;
@@ -353,14 +294,13 @@ async function getServer(ctx, session) {
     for (const item of api) {
       const note = ctx.config.cxV2[index]["note"][count];
       count++;
-      const response = await getHttp(log, item, ctx.config.timeout);
+      const response = await request(item, {}, ctx.config.timeout, log);
       if (response.success) {
-        data = response.data;
-        if (data["list"] == null) {
+        if (response.data.list == null) {
           const temp = {
             "count": count,
-            "players": data["players"],
-            "version": data["version"],
+            "players": response.data.players,
+            "version": response.data.version,
             "note": note ?? "无"
           };
           log.info(`Server ${count}:`);
@@ -369,9 +309,9 @@ async function getServer(ctx, session) {
         } else {
           const temp = {
             "count": count,
-            "players": data["players"],
-            "version": data["version"],
-            "list": data["list"].join(", "),
+            "players": response.data.players,
+            "version": response.data.version,
+            "list": response.data.list.join(", "),
             "note": note ?? "无"
           };
           log.info(`Server ${count}:`);
@@ -379,37 +319,30 @@ async function getServer(ctx, session) {
           list = list + "\n" + session.text(".list", temp);
         }
       } else {
-        if (response.error) {
-          data = response.data;
-          const temp = {
-            "count": count,
-            "data": data["name"] === "AbortError" ? session.text(".error") : data["message"]
-          };
-          log.info(`Server ${count}:`);
-          log.info(temp);
-          list = list + "\n" + session.text(".listFailed", temp);
-        } else {
-          data = response.data;
-          error = data["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");
+        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 temp = {
-            "count": count,
-            "data": error
-          };
-          log.info(`Server ${count}:`);
-          log.info(temp);
-          list = list + "\n" + session.text(".listFailed", temp);
+        } else {
+          err = response.error.message;
         }
+        const temp = {
+          "count": count,
+          "data": err
+        };
+        log.error(`Server ${count}:`);
+        log.error(temp);
+        list = list + "\n" + session.text(".listFailed", temp);
       }
     }
     msg = {
@@ -457,8 +390,8 @@ async function getStatus(ctx, session) {
       "success": 0
     };
   }
-  log.info("Sent:");
-  log.info(msg);
+  log.debug("Sent:");
+  log.debug(msg);
   return msg;
 }
 __name(getStatus, "getStatus");
@@ -480,8 +413,8 @@ async function getRandom(ctx, session, min, max) {
     "data": data,
     "success": 0
   };
-  log.info("Sent:");
-  log.info(msg);
+  log.debug("Sent:");
+  log.debug(msg);
   return msg;
 }
 __name(getRandom, "getRandom");
@@ -506,8 +439,8 @@ async function getInfo(ctx, session) {
       "success": 0
     };
   }
-  log.info("Sent:");
-  log.info(msg);
+  log.debug("Sent:");
+  log.debug(msg);
   return msg;
 }
 __name(getInfo, "getInfo");
@@ -515,7 +448,6 @@ async function getRandomWord(ctx, session) {
   const log = ctx.logger("rw");
   log.debug(`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();
   if (ctx.config.rwAPI == void 0) {
     msg = {
@@ -523,40 +455,33 @@ async function getRandomWord(ctx, session) {
       "data": "未指定 API",
       "success": 2
     };
-    log.info("Sent:");
-    log.info(msg);
+    log.warn("Sent:");
+    log.warn(msg);
     return msg;
   }
-  const response = await getHttp(log, ctx.config.rwAPI + "?format=json", ctx.config.timeout);
+  const response = await request(ctx.config.rwAPI + "?format=json", {}, ctx.config.timeout, log);
   if (response.success) {
-    data = response.data;
     msg = {
       "time": time,
-      "data": data["data"],
+      "data": response.data,
       "success": 0
     };
-    log.info("Sent:");
-    log.info(msg);
+    log.debug("Sent:");
+    log.debug(msg);
   } else {
-    if (response.error) {
-      data = response.data;
-      msg = {
-        "time": time,
-        "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
-        "success": 2
-      };
-      log.info("Sent:");
-      log.info(msg);
+    let err;
+    if (response.code) {
+      err = response.isJson ? response.error["data"] : response.error;
     } else {
-      data = response.data;
-      msg = {
-        "time": time,
-        "data": data["data"],
-        "success": 1
-      };
-      log.info("Sent:");
-      log.info(msg);
+      err = response.error.message;
     }
+    msg = {
+      "time": time,
+      "data": err,
+      "success": 1
+    };
+    log.warn("Sent:");
+    log.warn(msg);
   }
   return msg;
 }
@@ -678,7 +603,8 @@ async function getCat(ctx, session) {
   const response = await request(ctx.config.catAPI, {}, ctx.config.timeout, log);
   if (response.success) {
     log.debug(response.data);
-    await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
+    const status = await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
+    if (!status) await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": import_koishi2.h.image(response.data[0].url) }));
     log.debug("Sent:");
     log.debug(response.data[0].url);
   } else {
@@ -706,7 +632,6 @@ async function getQQInfo(ctx, session, qq) {
   }
   const response = await request(ctx.config.qqAPI + `?qq=${qq}`, {}, ctx.config.timeout, log);
   if (response.success) {
-    log.info(response.data);
     const fullHtml = await readUserCardFile(response.data);
     const page = await ctx.puppeteer.page();
     await page.setViewport({
@@ -735,7 +660,7 @@ async function getQQInfo(ctx, session, qq) {
 __name(getQQInfo, "getQQInfo");
 
 // package.json
-var version = "2.18.1";
+var version = "2.19.0";
 
 // src/index.ts
 var inject = ["database", "installer", "puppeteer"];
@@ -824,10 +749,8 @@ function apply(ctx) {
     const rw = await getRandomWord(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);
+      return session?.text(".failed", rw);
     }
   });
   ctx.command("randomBA").alias("随机ba图").action(async ({ session }) => {

package/package.json

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