mioki 0.2.1 → 0.2.3

package/dist/index.cjs

@@ -90,7 +90,6 @@ var utils_exports = /* @__PURE__ */ __export({
 	START_TIME: () => START_TIME,
 	base64Decode: () => base64Decode,
 	base64Encode: () => base64Encode,
-	bindBot: () => bindBot,
 	clamp: () => clamp,
 	createCmd: () => createCmd,
 	createDB: () => createDB,
@@ -188,9 +187,9 @@ const jiti$1 = (0, jiti.createJiti)(__dirname, {
 function createCmd(cmdStr, options = {}) {
 	const { prefix = "", onPrefix = () => {} } = options;
 	const { _, ...cmdOptions } = (0, mri.default)((0, string2argv.string2argv)(cmdStr));
-	const [cmd$1, ...params] = _;
+	const [cmd, ...params] = _;
 	if (prefix) {
-		if (cmd$1 !== prefix) return {
+		if (cmd !== prefix) return {
 			cmd: void 0,
 			params: [],
 			options: cmdOptions
@@ -203,7 +202,7 @@ function createCmd(cmdStr, options = {}) {
 		};
 	}
 	return {
-		cmd: cmd$1,
+		cmd,
 		params,
 		options: cmdOptions
 	};
@@ -782,9 +781,6 @@ async function getTerminalInput(inputTip = "请输入") {
 		getInput();
 	});
 }
-function bindBot(bot, func) {
-	return (...args) => func(bot, ...args);
-}
 /**
 * 当前 Node.js 进程的启动时间，常量，Date 类型
 */
@@ -887,7 +883,7 @@ function getLogFilePath(uin, platformName) {
 
 //#endregion
 //#region package.json
-var version = "0.2.1";
+var version = "0.2.3";
 
 //#endregion
 //#region src/actions.ts
@@ -1160,6 +1156,9 @@ function addService(name, service, cover = true) {
 
 //#endregion
 //#region src/plugin.ts
+function bindBot(bot, func) {
+	return (...args) => func(bot, ...args);
+}
 const runtimePlugins = /* @__PURE__ */ new Map();
 const buildRemovedActions = (bot) => Object.fromEntries(Object.entries(actions_exports).map(([k, v]) => [k, bindBot(bot, v)]));
 /**
@@ -1180,9 +1179,9 @@ function ensurePluginDir() {
 /**
 * 获取插件目录的绝对路径
 */
-function getAbsPluginDir(defaultDir = "plugin") {
+function getAbsPluginDir(defaultDir = "plugins") {
 	const cwd = BOT_CWD.value;
-	return node_path.default.resolve(cwd, botConfig.plugin_dir || defaultDir);
+	return node_path.default.join(cwd, botConfig.plugins_dir || defaultDir);
 }
 async function enablePlugin(bot, plugin, type = "external") {
 	const typeDesc = type === "builtin" ? "内置" : "用户";
@@ -1195,6 +1194,7 @@ async function enablePlugin(bot, plugin, type = "external") {
 		const context = {
 			bot,
 			segment: bot.segment,
+			getCookie: bot.getCookie,
 			...utils_exports,
 			...config_exports,
 			...buildRemovedActions(bot),
@@ -1230,15 +1230,15 @@ async function enablePlugin(bot, plugin, type = "external") {
 					await Promise.all([...clears, ...userClears].map((fn) => fn?.()));
 					runtimePlugins.delete(name);
 				} catch (err) {
-					throw new Error(`禁用插件 [${typeDesc}]${name}@${version$1} 失败: ${err?.message}`);
+					throw new Error(`>>> 禁用插件 [${typeDesc}]${name}@${version$1} 失败: ${err?.message}`);
 				}
 			}
 		});
 		const end = node_process.hrtime.bigint();
 		const time = Math.round(Number(end - start$1)) / 1e6;
-		bot.logger.info(`启用插件 [${typeDesc}]${name}@${version$1} => 耗时 ${time} ms`);
+		bot.logger.info(`>>> 启用插件 [${typeDesc}]${name}@${version$1} => 耗时 ${time} ms`);
 	} catch (e) {
-		throw new Error(`启用插件 [${typeDesc}]${name}@${version$1} 失败: ${e?.message}`);
+		throw new Error(`>>> 启用插件 [${typeDesc}]${name}@${version$1} 失败: ${e?.message}`);
 	}
 	return plugin;
 }
@@ -1250,7 +1250,7 @@ async function findLocalPlugins() {
 }
 
 //#endregion
-//#region src/builtins/cmd/status.ts
+//#region src/builtins/core/status.ts
 const SystemMap = {
 	Linux: "Linux",
 	Darwin: "macOS",
@@ -1302,8 +1302,8 @@ async function getMiokiStatus(bot) {
 			protocol: versionInfo.protocol_version
 		},
 		system: {
-			name: system.name,
-			version: system.version,
+			name: system.name || "N/A",
+			version: system.version || "N/A",
 			arch
 		},
 		memory: {
@@ -1322,7 +1322,7 @@ async function getMiokiStatus(bot) {
 			percent: 0
 		},
 		cpu: {
-			name: cpu.name,
+			name: cpu.name.trim(),
 			count: cpu.count,
 			percent: Number((await measureCpuUsage()).toFixed(1))
 		}
@@ -1341,7 +1341,7 @@ async function getMiokiStatusStr(client) {
 		hideYear: true,
 		secondsDecimalDigits: 0
 	})}
-🤖 NapCat/${versions.napcat}-mioki/${versions.mioki}
+🤖 mioki/${versions.mioki}-NapCat/${versions.napcat}
 🖥️ ${system.name.split(" ")[0]}/${system.version.split(".")[0]}-${system.name}-node/${versions.node.split(".")[0]}
 📊 ${memory.percent}%-${(0, filesize.filesize)(memory.used, {
 		base: 2,
@@ -1351,7 +1351,7 @@ async function getMiokiStatusStr(client) {
 		round: 1
 	})}
 🧮 ${cpu.percent}%-${cpu.name}-${cpu.count}核
-💾 ${diskValid ? diskDesc : "N/A (不适用)"}
+${diskValid ? `💾 ${diskDesc}` : ""}
   `.trim();
 }
 async function getDiskUsageInUnix(path$6 = "/") {
@@ -1407,10 +1407,10 @@ function getCpuInfo() {
 }
 
 //#endregion
-//#region src/builtins/cmd/index.ts
-const corePlugins = ["mioki-cmd"];
-const cmd = definePlugin({
-	name: "kivi-cmd",
+//#region src/builtins/core/index.ts
+const corePlugins = ["mioki-core"];
+const core = definePlugin({
+	name: "mioki-core",
 	version,
 	priority: 1,
 	setup(ctx) {
@@ -1428,9 +1428,9 @@ const cmd = definePlugin({
 			}
 			if (!ctx.isOwner(e)) return;
 			const { _: params, ..._options } = (0, mri.default)((0, string2argv.string2argv)(text$1));
-			const cmd$1 = params.shift()?.replace(cmdPrefix, "") ?? "";
+			const cmd = params.shift()?.replace(cmdPrefix, "") ?? "";
 			const [subCmd, target, ..._subParams] = params;
-			switch (cmd$1) {
+			switch (cmd) {
 				case "帮助":
 					await e.reply((0, dedent.default)(`
               〓 💡 mioki 帮助 〓
@@ -1659,11 +1659,11 @@ const cmd = definePlugin({
 		}, e));
 	}
 });
-var cmd_default = cmd;
+var core_default = core;
 
 //#endregion
 //#region src/builtins/index.ts
-const BUILTIN_PLUGINS = [cmd_default];
+const BUILTIN_PLUGINS = [core_default];
 
 //#endregion
 //#region src/start.ts
@@ -1673,13 +1673,16 @@ async function start(options = {}) {
 	process.title = `mioki v${version}`;
 	const logger = getMiokiLogger(botConfig.log_level || "info");
 	const plugin_dir = getAbsPluginDir();
-	logger.info(`>>> mioki v${version} 启动中，工作目录: ${BOT_CWD.value}，插件目录: ${plugin_dir}`);
+	logger.info(`>>> mioki v${version} 启动中`);
+	logger.info(`>>> 工作目录: ${BOT_CWD.value}`);
+	logger.info(`>>> 插件目录: ${plugin_dir}`);
 	const napcat = new napcat_sdk.NapCat({
 		...botConfig.napcat,
 		logger
 	});
 	napcat.on("napcat.connected", async ({ uin }) => {
-		logger.info(`>>> 已连接到 NapCat 服务器，当前登录 QQ 账号: ${uin}`);
+		logger.info(`>>> 已连接到 NapCat 服务器`);
+		logger.info(`>>> 当前登录 QQ 账号: ${uin}`);
 		let lastNoticeTime = 0;
 		process.on("uncaughtException", async (err) => {
 			napcat.logger.error(">>> uncaughtException, 出错了", err);
@@ -1739,17 +1742,14 @@ async function start(options = {}) {
 		try {
 			napcat.logger.info(`>>> 加载内置插件: ${BUILTIN_PLUGINS.map((p) => p.name).join(", ")}`);
 			await Promise.all(BUILTIN_PLUGINS.map((p) => enablePlugin(napcat, p, "builtin")));
-			for (const [priority, plugins$1] of sortedGroups) {
-				napcat.logger.info(`>>> 加载优先级 ${priority} 的插件: ${plugins$1.map((p) => p.name).join(", ")}`);
-				await Promise.all(plugins$1.map(async (p) => {
-					try {
-						await enablePlugin(napcat, p, "external");
-					} catch (e) {
-						const err = stringifyError(e);
-						failedEnablePlugins.push([p.name, err]);
-					}
-				}));
-			}
+			for (const [_, plugins$1] of sortedGroups) await Promise.all(plugins$1.map(async (p) => {
+				try {
+					await enablePlugin(napcat, p, "external");
+				} catch (e) {
+					const err = stringifyError(e);
+					failedEnablePlugins.push([p.name, err]);
+				}
+			}));
 		} catch (e) {
 			napcat.logger.error(e?.message);
 			noticeMainOwner(napcat, e?.message);
@@ -1771,6 +1771,7 @@ exports.START_TIME = START_TIME;
 exports.addService = addService;
 exports.base64Decode = base64Decode;
 exports.base64Encode = base64Encode;
+exports.bindBot = bindBot;
 exports.botConfig = botConfig;
 exports.clamp = clamp;
 exports.createCmd = createCmd;