mm_machine 1.9.2 → 1.9.4

package/demo/test1/index.js

@@ -1,7 +1,7 @@
 var i = 0;
 
 function test() {
-	console.log("你好7654321011", i++)
+	console.log("你好7654321", i++)
 }
 
 function main() {

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);
-			drive.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) {
-							o.set_config(cg);
+							await o.exec('set_config', cg);
 							continue;
 						}
 					}
 				} else {
-					o.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

@@ -98,7 +98,6 @@ class Item {
  */
 Item.prototype.set_config = function(config) {
 	this.config = conf(Object.assign({}, this.config, config || {}), this.filename);
-	this.set_config_after();
 }
 
 /**
@@ -247,6 +246,7 @@ Item.prototype.load_file = function(file, name) {
 							var o = list[i];
 							if (this.config.name === o.name) {
 								this.set_config(o);
+								this.set_config_after();
 								if (this.mode === 3 || this.mode === 4) {
 									this.reload_script();
 								}
@@ -255,6 +255,7 @@ Item.prototype.load_file = function(file, name) {
 						}
 					} else {
 						this.set_config(conf);
+						this.set_config_after();
 						if (this.mode === 3 || this.mode === 4) {
 							this.reload_script();
 						}
@@ -349,6 +350,7 @@ Item.prototype.load_config = function(cg, name) {
 		config = this.load_file(this.filename, name);
 	}
 	this.set_config(config);
+	this.set_config_after();
 };
 
 /**
@@ -409,13 +411,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.2",
+	"version": "1.9.4",
 	"description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
 	"main": "index.js",
 	"scripts": {

package/test.js

@@ -76,12 +76,12 @@ async function demo() {
 		console.log("这结果", ret);
 	}, 7000)
 
-	// setTimeout(() => {
-	// 	var file = "./demo/test2/index.js";
-	// 	var text = file.loadText();
-	// 	text = text.replace("123", "7654321");
-	// 	file.saveText(text);
-	// }, 11000)
+	setTimeout(() => {
+		var file = "./demo/test2/index.js";
+		var text = file.loadText();
+		text = text.replace("123", "7654321");
+		file.saveText(text);
+	}, 11000)
 
 	setTimeout(async () => {
 		// 让热重载失效
@@ -105,11 +105,11 @@ async function demo() {
 		if (plug) {
 			console.log("查看变化1", plug.config);
 		}
-		// var plug = engine.get("demo3");
-		// if (plug) {
-		// 	var ret = await plug.run('main');
-		// 	console.log("查看变化3", plug.config);
-		// }
+		var plug = engine.get("demo3");
+		if (plug) {
+			var ret = await plug.run();
+			console.log("查看变化3", plug.config);
+		}
 		n++;
 		if (n == 6) {
 			clearInterval(timer_2);