koishi-plugin-node-async-bot-all 2.13.1 → 2.15.0

package/lib/commands.d.ts

@@ -1,4 +1,10 @@
 import { Context, Session } from 'koishi';
+import { Installer } from "@koishijs/plugin-market";
+declare module 'koishi' {
+    interface Context {
+        installer: Installer;
+    }
+}
 export declare function getServer(ctx: Context, session: Session): Promise<Object>;
 export declare function getStatus(ctx: Context, session: Session): Promise<Object>;
 export declare function getRandom(ctx: Context, session: Session, min: number, max: number): Promise<Object>;
@@ -7,4 +13,4 @@ export declare function getRW(ctx: Context, session: Session): Promise<Object>;
 export declare function getBA(ctx: Context, session: Session): Promise<Number>;
 export declare function serverTest(ctx: Context, session: Session): Promise<Object>;
 export declare function getSteam(ctx: Context, session: Session, id: number): Promise<Object>;
-export declare function getMeme(ctx: Context, session: Session): Promise<Object>;
+export declare function getMeme(ctx: Context, session: Session, count: number): Promise<Object>;

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: "执行错误。", 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: { 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}" } }, steamid: { description: "将 Steam 好友码（SteamID 3）转为 SteamID 64。", messages: { msg: "{time}\n转换结果：{data}", failed: "{time}\n转换失败：{data}", null: "参数 Steam 好友码（SteamID 3） 不得为空。", error: "执行错误。" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } } } };
+    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}" } }, steamid: { description: "将 Steam 好友码（SteamID 3）转为 SteamID 64。", messages: { msg: "{time}\n转换结果：{data}", failed: "{time}\n转换失败：{data}", null: "参数 Steam 好友码（SteamID 3） 不得为空。", command: "执行错误。" } }, meme: { description: "群友的怪话！", messages: { msg: "{quote}{time}\n{image}\n{title}", failed: "{quote}{time}\n获取失败：{data}", forbidden: "{quote}{time}\n此指令不允许在本群使用。", error: "执行错误。" } } } };
   }
 });
 
@@ -164,10 +164,11 @@ async function readInfoFile(ctx) {
   try {
     const aPath = import_path.default.resolve(__dirname, "..") + import_path.default.sep + "res" + import_path.default.sep + "info.txt";
     info = await import_fs.default.promises.readFile(aPath, "utf8");
+    const deps = await ctx.installer.getDeps();
     info = info.toString().replace(
       "&version;",
       (await ctx.database.get("botData", "version"))[0].data
-    );
+    ).replace("&kVersion;", deps.koishi.resolved).replace("&nVersion;", process.versions.node);
   } catch (error) {
     info = error.message;
   }
