mioki 0.2.0 → 0.2.2

package/dist/index.cjs

@@ -64,12 +64,12 @@ let dedent = require("dedent");
 dedent = __toESM(dedent);
 let systeminformation = require("systeminformation");
 systeminformation = __toESM(systeminformation);
-let node_cron = require("node-cron");
-node_cron = __toESM(node_cron);
 let node_os = require("node:os");
 node_os = __toESM(node_os);
 let node_child_process = require("node:child_process");
 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) => {
@@ -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.0";
+var version = "0.2.2";
 
 //#endregion
 //#region src/actions.ts
@@ -959,7 +955,7 @@ async function noticeOwners(bot, message, delay = 1e3) {
 * 群发通知给第一个主人
 */
 async function noticeMainOwner(bot, message) {
-	if (!bot.isOnline) {
+	if (!bot.isOnline()) {
 		bot.logger.error("发送失败，Bot 不在线");
 		return;
 	}
@@ -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)]));
 /**
@@ -1170,6 +1169,20 @@ const buildRemovedActions = (bot) => Object.fromEntries(Object.entries(actions_e
 function definePlugin(plugin) {
 	return plugin;
 }
+/**
+* 确保插件目录存在
+*/
+function ensurePluginDir() {
+	const dir = getAbsPluginDir();
+	if (!node_fs.default.existsSync(dir)) node_fs.default.mkdirSync(dir, { recursive: true });
+}
+/**
+* 获取插件目录的绝对路径
+*/
+function getAbsPluginDir(defaultDir = "plugins") {
+	const cwd = BOT_CWD.value;
+	return node_path.default.join(cwd, botConfig.plugins_dir || defaultDir);
+}
 async function enablePlugin(bot, plugin, type = "external") {
 	const typeDesc = type === "builtin" ? "内置" : "用户";
 	const pluginName = plugin.name || "null";
@@ -1181,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),
@@ -1229,14 +1243,14 @@ async function enablePlugin(bot, plugin, type = "external") {
 	return plugin;
 }
 async function findLocalPlugins() {
-	return (await node_fs.default.promises.readdir(node_path.default.join(BOT_CWD.value, "plugins"), { withFileTypes: true })).filter((e) => e.isDirectory() && !!e.name && !e.name.startsWith("_")).map((e) => ({
+	return (await node_fs.default.promises.readdir(getAbsPluginDir(), { withFileTypes: true })).filter((e) => e.isDirectory() && !!e.name && !e.name.startsWith("_")).map((e) => ({
 		name: e.name,
-		absPath: node_path.default.join(BOT_CWD.value, "plugins", e.name)
+		absPath: node_path.default.join(getAbsPluginDir(), e.name)
 	}));
 }
 
 //#endregion
-//#region src/builtins/cmd/status.ts
+//#region src/builtins/core/status.ts
 const SystemMap = {
 	Linux: "Linux",
 	Darwin: "macOS",
@@ -1288,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: {
@@ -1308,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))
 		}
@@ -1327,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,
@@ -1337,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 = "/") {
@@ -1393,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) {
@@ -1414,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 帮助 〓
@@ -1645,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
@@ -1658,13 +1672,14 @@ async function start(options = {}) {
 	if (cwd !== BOT_CWD.value) updateBotCWD(cwd);
 	process.title = `mioki v${version}`;
 	const logger = getMiokiLogger(botConfig.log_level || "info");
-	logger.info(`>>> mioki v${version} 启动中，工作目录: ${BOT_CWD.value}`);
+	const plugin_dir = getAbsPluginDir();
+	logger.info(`>>> mioki v${version} 启动中，工作目录: ${BOT_CWD.value}，插件目录: ${plugin_dir}`);
 	const napcat = new napcat_sdk.NapCat({
 		...botConfig.napcat,
 		logger
 	});
 	napcat.on("napcat.connected", async ({ uin }) => {
-		logger.info(`>>> 已连接到 NapCat 服务器，账号: ${uin}`);
+		logger.info(`>>> 已连接到 NapCat 服务器，当前登录 QQ 账号: ${uin}`);
 		let lastNoticeTime = 0;
 		process.on("uncaughtException", async (err) => {
 			napcat.logger.error(">>> uncaughtException, 出错了", err);
@@ -1679,9 +1694,10 @@ async function start(options = {}) {
 			const date = (/* @__PURE__ */ new Date()).toLocaleString();
 			await noticeMainOwner(napcat, `【${date}】\n\nmioki 发生未处理异常:\n\n${err?.message || "未知错误"}`);
 		});
+		ensurePluginDir();
 		const plugins = botConfig.plugins.map((p) => ({
 			dirName: p,
-			absPath: node_path.default.resolve(BOT_CWD.value, "plugins", p)
+			absPath: node_path.default.resolve(plugin_dir, p)
 		})).filter((p) => {
 			if (!node_fs.default.existsSync(p.absPath)) {
 				napcat.logger.warn(`>>> 插件 ${p.dirName} 不存在，已忽略`);
@@ -1755,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;
@@ -1776,6 +1793,7 @@ Object.defineProperty(exports, 'dedent', {
 exports.definePlugin = definePlugin;
 exports.enablePlugin = enablePlugin;
 exports.ensureBuffer = ensureBuffer;
+exports.ensurePluginDir = ensurePluginDir;
 Object.defineProperty(exports, 'filesize', {
   enumerable: true,
   get: function () {
@@ -1793,6 +1811,7 @@ Object.defineProperty(exports, 'fs', {
     return node_fs.default;
   }
 });
+exports.getAbsPluginDir = getAbsPluginDir;
 exports.getAuthCodeViaTicket = getAuthCodeViaTicket;
 exports.getBfaceUrl = getBfaceUrl;
 exports.getGroupAvatarLink = getGroupAvatarLink;