mm_machine 2.3.3 → 2.3.5

package/index.js

@@ -50,6 +50,13 @@ class Manager extends Mod {
      * @type {string}
      */
     mod_type: 'drive',
+    /**
+     * 搜索模式
+     * dir 按目录搜索
+     * file 按文件名搜索
+     * @type {string}
+     */
+    search_way: 'file',
     /**
      * 是否懒加载
      * @type {boolean}
@@ -71,7 +78,7 @@ class Manager extends Mod {
      */
     sort_key: 'sort',
     /**
-     * 作用域（同时作为检索的后缀名）
+     * 作用域
      * @type {string}
      */
     scope: ($.val && $.val.scope) ? $.val.scope + '' : 'server'
@@ -130,7 +137,7 @@ Manager.prototype.newInfo = function (name, sort, state, file = '') {
  */
 Manager.prototype.setInfo = function (info) {
   let has = false;
-  for(let i = 0; i < this.infos.length; i++) {
+  for (let i = 0; i < this.infos.length; i++) {
     let o = this.infos[i];
     if (o.name == info.name) {
       this.infos[i] = info;
@@ -268,8 +275,12 @@ Manager.prototype.newMod = function (config_file, config, script) {
   }
   mod.mode = this.config.mode;
   mod.loadConfig(config_file);
-  mod.setMethods(script);
-  mod.setConfig(config);
+  if (script) {
+    mod.setMethods(script);
+  }
+  if (config) {
+    mod.setConfig(config);
+  }
   return mod;
 };
 
@@ -362,6 +373,36 @@ Manager.prototype.loads = async function () {
   await Promise.all(promises);
 };
 
+/**
+ * 获取目录名
+ * @returns {string} 目录名
+ */
+Manager.prototype._getDirName = function () {
+  // 前缀，为当前类名
+  let prefix = this.constructor.name.toLowerCase();
+  // 后缀，为配置项名称
+  let name = this.config.name.toLowerCase();
+  // 目录名，为前缀加下划线加后缀
+  return prefix + "_" + name;
+};
+
+/**
+ * 获取所有目录下的文件
+ * @param {string} dir 目录路径
+ * @returns {Array} 文件路径数组
+ */
+Manager.prototype._getAllDirFiles = function (dir) {
+  let files = [];
+  let dirs = $.dir.getAll(dir, this._getDirName());
+  for (let d of dirs) {
+    let list = $.file.getAll(d, this.config.filename);
+    if (list.length > 0) {
+      files.push(...list);
+    }
+  }
+  return files;
+};
+
 /**
  * 检索目录下所有文件
  * @private
@@ -379,6 +420,9 @@ Manager.prototype._findFiles = function (dir) {
     this.log('warn', '目录不存在', dir);
     return [];
   }
+  if (this.config.search_way === 'dir') {
+    return this._getAllDirFiles(dir);
+  }
   // 检索目录下所有文件
   return $.file.getAll(dir, this.config.filename);
 };

package/package.json

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