mm_machine 1.7.7 → 1.7.9

package/demo/test1/demo.json

@@ -26,7 +26,7 @@
 	/**
 	 * 状态, 0表示未启用, 1表示启用
 	 */
-	"state": 1,
+	"state": 0,
 	/**
 	 * 显示, 0表示不显示, 1表示显示
 	 */

package/demo2/test1/demo.json

@@ -26,7 +26,7 @@
 	/**
 	 * 状态, 0表示未启用, 1表示启用
 	 */
-	"state": 1,
+	"state": 0,
 	/**
 	 * 显示, 0表示不显示, 1表示显示
 	 */

package/index.js

@@ -156,9 +156,6 @@ Item.prototype.loadObj = function(config) {
 	if (f) {
 		var file = f.fullname(this.dir);
 		if (file.hasFile()) {
-			if (!config.state) {
-				return;
-			}
 			var name = config.func_name;
 			var cs = $.require(file, (cs, way) => {
 				if (way == "change" && cs) {
@@ -327,14 +324,27 @@ Item.prototype.main = async function(...params) {
 Item.prototype.run = async function(method, ...params) {
 	if (this[method]) {
 		if (this[method + "_before"]) {
-			this[method + "_before"](...params);
+			try {
+				this[method + "_before"](...params);
+			} catch (err) {
+				$.log.error("执行前失败！", err);
+			}
+		}
+		var ret;
+		try {
+			ret = this[method](...params);
+		} catch (err) {
+			$.log.error("执行失败！", err);
 		}
-		var ret = this[method](...params);
 		if (util.types.isPromise(ret)) {
 			ret = await ret;
 		}
 		if (this[method + "_after"]) {
-			ret = this[method + "_after"](ret, ...params) || ret;
+			try {
+				ret = this[method + "_after"](ret, ...params) || ret;
+			} catch (err) {
+				$.log.error("执行后失败！", err);
+			}
 		}
 		if (util.types.isPromise(ret)) {
 			ret = await ret;
@@ -755,7 +765,7 @@ Index.prototype.run = async function(name, method, ...params) {
 	var result;
 	if (name) {
 		var o = await this.get(name);
-		if (o) {
+		if (o && o.config.state === 1) {
 			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
@@ -770,11 +780,13 @@ Index.prototype.run = async function(name, method, ...params) {
 		var lt = this.list;
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
-			var ret = o.run(method, ...params);
-			if (util.types.isPromise(ret)) {
-				result = await ret;
-			} else {
-				result = ret;
+			if (o.config.state === 1) {
+				var ret = o.run(method, ...params);
+				if (util.types.isPromise(ret)) {
+					result = await ret;
+				} else {
+					result = ret;
+				}
 			}
 		}
 	}
@@ -792,7 +804,7 @@ Index.prototype.exec = async function(name, method, ...params) {
 	var result;
 	if (name) {
 		var o = await this.get(name);
-		if (o && o.config.state === 1) {
+		if (o) {
 			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
@@ -807,13 +819,11 @@ Index.prototype.exec = async function(name, method, ...params) {
 		var lt = this.list;
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
-			if (o.config.state === 1) {
-				var ret = o.run(method, ...params);
-				if (util.types.isPromise(ret)) {
-					result = await ret;
-				} else {
-					result = ret;
-				}
+			var ret = o.run(method, ...params);
+			if (util.types.isPromise(ret)) {
+				result = await ret;
+			} else {
+				result = ret;
 			}
 		}
 	}

package/package.json

@@ -1,36 +1,36 @@
 {
-    "name": "mm_machine",
-    "version": "1.7.7",
-    "description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
-    "main": "index.js",
-    "scripts": {
-        "test": "node ./test.js",
-        "dev": "nodemon ./test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/qiuwenwu/mm_machine.git"
-    },
-    "keywords": [
-        "common",
-        "com",
-        "run",
-        "cmd",
-        "load",
-        "save",
-        "get",
-        "set",
-        "add",
-        "del"
-    ],
-    "author": "邱文武",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/qiuwenwu/mm_machine/issues"
-    },
-    "homepage": "https://github.com/qiuwenwu/mm_machine#readme",
-    "dependencies": {
-        "mm_config": "^1.1.3",
-        "mm_hot_reload": "^1.0.1"
-    }
-}
+	"name": "mm_machine",
+	"version": "1.7.9",
+	"description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
+	"main": "index.js",
+	"scripts": {
+		"test": "node ./test.js",
+		"dev": "nodemon ./test.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/qiuwenwu/mm_machine.git"
+	},
+	"keywords": [
+		"common",
+		"com",
+		"run",
+		"cmd",
+		"load",
+		"save",
+		"get",
+		"set",
+		"add",
+		"del"
+	],
+	"author": "邱文武",
+	"license": "ISC",
+	"bugs": {
+		"url": "https://github.com/qiuwenwu/mm_machine/issues"
+	},
+	"homepage": "https://github.com/qiuwenwu/mm_machine#readme",
+	"dependencies": {
+		"mm_config": "^1.1.3",
+		"mm_hot_reload": "^1.0.1"
+	}
+}

package/test.js

@@ -26,8 +26,10 @@ async function demo() {
 	var engine = new Engine();
 	console.info("→ 加载mod");
 	await engine.update("./".fullname(__dirname));
-	// engine.run('demo1', 'init');
-	// engine.run(null, 'init');
+	await engine.run('demo1', 'init');
+	await engine.exec('demo1', 'init');
+	await engine.run(null, 'main');
+	await engine.exec(null, 'main');
 	// console.log("模块数", engine.list.length);
 
 	// var i = 0;