mm_os 2.6.4 → 2.6.6

package/core/com/plugin/drive.js

@@ -1,3 +1,4 @@
+const compressing = require('compressing');
 const Item = require('mm_machine').Item;
 const Log = require('./log.js');
 const conf = require('mm_config');
@@ -445,4 +446,17 @@ Drive.prototype.run_chat = async function(from_user, to_user, content, group, ty
 	return ret;
 };
 
+/**
+ * 压缩主题模板
+ */
+Drive.prototype.zip = async function(zip_dir = "/static/file/zip/") {
+	var dir = this.filename.dirname();
+	var file = ("./" + this.config.name + '.zip').fullname(zip_dir);
+	var done = await compressing.zip.compressDir(dir, file);
+	if (file.hasFile()) {
+		return file;
+	}
+	return null;
+}
+
 module.exports = Drive;

package/core/com/plugin/index.js

@@ -1,3 +1,4 @@
+const compressing = require('compressing');
 const Index = require('mm_machine').Index;
 const Drive = require('./drive');
 
@@ -92,6 +93,144 @@ Plugin.prototype.load = function(path) {
 	}
 };
 
+/**
+ * 压缩插件
+ * @param {Object} name 插件名称
+ * @returns {Boolean} 返回压缩路径
+ */
+Plugin.prototype.zip = async function(name) {
+	var plus = this.get(name);
+	if (plus) {
+		return await plus.zip();
+	}
+	return null;
+}
+
+/**
+ * 解压插件
+ * @param {Object} file 插件压缩文件
+ * @returns {Boolean} 返回解压结果
+ */
+Plugin.prototype.unzip = async function(file) {
+	var name = file.basename().left(".");
+	var dir = `/cache/plugin/${name}`.fullname();
+	dir.addDir();
+	var ret;
+	try {
+		await compressing.zip.uncompress(file, dir);
+		ret = {
+			file,
+			dir
+		};
+	} catch (err) {
+		$.log.error("插件解压失败！", err);
+	}
+	return ret;
+}
+
+/**
+ * 卸载插件
+ * @param {String} name 插件名称
+ * @returns {String} 返回卸载路径
+ */
+Plugin.prototype.uninstall = async function(name) {
+	var plus = this.get(name);
+	if (plus) {
+		await plus.run('uninstall');
+		var obj = this.del(name, true);
+		if (obj) {
+			var file = obj.filename;
+			// 删除目录
+			file.dirname().delDir();
+			return file
+		}
+	}
+	return null;
+}
+
+/**
+ * 复制目录
+ * @param {String} dir_src 原路径
+ * @param {String} dir 新路径
+ * @returns {Object} 返回复制结果
+ */
+Plugin.prototype.copy_dir = function(dir_src, dir) {
+	return new Promise((resolve, reject) => {
+		$.dir.copy(dir_src, dir, () => {
+			resolve({
+				dir_src,
+				dir
+			});
+		});
+	});
+}
+
+/**
+ * 安装插件
+ * @param {String} file 插件压缩文件
+ * @returns {Object} 返回解压结果
+ */
+Plugin.prototype.install = async function(file) {
+	var ret = await this.unzip(file);
+	if (ret) {
+		var dirs = $.dir.get(ret.dir);
+		if (dirs.length) {
+			var dir_src = dirs[0];
+			var file = "./plugin.json".fullname(dir_src);
+			var config = file.loadJson();
+			if (config) {
+				var app = config.app || 'sys';
+				var name = config.name;
+				if (name) {
+					var dir = `/app/${app}/plugin/${name}`;
+					await this.copy_dir(dir_src, dir);
+					var cs = $.pool.plugin[app];
+					if (cs) {
+						await cs.update(`/app/${app}/`.fullname());
+						await cs.exec(name, 'install');
+						setTimeout(() => {
+							ret.dir.delDir();
+						}, 3000)
+					}
+					return {
+						app,
+						name,
+						dir_src,
+						dir
+					}
+				}
+			}
+		}
+	}
+}
+
+// /**
+//  * 更新插件
+//  * @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,58 +1,59 @@
-{
-	"name": "mm_os",
-	"version": "2.6.4",
-	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
-	"main": "index.js",
-	"scripts": {
-		"test": "cross-env NODE_ENV=test node ./demo/index.js",
-		"start": "node --trace-warnings ./demo/index.js",
-		"dev": "cross-env NODE_ENV=development nodemon ./demo/index.js"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://gitee.com/qiuwenwu91/mm_os.git"
-	},
-	"keywords": [
-		"超级美眉",
-		"游戏",
-		"系统",
-		"物联网",
-		"服务端",
-		"框架",
-		"函数式",
-		"公众号",
-		"MM",
-		"game",
-		"iot",
-		"server",
-		"framework"
-	],
-	"author": "邱文武",
-	"license": "ISC",
-	"dependencies": {
-		"koa": "^2.15.3",
-		"koa-body": "^6.0.1",
-		"koa-compress": "^5.1.1",
-		"koa-send": "^5.0.1",
-		"koa-websocket": "^7.0.0",
-		"mm_check": "^1.4.9",
-		"mm_excel": "^1.2.0",
-		"mm_expand": "^1.7.7",
-		"mm_html": "^1.1.6",
-		"mm_koa_proxy": "^1.0.0",
-		"mm_logs": "^1.1.6",
-		"mm_machine": "^1.8.1",
-		"mm_mongodb": "^1.4.2",
-		"mm_mqtt": "^1.0.6",
-		"mm_mysql": "^1.8.6",
-		"mm_redis": "^1.4.2",
-		"mm_ret": "^1.3.9",
-		"mm_session": "^1.4.8",
-		"mm_statics": "^1.4.8",
-		"mm_tpl": "^2.3.9",
-		"mm_xml": "^1.1.6",
-		"mosca": "^2.8.3",
-		"mqtt": "^5.10.3",
-		"publish": "^0.6.0"
-	}
-}
+{
+  "name": "mm_os",
+  "version": "2.6.6",
+  "description": "这是超级美眉服务端框架，用于快速构建应用程序。",
+  "main": "index.js",
+  "scripts": {
+    "test": "cross-env NODE_ENV=test node ./demo/index.js",
+    "start": "node --trace-warnings ./demo/index.js",
+    "dev": "cross-env NODE_ENV=development nodemon ./demo/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/qiuwenwu91/mm_os.git"
+  },
+  "keywords": [
+    "超级美眉",
+    "游戏",
+    "系统",
+    "物联网",
+    "服务端",
+    "框架",
+    "函数式",
+    "公众号",
+    "MM",
+    "game",
+    "iot",
+    "server",
+    "framework"
+  ],
+  "author": "邱文武",
+  "license": "ISC",
+  "dependencies": {
+    "koa": "^2.15.3",
+    "koa-body": "^6.0.1",
+    "koa-compress": "^5.1.1",
+    "koa-send": "^5.0.1",
+    "koa-websocket": "^7.0.0",
+    "mm_check": "^1.4.9",
+    "mm_excel": "^1.2.0",
+    "mm_expand": "^1.7.7",
+    "mm_html": "^1.1.6",
+    "mm_koa_proxy": "^1.0.0",
+    "mm_logs": "^1.1.6",
+    "mm_machine": "^1.8.1",
+    "mm_mongodb": "^1.4.2",
+    "mm_mqtt": "^1.0.6",
+    "mm_mysql": "^1.8.6",
+    "mm_os": "^2.6.4",
+    "mm_redis": "^1.4.2",
+    "mm_ret": "^1.3.9",
+    "mm_session": "^1.4.8",
+    "mm_statics": "^1.4.8",
+    "mm_tpl": "^2.3.9",
+    "mm_xml": "^1.1.6",
+    "mosca": "^2.8.3",
+    "mqtt": "^5.10.3",
+    "publish": "^0.6.0"
+  }
+}