mm_machine 2.6.9 → 2.7.0

package/index.js

@@ -529,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);
@@ -550,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;
         // 如果结果不为空且有结束标志，则停止迭代
@@ -571,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;
 };
 
 /**
@@ -904,7 +909,7 @@ Manager.prototype.runWaterfall = async function (method, result, ...params) {
  * @param  {...any} params 事件参数
  * @returns {Promise} 事件触发结果
  */
-Manager.prototype.runSub = async function (name, method, ...params) {
+Manager.prototype.runSubMod = async function (name, method, ...params) {
   // 参数校验
   if (typeof method !== 'string') {
     throw new TypeError('方法名称必须是字符串');
@@ -913,8 +918,6 @@ Manager.prototype.runSub = async function (name, method, ...params) {
   if (!mod) {
     throw new Error(`模块${name}不存在`);
   }
-
-  await mod.call('loadScript');
   return await mod.do(method, ...params);
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.6.9",
+  "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": {