koishi-plugin-node-async-bot-all 3.1.0 → 3.1.2

package/lib/commands.d.ts

@@ -36,7 +36,7 @@ export declare class CommandHandler {
     server(): Promise<number>;
     status(botData: botDataType): Promise<object>;
     random(min: number, max: number): Promise<object>;
-    info(): Promise<object>;
+    info(botData: botDataType): Promise<object>;
     randomWord(): Promise<object>;
     blueArchive(): Promise<number>;
     centerServerTest(): Promise<number>;

package/lib/fun.d.ts

@@ -45,7 +45,6 @@ export declare function getSystemUsage(): Promise<{
 }>;
 export declare function getHongKongTime(): string;
 export declare function readInfo(ctx: Context): Promise<{
-    version: string;
     koishiVersion: string;
     nodeVersion: string;
 } | 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 = { noApi: "未指定 API", noop: "无", unknownError: "未知错误。", failed: "{quote}{time}\n{error}", "failed-md": "**{time}**\n{error}", cat: "{name}Cat 信息\n版本: {version}\n平台: {platform}\n运行时间: {time}", commands: { na: { description: "NodeAsync Bot" }, cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", "msg-md": "*{time}*\n\n---\n{list}\n\n---\n\n进服指南请在群公告中查看。", list: "【{name} 服务器 {count}】\n➣ {version}：{players}\n➣ {ne}：{list}\n➣ 备注：{note}", "list-md": "## {name} 服务器 {count}\n\n- {version}：{players}\n- {ne}：{list}\n- 备注：{note}", listFailed: "【{name} 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", "listFailed-md": "## {name} 服务器 {count}\n\n- 查询失败：{data}\n- 请稍后重试。\n- 备注：{note}", timeout: "请求超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", host: "没有到主机的路由。", dns: "解析失败。", "ne-a2s": "机器人", "ne-mc": "玩家列表", forbidden: "此指令不允许在本群使用。", failed: "查询失败：" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", "msg-md": "*{time}*\n\n---\n\n## 系统状态\n\n- 系统名称：{name}\n- CPU使用率：{cpu}\n- 内存使用率：{memory}\n\n## 机器人状态\n\n- 昨日收/发消息数量：{msgCount}\n- 机器人版本：{version}\n- 运行时间：{online}", error: "状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成了一个随机数：{data}", "msg-md": "*{time}*\n\n---\n\n生成了一个随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{time}\n--- NodeAsync {version} ---\n私有机器人，服务器专用。\n--- 开发者 ---\n德二吹风机（3112836258）\n--- 其他 ---\nNode.js 版本：{nodeVersion}\nKoishi 版本：{koishiVersion}\n开源地址：https://github.com/ccd2s/node-async-bot-all\n官网：https://www.tasaed.top", "msg-md": "*{time}*\n\n---\n\n## NodeAsync {version}\n\n私有机器人，服务器专用。\n\n## 开发者\n\n- 德二吹风机（3112836258）\n\n## 其他\n\n- Node.js 版本：{nodeVersion}\n- Koishi 版本：{koishiVersion}\n- 开源地址：https://github.com/ccd2s/node-async-bot-all\n- 官网：https://www.tasaed.top", error: "读取信息失败。" } }, rw: { description: "随机名言名句。", messages: null }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}" } }, centerservertest: { description: "查看中心服务器状态。", messages: { msg: "{time}{list}", "msg-md": "*{time}*\n\n---\n{list}", list: "== {name} ==\n状态：{status}\n存活率：{uptime}\n检测时间：{time}", "list-md": "## {name}\n\n- 状态：{status}\n- 存活率：{uptime}\n- 检测时间：{time}", listFailed: "== {name} ==\n查看失败：{data}", "listFailed-md": "## {name}\n\n查看失败：{data}", statusLive: "✅ 正常", statusDie: "❌ 故障", dataFail: "未能获取到此服务器的状态信息。" } }, meme: { description: "群友的怪话！", usage: "不带参数时随机查看\n带参数时为查看指定 meme", examples: "meme\nmeme 1145", messages: { msg: "{quote}{time}\n{image}\n{title}", "msg-qq": "{quote}{image}\n{time}\n{title}" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}" } }, getqqinfo: { description: "获取 QQ 号的信息。", usage: "获取 QQ 号的信息。", examples: "getqqinfo 10001", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", usage: "引用一条消息，/m。（不要带@）", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } }, steamnews: { description: "抓取 Steam 游戏的最新新闻。" }, use: { description: "使用 TA ！", usage: "use @用户", examples: "use @用户", messages: { command: "请 @ 一个用户。", msg: "{at} {desc}了 {at2} ！" } } } };
+    module2.exports = { noApi: "未指定 API", noop: "无", unknownError: "未知错误。", failed: "{quote}{time}\n{error}", "failed-md": "**{time}**\n{error}", cat: "{name}Cat 信息\n版本: {version}\n平台: {platform}\nKoishi 版本：{koishiVersion}\n运行时间: {time}", commands: { na: { description: "NodeAsync Bot" }, cxgame: { description: "查询服务器当前人数。", messages: { msg: "{time}{list}\n进服指南请在群公告中查看。", "msg-md": "*{time}*\n\n---\n{list}\n\n---\n\n进服指南请在群公告中查看。", list: "【{name} 服务器 {count}】\n➣ {version}：{players}\n➣ {ne}：{list}\n➣ 备注：{note}", "list-md": "## {name} 服务器 {count}\n\n- {version}：{players}\n- {ne}：{list}\n- 备注：{note}", listFailed: "【{name} 服务器 {count}】\n➣ 查询失败：{data}\n➣ 请稍后重试。\n➣ 备注：{note}", "listFailed-md": "## {name} 服务器 {count}\n\n- 查询失败：{data}\n- 请稍后重试。\n- 备注：{note}", timeout: "请求超时。", fewData: "服务端返回的数据过少。", close: "服务器已关闭。", host: "没有到主机的路由。", dns: "解析失败。", "ne-a2s": "机器人", "ne-mc": "玩家列表", forbidden: "此指令不允许在本群使用。", failed: "查询失败：" } }, status: { description: "查询机器人状态。", messages: { msg: "{time}\n--- 系统状态 ---\n系统名称：{name}\nCPU使用率：{cpu}\n内存使用率：{memory}\n--- 机器人状态 ---\n昨日收/发消息数量：{msgCount}\n机器人版本：{version}\n运行时间：{online}", "msg-md": "*{time}*\n\n---\n\n## 系统状态\n\n- 系统名称：{name}\n- CPU使用率：{cpu}\n- 内存使用率：{memory}\n\n## 机器人状态\n\n- 昨日收/发消息数量：{msgCount}\n- 机器人版本：{version}\n- 运行时间：{online}", error: "状态获取失败。" } }, random: { description: "随机数生成器。", usage: "缺少参数时默认生成 0-10000 的随机数。\n使用示例：", examples: "random 1 128 生成1到128范围的随机数", messages: { msg: "{time}\n生成了一个随机数：{data}", "msg-md": "*{time}*\n\n---\n\n生成了一个随机数：{data}" } }, info: { description: "查询机器人信息。", messages: { msg: "{time}\n--- NodeAsync {version} ---\n私有机器人，服务器专用。\n--- 开发者 ---\n德二吹风机（3112836258）\n--- 其他 ---\nNode.js 版本：{nodeVersion}\nKoishi 版本：{koishiVersion}\n开源地址：https://github.com/ccd2s/node-async-bot-all\n官网：https://www.tasaed.top", "msg-md": "*{time}*\n\n---\n\n## NodeAsync {version}\n\n私有机器人，服务器专用。\n\n## 开发者\n\n- 德二吹风机（3112836258）\n\n## 其他\n\n- Node.js 版本：{nodeVersion}\n- Koishi 版本：{koishiVersion}\n- 开源地址：https://github.com/ccd2s/node-async-bot-all\n- 官网：https://www.tasaed.top", error: "读取信息失败。" } }, rw: { description: "随机名言名句。", messages: null }, randomba: { description: "随机BA图。", messages: { msg: "{quote}{image}" } }, centerservertest: { description: "查看中心服务器状态。", messages: { msg: "{time}{list}", "msg-md": "*{time}*\n\n---\n{list}", list: "== {name} ==\n状态：{status}\n存活率：{uptime}\n检测时间：{time}", "list-md": "## {name}\n\n- 状态：{status}\n- 存活率：{uptime}\n- 检测时间：{time}", listFailed: "== {name} ==\n查看失败：{data}", "listFailed-md": "## {name}\n\n查看失败：{data}", statusLive: "✅ 正常", statusDie: "❌ 故障", dataFail: "未能获取到此服务器的状态信息。" } }, meme: { description: "群友的怪话！", usage: "不带参数时随机查看\n带参数时为查看指定 meme", examples: "meme\nmeme 1145", messages: { msg: "{quote}{time}\n{image}\n{title}", "msg-qq": "{quote}{image}\n{time}\n{title}" } }, randomcat: { description: "随机猫猫图。", messages: { msg: "{quote}{image}" } }, getqqinfo: { description: "获取 QQ 号的信息。", usage: "获取 QQ 号的信息。", examples: "getqqinfo 10001", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", command: "QQ 号不正确。" } }, msg2img: { description: "引用一个消息并使用此指令，即可将消息转图。", usage: "引用一条消息，/m。（不要带@）", messages: { msg: "{quote}{image}", failed: "{quote}{time}\n获取失败：{data}", null: "未引用任何消息。", matroska: "{quote}禁止套娃！" } }, steamnews: { description: "抓取 Steam 游戏的最新新闻。" }, use: { description: "使用 TA ！", usage: "use @用户", examples: "use @用户", messages: { command: "请 @ 一个用户。", msg: "{at} {desc}了 {at2} ！" } } } };
   }
 });
 
@@ -63,7 +63,7 @@ var import_steam_server_query = require("steam-server-query");
 var import_feedsmith = require("feedsmith");
 var import_minecraft_server_util = require("minecraft-server-util");
 function getSystemName() {
-  return import_os.default.type() + " " + import_os.default.release();
+  return import_os.default.type() + " " + import_os.default.release() + " (" + import_os.default.arch() + ")";
 }
 __name(getSystemName, "getSystemName");
 function getMemoryUsage() {
@@ -139,7 +139,6 @@ async function readInfo(ctx) {
   try {
     const deps = await ctx.installer.getDeps();
     return {
-      version: (await ctx.database.get("botData", "version"))[0].data,
       koishiVersion: deps.koishi.resolved,
       nodeVersion: process.versions.node
     };
@@ -491,7 +490,7 @@ var CommandHandler = class {
         cpu: vMsg.cpu,
         memory: vMsg.memory,
         online: formatTimestampDiff(
-          Number(botData.uptime),
+          Number((await ctx.database.get("botData", "uptime"))[0].data),
           Number(session.event.timestamp.toString().substring(0, 10))
         ),
         msgCount: `${msgCount.receive}/${msgCount.send}`,
@@ -525,7 +524,7 @@ var CommandHandler = class {
     return msg;
   }
   // 指令 Info
-  async info() {
+  async info(botData) {
     const { ctx, session, log, time } = this;
     let msg;
     let data = await readInfo(ctx);
@@ -542,6 +541,7 @@ var CommandHandler = class {
       msg = {
         time,
         ...data,
+        version: botData.version,
         success: 0
       };
     }
@@ -820,7 +820,7 @@ var CommandHandler = class {
 };
 
 // package.json
-var version = "3.1.0";
+var version = "3.1.2";
 
 // src/config.ts
 var import_koishi3 = require("koishi");
@@ -915,8 +915,7 @@ var NodeAsyncBot = class {
   }
   async init(ct) {
     this.ctx = ct;
-    const vUptime = (await this.ctx.database.get("botData", "uptime"))[0];
-    const date = vUptime ? vUptime.data : (/* @__PURE__ */ new Date()).getTime().toString().substring(0, 10);
+    const date = (/* @__PURE__ */ new Date()).getTime().toString().substring(0, 10);
     this.botData = {
       version,
       uptime: date
@@ -1021,15 +1020,19 @@ ${import_koishi4.h.image(outMsg.data, "image/png")}`
       const match = session.content.match(/^#([a-zA-Z0-9]+)cat$/);
       if (match) {
         const system = await getSystemUsage();
-        await session.send(session.text("cat", {
-          name: match[1].charAt(0).toUpperCase() + match[1].slice(1),
-          time: formatTimestampDiff(
-            Number(this.botData.uptime),
-            Number(session.event.timestamp.toString().substring(0, 10))
-          ),
-          version: this.botData.version,
-          platform: system.success == 1 ? "未知" : system.name
-        }));
+        const info = await readInfo(this.ctx);
+        await session.send(
+          session.text("cat", {
+            name: match[1].charAt(0).toUpperCase() + match[1].slice(1),
+            time: formatTimestampDiff(
+              Number((await this.ctx.database.get("botData", "uptime"))[0].data),
+              Number(session.event.timestamp.toString().substring(0, 10))
+            ),
+            version: this.botData.version,
+            platform: system.success == 1 ? "未知" : system.name,
+            koishiVersion: typeof info === "string" ? "未知" : info.koishiVersion
+          })
+        );
       }
       if (session.bot.createReaction) {
         for (const content of this.ctx.config.specialMsg) {
@@ -1073,7 +1076,7 @@ ${import_koishi4.h.image(outMsg.data, "image/png")}`
     });
     this.na.subcommand("info").action(async ({ session }) => {
       await this.execCommand(session, "info", async (handler) => {
-        const info = await handler.info();
+        const info = await handler.info(this.botData);
         await session?.send(
           session?.bot.adapterName == "qq" ? (0, import_koishi4.h)("qq:markdown", {
             content: session?.text(info["success"] == 0 ? ".msg-md" : "failed-md", info)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koishi-plugin-node-async-bot-all",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "NodeAsync Bot插件（自用）",
   "keywords": [
     "chatbot",