mm_machine 2.2.0 → 2.2.2

package/index.js

@@ -93,7 +93,7 @@ Index.prototype._exec = async function (module, method, params = []) {
     }
 
     // 执行方法
-    const ret = await module.exec(method, ...params);
+    let ret = await module.exec(method, ...params);
 
     // 根据模式决定是否重载
     if (this.mode >= 4) {
@@ -105,7 +105,7 @@ Index.prototype._exec = async function (module, method, params = []) {
     $.log.error(`[${this.type}] 执行模块方法失败: `, err);
     return null;
   }
-}
+};
 
 /**
  * 加载项
@@ -114,7 +114,7 @@ Index.prototype._exec = async function (module, method, params = []) {
  * @param {string} file 配置文件
  * @returns {Promise<object | null>} 加载的驱动或配置对象
  */
-Index.prototype.loadItem = async function (dir, cg, file) {
+Index.prototype.loadDrive = async function (dir, cg, file) {
   if (!dir || !file) {
     $.log.error(`[${this.type}] load: 缺少必要参数`);
     return null;
@@ -135,7 +135,7 @@ Index.prototype.loadItem = async function (dir, cg, file) {
     } else {
       let json = file.loadJson();
       if (!json) {
-        const fl = './config.tpl.json'.fullname(this.dir_base);
+        let fl = './config.tpl.json'.fullname(this.dir_base);
         if (fl.hasFile()) {
           fl.copyFile(file);
           json = file.loadJson();
@@ -176,8 +176,8 @@ Index.prototype.loads = async function (list) {
  */
 Index.prototype.sort = function () {
   this.list.sort((o1, o2) => {
-    const p1 = o1.config?.[this.sort_key] || 0;
-    const p2 = o2.config?.[this.sort_key] || 0;
+    let p1 = o1.config?.[this.sort_key] || 0;
+    let p2 = o2.config?.[this.sort_key] || 0;
     return p2 - p1;
   });
 };
@@ -203,7 +203,7 @@ Index.prototype.updateAfter = async function (dir_path) {
  * @param {string} search_path 检索路径
  * @returns {string} 规范化后的路径
  */
-Index.prototype._normalizeSearchPath = function (search_path) {
+Index.prototype._searchPath = function (search_path) {
   if (!search_path) {
     return './app/';
   }
@@ -216,7 +216,7 @@ Index.prototype._normalizeSearchPath = function (search_path) {
  * @param {string} norm_path 规范化路径
  * @returns {Array} 目录列表
  */
-Index.prototype._getDirectoryList = function (norm_path) {
+Index.prototype._getDirList = function (norm_path) {
   try {
     // 使用精准模式总是获取所有目录
     // 这样可以确保找到test1和test2目录
@@ -232,15 +232,15 @@ Index.prototype._getDirectoryList = function (norm_path) {
  * @param {string} dir 目录路径
  * @returns {Promise<void>}
  */
-Index.prototype._processDirectoryConfig = async function (dir) {
+Index.prototype._runDirConfig = async function (dir) {
   // 直接检查并加载demo.json文件
-  const config_file = `./${this.type}.json`.fullname(dir);
+  let config_file = `./${this.type}.json`.fullname(dir);
   if (config_file && config_file.hasFile && config_file.hasFile()) {
     await this.loadFile(config_file, true);
   }
 
   // 同时也检查config_demo.json文件
-  const config_file2 = `./config_${this.type}.json`.fullname(dir);
+  let config_file2 = `./config_${this.type}.json`.fullname(dir);
   if (config_file2 && config_file2.hasFile && config_file2.hasFile()) {
     await this.loadFile(config_file2, true);
   }
@@ -255,15 +255,15 @@ Index.prototype._processDirectoryConfig = async function (dir) {
 Index.prototype.updateConfigAll = async function (search_path, accurate) {
   try {
     // 规范化路径
-    const norm_path = this._normalizeSearchPath(search_path);
+    let norm_path = this._searchPath(search_path);
 
     // 获取目录列表
-    const list_scope = this._getDirectoryList(norm_path);
+    let list_scope = this._getDirList(norm_path);
 
     // 使用函数式编程处理目录
     await list_scope.reduce(async (prev_promise, dir) => {
       await prev_promise;
-      return this._processDirectoryConfig(dir);
+      return this._runDirConfig(dir);
     }, Promise.resolve());
   } catch (err) {
     $.log.error(`[${this.type}] 更新所有配置失败: `, err);
@@ -276,7 +276,7 @@ Index.prototype.updateConfigAll = async function (search_path, accurate) {
  * @returns {Promise<void>}
  */
 Index.prototype.updateConfigHave = async function (dir_path) {
-  const list = this.list;
+  let list = this.list;
   await list.reduce(async (prev_promise, o) => {
     await prev_promise;
     return this._updateSingleConfig(o);
@@ -288,14 +288,14 @@ Index.prototype.updateConfigHave = async function (dir_path) {
  * @param {object} o 配置对象
  */
 Index.prototype._updateSingleConfig = async function (o) {
-  const file = o.filename;
+  let file = o.filename;
   if (!file) return;
 
   try {
-    const config = file.loadJson();
+    let config = file.loadJson();
     if (!config) return;
 
-    const target_config = this._findConfig(config, o.config.name);
+    let target_config = this._findConfig(config, o.config.name);
     if (target_config) {
       await o.exec('setConfig', target_config);
     }
@@ -344,7 +344,7 @@ Index.prototype.updateConfig = async function (dir, accurate = false, clear = fa
  * @returns {Promise<void>}
  */
 Index.prototype.updateScript = async function () {
-  const list = this.list;
+  let list = this.list;
   await list.reduce(async (prev_promise, o) => {
     await prev_promise;
     if (o.config?.state === 1) {
@@ -400,7 +400,7 @@ Index.prototype.get = function (name) {
 Index.prototype.set = function (name, cg) {
   if (!name || !cg) return false;
 
-  const item = this.get(name);
+  let item = this.get(name);
   if (item) {
     // 使用Object.assign合并属性
     Object.assign(item.config, cg);
@@ -414,7 +414,7 @@ Index.prototype.set = function (name, cg) {
  * @returns {boolean} 是否保存成功
  */
 Index.prototype.save = async function () {
-  const list = this.list;
+  let list = this.list;
   await list.reduce(async (prev_promise, o) => {
     await prev_promise;
     if (o.config?.state === 1) {
@@ -436,7 +436,7 @@ Index.prototype.add = async function (config) {
 
   try {
     // 检查是否已存在
-    const existing = this.get(config.name);
+    let existing = this.get(config.name);
     if (existing) {
       $.log.warn(`插件 ${config.name} 已存在`);
       return existing;
@@ -460,11 +460,11 @@ Index.prototype.add = async function (config) {
 Index.prototype.del = async function (name) {
   if (!name) return false;
 
-  const index = this.list.findIndex((item) => item.config?.name === name);
+  let index = this.list.findIndex((item) => item.config?.name === name);
   if (index === -1) return false;
 
   try {
-    const item = this.list[index];
+    let item = this.list[index];
     await item.exec('unload');
     this.list.splice(index, 1);
     return true;
@@ -482,7 +482,7 @@ Index.prototype.del = async function (name) {
 Index.prototype.load = async function (name) {
   if (!name) return null;
 
-  const item = this.get(name);
+  let item = this.get(name);
   if (!item) return null;
 
   try {
@@ -504,7 +504,7 @@ Index.prototype.load = async function (name) {
 Index.prototype.unload = async function (name) {
   if (!name) return false;
 
-  const item = this.get(name);
+  let item = this.get(name);
   if (!item) return false;
 
   try {
@@ -524,7 +524,7 @@ Index.prototype.unload = async function (name) {
 Index.prototype.reload = async function (name) {
   if (!name) return null;
 
-  const item = this.get(name);
+  let item = this.get(name);
   if (!item) return null;
 
   try {
@@ -544,22 +544,22 @@ Index.prototype.reload = async function (name) {
  */
 Index.prototype.loadFile = async function (file, create = false) {
   try {
-    const dir = file.dirname();
+    let dir = file.dirname();
     // 载入文件
-    const obj = file.loadJson();
+    let obj = file.loadJson();
     if (obj) {
       if (Array.isArray(obj)) {
         // 使用函数式编程处理数组
         await obj.reduce(async (prev_promise, o) => {
           await prev_promise;
           // 实例化一个驱动
-          return this.loadItem(dir, o, file);
+          return this.loadDrive(dir, o, file);
         }, Promise.resolve());
       } else {
-        return await this.loadItem(dir, null, file);
+        return await this.loadDrive(dir, null, file);
       }
     } else if (create) {
-      return await this.loadItem(dir, null, file);
+      return await this.loadDrive(dir, null, file);
     } else {
       return `${file}文件不存在`;
     }
@@ -579,22 +579,23 @@ Index.prototype.loadFile = async function (file, create = false) {
  */
 Index.prototype.run = async function (name, method, ...params) {
   if (name) {
-    const module = await this.get(name);
+    let module = await this.get(name);
     if (module && module.config?.state === 1) {
       return await this._exec(module, method, params);
     }
     return null;
   } else if (name === null) {
     let result = null;
-    // 使用函数式编程处理列表，使用some模拟break逻辑
-    await this.list.some(async (module) => {
+    // 修复：使用for循环替代some，正确处理异步迭代
+    for (let module of this.list) {
       if (module.config?.state === 1) {
         result = await this._exec(module, method, params);
         // 如果结果不为空且有结束标志，则停止迭代
-        return result && module.config?.end;
+        if (result && module.config?.end) {
+          break;
+        }
       }
-      return false;
-    });
+    }
     return result;
   }
   return null;
@@ -609,7 +610,7 @@ Index.prototype.run = async function (name, method, ...params) {
  */
 Index.prototype.exec = async function (name, method, ...params) {
   if (name) {
-    const module = await this.get(name);
+    let module = await this.get(name);
     if (module) {
       return await this._exec(module, method, params);
     }
@@ -623,9 +624,9 @@ Index.prototype.exec = async function (name, method, ...params) {
       if (result && module.config?.end) {
         return;
       }
-      const current_result = await this._exec(module, method, params);
-      if (current_result) {
-        result = current_result;
+      let current = await this._exec(module, method, params);
+      if (current) {
+        result = current;
       }
     }, Promise.resolve());
     return result;

package/item.js

@@ -1,6 +1,6 @@
 let util = require('util');
 let { conf } = require('mm_config');
-let Tpl = require('mm_tpl');
+const Tpl = require('mm_tpl');
 let { HotReload } = require('mm_hot_reload');
 
 // 初始化全局对象
@@ -103,7 +103,6 @@ Item.prototype.log = function (level, message, ...args) {
 /**
  * 设置配置
  * @param {object} config 配置对象
- * @returns {Promise<void>}
  */
 Item.prototype.setConfig = function (config) {
   if (!config) return;
@@ -331,13 +330,23 @@ Item.prototype._setMainMethod = function (module, name) {
   }
 };
 
+/**
+ * 获取配置文件作用域
+ * @param {object} file 文件对象
+ * @returns {string} 配置文件作用域
+ */
+Item.prototype._getScope = function (file) {
+  return file.replace(/\\/g, '/').between('app/', '/');
+};
+
 /**
  * 新建配置文件
  * @param {string} file 目标文件路径
  */
 Item.prototype.newConfig = function (file) {
   if (!this.config.name) {
-    this.config.name = file.dirname().basename();
+    this.config.name = this._getName(file);
+    this.config.scope = this._getScope(file);
   }
   this._createConfigFile(file, this.config, this.dir_base);
 };
@@ -511,7 +520,7 @@ Item.prototype._removeConfigFile = function (file, name) {
 
   let config = text.toJson();
   if (Array.isArray(config)) {
-    return this._removeArrayItem(file, config, name);
+    return this._removeArray(file, config, name);
   }
 
   this.delDir();
@@ -541,6 +550,15 @@ Item.prototype._removeArrayItem = function (file, config, name) {
   return null;
 };
 
+/**
+ * 获取配置文件名称
+ * @param {object} file 文件对象
+ * @returns {string} 配置文件名称
+ */
+Item.prototype._getName = function (file) {
+  return file.dirname().basename();
+};
+
 /**
  * 载入配置
  * @param {object | string} config_data 配置对象或配置路径
@@ -608,17 +626,17 @@ Item.prototype.save = function () {
 
     if (text && text.trim().startsWith('[')) {
       // 数组格式配置
-      let config_array = text.toJson();
-      if (Array.isArray(config_array)) {
+      let config = text.toJson();
+      if (Array.isArray(config)) {
         // 查找并更新现有配置项
-        let existing_index = config_array.findIndex((item) => item.name === this.config.name);
-        if (existing_index !== -1) {
-          config_array[existing_index] = this.config;
+        let index = config.findIndex((item) => item.name === this.config.name);
+        if (index !== -1) {
+          config[index] = this.config;
         } else {
           // 如果不存在，添加新配置项
-          config_array.push(this.config);
+          config.push(this.config);
         }
-        full_path.saveText(JSON.stringify(config_array, null, 4));
+        full_path.saveText(JSON.stringify(config, null, 4));
         return;
       }
     }
@@ -714,40 +732,42 @@ Item.prototype._execBefore = async function (method, params) {
  * 执行主方法
  * @param {Function} method_func 方法函数
  * @param {Array} params 参数
- * @param {any} before_result 前置钩子结果
+ * @param {any} result 前置钩子结果
  * @returns {Promise<any>} 主方法结果
  */
-Item.prototype._execMain = async function (method_func, params, before_result) {
+Item.prototype._execMain = async function (method_func, params, result) {
   let method_result = method_func.call(this._mod || this, ...params);
-  let result = util.types.isPromise(method_result) ? await method_result : method_result;
-  return result;
+  if (util.types.isPromise(method_result)) {
+    method_result = await method_result;
+  }
+  // 修复：如果主方法返回undefined，则使用前置钩子的结果
+  return method_result !== undefined ? method_result : result;
 };
 
 /**
  * 执行后置钩子
  * @param {string} method 方法名
  * @param {Array} params 参数
- * @param {any} main_result 主方法结果
+ * @param {any} result 主方法结果
  * @returns {Promise<any>} 后置钩子结果
  */
-Item.prototype._execAfter = async function (method, params, main_result) {
+Item.prototype._execAfter = async function (method, params, result) {
   let after_method = `${method}After`;
   let after_func = this._getMethod(after_method);
 
-  if (!after_func) return main_result;
+  if (!after_func) return result;
 
   try {
-    let after_result = after_func.call(this._mod || this, main_result, ...params);
-
-    if (util.types.isPromise(after_result)) {
-      let resolved_result = await after_result;
-      return resolved_result !== undefined ? resolved_result : main_result;
+    let after = after_func.call(this._mod || this, result, ...params);
+    if (util.types.isPromise(after)) {
+      let resolved = await after;
+      return resolved !== undefined ? resolved : result;
     }
 
-    return after_result !== undefined ? after_result : main_result;
+    return after !== undefined ? after : result;
   } catch (err) {
     this.log('error', `执行后置钩子 ${after_method} 失败: `, err);
-    return main_result;
+    return result;
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_machine",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "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,5 +34,10 @@
     "mm_config": "^2.2.5",
     "mm_hot_reload": "^1.2.0",
     "mm_tpl": "^2.4.7"
+  },
+  "devDependencies": {
+    "eslint": "^9.39.2",
+    "eslint-plugin-jsdoc": "^62.5.0",
+    "mm_eslint": "^1.6.6"
   }
 }