@@ -244,7 +245,6 @@ async function getHttp(log, url, timeout) {
     } else {
       data = await response.text();
       log.error(`Error fetching data: ${data}`);
-      data = JSON.parse(data);
       return {
         "data": JSON.parse(data),
         "error": false,
@@ -267,7 +267,6 @@ async function getServer(ctx, session) {
   const log = ctx.logger("cx");
   log.info(`Got: {"form":"${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   let msg;
-  let dataError;
   let data;
   let error;
   const time = getHongKongTime();
@@ -289,58 +288,55 @@ async function getServer(ctx, session) {
     for (const item of api) {
       const note = ctx.config.cxV2[index]["note"][count];
       count++;
-      try {
-        const response = await fetchWithTimeout(item, {}, ctx.config.timeout, log);
-        if (response.ok) {
-          data = await response.text();
-          log.info("Server data: " + data);
-          data = JSON.parse(data);
-          if (data["list"] == null) {
-            const temp = {
-              "count": count,
-              "players": data["players"],
-              "version": data["version"],
-              "note": note ?? "无"
-            };
-            log.info(`Server ${count}:`);
-            log.info(temp);
-            list = list + "\n" + session.text(".listNoPlayer", temp);
-          } else {
-            const temp = {
-              "count": count,
-              "players": data["players"],
-              "version": data["version"],
-              "list": data["list"].join(", "),
-              "note": note ?? "无"
-            };
-            log.info(`Server ${count}:`);
-            log.info(temp);
-            list = list + "\n" + session.text(".list", temp);
-          }
+      const response = await getHttp(log, item, ctx.config.timeout);
+      if (response.success) {
+        data = response.data;
+        if (data["list"] == null) {
+          const temp = {
+            "count": count,
+            "players": data["players"],
+            "version": data["version"],
+            "note": note ?? "无"
+          };
+          log.info(`Server ${count}:`);
+          log.info(temp);
+          list = list + "\n" + session.text(".listNoPlayer", temp);
         } else {
-          dataError = await response.text();
-          try {
-            const vError = JSON.parse(dataError);
-            error = vError["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");
-            }
-          } catch (e) {
-            if (dataError.includes("CDN节点请求源服务器超时")) {
-              error = session.text(".timeout");
-            } else {
-              error = session.text(".unknown");
-            }
+          const temp = {
+            "count": count,
+            "players": data["players"],
+            "version": data["version"],
+            "list": data["list"].join(", "),
+            "note": note ?? "无"
+          };
+          log.info(`Server ${count}:`);
+          log.info(temp);
+          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");
           }
-          log.error(`Error fetching data: ${dataError}`);
           const temp = {
             "count": count,
             "data": error
@@ -349,15 +345,6 @@ async function getServer(ctx, session) {
           log.info(temp);
           list = list + "\n" + session.text(".listFailed", temp);
         }
-      } catch (err) {
-        log.error(`Request error: ${err.message}`);
-        const temp = {
-          "count": count,
-          "data": err.name === "AbortError" ? session.text(".error") : err.message
-        };
-        log.info(`Server ${count}:`);
-        log.info(temp);
-        list = list + "\n" + session.text(".listFailed", temp);
       }
     }
     msg = {
@@ -465,6 +452,16 @@ async function getRW(ctx, session) {
   let msg;
   let data;
   const time = getHongKongTime();
+  if (ctx.config.rwAPI == void 0) {
+    msg = {
+      "time": time,
+      "data": "未指定 API",
+      "success": 2
+    };
+    log.info("Sent:");
+    log.info(msg);
+    return msg;
+  }
   const response = await getHttp(log, ctx.config.rwAPI + "?format=json", ctx.config.timeout);
   if (response.success) {
     data = response.data;
@@ -503,6 +500,10 @@ 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 time = getHongKongTime();
+  if (ctx.config.rwAPI == void 0) {
+    await session.send(session.text(".msg", { "quote": import_koishi2.h.quote(session.messageId), "image": "未指定 API" }));
+    return 1;
+  }
   const vid = await session.send(session.text(".wait", { "quote": import_koishi2.h.quote(session.messageId), "time": time }));
   const ms = random(0, 0, 1500);
   const link = random(2, ctx.config.baAPI) + `?cacheBuster=${random(1, 1, 2147483647)}`;
@@ -571,7 +572,7 @@ async function getSteam(ctx, session, id) {
       data = response.data;
       msg = {
         "time": time,
-        "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
+        "data": data["name"] === "AbortError" ? session.text(".command") : data["message"],
         "success": 2
       };
       log.info("Sent:");
@@ -590,7 +591,7 @@ async function getSteam(ctx, session, id) {
   return msg;
 }
 __name(getSteam, "getSteam");
-async function getMeme(ctx, session) {
+async function getMeme(ctx, session, count) {
   const log = ctx.logger("getMeme");
   log.info(`Got: {"form":"${session.event.guild?.id}","user":"${session.event.user?.id}","timestamp":${session.event.timestamp},"messageId":"${session.event.message?.id}"}`);
   let msg;
@@ -607,7 +608,7 @@ async function getMeme(ctx, session) {
     log.info(msg);
     return msg;
   }
-  const response = await getHttp(log, api, ctx.config.timeout);
+  const response = count ? await getHttp(log, api + `&type=1&count=${count}`, ctx.config.timeout) : await getHttp(log, api, ctx.config.timeout);
   if (response.success) {
     data = response.data;
     msg = {
@@ -647,10 +648,10 @@ async function getMeme(ctx, session) {
 __name(getMeme, "getMeme");
 
 // package.json
-var version = "2.13.1";
+var version = "2.15.0";
 
 // src/index.ts
-var inject = ["database"];
+var inject = ["database", "installer"];
 var name = "node-async-bot-all";
 var usage = "这是一个私有插件。";
 var Config = import_koishi3.Schema.intersect([
@@ -760,8 +761,8 @@ function apply(ctx) {
       return session?.text(".failed", steam);
     }
   });
-  ctx.command("meme").alias("memes").action(async ({ session }) => {
-    const meme = await getMeme(ctx, session);
+  ctx.command("meme [序号:posint]").alias("memes").action(async ({ session }, count) => {
+    const meme = await getMeme(ctx, session, count);
     if (meme["success"] == 0) {
       return session?.text(".msg", meme);
     } else if (meme["success"] == 1) {

package/package.json

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

package/res/info.txt

@@ -4,5 +4,7 @@
 --- 开发者 ---
 德二吹风机（3112836258）
 --- 其他 ---
+Node.js 版本：&nVersion;
+Koishi 版本：&kVersion;
 开源地址：https://github.com/ccd2s/node-async-bot-all
 官网：https://www.tasaed.top