mm_machine 2.4.6 → 2.4.8

package/index.js

@@ -577,7 +577,8 @@ Manager.prototype._initManager = function () {
  */
 Manager.prototype._loadSources = async function () {
   // 通过更新函数加载资源信息
-  await this.call('update');
+  await this.call('update', this.config.base_dir);
+  await this.call('update', this.config.dir, false);
 };
 
 /**
@@ -638,11 +639,11 @@ Manager.prototype.exec = async function (name, method, ...params) {
  */
 Manager.prototype._ensureAllModulesLoaded = async function () {
   let infos = this.getInfos();
-  
+
   for (let i = 0; i < infos.length; i++) {
     let info = infos[i];
     let mod = this.getMod(info.name);
-    
+
     if (!mod.isLoaded()) {
       try {
         await mod.call('loadScript');
@@ -685,7 +686,7 @@ Manager.prototype.runWait = async function (method, ...params) {
 
     // 执行方法
     try {
-      let ret = await mod.call(method, ...params);
+      let ret = await mod.do(method, ...params);
       if (ret !== null && ret !== undefined) {
         result = ret;
       }
@@ -708,23 +709,23 @@ Manager.prototype.runAsync = async function (method, ...params) {
   if (typeof method !== 'string') {
     throw new TypeError('方法名称必须是字符串');
   }
-  
+
   // 确保所有模块都已加载
   await this._ensureAllModulesLoaded();
-  
+
   let infos = this.getInfos();
-  
+
   // 并发执行所有方法，不等待结果
   for (let i = 0; i < infos.length; i++) {
     let info = infos[i];
     let mod = this.getMod(info.name);
     try {
-      mod.call(method, ...params);
+      mod.do(method, ...params);
     } catch (error) {
       this.log('error', `模块${info.name}执行${method}方法失败`, error);
     }
   }
-  
+
   return true;
 };
 
@@ -750,14 +751,12 @@ Manager.prototype.runAll = async function (method, ...params) {
   for (let i = 0; i < infos.length; i++) {
     let info = infos[i];
     let mod = this.getMod(info.name);
-    if (mod.isLoaded()) {
-      promises.push(
-        mod.call(method, ...params).catch(error => {
-          this.log('error', `模块${info.name}执行${method}方法失败`, error);
-          return null; // 失败时返回null
-        })
-      );
-    }
+    promises.push(
+      mod.do(method, ...params).catch(error => {
+        this.log('error', `模块${info.name}执行${method}方法失败`, error);
+        return null; // 失败时返回null
+      })
+    );
   }
 
   return await Promise.all(promises);
@@ -774,27 +773,25 @@ Manager.prototype.runRace = async function (method, ...params) {
   if (typeof method !== 'string') {
     throw new TypeError('方法名称必须是字符串');
   }
-  
+
   // 确保所有模块都已加载
   await this._ensureAllModulesLoaded();
-  
+
   const promises = [];
   let infos = this.getInfos();
-  
+
   // 竞争执行所有方法
   for (let i = 0; i < infos.length; i++) {
     let info = infos[i];
     let mod = this.getMod(info.name);
-    if (mod.isLoaded()) {
-      promises.push(
-        mod.call(method, ...params).catch(error => {
-          this.log('error', `模块${info.name}执行${method}方法失败`, error);
-          throw error; // 竞争执行中，失败应该抛出错误
-        })
-      );
-    }
+    promises.push(
+      mod.do(method, ...params).catch(error => {
+        this.log('error', `模块${info.name}执行${method}方法失败`, error);
+        throw error; // 竞争执行中，失败应该抛出错误
+      })
+    );
   }
-  
+
   return await Promise.race(promises);
 };
 
@@ -829,7 +826,7 @@ Manager.prototype.runWaterfall = async function (method, result, ...params) {
 
     // 执行方法，将前一个结果作为参数传递给下一个
     try {
-      let ret = await mod.call(method, result, ...params);
+      let ret = await mod.do(method, result, ...params);
       if (ret !== null && ret !== undefined) {
         result = ret;
       }

package/mod.js

@@ -479,7 +479,7 @@ Mod.prototype._callBefore = async function (method, params) {
   if (!before_func) return undefined;
 
   try {
-    let result = await before_func.call(this._mod || this, ...params);
+    let result = await before_func.call(this, ...params);
     return result;
   } catch (err) {
     this.log('error', `执行前置钩子 ${before_method} 失败: `, err);
@@ -514,7 +514,7 @@ Mod.prototype._callAfter = async function (method, params, result) {
   if (!after_func) return result;
 
   try {
-    let after = await after_func.call(this._mod || this, result, ...params);
+    let after = await after_func.call(this, result, ...params);
     return after !== undefined ? after : result;
   } catch (err) {
     this.log('error', `执行后置钩子 ${after_method} 失败: `, err);

package/package.json

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