mioki 0.2.4 → 0.3.0

package/dist/index.cjs

@@ -38,13 +38,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-let pino = require("pino");
-pino = __toESM(pino);
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
-let node_process = require("node:process");
 let mri = require("mri");
 mri = __toESM(mri);
 let node_crypto = require("node:crypto");
@@ -64,6 +61,9 @@ let dedent = require("dedent");
 dedent = __toESM(dedent);
 let systeminformation = require("systeminformation");
 systeminformation = __toESM(systeminformation);
+let consola_utils = require("consola/utils");
+let consola_core = require("consola/core");
+let node_process = require("node:process");
 let node_os = require("node:os");
 node_os = __toESM(node_os);
 let node_child_process = require("node:child_process");
@@ -71,19 +71,6 @@ node_child_process = __toESM(node_child_process);
 let node_cron = require("node-cron");
 node_cron = __toESM(node_cron);
 
-//#region src/logger.ts
-const getMiokiLogger = (level) => {
-	return (0, pino.default)({
-		level,
-		name: "mioki",
-		transport: {
-			target: "pino-pretty",
-			options: { colorize: true }
-		}
-	});
-};
-
-//#endregion
 //#region src/utils.ts
 var utils_exports = /* @__PURE__ */ __export({
 	ChromeUA: () => ChromeUA,
@@ -791,7 +778,7 @@ const START_TIME = /* @__PURE__ */ new Date();
 var config_exports = /* @__PURE__ */ __export({
 	BOT_CWD: () => BOT_CWD,
 	botConfig: () => botConfig,
-	getLogFilePath: () => getLogFilePath,
+	getLogFilePath: () => getLogFilePath$1,
 	hasRight: () => hasRight,
 	isAdmin: () => isAdmin,
 	isInPm2: () => isInPm2,
@@ -876,14 +863,57 @@ const isInPm2 = Boolean("pm_id" in process.env || "PM2_USAGE" in process.env);
 /**
 * 获取日志文件名
 */
-function getLogFilePath(uin, platformName) {
+function getLogFilePath$1(uin, platformName) {
 	const startTime = (0, dayjs.default)().format("YYYY-MM-DD_HH-mm-ss");
 	return node_path.default.join(BOT_CWD.value, `logs/${uin}_${platformName}_${startTime}.log`);
 }
 
+//#endregion
+//#region src/logger.ts
+const LEVEL_MAP = {
+	0: "FATAL",
+	1: "ERROR",
+	2: "WARN",
+	3: "INFO",
+	4: "DEBUG",
+	5: "TRACE"
+};
+/**
+* 获取日志文件名
+*/
+function getLogFilePath(type = "") {
+	const startTime = (0, dayjs.default)().format("YYYY-MM-DD_HH-mm-ss");
+	return node_path.default.join(BOT_CWD.value, `logs/${startTime}${type ? "." + type : ""}.log`);
+}
+const getMiokiLogger = (level) => {
+	const logDir = node_path.default.join(BOT_CWD.value, "logs");
+	if (!node_fs.default.existsSync(logDir)) node_fs.default.mkdirSync(logDir, { recursive: true });
+	const logFile = getLogFilePath();
+	return (0, consola_core.createConsola)({
+		level: consola_core.LogLevels[level],
+		defaults: { tag: "mioki" },
+		reporters: [{ log: (logObj) => {
+			const message = (0, consola_utils.stripAnsi)(logObj.message || logObj.args?.join(" ") || "");
+			const line = `${`[${logObj.date.toISOString()}] [${LEVEL_MAP[logObj.level]}] ${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.blue(LEVEL_MAP[logObj.level])) + " " + (logObj.tag ? consola_utils.colors.bold(consola_utils.colors.green(`[${logObj.tag}] `)) : "")}${message}`;
+			if (logObj.level <= consola_core.LogLevels["info"]) console.log(line);
+			else if (logObj.level === consola_core.LogLevels["warn"]) console.warn(line);
+			else console.debug(line);
+		} }],
+		formatOptions: {
+			colors: true,
+			compact: true,
+			date: true
+		}
+	});
+};
+
 //#endregion
 //#region package.json
-var version = "0.2.4";
+var version = "0.3.0";
 
 //#endregion
 //#region src/actions.ts
@@ -1191,6 +1221,10 @@ async function enablePlugin(bot, plugin, type = "external") {
 		const start$1 = node_process.hrtime.bigint();
 		const clears = /* @__PURE__ */ new Set();
 		const userClears = /* @__PURE__ */ new Set();
+		const logger = bot.logger.withDefaults({
+			tag: `plugin:${name}`,
+			args: [name]
+		});
 		const context = {
 			bot,
 			segment: bot.segment,
@@ -1198,22 +1232,35 @@ async function enablePlugin(bot, plugin, type = "external") {
 			...utils_exports,
 			...config_exports,
 			...buildRemovedActions(bot),
+			logger,
 			services,
 			clears: userClears,
 			addService: (name$1, service, cover) => {
-				const removeService = addService(name$1, service, cover);
+				logger.debug(`Adding service: ${name$1} (cover: ${cover ? "yes" : "no"})`);
+				const removeService = () => {
+					logger.debug(`Removing service: ${name$1}`);
+					addService(name$1, service, cover);
+				};
 				clears.add(removeService);
 				return removeService;
 			},
 			handle: (eventName, handler) => {
+				logger.debug(`Registering event handler for event: ${String(eventName)}`);
 				bot.on(eventName, handler);
-				const unsubscribe = () => bot.off(eventName, handler);
+				const unsubscribe = () => {
+					logger.debug(`Unregistering event handler for event: ${String(eventName)}`);
+					bot.off(eventName, handler);
+				};
 				clears.add(unsubscribe);
 				return unsubscribe;
 			},
 			cron: (cronExpression, handler) => {
+				logger.debug(`Scheduling cron job: ${cronExpression}`);
 				const job = node_cron.default.schedule(cronExpression, (now) => handler(context, now));
-				const clear = () => job.stop();
+				const clear = () => {
+					logger.debug(`Stopping cron job: ${cronExpression}`);
+					job.stop();
+				};
 				clears.add(clear);
 				return job;
 			}
@@ -1227,6 +1274,7 @@ async function enablePlugin(bot, plugin, type = "external") {
 			plugin,
 			disable: async () => {
 				try {
+					logger.debug(`Disabling plugin [${typeDesc}]${name}@${version$1}`);
 					await Promise.all([...clears, ...userClears].map((fn) => fn?.()));
 					runtimePlugins.delete(name);
 				} catch (err) {
@@ -1354,9 +1402,9 @@ async function getMiokiStatusStr(client) {
 ${diskValid ? `💾 ${diskDesc}` : ""}
   `.trim();
 }
-async function getDiskUsageInUnix(path$6 = "/") {
+async function getDiskUsageInUnix(path$7 = "/") {
 	return new Promise((resolve) => {
-		node_child_process.default.exec(`df -k ${path$6} | tail -1 | awk '{print $2,$4}'`, (err, stdout) => {
+		node_child_process.default.exec(`df -k ${path$7} | tail -1 | awk '{print $2,$4}'`, (err, stdout) => {
 			if (err) {
 				console.error(err);
 				return resolve({
@@ -1680,9 +1728,8 @@ async function start(options = {}) {
 		...botConfig.napcat,
 		logger
 	});
-	napcat.on("napcat.connected", async ({ uin }) => {
-		logger.info(`>>> 已连接到 NapCat 服务器`);
-		logger.info(`>>> 当前登录 QQ 账号: ${uin}`);
+	napcat.on("napcat.connected", async ({ user_id, nickname }) => {
+		logger.info(`>>> 已连接到 NapCat: ${nickname} (${user_id})`);
 		let lastNoticeTime = 0;
 		process.on("uncaughtException", async (err) => {
 			const msg = stringifyError(err);
@@ -1826,7 +1873,6 @@ exports.getBfaceUrl = getBfaceUrl;
 exports.getGroupAvatarLink = getGroupAvatarLink;
 exports.getImage = getImage;
 exports.getImageUrl = getImageUrl;
-exports.getLogFilePath = getLogFilePath;
 exports.getMentionedImage = getMentionedImage;
 exports.getMentionedImageUrl = getMentionedImageUrl;
 exports.getMentionedUserId = getMentionedUserId;