mm_os 2.5.1 → 2.5.3

package/core/com/cmd/index.js

@@ -76,7 +76,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 
 			var lt = this.list_before;
 			for (var i = 0, o; o = lt[i++];) {
-				if (o.onOff) {
+				if (o.config.state === 1) {
 					try {
 						ret = await o.run_cmd(msg, db);
 					} catch (error) {
@@ -123,7 +123,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 		if (!ret) {
 			var lt = this.list_main;
 			for (var i = 0, o; o = lt[i++];) {
-				if (o.onOff) {
+				if (o.config.state === 1) {
 					try {
 						ret = await o.run_first(msg, db);
 					} catch (error) {
@@ -138,7 +138,7 @@ Cmd.prototype.run = async function(msg, db, table) {
 		if (!ret) {
 			var lt = this.list_after;
 			for (var i = 0, o; o = lt[i++];) {
-				if (o.onOff) {
+				if (o.config.state === 1) {
 					try {
 						ret = await o.run_first(msg, db);
 					} catch (error) {

package/core/com/eventer/com.js

@@ -143,11 +143,11 @@ Eventer.prototype.do_after = function() {
 /**
  * 执行事件
  */
-Eventer.prototype.doing = async function(o, msg) {
+Eventer.prototype.doing = async function(o, ...msg) {
 	o.num++;
 	var ret;
 	try {
-		ret = o.func(msg, o.param, o.num);
+		ret = o.func(...msg, o.param, o.num);
 		if (types.isPromise(ret)) {
 			ret = await ret;
 		}
@@ -167,10 +167,10 @@ Eventer.prototype.doing = async function(o, msg) {
  * 运行事件
  * @param {Array} list 列表
  * @param {String} type 类型
- * @param {Object} msg 事件消息
  * @param {Boolean} isBreak 是否中断
+ * @param {Object} msg 事件消息
  */
-Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
+Eventer.prototype.run_sub = async function(list, isBreak, ...msg) {
 	var ret;
 	if (list) {
 		for (var i = 0; i < list.length; i++) {
@@ -179,7 +179,7 @@ Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
 			if (o.state == 1) {
 				// 判断是否还需要执行
 				if (o.count < 0 || o.num < o.count) {
-					ret = await this.doing(o, msg);
+					ret = await this.doing(o, ...msg);
 					if (ret && isBreak) {
 						break;
 					}
@@ -201,19 +201,19 @@ Eventer.prototype.run_sub = async function(list, msg, isBreak = false) {
  * @param {String} type 类型
  * @param {Object} msg 事件消息
  */
-Eventer.prototype.run = async function(type, msg) {
+Eventer.prototype.run = async function(type, ...msg) {
 	this.do_before();
 	var ret;
 	var dt = this.dict[type];
 	if (dt) {
-		ret = await this.run_sub(dt.before, msg, false);
-		ret = await this.run_sub(dt.check, msg, true);
+		ret = await this.run_sub(dt.before, false, ...msg);
+		ret = await this.run_sub(dt.check, true, ...msg);
 		if (ret) {
 			return ret
 		}
-		ret = await this.run_sub(dt.main, msg, false);
+		ret = await this.run_sub(dt.main, false, ...msg);
 		if (ret) {
-			var ret_new = await this.run_sub(dt.after, msg, false);
+			var ret_new = await this.run_sub(dt.after, false, ...msg);
 			ret = ret_new || ret;
 		}
 	}

package/core/com/mqtt/drive.js

@@ -305,6 +305,18 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
 	});
 }
 
+/**
+ * 
+ * @param {Object} clientid
+ * @param {Object} online
+ * @param {Object} ip
+ */
+Drive.prototype.save_online = async function(clientid, online, ip) {
+	if (!clientid) {
+		
+	}
+}
+
 /**
  * 更新设备在线
  * @param {String} clientid 客户端ID

package/core/com/mqtt/index.js

@@ -126,28 +126,30 @@ MQTT.prototype.update_after = function() {
 	var _this = this;
 	var list = this.list;
 	for (var i = 0, o; o = list[i++];) {
-		o.send = function(topic, msg, qos = 0, retain = false) {
-			if (topic) {
-				_this.send(topic, msg, qos, retain);
-			}
-		};
+		if (o.config.state === 1) {
+			o.send = function(topic, msg, qos = 0, retain = false) {
+				if (topic) {
+					_this.send(topic, msg, qos, retain);
+				}
+			};
 
-		try {
-			o.run('init');
-		} catch (error) {
-			$.log.error("MQTT类初始化失败", o.config.name, error);
-		}
-		var topics = o.config.topic;
-		if (topics) {
-			for (var i = 0; i < topics.length; i++) {
-				var tc = topics[i];
-				var retain = o.config.retain || false;
-				var qos = o.config.qos || 0;
-				if (tc.indexOf("heartbeat") !== -1) {
-					retain = false;
-					qos = 0;
+			try {
+				o.run('init');
+			} catch (error) {
+				$.log.error("MQTT类初始化失败", o.config.name, error);
+			}
+			var topics = o.config.topic;
+			if (topics) {
+				for (var i = 0; i < topics.length; i++) {
+					var tc = topics[i];
+					var retain = o.config.retain || false;
+					var qos = o.config.qos || 0;
+					if (tc.indexOf("heartbeat") !== -1) {
+						retain = false;
+						qos = 0;
+					}
+					this.subscribe(tc, null, qos, retain);
 				}
-				this.subscribe(tc, null, qos, retain);
 			}
 		}
 	}
@@ -272,15 +274,17 @@ MQTT.prototype.receive = async function(push_topic, msg) {
 	var ret;
 	var list = this.list;
 	for (var i = 0, o; o = list[i++];) {
-		var topics = o.config.topic;
-		if (topics) {
-			for (var i = 0; i < topics.length; i++) {
-				var topic = topics[i];
-				if (this.match(push_topic, topic)) {
-					try {
-						ret = await o.run("main", push_topic, msg, topic, i);
-					} catch (error) {
-						$.log.error("MQTT执行失败", o.config.name, error);
+		if (o.config.state === 1) {
+			var topics = o.config.topic;
+			if (topics) {
+				for (var i = 0; i < topics.length; i++) {
+					var topic = topics[i];
+					if (this.match(push_topic, topic)) {
+						try {
+							ret = await o.run("main", push_topic, msg, topic, i);
+						} catch (error) {
+							$.log.error("MQTT执行失败", o.config.name, error);
+						}
 					}
 				}
 			}

package/core/com/plugin/drive.js

@@ -348,20 +348,4 @@ Drive.prototype.run_chat = async function(from_user, to_user, content, group, ty
 	return ret;
 };
 
-/**
- * 执行程序
- * @param {Object} param1 参数1
- * @param {Object} param2 参数2
- * @return {Object} 返回执行结果
- */
-Drive.prototype.exec = function(func_name, option) {
-	var msg = "";
-	if (this[func_name]) {
-		msg = this[func_name](option);
-	} else {
-		msg = "错误的操作";
-	}
-	return msg;
-};
-
 module.exports = Drive;

package/core/com/static/index.js

@@ -40,14 +40,16 @@ class Static extends Index {
 				if (path.indexOf('.') !== -1) {
 					for (var i = 0; i < len; i++) {
 						var o = list[i];
-						try {
-							done = await o.run(ctx, path, next);
-						} catch (error) {
-							$.log.error("静态文件执行错误", o.config.name, error);
-						}
-						
-						if (done) {
-							break;
+						if (o.config.state === 1) {
+							try {
+								done = await o.run(ctx, path, next);
+							} catch (error) {
+								$.log.error("静态文件执行错误", o.config.name, error);
+							}
+
+							if (done) {
+								break;
+							}
 						}
 					}
 					await next();
@@ -56,25 +58,27 @@ class Static extends Index {
 					var q = ctx.request.querystring;
 					for (var i = 0; i < len; i++) {
 						var o = list[i];
-						var p = o.config.path;
-						if (path === p) {
-							done = ' ';
-							if (ctx.status === 404) {
-								if (q) {
-									ctx.redirect(p + '/?' + q);
-								} else {
-									ctx.redirect(p + '/');
+						if (o.config.state === 1) {
+							var p = o.config.path;
+							if (path === p) {
+								done = ' ';
+								if (ctx.status === 404) {
+									if (q) {
+										ctx.redirect(p + '/?' + q);
+									} else {
+										ctx.redirect(p + '/');
+									}
 								}
-							}
-							break;
-						} else {
-							try {
-								done = await o.run(ctx, path, next);
-							} catch (error) {
-								$.log.error("静态文件执行错误", o.config.name, error);
-							}
-							if (done) {
 								break;
+							} else {
+								try {
+									done = await o.run(ctx, path, next);
+								} catch (error) {
+									$.log.error("静态文件执行错误", o.config.name, error);
+								}
+								if (done) {
+									break;
+								}
 							}
 						}
 					}

package/core/com/task/index.js

@@ -29,7 +29,7 @@ Task.prototype.run = async function(name) {
 	var lt = this.list;
 	if (name) {
 		for (var i = 0, o; o = lt[i++];) {
-			if (o.name === name) {
+			if (o.config.state === 1 && o.config.name === name) {
 				try {
 					o.run();
 				} catch (error) {
@@ -40,10 +40,12 @@ Task.prototype.run = async function(name) {
 		}
 	} else {
 		for (var i = 0, o; o = lt[i++];) {
-			try {
-				o.run();
-			} catch (error) {
-				$.log.error("定时任务错误", o.name, error);
+			if (o.config.state === 1) {
+				try {
+					o.run();
+				} catch (error) {
+					$.log.error("定时任务错误", o.name, error);
+				}
 			}
 		}
 	}

package/demo/app/test/plugin/main/api_demo_client/test/index.js

@@ -14,7 +14,7 @@ async function main(ctx, db) {
 	
 	var user = await this.get_state(ctx, db);
 	
-	console.log("用户", user);
+	// console.log("用户", user);
 	// return "hello world" + JSON.stringify(body);
 
 	// 操作sql模板
@@ -28,6 +28,9 @@ async function main(ctx, db) {
 	} else {
 
 	}
+	// var plus = $.plugin_admin('test');
+	// plus.run("main", "start");
+	// plus.run("main", "stop");
 	var ret = await this.sql.run(query, body, db);
 	return ret;
 };

package/demo/com/server/index.js

@@ -203,8 +203,8 @@ Server.prototype.exec_log = async function(clientid, log) {
  */
 Server.prototype.check_device = async function(clientid, key) {
 	var tip;
-	var db2 = dbs.new("face_device", "device_id");
-	var device = await db2.getObj({
+	var db_device = dbs.new("face_device", "device_id");
+	var device = await db_device.getObj({
 		clientid
 	});
 	if (device) {

package/lib/app.js

@@ -28,8 +28,8 @@ App.prototype.fullAction = function(action) {
 			// 创建插件
 			this.plugin = $.plugin_admin(action.key, action.title || action.name);
 			this.plugin.update(action.jsonFile.dirname()).then(() => {
-				this.plugin.exec(null, 'init').then(() => {
-					this.plugin.exec(null, 'start');
+				this.plugin.run(null, 'init').then(() => {
+					this.plugin.run(null, 'start');
 				});
 			});
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -37,14 +37,14 @@
     "koa-websocket": "^7.0.0",
     "mm_check": "^1.4.8",
     "mm_excel": "^1.2.0",
-    "mm_expand": "^1.7.3",
+    "mm_expand": "^1.7.4",
     "mm_html": "^1.1.6",
     "mm_koa_proxy": "^1.0.0",
     "mm_logs": "^1.1.4",
-    "mm_machine": "^1.7.6",
+    "mm_machine": "^1.7.8",
     "mm_mongodb": "^1.4.2",
     "mm_mqtt": "^1.0.6",
-    "mm_mysql": "^1.8.1",
+    "mm_mysql": "^1.8.3",
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.8",