mm_os 2.5.9 → 2.6.1

package/core/com/api/drive.js

@@ -720,4 +720,26 @@ Drive.prototype.runRPC = async function(db, method, query, body) {
 	return ret;
 };
 
+/**
+ * 获取插件
+ * @param {String} app 应用名称
+ * @param {String} name 插件名称
+ * @returns {Object} 返回获取到的插件
+ */
+Drive.prototype.plugin = function(app, name) {
+	var plus;
+	var l = $.slash;
+	if (!app) {
+		app = this.filename.between("app" + l, l);
+	}
+	if (!name) {
+		name = this.filename.between("plugin" + l, l);
+	}
+	var plugins = $.pool.plugin[app];
+	if (plugins) {
+		plus = plugins.get(name);
+	}
+	return plus
+}
+
 module.exports = Drive;

package/core/com/cmd/drive.js

@@ -519,4 +519,26 @@ Drive.prototype.view = function(msg, db) {
 	return ret.trim();
 };
 
+/**
+ * 获取插件
+ * @param {String} app 应用名称
+ * @param {String} name 插件名称
+ * @returns {Object} 返回获取到的插件
+ */
+Drive.prototype.plugin = function(app, name) {
+	var plus;
+	var l = $.slash;
+	if (!app) {
+		app = this.filename.between("app" + l, l);
+	}
+	if (!name) {
+		name = this.filename.between("plugin" + l, l);
+	}
+	var plugins = $.pool.plugin[app];
+	if (plugins) {
+		plus = plugins.get(name);
+	}
+	return plus
+}
+
 module.exports = Drive;

package/core/com/mqtt/drive.js

@@ -568,5 +568,26 @@ Drive.prototype.main_after = async function(ret, push_topic, msg, topic, index)
 	await this.message(push_topic, msg, topic, index);
 };
 
+/**
+ * 获取插件
+ * @param {String} app 应用名称
+ * @param {String} name 插件名称
+ * @returns {Object} 返回获取到的插件
+ */
+Drive.prototype.plugin = function(app, name) {
+	var plus;
+	var l = $.slash;
+	if (!app) {
+		app = this.filename.between("app" + l, l);
+	}
+	if (!name) {
+		name = this.filename.between("plugin" + l, l);
+	}
+	var plugins = $.pool.plugin[app];
+	if (plugins) {
+		plus = plugins.get(name);
+	}
+	return plus
+}
 
 module.exports = Drive;

package/core/com/plugin/drive.js

@@ -1,4 +1,5 @@
 const Item = require('mm_machine').Item;
