koishi-plugin-node-async-bot-all 2.11.0 → 2.12.0

package/lib/commands.d.ts

@@ -7,3 +7,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>;

package/lib/fun.d.ts

@@ -13,3 +13,8 @@ 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;
+}>;

package/lib/index.d.ts

@@ -15,7 +15,6 @@ export interface ConfigCxV2 {
     id: string;
     api: Array<string>;
     note: Array<string>;
-    type: Array<string>;
 }
 export interface Config {
     cxV2: Array<ConfigCxV2>;
@@ -23,6 +22,7 @@ export interface Config {
     timeout: number;
     baAPI: string[];
     steamAPI: string;
+    memesAPI: string;
 }
 export declare const Config: Schema<Config>;
 export declare function apply(ctx: Context): void;

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: "【{type} 服务器 {count}】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 备注：{note}", listNoPlayer: "【{type} 服务器 {count}】\n➣ {version}：{players}\n➣ 备注：{note}", listFailed: "【{type} 服务器 {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}" } }, steamid: { description: "将 Steam 好友码（SteamID 3）转为 SteamID 64。", messages: { msg: "{time}\n转换结果：{data}", failed: "{time}\n转换失败：{data}", null: "参数 Steam 好友码（SteamID 3） 不得为空。" } } } };
+    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: { 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}" } }, 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: "{time}\n{image}\n{title}", failed: "{time}\n获取失败：{data}", error: "执行错误。" } } } };
   }
 });
 
@@ -230,6 +230,37 @@ 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}`);
+      data = JSON.parse(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");
 
 // src/commands.ts
 async function getServer(ctx, session) {
@@ -434,37 +465,36 @@ async function getRW(ctx, session) {
   let msg;
   let data;
   const time = getHongKongTime();
-  try {
-    const response = await fetchWithTimeout(ctx.config.rwAPI, {}, ctx.config.timeout, log);
-    if (response.ok) {
-      data = await response.text();
-      log.info("Server data: " + data);
+  const response = await getHttp(log, ctx.config.rwAPI + "?format=json", ctx.config.timeout);
+  if (response.success) {
+    data = response.data;
+    msg = {
+      "time": time,
+      "data": data["data"],
+      "success": 0
+    };
+    log.info("Sent:");
+    log.info(msg);
+  } else {
+    if (response.error) {
+      data = response.data;
       msg = {
         "time": time,
-        "data": data,
-        "success": 0
+        "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
+        "success": 2
       };
       log.info("Sent:");
       log.info(msg);
     } else {
-      data = await response.text();
-      log.error(`Error fetching data: ${data}`);
+      data = response.data;
       msg = {
         "time": time,
+        "data": data["data"],
         "success": 1
       };
       log.info("Sent:");
       log.info(msg);
     }
-  } catch (err) {
-    log.error(`Request error:  ${err.message}`);
-    msg = {
-      "time": time,
-      "data": err.name === "AbortError" ? session.text(".error") : err.message,
-      "success": 2
-    };
-    log.info("Sent:");
-    log.info(msg);
   }
   return msg;
 }
@@ -526,23 +556,28 @@ async function getSteam(ctx, session, id) {
   let msg;
   let data;
   const time = getHongKongTime();
-  try {
-    const response = await fetchWithTimeout(ctx.config.steamAPI + `?format=json&id=${id}`, {}, ctx.config.timeout, log);
-    if (response.ok) {
-      data = await response.text();
-      log.info("Server data: " + data);
-      data = JSON.parse(data);
+  const response = await getHttp(log, ctx.config.steamAPI + `?format=json&id=${id}`, ctx.config.timeout);
+  if (response.success) {
+    data = response.data;
+    msg = {
+      "time": time,
+      "data": data["data"],
+      "success": 0
+    };
+    log.info("Sent:");
+    log.info(msg);
+  } else {
+    if (response.error) {
+      data = response.data;
       msg = {
         "time": time,
-        "data": data["data"],
-        "success": 0
+        "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
+        "success": 2
       };
       log.info("Sent:");
       log.info(msg);
     } else {
-      data = await response.text();
-      log.error(`Error fetching data: ${data}`);
-      data = JSON.parse(data);
+      data = response.data;
       msg = {
         "time": time,
         "data": data["data"],
@@ -551,22 +586,54 @@ async function getSteam(ctx, session, id) {
       log.info("Sent:");
       log.info(msg);
     }
-  } catch (err) {
-    log.error(`Request error:  ${err.message}`);
+  }
+  return msg;
+}
+__name(getSteam, "getSteam");
+async function getMeme(ctx, session) {
+  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;
+  let data;
+  const time = getHongKongTime();
+  const response = await getHttp(log, ctx.config.memesAPI, ctx.config.timeout);
+  if (response.success) {
+    data = response.data;
     msg = {
       "time": time,
-      "data": err.name === "AbortError" ? session.text(".error") : err.message,
-      "success": 2
+      "title": data["data"]["title"],
+      "image": import_koishi2.h.image(data["data"]["image"]),
+      "success": 0
     };
     log.info("Sent:");
     log.info(msg);
+  } else {
+    if (response.error) {
+      data = response.data;
+      msg = {
+        "time": time,
+        "data": data["name"] === "AbortError" ? session.text(".error") : data["message"],
+        "success": 1
+      };
+      log.info("Sent:");
+      log.info(msg);
+    } else {
+      data = response.data;
+      msg = {
+        "time": time,
+        "data": data["data"],
+        "success": 1
+      };
+      log.info("Sent:");
+      log.info(msg);
+    }
   }
   return msg;
 }
-__name(getSteam, "getSteam");
+__name(getMeme, "getMeme");
 
 // package.json
-var version = "2.11.0";
+var version = "2.12.0";
 
 // src/index.ts
 var inject = ["database"];
@@ -581,8 +648,7 @@ var Config = import_koishi3.Schema.intersect([
       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("查询 备注"),
-        type: import_koishi3.Schema.array(String).description("查询 类型")
+        note: import_koishi3.Schema.array(String).description("查询 备注")
       })
     ).default([]).description("查询的 API 和 群")
   }).description("查询"),
@@ -597,7 +663,10 @@ var Config = import_koishi3.Schema.intersect([
   }).description("服之测测（Ping）"),
   import_koishi3.Schema.object({
     steamAPI: import_koishi3.Schema.string().default("https://api.tasaed.top/get/steamid/").description("转换 Steam ID API")
-  }).description("转换 Steam ID")
+  }).description("转换 Steam ID"),
+  import_koishi3.Schema.object({
+    memesAPI: import_koishi3.Schema.string().description("群友 meme API")
+  }).description("群友 meme")
 ]).description("基础设置");
 function apply(ctx) {
   ctx.i18n.define("zh-CN", require_zh_CN());
@@ -677,6 +746,14 @@ function apply(ctx) {
       return session?.text(".failed", steam);
     }
   });
+  ctx.command("meme").alias("memes").action(async ({ session }) => {
+    const steam = await getMeme(ctx, session);
+    if (steam["success"] == 0) {
+      return session?.text(".msg", steam);
+    } else {
+      return session?.text(".failed", steam);
+    }
+  });
 }
 __name(apply, "apply");
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

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