mioki 0.5.1 → 0.6.1

package/dist/index.d.cts

@@ -1,5 +1,4 @@
-import { ConsolaInstance } from "consola/core";
-import { EventMap, GroupMessageEvent, LogLevel, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
+import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
 import { Low } from "lowdb";
 import { Jiti } from "jiti";
 import prettyMs from "pretty-ms";
@@ -18,12 +17,12 @@ import { ScheduledTask, TaskContext } from "node-cron";
 //#region rolldown:runtime
 //#endregion
 //#region src/logger.d.ts
-declare const logger: ConsolaInstance;
+declare const logger: Logger;
 /**
 * 获取日志文件名
 */
 declare function getLogFilePath(type?: string): string;
-declare function getMiokiLogger(level: LogLevel): ConsolaInstance;
+declare function getMiokiLogger(level: LogLevel): Logger;
 //#endregion
 //#region src/start.d.ts
 interface StartOptions {
@@ -524,6 +523,8 @@ interface MiokiStatus {
   bot: {
     uin: number;
     nickname: string;
+    friends: number;
+    groups: number;
   };
   plugins: {
     enabled: number;
@@ -531,6 +532,8 @@ interface MiokiStatus {
   };
   stats: {
     uptime: number;
+    send: number;
+    receive: number;
   };
   versions: {
     node: string;
@@ -614,7 +617,7 @@ interface MiokiContext extends Services, Configs, Utils, RemoveBotParam<Actions>
   /** 待清理的函数集合，在插件卸载时会被调用 */
   clears: Set<(() => any) | null | undefined>;
   /** 日志器 */
-  logger: ConsolaInstance;
+  logger: Logger;
 }
 declare const runtimePlugins: Map<string, {
   name: string;

package/dist/index.d.mts

@@ -5,23 +5,22 @@ import { BinaryLike, BinaryToTextEncoding } from "node:crypto";
 import { Low } from "lowdb";
 import { Jiti } from "jiti";
 import { string2argv } from "string2argv";
-import { EventMap, GroupMessageEvent, LogLevel, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
+import { EventMap, GroupMessageEvent, LogLevel, Logger, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
 import prettyMs from "pretty-ms";
 import { filesize } from "filesize";
 import dayjs from "dayjs";
 import dedent from "dedent";
 import { box, colorize, colors, stripAnsi } from "consola/utils";
 import systemInfo from "systeminformation";
-import { ConsolaInstance } from "consola/core";
 import { ScheduledTask, TaskContext } from "node-cron";
 
 //#region src/logger.d.ts
-declare const logger: ConsolaInstance;
+declare const logger: Logger;
 /**
 * 获取日志文件名
 */
 declare function getLogFilePath(type?: string): string;
-declare function getMiokiLogger(level: LogLevel): ConsolaInstance;
+declare function getMiokiLogger(level: LogLevel): Logger;
 //#endregion
 //#region src/start.d.ts
 interface StartOptions {
@@ -522,6 +521,8 @@ interface MiokiStatus {
   bot: {
     uin: number;
     nickname: string;
+    friends: number;
+    groups: number;
   };
   plugins: {
     enabled: number;
@@ -529,6 +530,8 @@ interface MiokiStatus {
   };
   stats: {
     uptime: number;
+    send: number;
+    receive: number;
   };
   versions: {
     node: string;
@@ -612,7 +615,7 @@ interface MiokiContext extends Services, Configs, Utils, RemoveBotParam<Actions>
   /** 待清理的函数集合，在插件卸载时会被调用 */
   clears: Set<(() => any) | null | undefined>;
   /** 日志器 */
-  logger: ConsolaInstance;
+  logger: Logger;
 }
 declare const runtimePlugins: Map<string, {
   name: string;

package/dist/index.mjs

@@ -1,5 +1,6 @@
 import { t as __export } from "./chunk-C6wwvPpM.mjs";
 import fs, { default as fs$1 } from "node:fs";
+import util from "node:util";
 import path, { default as path$1 } from "node:path";
 import mri, { default as mri$1 } from "mri";
 import crypto from "node:crypto";
@@ -858,14 +859,21 @@ function getMiokiLogger(level) {
 		level: LogLevels[level],
 		defaults: { tag: "mioki" },
 		reporters: [{ log: (logObj) => {
-			const message = stripAnsi$1(logObj.message || logObj.args?.join(" ") || "");
+			const message = stripAnsi$1(logObj.message || logObj.args?.map((e) => typeof e === "string" ? e : util.inspect(e, {
+				colors: true,
+				depth: null
+			})).join(" ") || "");
 			const line = `${`[${logObj.date.toISOString()}] [${LEVEL_MAP[logObj.level].name}] ${logObj.tag ? `[${logObj.tag}] ` : ""}`}${message}`;
 			fs$1.appendFileSync(logFile, line + "\n");
 		} }, { log: (logObj) => {
-			const message = logObj.message || logObj.args?.join(" ") || "";
-			const line = `${colors$1.gray(`[${logObj.date.toLocaleTimeString("zh-CN")}]`) + " " + colors$1.bold(colors$1[LEVEL_MAP[logObj.level].color](LEVEL_MAP[logObj.level].name)) + " " + (logObj.tag ? colors$1.dim(`[${logObj.tag}] `) : "")}${message}`;
-			if (logObj.level <= LogLevels["info"]) console.log(line);
+			const line = `${colors$1.gray(`[${logObj.date.toLocaleTimeString("zh-CN")}]`)} ${colors$1.bold(colors$1[LEVEL_MAP[logObj.level].color](LEVEL_MAP[logObj.level].name))} ${logObj.tag ? colors$1.dim(`[${logObj.tag}] `) : ""} ${logObj.message || logObj.args?.map((e) => typeof e === "string" ? e : util.inspect(e, {
+				colors: true,
+				depth: null
+			})).join(" ") || ""}`;
+			if (logObj.level <= LogLevels["error"]) console.error(line);
 			else if (logObj.level === LogLevels["warn"]) console.warn(line);
+			else if (logObj.level === LogLevels["log"]) console.log(line);
+			else if (logObj.level === LogLevels["info"]) console.info(line);
 			else console.debug(line);
 		} }],
 		formatOptions: {
@@ -878,7 +886,7 @@ function getMiokiLogger(level) {
 
 //#endregion
 //#region package.json
-var version = "0.5.1";
+var version = "0.6.1";
 
 //#endregion
 //#region src/actions.ts
@@ -1249,9 +1257,9 @@ async function enablePlugin(bot, plugin, type = "external") {
 		});
 		const end = hrtime.bigint();
 		const time = Math.round(Number(end - start$1)) / 1e6;
-		bot.logger.info(`启用插件 ${colors$1.yellow(`[${typeDesc}]`)}${colors$1.yellow(`${name}@${version$1}`)} => 耗时 ${colors$1.green(time.toFixed(2))} ms`);
+		bot.logger.info(`- 启用插件 ${colors$1.yellow(`[${typeDesc}]`)} ${colors$1.yellow(`${name}@${version$1}`)} => 耗时 ${colors$1.green(time.toFixed(2))} 毫秒`);
 	} catch (e) {
-		throw new Error(`启用插件 ${colors$1.yellow(`[${typeDesc}]`)}${colors$1.yellow(`${name}@${version$1}`)} 失败: ${e?.message}`);
+		throw new Error(`启用插件 ${colors$1.yellow(`[${typeDesc}]`)} ${colors$1.yellow(`${name}@${version$1}`)} 失败: ${e?.message}`);
 	}
 	return plugin;
 }
@@ -1280,10 +1288,12 @@ async function getMiokiStatus(bot) {
 	const osArch = os.arch();
 	const isInUnix = ["Linux", "Darwin"].includes(osType);
 	const arch = ArchMap[osArch] || osArch;
-	const [osInfo, localPlugins, versionInfo] = await Promise.all([
+	const [osInfo, localPlugins, versionInfo, friendList, groupList] = await Promise.all([
 		systemInfo.osInfo(),
 		findLocalPlugins(),
-		bot.getVersionInfo()
+		bot.getVersionInfo(),
+		bot.getFriendList(),
+		bot.getGroupList()
 	]);
 	const pluginCount = localPlugins.length + BUILTIN_PLUGINS.length;
 	const system = isInUnix ? {
@@ -1301,13 +1311,19 @@ async function getMiokiStatus(bot) {
 	return {
 		bot: {
 			uin: bot.uin,
-			nickname: bot.nickname
+			nickname: bot.nickname,
+			friends: friendList.length,
+			groups: groupList.length
 		},
 		plugins: {
 			enabled: runtimePlugins.size,
 			total: pluginCount
 		},
-		stats: { uptime: process.uptime() * 1e3 },
+		stats: {
+			uptime: process.uptime() * 1e3,
+			send: bot.stat.send.group + bot.stat.send.private,
+			receive: bot.stat.recv.group + bot.stat.recv.private
+		},
 		versions: {
 			node: nodeVersion,
 			mioki: version,
@@ -1348,7 +1364,9 @@ async function getMiokiStatusStr(client) {
 	return `
 👤 ${bot.nickname}
 🆔 ${bot.uin}
+📋 ${localNum(bot.friends)} 好友 / ${localNum(bot.groups)} 群
 🧩 启用了 ${localNum(plugins.enabled)} 个插件，共 ${localNum(plugins.total)} 个
+📮 收 ${localNum(stats.receive)} 条，发 ${localNum(stats.send)} 条
 🚀 ${filesize(memory.rss.used, { round: 1 })}/${memory.percent}%
 ⏳ 已运行 ${pm(stats.uptime, {
 		hideYear: true,
@@ -1682,7 +1700,7 @@ const BUILTIN_PLUGINS = [core_default];
 //#region src/start.ts
 async function start(options = {}) {
 	const { cwd = process.cwd() } = options;
-	if (cwd !== BOT_CWD.value) updateBotCWD(cwd);
+	if (cwd !== BOT_CWD.value) updateBotCWD(path$1.resolve(cwd));
 	process.title = `mioki v${version}`;
 	const plugin_dir = getAbsPluginDir();
 	logger.info(colors$1.dim("=".repeat(40)));
@@ -1699,7 +1717,7 @@ async function start(options = {}) {
 	logger.info(`${colors$1.dim("配置文件: ")}${colors$1.blue(`${BOT_CWD.value}/package.json`)}`);
 	logger.info(colors$1.dim("=".repeat(40)));
 	const { protocol = "ws", port = 6700, host = "localhost", token } = botConfig.napcat || {};
-	logger.info(`开始连接 NapCat 实例: ${colors$1.green(`${protocol}://${host}:${port}`)}`);
+	logger.info(`>>> 正在连接 NapCat 实例: ${colors$1.green(`${protocol}://${host}:${port}`)}`);
 	const napcat = new NapCat({
 		token,
 		protocol,
@@ -1709,9 +1727,11 @@ async function start(options = {}) {
 	});
 	napcat.on("ws.close", () => {
 		logger.error("连接已关闭，请确保 NapCat 实例正常运行及 token 配置正确");
+		process.exit(1);
 	});
 	napcat.on("napcat.connected", async ({ user_id, nickname, app_name, app_version }) => {
-		logger.info(`已连接到 NapCat 实例: ${colors$1.green(`${app_name}-v${app_version}-${nickname}(${user_id})`)}`);
+		logger.info(`已连接到 NapCat 实例: ${colors$1.green(`${app_name}-v${app_version} ${nickname}(${user_id})`)}`);
+		process.title = `mioki v${version} ${app_name}-v${app_version}-${user_id}`;
 		let lastNoticeTime = 0;
 		process.on("uncaughtException", async (err) => {
 			const msg = stringifyError(err);
@@ -1775,7 +1795,7 @@ async function start(options = {}) {
 		const sortedGroups = Array.from(pluginGroups.entries()).toSorted(([a], [b]) => a - b);
 		const failedEnablePlugins = [];
 		try {
-			napcat.logger.info(`加载内置插件: ${BUILTIN_PLUGINS.map((p) => colors$1.cyan(p.name)).join(", ")}`);
+			napcat.logger.info(`>>> 加载 mioki 内置插件: ${BUILTIN_PLUGINS.map((p) => colors$1.cyan(p.name)).join(", ")}`);
 			await Promise.all(BUILTIN_PLUGINS.map((p) => enablePlugin(napcat, p, "builtin")));
 			for (const [_, plugins$1] of sortedGroups) await Promise.all(plugins$1.map(async (p) => {
 				try {