mm_os 2.4.3 → 2.4.4

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/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,6 +78,9 @@ exports.delete_member = async function(clientid, uuid) {
 		"per_id": uuid,
 		"type": 0
 	});
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -151,6 +157,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;
 	}
@@ -168,6 +177,9 @@ exports.set_device_time = async function(clientid, datetime) {
 		}
 	});
 
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -180,15 +192,15 @@ exports.set_device_time = async function(clientid, datetime) {
  * @param {Boolean} member 是否恢复成员，true为恢复
  * @param {Boolean} log 是否恢复请求日志，true为恢复
  */
-exports.reset_device = function(clientid, record = true, member = false, log = true) {
+exports.reset_device = async function(clientid, record = true, member = false, log = true) {
 	if (record) {
 		// 清空记录
-		this.push("delete_record", clientid, {});
+		await this.push("delete_record", clientid, {});
 	}
 
 	if (member) {
 		// 删除所有成员
-		this.push("delete_face", clientid, {
+		await this.push("delete_face", clientid, {
 			type: 4
 		});
 	}
@@ -339,6 +351,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;
 	}
@@ -434,6 +449,9 @@ exports.play_audio = async function(clientid, type = 3) {
 		body
 	});
 
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -452,6 +470,10 @@ exports.set_qrcode_mode = async function(clientid, mode = 1) {
 			mode
 		}
 	});
+	
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}
@@ -469,6 +491,10 @@ exports.send_led = async function(clientid, color = 1) {
 			color
 		}
 	});
+
+	if (!res) {
+		return "请求超时！"
+	}
 	if (res.message !== "ACK") {
 		return res.code;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
   "main": "index.js",
   "scripts": {