+const Log = require('./log.js');
 
 /**
  * Plugin插件驱动类
@@ -66,6 +67,61 @@ class Drive extends Item {
 	}
 }
 
+/**
+ * 插件初始化之后
+ */
+Drive.prototype.init_after = function() {
+	var file = this.filename;
+	var filename = file.replace('app', 'log').replace($.slash + 'plugin', '').replace('json', 'log').replace($
+		.slash + 'plugin.log', '.log');
+	this.log = new Log({
+		filename
+	});
+}
+
+/**
+ * 重启设备
+ * @param {Object} option 配置
+ */
+Drive.prototype.restart = function(option) {
+	this.stop();
+	this.start();
+}
+
+/**
+ * 更新配置
+ */
+Drive.prototype.update_options = function(options = []) {
+	var op = this.config.options;
+	var list = [];
+	for (var i = options.length - 1; i >= 0; i--) {
+		var o = options[i];
+		var obj = op.get({
+			name: o.name
+		});
+		if (obj) {
+			Object.assign(obj, o);
+		} else {
+			list.push(o);
+			// options.splice(i, 1);
+		}
+	}
+	for (var i = 0; i < options.length; i++) {
+		var o = options[i];
+		op.push(o);
+	}
+}
+
+/**
+ * 更新配置后
+ * @param {Object} options
+ */
+Drive.prototype.update_options_after = function(options) {
+	// if (this.config.state) {
+	// 	this.restart();
+	// }
+}
+
 /**
  * 获取配置参数
  * @return {Object} 返回配置参数

package/core/com/plugin/log.js

@@ -0,0 +1,156 @@
+/**
+ * 日志类
+ */
+class Log {
+	/**
+	 * 构造函数
+	 * @param {Object} config 配置参数
+	 */
+	constructor(config) {
+		this.config = {
+			filename: '/log/output.log',
+			console: false
+		};
+		this.init(config);
+	}
+}
+
+/**
+ * 初始化
+ * @returns {Object} 配置参数
+ */
+Log.prototype.init = function(config) {
+	Object.assign(this.config, config);
+	this.config.filename.addDir();
+}
+
+/**
+ * 加载日志
+ * @returns {String} 返回日志内容
+ */
+Log.prototype.load = function() {
+	return this.config.filename.loadText() || "";
+}
+
+/**
+ * 保存日志
+ * @param {String} text 日志
+ */
+Log.prototype.save = function(text) {
+	return this.config.filename.saveText(text);
+}
+
+/**
+ * 读取日志指定条
+ * @param {Number} index 索引，默认为最后一条
+ */
+Log.prototype.read = function(index = -1) {
+	var text = this.load();
+	var arr = text.split(/\n\[/);
+	if (index < 0) {
+		index = arr.length - 1;
+	}
+	var str = arr[index];
+	if (index == 0) {
+		return str;
+	}
+	return "[" + str;
+}
+
+/**
+ * 获取日志列表
+ * @returns {Array} 返回日志列表
+ */
+Log.prototype.list = function() {
+	var text = this.load();
+	var arr = text.split(/\n\[/);
+	return arr.map((str, i) => {
+		if (i == 0) {
+			return str;
+		}
+		return "[" + str;
+	});
+}
+
+/**
+ * 添加日志
+ * @param {String} type 日志类型
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.add = function(type, tag, ...arg) {
+	var now = new Date();
+	var datetime = now.toStr('yyyy-MM-dd hh:mm:ss');
+	var list = new Array(arg);
+	var content = "";
+	for (var i = 0; i < list.length; i++) {
+		var o = list[i];
+		content += " " + o.toString();
+	}
+	var str = `\n[${datetime}] [${type}] ${tag} -` + content;
+	var text = this.load();
+	text += str;
+	this.save(text.trim());
+}
+
+/**
+ * @description 信息
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.debug = function(tag, ...arg) {
+	if (this.config.console) {
+		console.log(tag, ...arg);
+	}
+	this.add('debug', tag, ...arg);
+};
+
+/**
+ * @description 信息
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.info = function(tag, ...arg) {
+	if (this.config.console) {
+		console.info(tag.blue, ...arg);
+	}
+	this.add('info', tag, ...arg);
+};
+
+/**
+ * @description 信息
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.warn = function(tag, ...arg) {
+	if (this.config.console) {
+		console.warn(tag.yellow, ...arg);
+	}
+	this.add('warn', tag, ...arg);
+};
+
+/**
+ * @description 信息
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.error = function(tag, ...arg) {
+	if (this.config.console) {
+		console.error(tag.red, ...arg);
+	}
+	this.add('error', tag, ...arg);
+};
+
+/**
+ * @description 成功
+ * @param {String} tag 日志标签
+ * @param {Object} arg 其他要输出的信息
+ */
+Log.prototype.success = function(tag, ...arg) {
+	if (this.config.console) {
+		console.success(tag.green, ...arg);
+	}
+	this.add('debug', tag, ...arg);
+};
+
+module.exports = Log;

package/core/com/plugin/script.js

@@ -67,7 +67,17 @@ module.exports = {
 		var msg = null;
 		return msg;
 	},
-
+	/**
+	 * 重启，如果插件处于开启状态，当配置发生更改时或插件更新时会执行重启
+	 * @param {Object} option 配置参数
+	 * @return {String} 成功返回null,否则返回错误提示
+	 */
+	restart(option) {
+		var msg = null;
+		this.stop();
+		this.start();
+		return msg;
+	},
 	/**
 	 * 结束
 	 * @param {Object} opiton 配置参数
@@ -77,7 +87,15 @@ module.exports = {
 		var msg = null;
 		return msg;
 	},
-
+	/**
+	 * 更新配置后，当用户在后台更改配置时触发
+	 * @param {Object} options
+	 */
+	update_options_after = function(options) {
+		if (this.config.state) {
+			this.restart();
+		}
+	},
 	/**
 	 * 插件
 	 * @param {String} item 插件项
@@ -141,4 +159,4 @@ module.exports = {
 		var ret = "";
 		return ret;
 	}
-};
+};

package/core/com/socket/drive.js

@@ -379,4 +379,26 @@ Drive.prototype.load_after = function() {
 	};
 };
 
+/**
+ * 获取插件
+ * @param {String} app 应用名称
+ * @param {String} name 插件名称
+ * @returns {Object} 返回获取到的插件
+ */
+Drive.prototype.plugin = function(app, name) {
+	var plus;
+	var l = $.slash;
+	if (!app) {
+		app = this.filename.between("app" + l, l);
+	}
+	if (!name) {
+		name = this.filename.between("plugin" + l, l);
+	}
+	var plugins = $.pool.plugin[app];
+	if (plugins) {
+		plus = plugins.get(name);
+	}
+	return plus
+}
+
 module.exports = Drive;

package/core/com/task/drive.js

@@ -373,4 +373,26 @@ Drive.prototype.dispose = function() {
 	this.timeout = undefined;
 };
 
+/**
+ * 获取插件
+ * @param {String} app 应用名称
+ * @param {String} name 插件名称
+ * @returns {Object} 返回获取到的插件
+ */
+Drive.prototype.plugin = function(app, name) {
+	var plus;
+	var l = $.slash;
+	if (!app) {
+		app = this.filename.between("app" + l, l);
+	}
+	if (!name) {
+		name = this.filename.between("plugin" + l, l);
+	}
+	var plugins = $.pool.plugin[app];
+	if (plugins) {
+		plus = plugins.get(name);
+	}
+	return plus
+}
+
 module.exports = Drive;

package/demo/app/test/plugin/main/api_demo_client/test/index.js

@@ -5,15 +5,16 @@
  * @return {Object} 执行结果
  */
 async function main(ctx, db) {
+	var ret;
 	// 获取请求参数
 	var req = ctx.request;
 	var {
 		query,
 		body
 	} = req;
-	
+
 	var user = await this.get_state(ctx, db);
-	
+
 	// console.log("用户", user);
 	// return "hello world" + JSON.stringify(body);
 
@@ -25,13 +26,28 @@ async function main(ctx, db) {
 
 	} else if (m === "set") {
 
+	} else if (m === "update") {
+		var plus = this.plugin();
+		plus.run('update_options', [{
+			name: "sandbox",
+			value: true
+		}]);
+		var op = plus.get_options();
+		console.log("当前配置", op);
+		ret = $.ret.bl(op["sandbox"]);
 	} else {
-
+		// var plugins = $.pool.plugin["test"];
+		// var plus = plugins.get("main");
+		// console.log("获取插件", plus);
+		// plus.log.debug("调用接口", "/api/test");
+		var plus = this.plugin();
+		console.log("获取插件", plus);
+		ret = $.ret.list(plus.log.list());
 	}
 	// var plus = $.plugin_admin('test');
 	// plus.run("main", "start");
 	// plus.run("main", "stop");
-	var ret = await this.sql.run(query, body, db);
+	// var ret = await this.sql.run(query, body, db);
 	return ret;
 };
 

package/demo/app/test/plugin/main/index.js

@@ -56,7 +56,19 @@ module.exports = {
 	 */
 	start(option) {
 		var msg = null;
-		console.log("启动了", this.get_options());
+		var options = this.get_options();
+		console.log("启动了", options);
+		this.log.info("启动了", "示例插件", options);
+		// try {
+		// 	var a = asr;
+		// } catch (error) {
+		// 	this.log.error("执行失败!", error);
+		// }
+		var list = this.log.list();
+		console.log(list.length);
+
+		var str = this.log.read();
+		console.log("打印最后一条输出记录", str);
 		return msg;
 	},
 
@@ -144,4 +156,4 @@ module.exports = {
 		var ret = "";
 		return ret;
 	}
-};
+};

package/demo/app/test/{task → plugin/main/task}/demo_task/index.js

@@ -29,7 +29,7 @@ exports.notify = async function(name, state) {
 			$.log.debug('任务-已到期');
 			break;
 		case "completed":
-			$.log.debug('任务-已完成');
+			$.log.debug('任务-已完成', this.plugin().log.list().length);
 			break;
 		default:
 			break;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "2.5.9",
+	"version": "2.6.1",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -35,7 +35,7 @@
 		"koa-compress": "^5.1.1",
 		"koa-send": "^5.0.1",
 		"koa-websocket": "^7.0.0",
-		"mm_check": "^1.4.8",
+		"mm_check": "^1.4.9",
 		"mm_excel": "^1.2.0",
 		"mm_expand": "^1.7.7",
 		"mm_html": "^1.1.6",
@@ -50,7 +50,7 @@
 		"mm_session": "^1.4.8",
 		"mm_statics": "^1.4.8",
 		"mm_tpl": "^2.3.9",
-		"mm_xml": "^1.1.5",
+		"mm_xml": "^1.1.6",
 		"mosca": "^2.8.3",
 		"mqtt": "^5.10.3",
 		"publish": "^0.6.0"