mioki 0.2.4 → 0.3.0

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-import { LevelWithSilentOrString } from "pino";
 import fs from "node:fs";
 import path from "node:path";
 import mri from "mri";
@@ -6,16 +5,17 @@ import { BinaryLike, BinaryToTextEncoding } from "node:crypto";
 import { Low } from "lowdb";
 import { Jiti } from "jiti";
 import { string2argv } from "string2argv";
-import { EventMap, GroupMessageEvent, Logger, MessageEvent, NapCat, PrivateMessageEvent, RecvElement, RecvImageElement, Sendable } from "napcat-sdk";
+import { EventMap, GroupMessageEvent, LogLevel, 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 systemInfo from "systeminformation";
+import { ConsolaInstance } from "consola/core";
 import { ScheduledTask, TaskContext } from "node-cron";
 
 //#region src/logger.d.ts
-declare const getMiokiLogger: (level: LevelWithSilentOrString) => Logger;
+declare const getMiokiLogger: (level: LogLevel) => ConsolaInstance;
 //#endregion
 //#region src/start.d.ts
 interface StartOptions {
@@ -365,7 +365,7 @@ interface MiokiConfig {
   admins: number[];
   plugins: string[];
   online_push?: boolean;
-  log_level?: string;
+  log_level?: LogLevel;
   plugins_dir?: string;
   napcat: {
     protocol?: "ws" | "wss";
@@ -609,6 +609,8 @@ interface MiokiContext extends Services, Configs, Utils, RemoveBotParam<Actions>
   cron: (cronExpression: string, handler: (ctx: MiokiContext, task: TaskContext) => any) => ScheduledTask;
   /** 待清理的函数集合，在插件卸载时会被调用 */
   clears: Set<(() => any) | null | undefined>;
+  /** 日志器 */
+  logger: ConsolaInstance;
 }
 declare const runtimePlugins: Map<string, {
   name: string;
@@ -652,5 +654,5 @@ declare function findLocalPlugins(): Promise<{
   absPath: string;
 }[]>;
 //#endregion
-export { AnyFunc, Arrayable, BOT_CWD, ChromeUA, CreateCmdOptions, Gettable, HasMessage, MiokiConfig, MiokiContext, MiokiPlugin, MiokiServices, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, addService, base64Decode, base64Encode, bindBot, botConfig, clamp, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMessage, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, match, md5, mri, noNullish, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
+export { AnyFunc, Arrayable, BOT_CWD, ChromeUA, CreateCmdOptions, Gettable, HasMessage, MiokiConfig, MiokiContext, MiokiPlugin, MiokiServices, Noop, OmitBotParamFromFunc, PureObject, START_TIME, StartOptions, addService, base64Decode, base64Encode, bindBot, botConfig, clamp, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGroupAvatarLink, getImage, getImageUrl, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMessage, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, match, md5, mri, noNullish, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,8 +1,6 @@
 import { t as __export } from "./chunk-C6wwvPpM.mjs";
-import pino from "pino";
 import fs, { default as fs$1 } from "node:fs";
 import path, { default as path$1 } from "node:path";
-import { hrtime } from "node:process";
 import mri, { default as mri$1 } from "mri";
 import crypto from "node:crypto";
 import { Low } from "lowdb";
@@ -16,23 +14,13 @@ import { filesize } from "filesize";
 import dayjs from "dayjs";
 import dedent, { default as dedent$1 } from "dedent";
 import systemInfo from "systeminformation";
+import { colors, stripAnsi } from "consola/utils";
+import { LogLevels, createConsola } from "consola/core";
+import { hrtime } from "node:process";
 import os from "node:os";
 import cp from "node:child_process";
 import nodeCron from "node-cron";
 
-//#region src/logger.ts
-const getMiokiLogger = (level) => {
-	return pino({
-		level,
-		name: "mioki",
-		transport: {
-			target: "pino-pretty",
-			options: { colorize: true }
-		}
-	});
-};
-
-//#endregion
 //#region src/utils.ts
 var utils_exports = /* @__PURE__ */ __export({
 	ChromeUA: () => ChromeUA,
@@ -740,7 +728,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,
@@ -825,14 +813,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 = dayjs().format("YYYY-MM-DD_HH-mm-ss");
 	return path$1.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 = dayjs().format("YYYY-MM-DD_HH-mm-ss");
+	return path$1.join(BOT_CWD.value, `logs/${startTime}${type ? "." + type : ""}.log`);
+}
+const getMiokiLogger = (level) => {
+	const logDir = path$1.join(BOT_CWD.value, "logs");
+	if (!fs$1.existsSync(logDir)) fs$1.mkdirSync(logDir, { recursive: true });
+	const logFile = getLogFilePath();
+	return createConsola({
+		level: LogLevels[level],
+		defaults: { tag: "mioki" },
+		reporters: [{ log: (logObj) => {
+			const message = stripAnsi(logObj.message || logObj.args?.join(" ") || "");
+			const line = `${`[${logObj.date.toISOString()}] [${LEVEL_MAP[logObj.level]}] ${logObj.tag ? `[${logObj.tag}] ` : ""}`}${message}`;
+			fs$1.appendFileSync(logFile, line + "\n");
+		} }, { log: (logObj) => {
+			const message = logObj.message || logObj.args?.join(" ") || "";
+			const line = `${colors.gray(`[${logObj.date.toLocaleTimeString("zh-CN")}]`) + " " + colors.bold(colors.blue(LEVEL_MAP[logObj.level])) + " " + (logObj.tag ? colors.bold(colors.green(`[${logObj.tag}] `)) : "")}${message}`;
+			if (logObj.level <= LogLevels["info"]) console.log(line);
+			else if (logObj.level === 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
@@ -1140,6 +1171,10 @@ async function enablePlugin(bot, plugin, type = "external") {
 		const start$1 = 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,
@@ -1147,22 +1182,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 = nodeCron.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;
 			}
@@ -1176,6 +1224,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) {
@@ -1629,9 +1678,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);
@@ -1723,5 +1771,5 @@ async function start(options = {}) {
 }
 
 //#endregion
-export { BOT_CWD, ChromeUA, START_TIME, addService, base64Decode, base64Encode, bindBot, botConfig, clamp, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGroupAvatarLink, getImage, getImageUrl, getLogFilePath, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMessage, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, match, md5, mri, noNullish, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
+export { BOT_CWD, ChromeUA, START_TIME, addService, base64Decode, base64Encode, bindBot, botConfig, clamp, createCmd, createDB, createForwardMsg, createStore, dayjs, dedent, definePlugin, enablePlugin, ensureBuffer, ensurePluginDir, filesize, filter, find, findLocalPlugins, formatDuration, formatQQLevel, fs, getAbsPluginDir, getAuthCodeViaTicket, getBfaceUrl, getGroupAvatarLink, getImage, getImageUrl, getMentionedImage, getMentionedImageUrl, getMentionedUserId, getMinicoTokenViaAuthCode, getMiokiLogger, getQQAvatarLink, getQuoteImage, getQuoteImageUrl, getQuoteMessage, getQuoteText, getTerminalInput, getViolationRecords, hasRight, isAdmin, isBoolean, isDefined, isFunction, isGroupMsg, isInPm2, isNumber, isObject, isOwner, isOwnerOrAdmin, isPrivateMsg, isString, jiti, localNum, localeDate, localeTime, match, md5, mri, noNullish, noticeAdmins, noticeFriends, noticeGroups, noticeMainOwner, noticeOwners, path, prettyMs, qs, queryDevToolsLoginStatus, randomId, randomInt, randomItem, randomItems, readMiokiConfig, readPackageJson, requestLoginViaDevTools, runWithErrorHandler, runWithReaction, runtimePlugins, services, signArk, start, string2argv, stringifyError, systemInfo, text, toArray, toMsgId, unique, updateBotCWD, updateBotConfig, uploadImageToCollection, uploadImageToGroupHomework, uploadImageToGroupNotice, uuid, wait, writePackageJson };
 //# sourceMappingURL=index.mjs.map