mm_machine 2.8.2 → 2.8.4

package/drive.js

@@ -135,9 +135,34 @@ Drive.prototype.setConfig = function (config) {
     }
   }
   this._preset();
+  // 通知父级刷新快照
+  this._notifySnapshot();
   return this.config;
 };
 
+/**
+ * 通知父级Manager刷新快照（防抖）
+ */
+Drive.prototype._notifySnapshot = function () {
+  if (!this.getParent) {
+    return;
+  }
+  var parent = this.getParent();
+  if (!parent || !parent.config || !parent.config.use_snapshot) {
+    return;
+  }
+  // 防抖：避免频繁写文件，500ms内只刷新一次
+  if (this._snapshot_timer) {
+    return;
+  }
+  this._snapshot_timer = setTimeout(() => {
+    this._snapshot_timer = null;
+    if (parent.refreshSnapshot) {
+      parent.refreshSnapshot();
+    }
+  }, 500);
+};
+
 /**
  * 获取配置
  * @returns {object} 配置项

package/index.js

@@ -483,18 +483,19 @@ Manager.prototype._findFiles = async function (dir) {
  */
 Manager.prototype.getSnapshotPath = function () {
   var snapshot_file = this.config.snapshot_file || './snapshot.json';
-  return snapshot_file.fullname(__dirname);
+  let dir = this.getBaseDir();
+  return snapshot_file.fullname(dir);
 };
 
 /**
  * 保存快照数据
- * @param {object} files_map 目录到文件列表的映射 { dir: [file_path, ...] }
+ * @param {object} mods_map 目录到模块条目的映射 { dir: [{ file, config }, ...] }
  */
