mm_machine 2.6.8 → 2.7.0

package/index.js

@@ -103,6 +103,10 @@ class Manager extends Mod {
       this.Drive = Drive;
     }
   }
+
+  get list() {
+    return this.getList();
+  }
 }
 
 /**
@@ -525,7 +529,7 @@ Manager.prototype.main = async function (name, method, ...params) {
   if (name) {
     let mod = this.getMod(name);
     if (mod && mod.config?.state === 1) {
-      result = await this._run(mod, method, ...params);
+      result = await this._runMod(mod, method, ...params);
     }
   } else if (name === null) {
     result = await this._runAllEnabled(method, ...params);
@@ -546,7 +550,12 @@ Manager.prototype._runAllEnabled = async function (method, ...params) {
     let config = this.infos[i];
     let mod = this.getMod(config.name);
     if (mod && mod.config?.state === 1) {
-      var ret = await this._run(mod, method, ...params);
+      var ret = null;
+      try {
+        ret = await this._runMod(mod, method, ...params);
+      } catch (err) {
+        $.log.error(`执行模块方法失败: `, err);
+      }
       if (ret !== null && ret !== undefined) {
         result = ret;
         // 如果结果不为空且有结束标志，则停止迭代
@@ -567,27 +576,27 @@ Manager.prototype._runAllEnabled = async function (method, ...params) {
  * @returns {Promise<any>} 执行结果
  * @private
  */
-Manager.prototype._run = async function (mod, method, ...params) {
+Manager.prototype._runMod = async function (mod, method, ...params) {
   if (!mod || !method) return null;
 
-  try {
-    // 确保模块已加载
-    if (!mod.isLoaded()) {
+  // 确保模块已加载
+  if (!mod.isLoaded()) {
+    try {
       await mod.call('loadScript');
     }
-
-    // 执行方法
-    let ret = await mod.call(method, ...params);
-    // 根据模式决定是否重载
-    if (this.mode >= 4) {
-      mod.do('reload');
+    catch (err) {
+      $.log.error(`加载模块脚本失败: `, err);
     }
-
-    return ret;
-  } catch (err) {
-    $.log.error(`执行模块方法失败: `, err);
-    return null;
   }
+  
+  // 执行方法
+  let ret = await mod.call(method, ...params);
+  // 根据模式决定是否重载
+  if (this.mode >= 4) {
+    mod.do('reload');
+  }
+
+  return ret;
 };
 
 /**
@@ -726,7 +735,9 @@ Manager.prototype.runWait = async function (method, ...params) {
   for (let i = 0; i < infos.length; i++) {
     let info = infos[i];
     let mod = this.getMod(info.name);
-
+    if (!mod) {
+      continue; // 跳过不存在的模块
+    }
     // 确保模块已加载
     if (!mod.isLoaded()) {
       try {
@@ -891,6 +902,25 @@ Manager.prototype.runWaterfall = async function (method, result, ...params) {
   return result;
 };
 
+/**
+ * 异步触发事件，子模块执行
+ * @param {string} name 子模块名称
+ * @param {string} method 方法名称
+ * @param  {...any} params 事件参数
+ * @returns {Promise} 事件触发结果
+ */
+Manager.prototype.runSubMod = async function (name, method, ...params) {
+  // 参数校验
+  if (typeof method !== 'string') {
+    throw new TypeError('方法名称必须是字符串');
+  }
+  let mod = this.getMod(name);
+  if (!mod) {
+    throw new Error(`模块${name}不存在`);
+  }
+  return await mod.do(method, ...params);
+};
+
 /**
  * 触发事件
  * @param {string} event 事件名

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.6.8",
+  "version": "2.7.0",
   "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": {
@@ -35,11 +35,11 @@
   "dependencies": {
     "@prettier/sync": "^0.6.1",
     "mm_config": "^2.3.6",
-    "mm_hot_reload": "^1.3.2",
-    "mm_tpl": "^2.5.4"
+    "mm_hot_reload": "^1.3.3",
+    "mm_tpl": "^2.5.5"
   },
   "devDependencies": {
-    "eslint": "^10.2.1",
+    "eslint": "^10.3.0",
     "eslint-plugin-jsdoc": "^62.9.0",
     "mm_eslint": "^1.7.1"
   }