mm_machine 2.7.3 → 2.7.5

package/drive.js

@@ -76,7 +76,7 @@ Drive.prototype.getEventer = function () {
 Drive.prototype._preset = function () {
   let file = this.config.main;
   if (file) {
-    this.script_file = file.fullname(this._getDir());
+    this.script_file = file.fullname(this.getDir());
   }
 };
 
@@ -152,7 +152,7 @@ Drive.prototype.getConfig = function () {
  * 获取当前文件
  * @returns {object} 当前文件对象
  */
-Drive.prototype._getDir = function () {
+Drive.prototype.getDir = function () {
   let dir = this._dir;
   if (!dir) {
     if (this.script_file) {
@@ -242,7 +242,7 @@ Drive.prototype._getScriptFile = function () {
   let main = this.config.main || '';
   if (!main) return null;
 
-  let filename = main.fullname(this._getDir());
+  let filename = main.fullname(this.getDir());
   if (!filename.hasFile()) {
     this.newScript(filename);
   }
@@ -484,7 +484,7 @@ Drive.prototype._getConfigTpl = function () {
  */
 Drive.prototype.loadFile = function (file, name) {
   try {
-    let filename = file.fullname(this._getDir());
+    let filename = file.fullname(this.getDir());
     let text = filename.loadText();
 
     // 如果文件不存在，创建新的配置文件
@@ -659,7 +659,7 @@ Drive.prototype.save = function () {
   try {
     if (!this.script_file) return;
 
-    let file = this.script_file.fullname(this._getDir());
+    let file = this.script_file.fullname(this.getDir());
     let text = file.loadText();
 
     if (text && text.trim().startsWith('[')) {
@@ -690,7 +690,7 @@ Drive.prototype.save = function () {
  * 删除项目
  */
 Drive.prototype.remove = function () {
-  let dir = this._getDir();
+  let dir = this.getDir();
   if (dir) {
     dir.delDir();
   }

package/index.js

@@ -418,7 +418,7 @@ Manager.prototype.loadMods = async function () {
  * 获取目录名
  * @returns {string} 目录名
  */
-Manager.prototype._getDirName = function () {
+Manager.prototype.getDirName = function () {
   // 前缀，为当前类名
   let prefix = this.constructor.name.toLowerCase();
   // 后缀，为配置项名称
@@ -434,7 +434,7 @@ Manager.prototype._getDirName = function () {
  */
 Manager.prototype._getAllDirFiles = function (dir) {
   let files = [];
-  let dirs = $.dir.getAll(dir, this._getDirName());
+  let dirs = $.dir.getAll(dir, this.getDirName());
   for (let i = 0; i < dirs.length; i++) {
     let d = dirs[i];
     let lt = $.file.getAll(d, this.config.filename);
@@ -621,7 +621,7 @@ Manager.prototype.getBaseDir = function () {
  * @returns {string} 二次开发模块目录
  */
 Manager.prototype.getDir = function () {
-  return this.config.dir || this._getDir();
+  return this.config.dir || this.getDir();
 };
 
 /**
@@ -955,7 +955,7 @@ Manager.prototype.createFile = function (config, file) {
   if (!f) {
     f = `${config.name}/${this.config.filename}`;
     if (this.config.search_way === 'dir') {
-      let dir_name = this._getDirName();
+      let dir_name = this.getDirName();
       f = `${dir_name}/${f}`;
     }
   }

package/mod.js

@@ -423,9 +423,20 @@ Mod.prototype.emitEvent = function (event, ...args) {
  * 触发事件 - 随机触发
  * @param {string} event 事件名
  * @param {...any} args 事件参数
+ * @returns {Promise<any>} 事件触发结果
  */
-Mod.prototype.emitEventRace = function (event, ...args) {
-  this.getEventer()?.emitRace(event, ...args);
+Mod.prototype.emitEventRace = async function (event, ...args) {
+  return await this.getEventer()?.emitRace(event, ...args);
+};
+
+/**
+ * 触发事件 - 返回第一个非空结果
+ * @param {string} event 事件名
+ * @param {...any} args 事件参数
+ * @returns {Promise<any>} 事件触发结果
+ */
+Mod.prototype.emitEventFirst = async function (event, ...args) {
+  return await this.getEventer()?.emitFirst(event, ...args);
 };
 
 /**
@@ -690,7 +701,7 @@ Mod.prototype._destroyCore = async function () {
  * 获取模块目录
  * @returns {string} 模块目录
  */
-Mod.prototype._getDir = function () {
+Mod.prototype.getDir = function () {
   if (!this.getParent) return '';
   return this.getParent()?.getDir() || '';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "description": "A flexible Node.js plugin mechanism system for dynamic loading, management and execution of modules. Supports hot reload, lifecycle management, and modern JavaScript features.",
   "main": "index.js",
   "scripts": {
@@ -34,9 +34,9 @@
   ],
   "dependencies": {
     "@prettier/sync": "^0.6.1",
-    "mm_config": "^2.3.6",
-    "mm_hot_reload": "^1.3.3",
-    "mm_tpl": "^2.5.5"
+    "mm_config": "^2.3.7",
+    "mm_hot_reload": "^1.3.4",
+    "mm_tpl": "^2.5.6"
   },
   "devDependencies": {
     "eslint": "^10.3.0",