mm_machine 2.5.0 → 2.5.2

package/drive.js

@@ -361,12 +361,17 @@ Drive.prototype._setMainMethod = function (mod) {
   if (name && mod[name]) {
     this.main = mod[name];
   }
-  if ($.push) {
-    $.push(this._methods, mod, true);
-  }
-  else {
-    Object.assign(this._methods, mod);
+
+  for (let key in mod) {
+    let obj = mod[key];
+    if (typeof obj === 'function') {
+      this._methods[key] = obj;
+    }
+    else {
+      this._datas[key] = obj;
+    }
   }
+  Object.assign(this, mod);
   this.is_loaded = true;
 };
 

package/index.js

@@ -286,7 +286,15 @@ Manager.prototype.newMod = function (config_file, config, script) {
   mod.mode = this.config.mode;
   mod.loadConfig(config_file);
   if (script) {
-    mod.setMethods(script);
+    for (let key in script) {
+      let obj = script[key];
+      if (typeof obj == 'function') {
+        mod.setMethod(key, obj);
+      }
+      else {
+        mod.setData(key, obj);
+      }
+    }
   }
   if (config) {
     mod.setConfig(config);

package/mod.js

@@ -75,6 +75,10 @@ class Mod extends Base {
    */
   constructor(config, parent = null) {
     super(config);
+    // 脚本方法
+    this._methods = {};
+    // 脚本数据
+    this._datas = {};
     // 是否已加载
     this.is_loaded = false;
     // 追加查询到上级的方法
@@ -326,8 +330,17 @@ Mod.prototype.unload = async function () {
  * 卸载核心
  */
 Mod.prototype._unloadCore = async function () {
-  if (this.methods) {
-    this.methods = {};
+  if (this._methods) {
+    for (let key in this._methods) {
+      delete this[key];
+    }
+    this._methods = {};
+  }
+  if (this._datas) {
+    for (let key in this._datas) {
+      delete this[key];
+    }
+    this._datas = {};
   }
 };
 
@@ -396,11 +409,12 @@ Mod.prototype.emitEvent = function (event, ...args) {
  */
 Mod.prototype.main = async function (...args) {
   let method = args[0];
-  if (!this.methods?.[method]) {
+  let func = this.getMethod(method);
+  if (!func) {
     throw new Error(`方法${method}不存在`);
   }
   let params = args.slice(1);
-  return await this.methods[method](...params);
+  return await func(...params);
 };
 
 /**
@@ -413,6 +427,9 @@ Mod.prototype.setMethods = function (methods) {
     this._methods = {};
   }
   Object.assign(this._methods, methods);
+  for (let key in this._methods) {
+    this[key] = this._methods[key];
+  }
 };
 
 /**
@@ -426,6 +443,7 @@ Mod.prototype.setMethod = function (method, func) {
     this._methods = {};
   }
   this._methods[method] = func;
+  this[method] = this._methods[method];
 };
 
 /**
@@ -434,13 +452,45 @@ Mod.prototype.setMethod = function (method, func) {
  * @returns {Function|null} 方法函数
  */
 Mod.prototype.getMethod = function (method) {
-  let func = this._methods && this._methods[method];
+  let func = this._methods[method];
   if (!func) {
     func = this[method];
   }
   return func;
 };
 
+/**
+ * 获取数据
+ * @returns {object} 数据对象
+ */
+Mod.prototype.getDatas = function () {
+  return this._datas;
+};
+
+/**
+ * 设置数据
+ * @param {object} datas 数据对象
+ */
+Mod.prototype.setDatas = function (datas) {
+  if (!this._datas) {
+    this._datas = {};
+  }
+  Object.assign(this._datas, datas);
+  for (let key in this._datas) {
+    this[key] = this._datas[key];
+  }
+};
+
+/**
+ * 设置数据
+ * @param {string} key 数据键
+ * @param {*} value 数据值
+ */
+Mod.prototype.setData = function (key, value) {
+  this._datas[key] = value;
+  this[key] = value;
+};
+
 /**
  * 调用函数（核心执行方法）
  * @param {string} method 函数名

package/package.json

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