koishi-plugin-node-async-bot-all 2.1.0 → 2.3.0

package/lib/commands.d.ts

@@ -1,6 +1,6 @@
-import { Context } from 'koishi';
-export declare function getServer(ctx: Context, session: any): Promise<object>;
-export declare function getStatus(ctx: Context, session: any): Promise<object>;
-export declare function getRandom(ctx: Context, session: any, min: number, max: number): Promise<object>;
-export declare function getInfo(ctx: Context, session: any): Promise<object>;
-export declare function getRW(ctx: Context, session: any): Promise<object>;
+import { Context, Session } from 'koishi';
+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>;
+export declare function getInfo(ctx: Context, session: Session): Promise<Object>;
+export declare function getRW(ctx: Context, session: Session): Promise<Object>;

package/lib/fun.d.ts

@@ -1,6 +1,8 @@
-import { Context } from "koishi";
-export declare function getSystemUsage(): Promise<object>;
+import { Context, FlatPick } from "koishi";
+import Analytics from "@koishijs/plugin-analytics";
+export declare function getSystemUsage(): Promise<Object>;
 export declare function getHongKongTime(): string;
 export declare function fetchWithTimeout(url: string, options: {}, timeout: number, 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;

package/lib/index.d.ts

@@ -0,0 +1,21 @@
+import { Context, Schema } from 'koishi';
+export declare const inject: string[];
+declare module 'koishi' {
+    interface Tables {
+        botData: botDataTables;
+    }
+}
+interface botDataTables {
+    id: string;
+    data: string;
+}
+export declare const name = "node-async-bot-all";
+export declare const usage = "\u8FD9\u662F\u4E00\u4E2A\u79C1\u6709\u63D2\u4EF6\u3002";
+export interface Config {
+    cxAPI: string;
+    rwAPI: string;
+    timeout: number;
+}
+export declare const Config: Schema<Config>;
+export declare function apply(ctx: Context): void;
+export {};

package/lib/index.js

@@ -33,7 +33,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}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", msgNoPlayer: "{time}\n【服务器当前人数】\n➣ {version}：{players}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}\n请稍后重试。", timeout: "请求超时。", timeout2: "响应超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", error: "执行错误。", unknown: "未知错误。", host: "没有到主机的路由。" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\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）。" } } } };
+    module2.exports = { commands: { cx: { description: "查询服务器当前人数。", messages: { msg: "{time}\n【MC服务器当前人数】\n➣ {version}：{players}\n➣ 玩家列表：{list}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", msgNoPlayer: "{time}\n【MC服务器当前人数】\n➣ {version}：{players}\n➣ 协议版本：{protocol}\n进服指南请在群公告中查看。", forbidden: "{time}\n此指令不允许在本群使用。", failed: "{time}\n查询失败：{data}\n请稍后重试。", 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）。" } } } };
   }
 });
 
@@ -47,6 +47,9 @@ __export(src_exports, {
   usage: () => usage
 });
 module.exports = __toCommonJS(src_exports);
+var import_koishi2 = require("koishi");
+
+// src/commands.ts
 var import_koishi = require("koishi");
 
 // src/fun.ts
@@ -157,19 +160,38 @@ function formatTimestampDiff(start, end) {
   return `${hours} 时 ${minutes} 分 ${seconds} 秒`;
 }
 __name(formatTimestampDiff, "formatTimestampDiff");
+function getMsgCount(array) {
+  let receive = 0;
+  let send = 0;
+  array.forEach((item) => {
+    if (item.type == "receive") {
+      receive = receive + item.count;
+    } else {
+      send = send + item.count;
+    }
+  });
+  return { "receive": receive, "send": send };
+}
+__name(getMsgCount, "getMsgCount");
 
 // src/commands.ts
 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 api;
   let dataError;
   let data;
   let error;
   const time = getHongKongTime();
-  if (session.event.guild.id == "757729218" || session.event.guild.id == "1047732162") {
+  if (session.event.guild.id == "757729218" || session.event.guild.id == "1047732162" || session.event.guild.id == "917260212") {
     try {
-      const response = await fetchWithTimeout(ctx.config.cxAPI, {}, ctx.config.timeout, log);
+      if (session.event.guild.id == "917260212") {
+        api = ctx.config.cxAPI2;
+      } else {
+        api = ctx.config.cxAPI;
+      }
+      const response = await fetchWithTimeout(api, {}, ctx.config.timeout, log);
       if (response.ok) {
         data = await response.text();
         log.info("Server data: " + data);
@@ -263,7 +285,7 @@ async function getStatus(ctx, session) {
       "success": 1
     };
   } else {
-    log.info((await ctx.database.get("botData", "uptime"))[0].data);
+    const msgCount = getMsgCount(await ctx.database.get("analytics.message", { date: import_koishi.Time.getDateNumber() - 1 }, ["type", "count"]));
     msg = {
       "time": time,
       "name": vMsg["name"],
@@ -271,8 +293,10 @@ async function getStatus(ctx, session) {
       "memory": vMsg["memory"],
       "online": formatTimestampDiff(
         Number((await ctx.database.get("botData", "uptime"))[0].data),
-        session.event.timestamp.toString().substring(0, 10)
+        Number(session.event.timestamp.toString().substring(0, 10))
       ),
+      "msgCount": `${msgCount["receive"]}/${msgCount["send"]}`,
+      "version": (await ctx.database.get("botData", "version"))[0].data,
       "success": 0
     };
   }
@@ -372,21 +396,22 @@ async function getRW(ctx, session) {
 __name(getRW, "getRW");
 
 // package.json
-var version = "2.1.0";
+var version = "2.3.0";
 
 // src/index.ts
-var inject = ["silk", "database"];
+var inject = ["database"];
 var name = "node-async-bot-all";
 var usage = "这是一个私有插件。";
-var Config = import_koishi.Schema.intersect([
-  import_koishi.Schema.object({
-    timeout: import_koishi.Schema.number().default(8e3).description("超时时间（毫秒）")
+var Config = import_koishi2.Schema.intersect([
+  import_koishi2.Schema.object({
+    timeout: import_koishi2.Schema.number().default(8e3).description("超时时间（毫秒）")
   }).description("基础"),
-  import_koishi.Schema.object({
-    cxAPI: import_koishi.Schema.string().default("https://api.tasaed.top/get/minecraftServer/").description("查询 API")
+  import_koishi2.Schema.object({
+    cxAPI: import_koishi2.Schema.string().default("https://api.tasaed.top/get/minecraftServer/").description("查询 API"),
+    cxAPI2: import_koishi2.Schema.string().default("https://api.tasaed.top/get/minecraftServer/bas.php").description("查询 API 2")
   }).description("查询"),
-  import_koishi.Schema.object({
-    rwAPI: import_koishi.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")
+  import_koishi2.Schema.object({
+    rwAPI: import_koishi2.Schema.string().default("https://api.tasaed.top/rw/").description("随机文本 API")
   }).description("随机文本")
 ]).description("基础设置");
 function apply(ctx) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
   "description": "NodeAsync Bot插件（自用）",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "contributors": [
@@ -31,8 +31,8 @@
     "@koishijs/client": "^5.30.4"
   },
   "peerDependencies": {
+    "@koishijs/plugin-database-sqlite": "^4.6.0",
     "@koishijs/plugin-help": "^2.4.5",
-    "koishi": "^4.18.7",
-    "koishi-plugin-silk": "^2.0.1"
+    "koishi": "^4.18.7"
   }
 }