-Manager.prototype._saveSnapshot = function (files_map) {
+Manager.prototype._saveSnapshot = function (mods_map) {
   try {
     var snapshot_path = this.getSnapshotPath();
     var snapshot = {
-      files_map: files_map,
+      mods_map: mods_map,
       updated_at: Date.now()
     };
     snapshot_path.saveJson(snapshot);
@@ -503,6 +504,47 @@ Manager.prototype._saveSnapshot = function (files_map) {
   }
 };
 
+/**
+ * 从当前已加载模块刷新快照
+ * 确保快照与内存中模块状态一致
+ */
+Manager.prototype.refreshSnapshot = function () {
+  if (!this.config.use_snapshot) {
+    return;
+  }
+  var mods_map = {};
+  for (var name in this.mods) {
+    var mod = this.mods[name];
+    var f = mod.config_file;
+    if (!f) {
+      continue;
+    }
+    var dir = this._findSnapshotDir(f);
+    if (!mods_map[dir]) {
+      mods_map[dir] = [];
+    }
+    mods_map[dir].push({ file: f, config: mod.config });
+  }
+  this._saveSnapshot(mods_map);
+};
+
+/**
+ * 推断配置文件所属的快照检索目录
+ * @param {string} file 配置文件路径
+ * @returns {string} 检索目录
+ */
+Manager.prototype._findSnapshotDir = function (file) {
+  var base_dir = this.getBaseDir();
+  if (base_dir && file.startsWith(base_dir)) {
+    return base_dir;
+  }
+  var dir = this.getDir();
+  if (dir && file.startsWith(dir)) {
+    return dir;
+  }
+  return file.dirname();
+};
+
 /**
  * 加载快照数据
  * @returns {object|null} 快照数据，不存在时返回null
@@ -514,7 +556,7 @@ Manager.prototype._loadSnapshot = function () {
       return null;
     }
     var snapshot = snapshot_path.loadJson();
-    if (!snapshot || !snapshot.files_map) {
+    if (!snapshot || !snapshot.mods_map) {
       return null;
     }
     return snapshot;
@@ -525,31 +567,68 @@ Manager.prototype._loadSnapshot = function () {
 };
 
 /**
- * 从快照快速加载模块，不进行文件系统扫描
- * @param {object} files_map 目录到文件列表的映射
+ * 从快照快速加载模块，不进行文件系统扫描和磁盘配置读取
+ * 使用快照中的config直接创建模块，跳过loadConfig的IO
+ * @param {object} mods_map 目录到模块条目的映射 { dir: [{ file, config }, ...] }
  * @param {boolean} clear 是否清除已有模块
  */
-Manager.prototype._loadFromSnapshot = function (files_map, clear = true) {
+Manager.prototype._loadFromSnapshot = function (mods_map, clear = true) {
   if (clear) {
     this.clearMods();
   }
-  for (var dir in files_map) {
-    var files = files_map[dir];
-    if (files && files.length > 0) {
-      this.registerMods(files);
+  for (var dir in mods_map) {
+    var entries = mods_map[dir];
+    if (!entries || entries.length === 0) {
+      continue;
+    }
+    for (var i = 0; i < entries.length; i++) {
+      var entry = entries[i];
+      var f = entry.file;
+      // 跳过已不存在的文件，等待后台同步处理
+      if (!f.hasFile || !f.hasFile()) {
+        continue;
+      }
+      this._newModFromSnap(f, entry.config);
     }
   }
   this.updateInfo();
   this.is_loaded = true;
 };
 
+/**
+ * 用快照config创建模块，跳过磁盘读取
+ * @param {string} file 配置文件路径
+ * @param {object} config 模块配置
+ * @returns {object} 模块对象
+ */
+Manager.prototype._newModFromSnap = function (file, config) {
+  var mod;
+  if (this.config.mod_type === 'script') {
+    mod = new Mod(config || {}, this);
+  } else {
+    mod = new this.Drive(config || {}, this);
+  }
+  mod.mode = this.config.mode;
+  mod.config_file = file;
+  if (mod._preset) {
+    mod._preset();
+  }
+  return this.setMod(mod.config.name, mod);
+};
+
 /**
  * 后台增量同步：扫描文件系统并与快照进行diff，增减模块
+ * 使用锁防止多次重入冲突
  * @param {object} snapshot 快照数据
  */
 Manager.prototype._syncFromFile = async function (snapshot) {
+  // 防重入锁，避免多次同步同时执行
+  if (this._syncing) {
+    return;
+  }
+  this._syncing = true;
   try {
-    var old_dirs = snapshot.files_map || {};
+    var old_dirs = snapshot.mods_map || {};
     var old = this._buildSet(old_dirs);
 
     // 扫描目录并注册新模块
@@ -566,25 +645,28 @@ Manager.prototype._syncFromFile = async function (snapshot) {
     }
 
     // 移除已删除的模块
-    this._removeStale(old);
+    await this._removeStale(old);
     this.updateInfo();
     await this._saveSnapshotDirs(Object.keys(old_dirs));
+    this.log('info', '快照同步完成');
   } catch (err) {
     this.log('error', '快照增量同步失败', err);
+  } finally {
+    this._syncing = false;
   }
 };
 
 /**
  * 构建文件集合
- * @param {object} dirs 目录到文件列表的映射
+ * @param {object} dirs 目录到模块条目的映射 { dir: [{ file, config }, ...] }
  * @returns {object} 文件集合 { file: true }
  */
 Manager.prototype._buildSet = function (dirs) {
   var set = {};
   for (var dir in dirs) {
-    var files = dirs[dir];
-    for (var i = 0; i < files.length; i++) {
-      set[files[i]] = true;
+    var entries = dirs[dir];
+    for (var i = 0; i < entries.length; i++) {
+      set[entries[i].file] = true;
     }
   }
   return set;
@@ -594,12 +676,12 @@ Manager.prototype._buildSet = function (dirs) {
  * 移除已删除的模块
  * @param {object} old 旧文件集合，标记为false表示仍存在
  */
-Manager.prototype._removeStale = function (old) {
+Manager.prototype._removeStale = async function (old) {
   for (var file in old) {
     if (old[file] === true) {
       var mod = this.getMod(file);
       if (mod) {
-        this.unloadMod(mod.config.name);
+        await this.unloadMod(mod.config.name);
         this.delMod(mod.config.name);
         this.log('info', '快照同步: 移除模块 ' + file);
       }
@@ -608,16 +690,52 @@ Manager.prototype._removeStale = function (old) {
 };
 
 /**
- * 保存快照目录
+ * 构建文件到config的映射
+ * @returns {object} 文件到config的映射 { file_path: config }
+ */
+Manager.prototype._buildConfigMap = function () {
+  var map = {};
+  var mods = this.getMods();
+  for (var name in mods) {
+    var mod = mods[name];
+    if (mod.config_file) {
+      map[mod.config_file] = mod.config;
+    }
+  }
+  return map;
+};
+
+/**
+ * 构建模块条目列表
+ * @param {string[]} files 文件路径数组
+ * @param {object} config_dict 文件到config的映射
+ * @returns {object[]} 模块条目数组 [{ file, config }]
+ */
+Manager.prototype._buildEntries = function (files, config_dict) {
+  var entries = [];
+  for (var i = 0; i < files.length; i++) {
+    var f = files[i];
+    var config = config_dict[f];
+    if (config) {
+      entries.push({ file: f, config: config });
+    }
+  }
+  return entries;
+};
+
+/**
+ * 保存快照目录（含config）
  * @param {string[]} dirs 目录列表
  */
 Manager.prototype._saveSnapshotDirs = async function (dirs) {
-  var new_dirs = {};
+  var new_map = {};
+  var config_dict = this._buildConfigMap();
   for (var i = 0; i < dirs.length; i++) {
     var dir = dirs[i];
-    new_dirs[dir] = await this._findFiles(dir);
+    var files = await this._findFiles(dir);
+    new_map[dir] = this._buildEntries(files, config_dict);
   }
-  this._saveSnapshot(new_dirs);
+  this._saveSnapshot(new_map);
 };
 
 /**
@@ -785,8 +903,8 @@ Manager.prototype._loadSources = async function () {
   if (this.config.use_snapshot) {
     var snapshot = this._loadSnapshot();
     if (snapshot) {
-      // 快照存在，快速加载模块
-      this._loadFromSnapshot(snapshot.files_map);
+      // 快照存在，用config快速加载模块
+      this._loadFromSnapshot(snapshot.mods_map);
       this.log('info', '已从快照快速加载模块，正在后台同步文件变更...');
       // 异步增量同步，不阻塞启动
       this._syncFromFile(snapshot);
@@ -802,14 +920,16 @@ Manager.prototype._loadSources = async function () {
     await this.call('update', dir, true);
   }
 
-  // 首次扫描后保存快照
+  // 首次扫描后保存快照（含config）
   if (this.config.use_snapshot) {
-    var files_map = {};
+    var dirs = [];
     if (base_dir) {
-      files_map[base_dir] = await this._findFiles(base_dir);
+      dirs.push(base_dir);
+    }
+    if (dir) {
+      dirs.push(dir);
     }
-    files_map[dir] = await this._findFiles(dir);
-    this._saveSnapshot(files_map);
+    await this._saveSnapshotDirs(dirs);
   }
 };
 
@@ -1147,6 +1267,7 @@ Manager.prototype.createFile = function (config, file) {
 Manager.prototype.create = function (config, file = '') {
   let f = this.createFile(config, file);
   let mod = this.registerMod(f, config);
+  this.refreshSnapshot();
   return mod;
 };
 
@@ -1161,6 +1282,7 @@ Manager.prototype.remove = async function (name) {
     await mod.remove();
   }
   this.unregisterMod(name);
+  this.refreshSnapshot();
   return mod;
 };
 

package/package.json

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