mioki 0.2.0 → 0.2.1

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) => {
@@ -887,7 +887,7 @@ function getLogFilePath(uin, platformName) {
 
 //#endregion
 //#region package.json
-var version = "0.2.0";
+var version = "0.2.1";
 
 //#endregion
 //#region src/actions.ts
@@ -959,7 +959,7 @@ async function noticeOwners(bot, message, delay = 1e3) {
 * 群发通知给第一个主人
 */
 async function noticeMainOwner(bot, message) {
-	if (!bot.isOnline) {
+	if (!bot.isOnline()) {
 		bot.logger.error("发送失败，Bot 不在线");
 		return;
 	}
@@ -1170,6 +1170,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 = "plugin") {
+	const cwd = BOT_CWD.value;
+	return node_path.default.resolve(cwd, botConfig.plugin_dir || defaultDir);
+}
 async function enablePlugin(bot, plugin, type = "external") {
 	const typeDesc = type === "builtin" ? "内置" : "用户";
 	const pluginName = plugin.name || "null";
@@ -1229,9 +1243,9 @@ 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)
 	}));
 }
 
@@ -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} 不存在，已忽略`);
@@ -1776,6 +1792,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 +1810,7 @@ Object.defineProperty(exports, 'fs', {
     return node_fs.default;
   }
 });
+exports.getAbsPluginDir = getAbsPluginDir;
 exports.getAuthCodeViaTicket = getAuthCodeViaTicket;
 exports.getBfaceUrl = getBfaceUrl;
 exports.getGroupAvatarLink = getGroupAvatarLink;