mm_machine 1.9.3 → 1.9.5

package/index.js

@@ -78,10 +78,10 @@ Index.prototype.load_item = async function(dir, cg, file) {
 		var drive = new this.Drive(dir, this.dir_base.fullname());
 		drive.mode = this.mode;
 		if (cg) {
-			await drive.run('load_config', file, cg.name);
-			await drive.run('set_config', cg);
+			await drive.exec('load_config', file, cg.name);
+			await drive.exec('set_config', cg);
 		} else {
-			await drive.run('load_config', file);
+			await drive.exec('load_config', file);
 		}
 		this.list.push(drive);
 		return drive;
@@ -195,12 +195,12 @@ Index.prototype.update_config_have = async function(dir) {
 					for (var n = 0; n < lt.length; n++) {
 						var cg = lt[n];
 						if (cg.name == o.config.name) {
-							await o.run('set_config', cg);
+							await o.exec('set_config', cg);
 							continue;
 						}
 					}
 				} else {
-					await o.run('set_config', config);
+					await o.exec('set_config', config);
 				}
 			}
 		}
@@ -230,7 +230,7 @@ Index.prototype.update_script = async function() {
 	for (var i = 0; i < list.length; i++) {
 		var o = list[i];
 		if (o.config.state === 1) {
-			await o.run('load');
+			await o.exec('load');
 		}
 	}
 }
@@ -391,7 +391,7 @@ Index.prototype.load = async function(name) {
 	var o = this.get(name);
 	var file = null;
 	if (o) {
-		await o.run('load');
+		await o.exec('load');
 		file = o.filename;
 	}
 	return file;
@@ -407,7 +407,7 @@ Index.prototype.unload = async function(name, remove) {
 	var o = this.del(name, remove);
 	var file = null;
 	if (o) {
-		await o.run('unload', remove);
+		await o.exec('unload', remove);
 		file = o.filename;
 	}
 	return file;
@@ -421,7 +421,7 @@ Index.prototype.unload = async function(name, remove) {
 Index.prototype.reload = async function(name) {
 	var o = this.get(name);
 	if (o) {
-		await o.run('reload');
+		await o.exec('reload');
 		return o.filename;
 	}
 	return '没有找到模块';
@@ -468,14 +468,14 @@ Index.prototype.run = async function(name, method, ...params) {
 	if (name) {
 		var o = await this.get(name);
 		if (o && o.config.state === 1) {
-			var ret = o.run(method, ...params);
+			var ret = o.exec(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
 			} else {
 				result = ret;
 			}
 			if (this.mode >= 4) {
-				o.run('reload');
+				o.exec('reload');
 			}
 		}
 	} else if (name === null) {
@@ -483,14 +483,14 @@ Index.prototype.run = async function(name, method, ...params) {
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
 			if (o.config.state === 1) {
-				var ret = o.run(method, ...params);
+				var ret = o.exec(method, ...params);
 				if (util.types.isPromise(ret)) {
 					result = await ret;
 				} else {
 					result = ret;
 				}
 				if (this.mode >= 4) {
-					o.run('reload');
+					o.exec('reload');
 				}
 			}
 		}
@@ -511,16 +511,16 @@ Index.prototype.exec = async function(name, method, ...params) {
 		var o = await this.get(name);
 		if (o) {
 			if (!o.complete) {
-				await o.run('load');
+				await o.exec('load');
 			}
-			var ret = o.run(method, ...params);
+			var ret = o.exec(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
 			} else {
 				result = ret;
 			}
 			if (this.mode >= 4) {
-				await o.run('reload');
+				await o.exec('reload');
 			}
 		}
 	} else if (name === null) {
@@ -528,16 +528,16 @@ Index.prototype.exec = async function(name, method, ...params) {
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
 			if (!o.complete) {
-				await o.run('load');
+				await o.exec('load');
 			}
-			var ret = o.run(method, ...params);
+			var ret = o.exec(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
 			} else {
 				result = ret;
 			}
 			if (this.mode >= 4) {
-				await o.run('reload');
+				await o.exec('reload');
 			}
 		}
 	}

package/item.js

@@ -185,6 +185,8 @@ Item.prototype.load_script = function(file, name = "") {
 			if (!file.hasFile()) {
 				this.new_script(file);
 			}
+		} else {
+			return;
 		}
 	}
 	if (!name) {
@@ -411,13 +413,21 @@ Item.prototype.main = async function(...params) {
 	return null;
 };
 
+/**
+ * 运行
+ * @param {Object} params 参数集合
+ */
+Item.prototype.run = async function(...params) {
+	return await this.exec("main", ...params);
+}
+
 /**
  * 调用函数
  * @param {String} method 函数名
  * @param {Object} params 参数集合
  * @return {Object} 执行结果
  */
-Item.prototype.run = async function(method, ...params) {
+Item.prototype.exec = async function(method, ...params) {
 	if (this[method]) {
 		var ret;
 		if (this[method + "_before"]) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_machine",
-	"version": "1.9.3",
+	"version": "1.9.5",
 	"description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
 	"main": "index.js",
 	"scripts": {

package/test.js

@@ -107,7 +107,7 @@ async function demo() {
 		}
 		var plug = engine.get("demo3");
 		if (plug) {
-			var ret = await plug.run('main');
+			var ret = await plug.run();
 			console.log("查看变化3", plug.config);
 		}
 		n++;