mm_machine 1.7.1 → 1.7.3

package/demo/test1/index.js

@@ -1,7 +1,7 @@
-
 var i = 0;
+
 function test() {
-	console.log("你好7654321", i++)
+	console.log("你好123", i++)
 }
 
 function main() {
@@ -11,10 +11,14 @@ function main() {
 
 exports.main = main;
 
-exports.main_before = function(){
+exports.main_before = function() {
 	console.log("请求前")
 }
 
-exports.main_after = function(ret){
+exports.main_after = async function(ret) {
 	console.log("请求后", ret)
+}
+
+exports.init = function() {
+	console.log("初始化test");
 }

package/demo/test2/index.js

@@ -3,7 +3,10 @@ class Demo {
 }
 var i = 0;
 Demo.prototype.main = function() {
-	console.log("我很好7654321", i++);
+	console.log("我很好123", i++);
+}
+Demo.prototype.init = function(){
+	console.log("初始化test2");
 }
 
 module.exports = new Demo();

package/demo2/test1/index.js

@@ -17,4 +17,8 @@ exports.main_before = function() {
 
 exports.main_after = async function(ret) {
 	console.log("请求后", ret)
+}
+
+exports.init = function() {
+	console.log("初始化test");
 }

package/demo2/test2/index.js

@@ -5,5 +5,8 @@ var i = 0;
 Demo.prototype.main = function() {
 	console.log("我很好123", i++);
 }
+Demo.prototype.init = function(){
+	console.log("初始化test2");
+}
 
 module.exports = new Demo();

package/index.js

@@ -515,28 +515,34 @@ Index.prototype.sort = function() {
 /**
  * 更新前
  */
-Index.prototype.update_before = function(dir) {
+Index.prototype.update_before = async function(dir) {
 	// console.log("更新前")
 }
 
-
 /**
  * 更新后
  */
-Index.prototype.update_after = function(dir) {
+Index.prototype.update_after = async function(dir) {
 	// console.log("更新后")
 }
 
 /**
- * 更新配置
- * @param {String} dir 检索的路径
+ * 更新
  */
-Index.prototype.update = function(dir) {
-	this.update_before(dir);
+Index.prototype.update_main = async function(dir) {
 	this.clear();
 	this.load(dir);
 	this.sort();
-	this.update_after(dir);
+}
+
+/**
+ * 更新配置
+ * @param {String} dir 检索的路径
+ */
+Index.prototype.update = async function(dir) {
+	await this.update_before(dir);
+	await this.update_main(dir);
+	await this.update_after(dir);
 };
 
 /**
@@ -740,21 +746,32 @@ Index.prototype.reload = function(name) {
 
 /**
  * 调用函数
- * @param {String} 模块名
+ * @param {String} name 模块名
  * @param {String} method 函数名
  * @param {Object} params 参数集合
  * @return {Object} 执行结果
  */
 Index.prototype.run = async function(name, method, ...params) {
-	var o = await this.get(name);
 	var ret;
-	if (o) {
-		ret = o.run(method, params);
-		if (util.types.isPromise(ret)) {
-			ret = await ret;
+	if (name) {
+		var o = await this.get(name);
+		if (o) {
+			ret = o.run(method, params);
+			if (util.types.isPromise(ret)) {
+				ret = await ret;
+			}
+			if (this.mode) {
+				o.reload();
+			}
 		}
-		if (this.mode) {
-			o.reload();
+	} else if (name === null) {
+		var lt = this.list;
+		for (var i = 0; i < lt.length; i++) {
+			var o = lt[i];
+			ret = o.run(method, params);
+			if (util.types.isPromise(ret)) {
+				ret = await ret;
+			}
 		}
 	}
 	return ret;

package/package.json

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

package/test.js

@@ -26,6 +26,10 @@ async function demo() {
 	var engine = new Engine();
 	console.info("→ 加载mod");
 	await engine.update("./".fullname(__dirname));
+
+	engine.run(null, 'init');
+	engine.run(undefined, 'init');
+	return
 	console.log("模块数", engine.list.length);
 
 	var i = 0;
@@ -61,7 +65,7 @@ async function demo() {
 		text = text.replace("123", "7654321");
 		file.saveText(text);
 	}, 20000)
-	
+
 	setTimeout(() => {
 		// 让热重载失效
 		console.info("→ 热重载失效");