mm_os 2.3.5 → 2.3.7

package/core/com/mqtt/drive.js

@@ -304,8 +304,9 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
  * 更新设备在线
  * @param {String} clientid 客户端ID
  * @param {Boolean} online 是否在线 0为没在线 1为在线
+ * @param {String} ip 设备IP
  */
-Drive.prototype.update_online = async function(clientid, online = 1) {
+Drive.prototype.update_online = async function(clientid, online = 1, ip = '') {
 	if (!this.drives[clientid]) {
 		this.drives[clientid] = {};
 	}
@@ -320,6 +321,9 @@ Drive.prototype.update_online = async function(clientid, online = 1) {
 	} = await $.server.check_device(clientid);
 	if (device && online && !device.online) {
 		device.online = online;
+		if (ip) {
+			device.ip = ip;
+		}
 	}
 }
 

package/core/com/mqtt/index.js

@@ -38,8 +38,10 @@ class MQTT extends Index {
 			longtime: 15000,
 			// 在线有效期时长判断 单位：毫秒，150000毫秒为2.5分钟
 			online_expires: 150000,
+			// 在线有效期检测间隔
 			online_interval: 10000,
-			connectTimeout: 4000,
+			// 连接超时
+			connectTimeout: 6000,
 			// maxInflight: 20,
 			// 重连间隔
 			// interval: 6000,
@@ -414,26 +416,21 @@ MQTT.prototype.reqASync = function(topic, method, params) {
  * 保存在线到数据库
  * @param {Array} arr 客户端ID数组
  * @param {Number} online 在线情况 0为不在线，1为在线
- * @param {Number} time_last 最后上线时间
  */
-MQTT.prototype.save_online = async function(arr, online, time_last) {
+MQTT.prototype.save_online = async function(arr, online = 1) {
 	if (!arr || !arr.length) {
 		return
 	}
 	var body = {
 		online
 	}
-	if (time_last) {
-		body.time_last = time_last;
-		// time_last = (new Date()).toStr('yyyy-MM-dd hh:mm:ss');
-	}
 	var sql = $.mysql_admin('sys');
 	sql.open();
 	var db = sql.db();
 	db.table = "face_device";
 	db.size = 0;
 	await db.set({
-		clientid_has: arr
+		clientid_has: arr.join(",")
 	}, body);
 }
 
@@ -450,7 +447,7 @@ MQTT.prototype.update_online = async function() {
 		var dict = list[i].drives;
 		for (var clientid in dict) {
 			var o = dict[clientid];
-			if (!o.online) {
+			if (o.online === 0) {
 				list_offline.push(clientid);
 			} else {
 				if (o.time_last) {
@@ -463,6 +460,9 @@ MQTT.prototype.update_online = async function() {
 						list_online.push(clientid);
 					}
 				}
+				else {
+					list_online.push(clientid);
+				}
 			}
 		}
 	}

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

@@ -37,13 +37,32 @@ exports.push_qrcode = function(clientid, param) {
  * @param {Object} avatar 人脸照片
  * @param {Number} longtime 超时回馈
  */
-exports.get_member_pic = function(clientid, avatar) {
-	return this.push("GetPictureSearch", clientid, {
+exports.get_member_pic = async function(clientid, avatar) {
+	var res = await this.push("GetPictureSearch", clientid, {
 		"facesluiceId": clientid,
 		"MaxSimilarity": 80,
 		"MaxNum": 1,
 		"picinfo": avatar
 	});
+	var user;
+	if (res) {
+		if (res.result == "fail") {
+
+		} else {
+			var u = res.SearchInfo[0];
+			var name = u.name || u.persionName;
+			var customId = u.customId.trim();
+			var phone = (u.telnum || "").trim();
+			var idcard = (u.idCard || "").trim();
+			user = {
+				name,
+				customId,
+				phone,
+				idcard
+			}
+		}
+	}
+	return user
 }
 
 /**
@@ -53,13 +72,17 @@ exports.get_member_pic = function(clientid, avatar) {
  * @param {Boolean} pass 是否可通行 true为是
  * @param {String} tip 提示
  */
-exports.unlock = function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
-	return this.push("Unlock", clientid, {
+exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
+	var res = await this.push("Unlock", clientid, {
 		"uid": uuid,
 		// 0不开门，1开门
 		"openDoor": pass ? "1" : "0",
 		"showInfo": tip
 	});
+
+	if (!res || res.result == "fail") {
+		return "非内部人员！";
+	}
 }
 
 /**
@@ -68,7 +91,7 @@ exports.unlock = function(clientid, uuid = '0', pass = false, tip = '没有访
  * @param {String} uuid 用户唯一标识
  * @param {Number} longtime 超时回馈
  */
-exports.del_member = function(clientid, uuid) {
+exports.delete_member = function(clientid, uuid) {
 	return this.push("DeletePersons", clientid, {
 		"customId": uuid
 	});
@@ -80,7 +103,7 @@ exports.del_member = function(clientid, uuid) {
  * @param {Object} arr 成员列表
  * @param {Number} longtime 超时回馈
  */
-exports.del_member_batch = function(clientid, arr, longtime) {
+exports.delete_member_batch = function(clientid, arr, longtime) {
 	return this.push("DeletePersons", clientid, {
 		DataBegin: "BeginFlag",
 		DataEnd: "EndFlag",
@@ -102,8 +125,8 @@ exports.reboot_device = function(clientid) {
  * @param {String} clientid 设备sn
  * @param {String} datetime 日期时间
  */
-exports.set_device_time = function(clientid, datetime) {
-	var res = this.push("SetSysTime", clientid, {
+exports.set_device_time = async function(clientid, datetime) {
+	var res = await this.push("SetSysTime", clientid, {
 		"SysTime": datetime.replace(" ", "T")
 	});
 	if (!res || res.result == "ok") {
@@ -119,20 +142,42 @@ exports.set_device_time = function(clientid, datetime) {
  * @param {Boolean} member 是否恢复成员，true为恢复
  * @param {Boolean} log 是否恢复请求日志，true为恢复
  */
-exports.reset_device = function(clientid, record = true, member = false, log = true) {
-	return this.push("SetFactoryDefault", clientid, {
+exports.reset_device = async function(clientid, record = true, member = false, log = true) {
+	var res = await this.push("SetFactoryDefault", clientid, {
 		DefaltRecord: record ? "1" : "0",
 		DefaltPerson: member ? "1" : "0",
 		DefaltLog: log ? "1" : "0"
 	});
+
+	if (!res || res.result == "ok") {
+		return
+	}
+	return "恢复出厂设置失败"
 }
 
 /**
  * 查询下发进度
  * @param {String} clientid 设备sn
+ * @param {String} mode 查询方式 默认为更新
  */
-exports.get_progress = function(clientid) {
-	return this.push("QueryProgress", clientid, {});
+exports.get_progress = async function(clientid, mode = 'update') {
+	var type = "";
+	if (mode == 'update') {
+		type = "EditPersonsNew";
+	} else {
+		type = "DeletePersons";
+	}
+	var res = await this.push("QueryProgress", clientid, {
+		"QueryType": type
+	});
+	if (res) {
+		if (res.Status !== "0") {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	return -1;
 }
 
 /**
@@ -141,8 +186,12 @@ exports.get_progress = function(clientid) {
  * @param {Object} param 其他信息
  * @param {Number} longtime 超时回馈
  */
-exports.replacement = function(clientid, param, longtime = 0) {
-	return this.push("PullRecordOnlyName", clientid, param, longtime);
+exports.replacement = function(clientid, uuid, time, avatar) {
+	return this.push("PullRecordOnlyName", clientid, {
+		"personID": uuid,
+		"time": time,
+		"picinfo": avatar
+	}, longtime);
 }
 
 /**
@@ -191,7 +240,9 @@ exports.member_model_out = function(m) {
 		"cardType": 0,
 		"picURI": this.fullUrl(m.avatar)
 	}
-	if (m.time_valid_end && m.time_valid_end > date && m.time_valid_end <= endDate) {
+
+	if (m.time_valid_end && m.time_valid_end > "2021-01-01 00:00:00".toTime() && m.time_valid_end <=
+		"2038-01-01 00:00:00".toTime()) {
 		if (typeof(m.time_valid_start) == "object") {
 			obj.cardValidBegin = m.time_valid_start.toStr("yyyy-MM-dd hh:mm:ss");
 		} else {
@@ -215,17 +266,18 @@ exports.member_model_out = function(m) {
  * @param {Array} list 人员名单
  * @param {Number} longtime 超时回馈
  */
-exports.update_member_batch = function(clientid, list, longtime = 0) {
-	return this.pushS(clientid, {
+exports.update_member_batch = async function(clientid, list, longtime = 180) {
+	var res = await this.pushS(clientid, {
 		"messageId": this.get_msgid('EditPersonsNew'),
 		"DataBegin": "BeginFlag",
 		"DataEnd": "EndFlag",
-		"method": "EditPersonsNew",
+		"operator": "EditPersonsNew",
 		"PersonNum": list.length,
 		"info": list.map((o) => {
 			return this.member_model_out(o);
 		})
 	}, longtime);
+	return res;
 }
 
 /**
@@ -257,7 +309,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]);
 	}
 
 	/**
@@ -266,10 +318,8 @@ exports.init = function() {
 	 * @param {Object} param 其他信息
 	 */
 	m["Offline"] = async function(clientid, params) {
-		if (_this.drives[clientid]) {
-			_this.drives[clientid].online = 0;
-		}
-		console.log("离线", clientid, _this.drives[clientid]);
+		_this.update_online(clientid, 0);
+		// console.log("离线", clientid, _this.drives[clientid]);
 	};
 
 	/**
@@ -278,10 +328,13 @@ exports.init = function() {
 	 * @param {Object} param 其他信息
 	 */
 	m["Online"] = async function(clientid, params) {
-		if (!_this.drives[clientid]) {
-			_this.drives[clientid] = {};
-		}
-		_this.drives[clientid].online = 1;
+		await _this.update_online(clientid, 1, params.ip);
+		return {
+			"facesluiceId": clientid,
+			"result": "ok",
+			"detail": ""
+		};
+		console.log("上线", clientid, _this.drives[clientid]);
 	};
 
 	m["RecPush"] = async function(clientid, params, msg, id) {
@@ -366,7 +419,7 @@ exports.init = function() {
 			pass,
 			tip,
 			device
-		} = $.server.exec_qrcode(clientid, qrcode);
+		} = await $.server.exec_qrcode(clientid, qrcode);
 		if (device && device.online) {
 			await _this.unlock(clientid, uuid, pass, tip);
 		}

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

@@ -1,34 +1,24 @@
-{
-	// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
-	"name": "DF",
-	// mqtt 服务标题
-	"title": "原设备",
-	// mqtt 服务介绍
-	"description": "",
-	// 状态 0未启用，1启用
-	"state": 1,
-	// 订阅的主题
-	"topic": ["mqtt/face/#"],
-	// 主题回复
-	"topic_receive": ["mqtt/face/${clientid}"],
-	// 给客户端推送的主题
-	"topic_push": "mqtt/face/${clientid}",
-	// 接收方式
-	"qos": 1,
-	// 保持接收
-	"retain": true,
-	// 调用的脚本
-	"func_file": "./index.js",
-	// 客户端ID
-	"clientid": "facesluiceId",
-	// 消息ID
-	"msgid": "messageId",
-	// 请求方法
-	"method": "operator",
-	// 参数
-	"params": "info",
-	// 结果
-	"result": "info",
-	// 回复方法
-	"method_receive": "${method}-Ack"
+{
+    "name": "DF",
+    "title": "原设备",
+    "description": "",
+    "state": 1,
+    "topic": [
+        "mqtt/face/#"
+    ],
+    "topic_receive": [
+        "mqtt/face/${clientid}"
+    ],
+    "topic_push": "mqtt/face/${clientid}",
+    "qos": 2,
+    "qos_push": 2,
+    "retain": true,
+    "longtime": 10000,
+    "func_file": "./index.js",
+    "clientid": "facesluiceId",
+    "msgid": "messageId",
+    "method": "operator",
+    "params": "info",
+    "result": "info",
+    "method_receive": "${method}-Ack"
 }

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

@@ -53,11 +53,12 @@ exports.get_member_pic = function(clientid, avatar) {
  * @param {Boolean} pass 是否可通行 true为是
  * @param {String} tip 提示
  */
-exports.unlock = function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
-	return this.push("gpio control", clientid, {
+exports.unlock = async function(clientid, uuid = '0', pass = false, tip = '没有访问权限') {
+	var res = await this.push("gpio control", clientid, {
 		// 0不开门，1开门
 		"ctrl_type": pass ? "on" : "off"
 	});
+	return res
 }
 
 /**
@@ -115,12 +116,13 @@ exports.reboot_device = function(clientid) {
  * @param {String} clientid 设备sn
  * @param {String} datetime 日期时间
  */
-exports.set_device_time = function(clientid, datetime) {
-	return this.push("ss_set_timing", clientid, {
+exports.set_device_time = async function(clientid, datetime) {
+	var res = await this.push("ss_set_timing", clientid, {
 		"body": {
 			"datetime": datetime
 		}
 	});
+	return
 }
 
 /**
@@ -149,7 +151,52 @@ exports.reset_device = function(clientid, record = true, member = false, log = t
  * @param {String} clientid 设备sn
  */
 exports.get_progress = function(clientid) {
-	return this.push("QueryProgress", clientid, {});
+	// return this.push("QueryProgress", clientid, {});
+}
+
+/**
+ * 转换进入的消息
+ * @param {Object} push_topic
+ * @param {Object} msg
+ * @param {Object} topic
+ */
+exports.convert_in = function(push_topic, msg, topic) {
+	var cg = this.config;
+	var method = msg[cg.method];
+	var json = {
+		clientid: "",
+		id: msg[cg.msgid] || this.get_msgid(method, 'client'),
+		method
+	};
+	if (msg[cg.params]) {
+		json.params = msg[cg.params];
+	}
+	if (msg[cg.result]) {
+		json.result = msg[cg.result];
+	}
+	json.clientid = this.get_clientid(push_topic, json.params || json.result || {}, msg, topic);
+
+	if (push_topic.indexOf("heartbeat") !== -1) {
+		json.method = "mqtt_heartbeat";
+	}
+	return json;
+}
+
+// exports.main = function(push_topic, params, msg, topic, index) {
+// 	console.log(push_topic, params, msg, topic, index);
+// }
+
+/**
+ * 转换消息并推送
+ */
+exports.push = function(method, clientid, params, longtime = 0) {
+	var cg = this.config;
+	var msg = {};
+	msg.client_id = clientid;
+	msg[cg.msgid] = this.get_msgid(method);
+	msg[cg.method] = method;
+	Object.assign(msg, params);
+	return this.pushS(clientid, msg);
 }
 
 /**
@@ -283,9 +330,14 @@ exports.play_audio = async function(clientid, type = 3) {
 			break;
 	}
 	body.type = 0;
-	var res = await this.push("trylisten_wav", clientid, body);
+	var res = await this.push("trylisten_wav", clientid, {
+		body
+	});
 }
 
+// exports.convert_in = function(push_topic, msg, topic, index) {
+// 	console.log("收到", push_topic, msg, topic, index);
+// }
 
 /**
  * 初始化函数, 用于定义开放给前端的函数
@@ -299,6 +351,7 @@ exports.init = function() {
 			_this.drives[clientid] = {};
 		}
 		_this.drives[clientid].online = 1;
+		_this.drives[clientid].time_last = new Date().getTime();
 		console.log("心跳", clientid, _this.drives[clientid]);
 	}
 
@@ -308,10 +361,8 @@ exports.init = function() {
 	 * @param {Object} param 其他信息
 	 */
 	m["mqtt_online"] = async function(clientid, params) {
-		if (!_this.drives[clientid]) {
-			_this.drives[clientid] = {};
-		}
-		_this.drives[clientid].online = 1;
+		_this.update_online(clientid, 1);
+		console.log("上线", clientid, _this.drives[clientid]);
 	};
 
 	m["RecPush"] = async function(clientid, params, msg, id) {
@@ -414,14 +465,20 @@ exports.init = function() {
 			pass,
 			tip,
 			device
-		} = $.server.exec_qrcode(clientid, qrcode);
+		} = await $.server.exec_qrcode(clientid, qrcode);
+		console.log('扫码', qrcode, uuid,
+			pass,
+			tip,
+			device)
 		if (device && device.online) {
-			await _this.unlock(clientid, uuid, pass, tip);
+			console.log("看门", clientid.toLocaleUpperCase(), uuid, pass, tip);
+			await _this.unlock(clientid.toLocaleUpperCase(), uuid, pass, tip);
 		}
-
 		if (tip) {
-			if (tip.indexOf("过期")) {
+			if (tip.indexOf("过期") !== -1) {
 				_this.play_audio(clientid, 1);
+			} else if (tip.indexOf("通行") !== -1) {
+				// _this.play_audio(clientid, 3);
 			} else {
 				_this.play_audio(clientid, 2);
 			}

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

@@ -8,13 +8,13 @@
 	// 状态 0未启用，1启用
 	"state": 1,
 	// 订阅的主题
-	"topic": ["face/response", "qr/response", "online/response", "heartbeat/response"],
+	"topic": ["face/+/response", "face/response", "qr/response", "online/response", "heartbeat/response"],
 	// 主题回复
-	"topic_receive": ["mqtt/face/${clientid}"],
+	"topic_receive": ["face/${clientid}/request", "face/request"],
 	// 给客户端推送的主题
 	"topic_push": "face/${clientid}/request",
 	// 接收方式
-	"qos": 1,
+	"qos": 2,
 	// 保持接收
 	"retain": true,
 	// 调用的脚本

package/package.json

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