mm_os 2.2.7 → 2.2.8

package/core/com/mqtt/drive.js

@@ -312,9 +312,9 @@ Drive.prototype.pushS = function(clientid, msg, longtime) {
 Drive.prototype.push = function(method, clientid, params, longtime = 0) {
 	var cg = this.config;
 	var msg = {};
-	cg[cg.msgid] = this.get_msgid(method);
-	cg[cg.method] = method;
-	cg[cg.params] = params;
+	msg[cg.msgid] = this.get_msgid(method);
+	msg[cg.method] = method;
+	msg[cg.params] = params;
 	return this.pushS(clientid, msg);
 }
 
@@ -366,7 +366,8 @@ Drive.prototype.exec = async function(clientid, key, json) {
 /**
  * 获取客户端ID
  * @param {String} push_topic 推送过来的主题
- * @param {Object} msg 消息
+ * @param {Object} body 消息主体
+ * @param {Object} msg 消息源
  * @param {String} topic 订阅的主题
  */
 Drive.prototype.get_clientid = function(push_topic, body, msg, topic) {
@@ -382,7 +383,7 @@ Drive.prototype.get_clientid = function(push_topic, body, msg, topic) {
 /**
  * 数据格式转换-转入
  * @param {String} push_topic 推送过来的主题
- * @param {Object} msg 消息主体
+ * @param {Object} msg 消息源
  * @param {Number} index 索引
  * @param {String} topic 订阅的主题
  */
@@ -396,12 +397,11 @@ Drive.prototype.convert_in = function(push_topic, msg, topic, index) {
 	};
 	if (msg[cg.params]) {
 		json.params = msg[cg.params];
-		json.clientid = this.get_clientid(push_topic, json.params, msg, topic);
 	}
 	if (msg[cg.result]) {
-		json.result = msg[cg.result]
-		json.clientid = this.get_clientid(push_topic, json.result, msg, topic);
+		json.result = msg[cg.result];
 	}
+	json.clientid = this.get_clientid(push_topic, json.params || json.result || {}, msg, topic);
 	return json;
 }
 
@@ -480,7 +480,7 @@ Drive.prototype.handle = async function(push_topic, msg, topic, index) {
 						obj[cg.result] = ret;
 						var topic_receive = this.get_topic(arr_tc[index], json.clientid, params);
 						var reply_msg = this.convert_out(topic_receive, obj, topic, index);
-						this.send(topic_receive, reply_msg);
+						await this.send(topic_receive, reply_msg);
 					}
 				}
 			}

package/package.json

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