mm_machine 2.4.9 → 2.5.1

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

@@ -847,6 +847,7 @@ Manager.prototype.runWaterfall = async function (method, result, ...params) {
 module.exports = {
   Manager,
   Drive,
+  Mod,
   // 向后兼容
   Index: Manager,
   Item: Drive

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,8 @@ Mod.prototype.unload = async function () {
  * 卸载核心
  */
 Mod.prototype._unloadCore = async function () {
-  if (this.methods) {
-    this.methods = {};
+  if (this._methods) {
+    this._methods = {};
   }
 };
 
@@ -396,11 +400,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);
 };
 
 /**
@@ -434,7 +439,7 @@ 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];
   }

package/package.json

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