mm_os 2.9.1 → 2.9.3

package/core/com/eventer/com.js

@@ -151,8 +151,8 @@ Eventer.prototype.doing = async function(o, ...msg) {
 		if (types.isPromise(ret)) {
 			ret = await ret;
 		}
-		if (this.mode > 2) {
-			o.load(o.filename);
+		if (this.mode > 4) {
+			o.exec('reload', o.filename);
 		}
 	} catch (err) {
 		$.log.error("事件器执行失败！", err);

package/core/com/middleware/com.js

@@ -7,14 +7,20 @@ class Middleware {
 		// 中间件列表
 		this.list = [];
 
-		this.config = Object.assign({
+		this.config = {
 			path: "./middleware".fullname($.runPath),
 			file: "middleware.json",
 			mode: "web"
-		}, config);
+		};
+		this.init(config);
 	}
 }
 
+Middleware.prototype.init = function(config) {
+	if (config) {
+		Object.assign(this.config, config);
+	}
+}
 
 /**
  * 新建脚本
@@ -58,8 +64,7 @@ Middleware.prototype.new_config = function(file) {
  * 加载配置
  * @param {String} file 配置文件路径
  */
-Middleware.prototype.load = function(file) {
-	var f = this.config.file;
+Middleware.prototype.load_item = function(file) {
 	var config = file.loadJson();
 	if (config) {
 		var cg = this.list.getObj({
@@ -69,7 +74,7 @@ Middleware.prototype.load = function(file) {
 			$.push(cg, config, true);
 		} else {
 			cg = {
-				func_file: file.replace(f, 'index.js')
+				func_file: file.replace(this.config.file, 'index.js')
 			}
 			$.push(cg, config, true);
 			this.list.push(cg);
@@ -87,14 +92,15 @@ Middleware.prototype.load = function(file) {
  * 遍历加载配置
  * @param {Object} path
  */
-Middleware.prototype.each_load = function(path) {
+Middleware.prototype.update_config_all = function(path, accurate) {
 	if (path.hasDir()) {
-		var dirs = $.dir.getAll(path);	
+		var dirs = $.dir.getAll(path);
 		// 遍历目录路径
 		var file = this.config.file;
-		dirs.map((d) => {
-			this.load(d + file);
-		});
+		for (var i = 0; i < dirs.length; i++) {
+			var d = dirs[i];
+			this.load_item(d + file);
+		}
 	}
 };
 
@@ -105,24 +111,43 @@ Middleware.prototype.sort = function() {
 	return this.list.sortBy('asc', 'sort');
 };
 
+/**
+ * 清除接口缓存
+ */
+Middleware.prototype.clear = function() {
+	this.list = [];
+};
+
 /**
  * 遍历加载配置
  */
-Middleware.prototype.init = function(path) {
-	this.each_load("../../../middleware/".fullname(__dirname));
+Middleware.prototype.update_config = function(path, accurate = true, clear = true) {
+	if (clear) {
+		this.clear();
+	}
+	this.update_config_all("../../../middleware/".fullname(__dirname));
 	if (path) {
-		this.each_load(path);
+		this.update_config_all(path);
 	}
-	this.each_load(this.config.path);
+	this.update_config_all(this.config.path);
 	var p = "./middleware".fullname($.runPath);
 	if (this.config.path !== p) {
-		this.each_load(p);
+		this.update_config_all(p);
 	}
 	this.sort();
 };
 
+/**
+ * 更新
+ * @param {String} dir 检索的路径
+ * @param {Boolean} loadJS 是否加载JS
+ */
+Middleware.prototype.update = function(dir, accurate = true, loadJS = true, clear = true) {
+	this.update_config(dir, accurate, clear);
+}
+
 if (!$.middleware) {
 	$.middleware = new Middleware();
 }
 
-module.exports = Middleware;
+module.exports = Middleware;

package/core/com/mqtt/drive.js

@@ -16,7 +16,8 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./mqtt.json";
-
+		
+		this.mode = 3;
 		/* 通用项 */
 		/**
 		 * 配置参数
@@ -400,7 +401,7 @@ Drive.prototype.run_event = function(clientid, key, json) {
  * @param {String} msgid 消息ID
  * @param {Object} json 信息
  */
-Drive.prototype.exec = async function(clientid, key, json) {
+Drive.prototype.run = async function(clientid, key, json) {
 	var o;
 	if (this.drives[clientid]) {
 		o = this.drives[clientid][key];
@@ -495,7 +496,7 @@ Drive.prototype.handle = async function(push_topic, msg, topic, index) {
 	var id = json.id;
 	if (json.result && id) {
 		var key = this.get_key(json.method, json.clientid, id);
-		var o = await this.exec(json.clientid, key, json.result);
+		var o = await this.run(json.clientid, key, json.result);
 		if (o) {
 			return
 		}

package/core/com/mqtt/index.js

@@ -21,22 +21,24 @@ class MQTT extends Index {
 	constructor(scope, title) {
 		super(scope, __dirname);
 		this.Drive = Drive;
+		// 更新并重载脚本
+		this.mode = 3;
 		this.type = "mqtt";
 		this.title = title;
 		this.dict = {};
-
 		this.config = {
 			hostname: "127.0.0.1",
 			port: "1883",
 			protocol: "mqtt",
-			clientId: "de",
-			subscribe_qos: 0,
+			clientId: "iot_test",
+			subscribe_qos: 1,
 			publish_qos: 1,
-			username: "de",
+			username: "iot_test",
 			password: "asd123",
 			table: "iot_device",
 			clean: false,
 			longtime: 15000,
+			requestTimeout: 3000,
 			// 在线有效期时长判断 单位：毫秒，150000毫秒为2.5分钟
 			online_expires: 150000,
 			// 在线有效期检测间隔
@@ -123,7 +125,7 @@ MQTT.prototype.match = function(topic, top) {
 /**
  * 初始化
  */
-MQTT.prototype.update_after = function() {
+MQTT.prototype.update_after = async function() {
 	var _this = this;
 	var list = this.list;
 	for (var i = 0, o; o = list[i++];) {
@@ -133,7 +135,7 @@ MQTT.prototype.update_after = function() {
 					_this.send(topic, msg, qos, retain);
 				}
 			};
-			o.run('init');
+			await o.exec('init');
 			var topics = o.config.topic;
 			if (topics) {
 				for (var i = 0; i < topics.length; i++) {
@@ -273,7 +275,7 @@ MQTT.prototype.receive = async function(push_topic, msg) {
 				for (var i = 0; i < topics.length; i++) {
 					var topic = topics[i];
 					if (this.match(push_topic, topic)) {
-						ret = await o.run("main", push_topic, msg, topic, i);
+						ret = await o.exec('handle', push_topic, msg, topic, i);
 					}
 				}
 			}
@@ -410,7 +412,7 @@ MQTT.prototype.reqASync = function(topic, method, params) {
 				resolve(null);
 				reject("request timeout!");
 			}
-		}, 3000);
+		}, _this.config.requestTimeout);
 	});
 };
 

package/core/com/nav/drive.js

@@ -29,7 +29,7 @@ class Drive extends Item {
 		// 模板路径
 		this.tpl_path = "./tpl/";
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		/* 通用项 */
 		// 配置参数
 		this.config = {
@@ -349,24 +349,6 @@ Drive.prototype.new_config = function(file) {
 	file.saveText(JSON.stringify(cg, null, 4));
 };
 
-/**
- * 载入配置
- * @param {Object|String} cg 配置对象或配置路径
- */
-Drive.prototype.load = function(cg) {
-	var obj;
-	if (!cg) {
-		cg = this.extensions;
-	}
-	if (typeof(cg) === "string") {
-		obj = this.loadFile(cg);
-	} else {
-		obj = cg;
-	}
-	this.loadObj(obj);
-};
-
-
 /**
  * 获取API配置
  * @param {String} app 应用域名

package/core/com/nav/index.js

@@ -19,7 +19,7 @@ class Nav extends Index {
 		this.type = "nav";
 		this.title = title;
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 

package/core/com/param/drive.js

@@ -14,7 +14,7 @@ class Drive extends Item {
 		super(dir, __dirname);
 		this.default_file = "./param.json";
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		/* 通用项 */
 		// 配置参数
 		this.config = {

package/core/com/param/index.js

@@ -19,36 +19,10 @@ class Param extends Index {
 		this.type = "param";
 		this.title = title;
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 
-/**
- * 加载配置
- * @param {String} path 检索路径
- */
-Param.prototype.load = function(path) {
-	if (!path) {
-		path = "./app/";
-	}
-	// 获取所有应用路径
-	var search_dir;
-	var _this = this;
-	if (this.scope && this.scope !== $.val.scope) {
-		search_dir = this.type + '_' + this.scope;
-		var list_scope = $.dir.getAll(path, search_dir);
-		list_scope.map(function(f) {
-			// 获取所有param配置文件
-			var list_file = $.file.getAll(f, "*" + _this.type + ".json");
-			_this.load_list(list_file);
-		});
-	} else {
-		// 获取所有param配置文件
-		var list_file = $.file.getAll(path, "*" + _this.type + ".json");
-		_this.load_list(list_file);
-	}
-};
-
 /**
  * 排序
  */

package/core/com/plugin/drive.js

@@ -18,7 +18,7 @@ class Drive extends Item {
 		super(dir, __dirname);
 		this.default_file = "./plugin.json";
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		/**
 		 * 当前语言
 		 */
@@ -80,7 +80,6 @@ Drive.prototype.set_config = function(config) {
 	var file = this.filename;
 	var cg = Object.assign({}, this.config, config || {});
 	this.config = conf(cg, file);
-	this.set_config_after();
 }
 
 /**
@@ -98,15 +97,6 @@ Drive.prototype.set_config_after = function() {
 	this.backup_options();
 }
 
-/**
- * 重启设备
- * @param {Object} option 配置
- */
-Drive.prototype.restart = function(option) {
-	this.stop();
-	this.start();
-}
-
 /**
  * 更新配置
  */
@@ -327,31 +317,40 @@ Drive.prototype.set_lang = function(lang) {
 };
 
 /**
- * 初始化
+ * 安装
  * @param {Object} option 配置参数
- * @return {String} 成功返回null, 否则返回错误提示
+ * @return {String} 成功返回null,否则返回错误提示
  */
-Drive.prototype.init = function(option) {
+Drive.prototype.install = function(option) {
 	var msg = null;
 	return msg;
 };
 
 /**
- * 更新
+ * 重启设备
+ * @param {Object} option 配置
+ */
+Drive.prototype.restart = async function(option) {
+	await this.run('stop');
+	await this.run('start');
+}
+
+/**
+ * 初始化
  * @param {Object} option 配置参数
  * @return {String} 成功返回null, 否则返回错误提示
  */
-Drive.prototype.update = function(option) {
+Drive.prototype.init = function(option) {
 	var msg = null;
 	return msg;
 };
 
 /**
- * 安装
+ * 更新
  * @param {Object} option 配置参数
- * @return {String} 成功返回null,否则返回错误提示
+ * @return {String} 成功返回null, 否则返回错误提示
  */
-Drive.prototype.install = function(option) {
+Drive.prototype.update = function(option) {
 	var msg = null;
 	return msg;
 };

package/core/com/plugin/index.js

@@ -20,7 +20,7 @@ class Plugin extends Index {
 		this.type = "plugin";
 		this.title = title;
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 
@@ -58,40 +58,35 @@ Plugin.prototype.init = function(option) {
 	var ret = "";
 	var lt = this.list;
 	for (var i = 0, o; o = lt[i++];) {
-		ret = o.run('init', option);
+		ret = o.exec('init', option);
 	}
 	return ret;
 };
 
-Plugin.prototype.sort = function() {
-	this.list.sortBy('sort');
-};
-
 /**
  * 加载插件
  * @param {String} path 检索路径
- * @param {Boolean} isApp 是否APP
+ * @param {Boolean} accurate 是否精确路径
  */
-Plugin.prototype.load = function(path) {
-	if (!path) {
-		path = '/app/' + this.scope;
+Plugin.prototype.update_config_all = async function(path, accurate) {
+	var dir_plugin;
+	if (accurate) {
+		dir_plugin = path;
+	} else {
+		if (!path) {
+			path = '/app/' + this.scope;
+		}
+		dir_plugin = path + "/plugin/";
 	}
-	list = this.list;
-	var dir_plugin = path + "/plugin/";
 	if (dir_plugin.hasDir()) {
 		var list_scope = $.dir.get(dir_plugin);
-
 		// 遍历目录路径
-		list_scope.map(function(o) {
+		for (var i = 0, o; o = list_scope[i++];) {
 			var file = './plugin.json'.fullname(o);
 			if (file.hasFile()) {
-				var obj = new Drive(o);
-				obj.load(file);
-				if (obj.config.name) {
-					list.push(obj);
-				}
+				await this.load_file(file, true);
 			}
-		});
+		}
 	}
 };
 
@@ -138,7 +133,7 @@ Plugin.prototype.unzip = async function(file) {
 Plugin.prototype.uninstall = async function(name) {
 	var plus = this.get(name);
 	if (plus) {
-		await plus.run('uninstall');
+		await plus.exec('uninstall');
 		var obj = this.del(name, true);
 		if (obj) {
 			var file = obj.filename;