mm_os 2.4.3 → 2.4.5

package/core/com/mqtt/drive.js

@@ -275,11 +275,16 @@ Drive.prototype.pushSync = function(clientid, msg, func, longtime = 0) {
 		if (!longtime) {
 			longtime = this.config.longtime || 60000;
 		}
-		var timer = setTimeout(() => {
+		setTimeout(async () => {
 			// 如果时间到了，回调函数还在队列中，则视为无回复
 			if (this.drives[clientid][key]) {
+				try {
+					await this.drives[clientid][key].func(null);
+				} catch (error) {
+					$.log.error("MQTT回调错误", key, error);
+					//TODO handle the exception
+				}
 				this.del_msg(clientid, key);
-				func(null);
 			}
 		}, longtime);
 	}
@@ -340,7 +345,7 @@ Drive.prototype.push = function(method, clientid, params, longtime = 0) {
 	msg[cg.msgid] = this.get_msgid(method);
 	msg[cg.method] = method;
 	msg[cg.params] = params;
-	return this.pushS(clientid, msg);
+	return this.pushS(clientid, msg, longtime);
 }
 
 /**

package/demo/app/test/mqtt/df/index.js

@@ -388,7 +388,7 @@ exports.init = function() {
 		}
 		_this.drives[clientid].online = 1;
 		_this.drives[clientid].time_last = new Date().getTime();
-		console.log("心跳", clientid, _this.drives[clientid]);
+		// console.log("心跳", clientid, _this.drives[clientid]);
 	}
 
 	/**

package/demo/app/test/mqtt/df/mqtt.json

@@ -10,8 +10,8 @@
         "mqtt/face/${clientid}"
     ],
     "topic_push": "mqtt/face/${clientid}",
-    "qos": 2,
-    "qos_push": 2,
+    "qos": 1,
+    "qos_push": 0,
     "retain": true,
     "longtime": 10000,
     "func_file": "./index.js",

package/demo/app/test/mqtt/zs/index.js

@@ -58,6 +58,9 @@ exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没
 		// 0不开门，1开门
 		"ctrl_type": pass ? "on" : "off"
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -75,12 +78,23 @@ exports.delete_member = async function(clientid, uuid) {
 		"per_id": uuid,
 		"type": 0
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
 	return
 }
 
+exports.sleep = async function(longtime, param) {
+	return new Promise((resolve, reject) => {
+		setTimeout(() => {
+			resolve(param);
+		}, longtime);
+	});
+}
+
 /**
  * 批量删除成员
  * @param {String} clientid 客户端ID
@@ -91,7 +105,7 @@ exports.delete_member_batch = async function(clientid, arr, longtime) {
 	if (!this.drives[clientid]) {
 		this.drives[clientid] = {};
 	}
-	if (this.drives[clientid].pushing == 1) {
+	if (this.drives[clientid].pushing) {
 		return {
 			detail: "busy"
 		}
@@ -111,8 +125,21 @@ exports.delete_member_batch = async function(clientid, arr, longtime) {
 		var res = await this.push("delete_face", clientid, {
 			"per_id": customId,
 			"type": 0
-		});
-		if (res.message == "ACK") {
+		}, 10000);
+		if (!res) {
+			await this.sleep(60000);
+			res = await this.push("delete_face", clientid, {
+				"per_id": customId,
+				"type": 0
+			}, 10000);
+		}
+		if (!res) {
+			error_info.push({
+				customId,
+				errcode: -1,
+				time_create: now
+			});
+		} else if (res.message == "ACK") {
 			success++;
 			success_info.push({
 				customId,
@@ -151,6 +178,9 @@ exports.delete_member_batch = async function(clientid, arr, longtime) {
  */
 exports.reboot_device = async function(clientid) {
 	var res = await this.push("reboot_cam", clientid, {});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -167,6 +197,9 @@ exports.set_device_time = async function(clientid, datetime) {
 			"datetime": datetime
 		}
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 
 	if (res.message !== "ACK") {
 		return res.code;
@@ -198,7 +231,7 @@ exports.reset_device = function(clientid, record = true, member = false, log = t
  * 查询下发进度(未完成)
  * @param {String} clientid 设备sn
  */
-exports.get_progress = function(clientid) {
+exports.get_progress = async function(clientid) {
 	if (!this.drives[clientid]) {
 		this.drives[clientid] = {};
 	}
@@ -281,6 +314,9 @@ exports.get_member = async function(clientid, uuid, name) {
 		qy.name = name;
 	}
 	var res = await this.push("query_face", qy);
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.code) {
 		return res.pers_id;
 	}
@@ -339,6 +375,9 @@ exports.member_model_out = function(m) {
 exports.update_member = async function(clientid, user) {
 	var member = this.member_model_out(user);
 	var res = await this.push("update_face_ex", clientid, member);
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -355,7 +394,7 @@ exports.update_member_batch = async function(clientid, list, longtime = 0) {
 	if (!this.drives[clientid]) {
 		this.drives[clientid] = {};
 	}
-	if (this.drives[clientid].pushing == 1) {
+	if (this.drives[clientid].pushing) {
 		return {
 			detail: "busy"
 		}
@@ -372,8 +411,18 @@ exports.update_member_batch = async function(clientid, list, longtime = 0) {
 	var now = new Date().toStr("yyyy-MM-dd hh:mm:ss");
 	for (var i = 0; i < list.length; i++) {
 		var user = list[i];
-		var res = await this.push("update_face_ex", clientid, this.member_model_out(user));
-		if (res.message == "ACK") {
+		var res = await this.push("update_face_ex", clientid, this.member_model_out(user), 10000);
+		if (!res) {
+			await this.sleep(60000);
+			res = await this.push("update_face_ex", clientid, this.member_model_out(user), 10000);
+		}
+		if (!res) {
+			error_info.push({
+				customId: user.customId,
+				errcode: -1,
+				time_create: now
+			});
+		} else if (res.message == "ACK") {
 			success++;
 			success_info.push({
 				customId: user.customId,
@@ -434,6 +483,9 @@ exports.play_audio = async function(clientid, type = 3) {
 		body
 	});
 
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -452,6 +504,9 @@ exports.set_qrcode_mode = async function(clientid, mode = 1) {
 			mode
 		}
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -469,6 +524,9 @@ exports.send_led = async function(clientid, color = 1) {
 			color
 		}
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}

package/demo/app/test/mqtt/zs/mqtt.json

@@ -14,7 +14,9 @@
 	// 给客户端推送的主题
 	"topic_push": "face/${clientid}/request",
 	// 接收方式
-	"qos": 2,
+	"qos": 1,
+	// 推送方式
+    "qos_push": 0,
 	// 保持接收
 	"retain": true,
 	// 调用的脚本

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {
@@ -48,7 +48,7 @@
     "mm_redis": "^1.4.2",
     "mm_ret": "^1.3.9",
     "mm_session": "^1.4.8",
-    "mm_statics": "^1.4.2",
+    "mm_statics": "^1.4.8",
     "mm_tpl": "^2.3.9",
     "mm_xml": "^1.1.5",
     "mosca": "^2.8.3",