mioki 0.5.1 → 0.6.1

package/dist/index.cjs

@@ -40,6 +40,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs);
+let node_util = require("node:util");
+node_util = __toESM(node_util);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let mri = require("mri");
@@ -908,14 +910,21 @@ function getMiokiLogger(level) {
 		level: consola_core.LogLevels[level],
 		defaults: { tag: "mioki" },
 		reporters: [{ log: (logObj) => {
-			const message = (0, consola_utils.stripAnsi)(logObj.message || logObj.args?.join(" ") || "");
+			const message = (0, consola_utils.stripAnsi)(logObj.message || logObj.args?.map((e) => typeof e === "string" ? e : node_util.default.inspect(e, {
+				colors: true,
+				depth: null
+			})).join(" ") || "");
 			const line = `${`[${logObj.date.toISOString()}] [${LEVEL_MAP[logObj.level].name}] ${logObj.tag ? `[${logObj.tag}] ` : ""}`}${message}`;
 			node_fs.default.appendFileSync(logFile, line + "\n");
 		} }, { log: (logObj) => {
-			const message = logObj.message || logObj.args?.join(" ") || "";
-			const line = `${consola_utils.colors.gray(`[${logObj.date.toLocaleTimeString("zh-CN")}]`) + " " + consola_utils.colors.bold(consola_utils.colors[LEVEL_MAP[logObj.level].color](LEVEL_MAP[logObj.level].name)) + " " + (logObj.tag ? consola_utils.colors.dim(`[${logObj.tag}] `) : "")}${message}`;
-			if (logObj.level <= consola_core.LogLevels["info"]) console.log(line);
+			const line = `${consola_utils.colors.gray(`[${logObj.date.toLocaleTimeString("zh-CN")}]`)} ${consola_utils.colors.bold(consola_utils.colors[LEVEL_MAP[logObj.level].color](LEVEL_MAP[logObj.level].name))} ${logObj.tag ? consola_utils.colors.dim(`[${logObj.tag}] `) : ""} ${logObj.message || logObj.args?.map((e) => typeof e === "string" ? e : node_util.default.inspect(e, {
+				colors: true,
+				depth: null
+			})).join(" ") || ""}`;
+			if (logObj.level <= consola_core.LogLevels["error"]) console.error(line);
 			else if (logObj.level === consola_core.LogLevels["warn"]) console.warn(line);
+			else if (logObj.level === consola_core.LogLevels["log"]) console.log(line);
+			else if (logObj.level === consola_core.LogLevels["info"]) console.info(line);
 			else console.debug(line);
 		} }],
 		formatOptions: {
@@ -928,7 +937,7 @@ function getMiokiLogger(level) {
 
 //#endregion
 //#region package.json
-var version = "0.5.1";
+var version = "0.6.1";
 
 //#endregion
 //#region src/actions.ts
@@ -1299,9 +1308,9 @@ async function enablePlugin(bot, plugin, type = "external") {
 		});
 		const end = node_process.hrtime.bigint();
 		const time = Math.round(Number(end - start$1)) / 1e6;
-		bot.logger.info(`启用插件 ${consola_utils.colors.yellow(`[${typeDesc}]`)}${consola_utils.colors.yellow(`${name}@${version$1}`)} => 耗时 ${consola_utils.colors.green(time.toFixed(2))} ms`);
+		bot.logger.info(`- 启用插件 ${consola_utils.colors.yellow(`[${typeDesc}]`)} ${consola_utils.colors.yellow(`${name}@${version$1}`)} => 耗时 ${consola_utils.colors.green(time.toFixed(2))} 毫秒`);
 	} catch (e) {
-		throw new Error(`启用插件 ${consola_utils.colors.yellow(`[${typeDesc}]`)}${consola_utils.colors.yellow(`${name}@${version$1}`)} 失败: ${e?.message}`);
+		throw new Error(`启用插件 ${consola_utils.colors.yellow(`[${typeDesc}]`)} ${consola_utils.colors.yellow(`${name}@${version$1}`)} 失败: ${e?.message}`);
 	}
 	return plugin;
 }
@@ -1330,10 +1339,12 @@ async function getMiokiStatus(bot) {
 	const osArch = node_os.default.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([
 		systeminformation.default.osInfo(),
 		findLocalPlugins(),
-		bot.getVersionInfo()
+		bot.getVersionInfo(),
+		bot.getFriendList(),
+		bot.getGroupList()
 	]);
 	const pluginCount = localPlugins.length + BUILTIN_PLUGINS.length;
 	const system = isInUnix ? {
@@ -1351,13 +1362,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,
@@ -1398,7 +1415,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)} 条
 🚀 ${(0, filesize.filesize)(memory.rss.used, { round: 1 })}/${memory.percent}%
 ⏳ 已运行 ${(0, pretty_ms.default)(stats.uptime, {
 		hideYear: true,
@@ -1732,7 +1751,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(node_path.default.resolve(cwd));
 	process.title = `mioki v${version}`;
 	const plugin_dir = getAbsPluginDir();
 	logger.info(consola_utils.colors.dim("=".repeat(40)));
@@ -1749,7 +1768,7 @@ async function start(options = {}) {
 	logger.info(`${consola_utils.colors.dim("配置文件: ")}${consola_utils.colors.blue(`${BOT_CWD.value}/package.json`)}`);
 	logger.info(consola_utils.colors.dim("=".repeat(40)));
 	const { protocol = "ws", port = 6700, host = "localhost", token } = botConfig.napcat || {};
-	logger.info(`开始连接 NapCat 实例: ${consola_utils.colors.green(`${protocol}://${host}:${port}`)}`);
+	logger.info(`>>> 正在连接 NapCat 实例: ${consola_utils.colors.green(`${protocol}://${host}:${port}`)}`);
 	const napcat = new napcat_sdk.NapCat({
 		token,
 		protocol,
@@ -1759,9 +1778,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 实例: ${consola_utils.colors.green(`${app_name}-v${app_version}-${nickname}(${user_id})`)}`);
+		logger.info(`已连接到 NapCat 实例: ${consola_utils.colors.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);
@@ -1825,7 +1846,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) => consola_utils.colors.cyan(p.name)).join(", ")}`);
+			napcat.logger.info(`>>> 加载 mioki 内置插件: ${BUILTIN_PLUGINS.map((p) => consola_utils.colors.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 {