mm_os 2.6.5 → 2.6.7

package/core/com/mqtt/index.js

@@ -172,9 +172,6 @@ MQTT.prototype.reconnect = function() {
  */
 MQTT.prototype.init = function(config) {
 	this.config = Object.assign(this.config, config);
-	this.client = {
-		connected: false
-	};
 	this.retryTimes = 0;
 	this.connecting = false;
 };
@@ -196,7 +193,7 @@ MQTT.prototype.start = function() {
 		} else {
 			this.client = MQTT_client.connect(cg);
 		}
-		if (this.client.on) {
+		if (this.client && this.client.on) {
 			return new Promise((resolve, reject) => {
 				this.client.on('connect', (packet, err) => {
 					this.connecting = false;
@@ -334,7 +331,13 @@ MQTT.prototype.unsubscribe = function(topic, key) {
  * 结束客户端
  */
 MQTT.prototype.end = function() {
-	this.client.end();
+	if (this.client) {
+		this.client.end();
+	}
+	if (this.timer) {
+		clearInterval(this.timer);
+		this.timer = null;
+	}
 };
 
 /**

package/core/com/plugin/index.js

@@ -112,7 +112,8 @@ Plugin.prototype.zip = async function(name) {
  * @returns {Boolean} 返回解压结果
  */
 Plugin.prototype.unzip = async function(file) {
-	var dir = "/cache/plugin".fullname();
+	var name = file.basename().left(".");
+	var dir = `/cache/plugin/${name}`.fullname();
 	dir.addDir();
 	var ret;
 	try {
@@ -183,11 +184,13 @@ Plugin.prototype.install = async function(file) {
 				if (name) {
 					var dir = `/app/${app}/plugin/${name}`;
 					await this.copy_dir(dir_src, dir);
-					dir_src.delDir();
 					var cs = $.pool.plugin[app];
 					if (cs) {
-						await cs.update();
+						await cs.update(`/app/${app}/`.fullname());
 						await cs.exec(name, 'install');
+						setTimeout(() => {
+							ret.dir.delDir();
+						}, 3000)
 					}
 					return {
 						app,
@@ -201,6 +204,33 @@ Plugin.prototype.install = async function(file) {
 	}
 }
 
+// /**
+//  * 更新插件
+//  * @param {String} name 插件名称
+//  * @returns {Object} 返回更新结果
+//  */
+// Plugin.prototype.update = async function(name) {
+// 	var plus = this.get(name);
+// 	if (plus) {
+// 		var cg = plus.config;
+// 		// 先将配置缓存
+// 		var file = `/cache/config/${cg.app}_${cg.name}.json`;
+// 		file.saveJson(cg);
+
+// 		var dir = plus.filename.dirname();
+
+// 		// 判断是否存在git仓库
+// 		if (cg.git) {
+// 			if (dir.hasDir('.git')) {
+// 				// "git fetch";
+// 				// "git reset --hard origin/master"
+// 			}
+// 		}
+// 	} else {
+// 		ret = $.ret.error("更新失败！原因：插件不存在");
+// 	}
+// }
+
 module.exports = Plugin;
 
 

package/package.json

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