mm_os 2.9.1 → 2.9.2

package/core/com/api/drive.js

@@ -36,10 +36,10 @@ class Drive extends Item {
 		this.param;
 		// sql模板配置 + 函数
 		this.sql;
-		
+
 		/* 通用项 */
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
@@ -60,8 +60,6 @@ class Drive extends Item {
 			"func_file": "",
 			// 回调函数名 用于决定调用脚本的哪个函数
 			"func_name": "",
-			// Rpc接口文件路径
-			"rpc_file": "",
 			// 请求方式, POST或GET, 为空或ALL表示都可以
 			"method": "ALL",
 			// 缓存时长 (单位：秒) 默认：60秒，建议600秒
@@ -87,16 +85,6 @@ class Drive extends Item {
 				"user_group": []
 			}
 		};
-
-		/**
-		 * 定义rpc 方法
-		 */
-		this.methods = {};
-
-		/**
-		 * 定义当前RPC文件路径
-		 */
-		this.rpc_file_now = "";
 	}
 }
 
@@ -147,7 +135,6 @@ Drive.prototype.load_after = function() {
 	var cg = this.config;
 	this.loadParam(cg.param_path);
 	this.loadSql(cg.sql_path);
-	this.loadRPC(cg.rpc_file);
 	this.loadOauth();
 };
 
@@ -205,8 +192,9 @@ Drive.prototype.loadParam = async function(file_path) {
 			this.param = param;
 		} else {
 			this.param = new Param(this.dir);
-			this.param.load(p);
+			await this.param.exec('load_config', p);
 			this.setParam(this.param);
+			this.param.load('load');
 		}
 	}
 };
@@ -268,8 +256,9 @@ Drive.prototype.loadSql = async function(file_path) {
 			this.sql = sql;
 		} else {
 			this.sql = new Sql(this.dir);
-			this.sql.load(p);
+			await this.sql.exec('load_config', p);
 			this.setSql(this.sql);
+			this.sql.exec('load');
 		}
 		// if (this.sql && this.param && this.param.config) {
 		// 	var list = this.param.config.list;
@@ -280,41 +269,6 @@ Drive.prototype.loadSql = async function(file_path) {
 	}
 };
 
-/**
- * 加载RPC方法
- * @param {String} file_path 文件路径
- */
-Drive.prototype.loadRPC = async function(file_path) {
-	if (file_path) {
-		var p = file_path.fullname(this.dir);
-		this.rpc_file_now = file_path;
-		if (p.hasFile()) {
-			await this.unloadRPC(this.rpc_file_now);
-			var f = require(p);
-			this.methods = f(this);
-		} else {
-			var fl = this.dir_base + "/rpc.js";
-			fl.copyFile(p);
-			var f = require(p);
-			this.methods = f(this);
-		}
-	}
-};
-
-/**
- * 卸载RPC方法
- * @param {String} file_path 文件路径
- */
-Drive.prototype.unloadRPC = async function(file_path) {
-	if (file_path) {
-		var p = file_path.fullname(this.dir);
-		if (p.hasFile()) {
-			delete require.cache[require.resolve(p)];
-			this.methods = {};
-		}
-	}
-};
-
 /**
  * 加载身份验证配置
  * @param {Object} cg 配置对象
@@ -463,6 +417,9 @@ Drive.prototype.before = async function(ctx, db) {
  * @return {Object} 执行结果
  */
 Drive.prototype.main = async function(ctx, db) {
+	if (ret) {
+		console.log("是啥？", this.config.path, this.config.name, this.sql);
+	}
 	if (this.sql) {
 		var req = ctx.request;
 		// 获取文件
@@ -685,43 +642,6 @@ Drive.prototype.checkOauth = async function(ctx) {
 	}
 };
 
-/**
- * 运行GRPC方法
- * @param {Object} db 数据库管理器
- * @param {String} method 方法名称
- * @param {Object} query 查询条件
- * @param {Object} body 增改项
- * @return {Object} 返回执行结果
- */
-Drive.prototype.runRPC = async function(db, method, query, body) {
-	var func = this.methods[method];
-	var ret = {};
-	try {
-		if (func) {
-			ret = this.checkParam(query, body, method);
-			if (!ret) {
-				ret = await func(db, query, body);
-			}
-		} else {
-			ret = {
-				error: {
-					code: 60000,
-					message: "方法名称不存在",
-					data: Object.keys(this.methods)
-				}
-			}
-		}
-	} catch (err) {
-		$.log.error("运行RPC方法错误！", method, err);
-		ret = {
-			error: {
-				code: 500,
-				message: "服务端业务逻辑错误"
-			}
-		}
-	}
-	return ret;
-};
 
 /**
  * 获取插件

package/core/com/api/index.js

@@ -19,7 +19,7 @@ class Api extends Index {
 		this.type = "api";
 		this.title = title;
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 
@@ -57,8 +57,8 @@ Api.prototype.run = async function(ctx, db) {
 	for (var i = 0, o; o = lt[i++];) {
 		if (o.config.state === 1 && path.has(o.config.path)) {
 			var ret = await o.run(ctx, db);
-			if (this.mode > 2) {
-				o.load(o.filename);
+			if (this.mode > 4) {
+				o.exec('reload', o.filename);
 			}
 			if (ret) {
 				db.ret = ret;
@@ -70,34 +70,6 @@ Api.prototype.run = async function(ctx, db) {
 };
 
 
-/**
- * 运行GRPC方法
- * @param {Object} db 数据库管理器
- * @param {String} class_name 类名
- * @param {String} method 方法名称
- * @param {Object} query 查询条件
- * @param {Object} body 增改项
- * @return {Object} 返回执行结果
- */
-Api.prototype.runRPC = async function(db, class_name, method, query, body) {
-	if (!db) {
-		db = {
-			ret: null
-		};
-	}
-
-	var lt = this.list;
-	for (var i = 0, o; o = lt[i++];) {
-		if (o.config.state === 1 && class_name == o.config.name) {
-			var ret = await o.runRPC(db, method, query, body);
-			if (ret) {
-				db.ret = ret;
-				break;
-			}
-		}
-	}
-	return db.ret;
-};
 
 /**
  * @module 导出API类

package/core/com/cmd/drive.js

@@ -15,7 +15,7 @@ class Drive extends Item {
 		super(dir, __dirname);
 		this.default_file = "./cmd.json";
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		// 开关 true为开启, false为关闭
 		this.onOff = true;
 
@@ -387,6 +387,15 @@ Drive.prototype.end = async function(msg, db, ret) {
 	return ret;
 };
 
+/**
+ * 下达指令
+ * @param {Number} state 状态 0为不可以，1为可用
+ * @param {Array} ...params 参数集合
+ */
+Drive.prototype.cmd = function(state, ...params) {
+	return null;
+}
+
 /**
  * 执行但不记录指令
  * @param {Object} msg 消息上下文

package/core/com/cmd/index.js

@@ -22,7 +22,7 @@ class Cmd extends Index {
 		this.list_main = [];
 		this.list_after = [];
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 
@@ -181,6 +181,20 @@ Cmd.prototype.sort_tense = async function() {
 	}
 };
 
+/**
+ * 下达指令
+ * @param {String} name 名称
+ * @param {Number} state 状态
+ * @param {Array} ...params 参数集合
+ */
+Cmd.prototype.cmd = async function(name, state, ...params) {
+	var obj = this.get(name);
+	if (!obj) {
+		return "error: program does not exist";
+	}
+	return await obj.exec("cmd", state, ...params);
+}
+
 /* 导出指令 */
 exports.Cmd = Cmd;
 

package/core/com/component/drive.js

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

package/core/com/component/index.js

@@ -20,7 +20,7 @@ class Component extends Index {
 		this.title = title;
 		this.list = [];
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 	}
 }
 
@@ -29,21 +29,24 @@ class Component extends Index {
  * 加载列表
  * @param {Array} list 文件列表
  */
-Component.prototype.load_list = function(list) {
+Component.prototype.load_list = async function(list) {
 	var _this = this;
+
 	// 遍历文件路径
-	list.map(function(file) {
+	for (var i = 0; i < list.length; i++) {
+		var file = list[i];
 		var dir = file.dirname();
 		// 载入文件
 		var obj = file.loadJson(dir);
 		if (obj) {
 			if (obj.constructor == Array) {
-				obj.map(function(o) {
+				for (var n = 0; n < obj.length; n++) {
+					var o = obj[n];
 					// 实例化一个驱动
-					_this.load_item(dir, o, file);
-				});
+					await _this.load_item(dir, o, file);
+				}
 			} else {
-				_this.load_item(dir, obj, file);
+				await _this.load_item(dir, obj, file);
 			}
 		} else {
 			var fl = _this.dir_base + "/config.tpl.json";
@@ -51,14 +54,15 @@ Component.prototype.load_list = function(list) {
 				var text = fl.loadText();
 				if (text) {
 					var l = $.slash;
-					var arr = file.split(l);
-					var name = arr[arr.length - 2];
+					var name = file.between("component" + l, l);
 					text = text.replaceAll('{0}', name);
+					var app = file.between("app" + l, l);
+					text = text.replaceAll('{1}', app);
 					file.saveText(text);
 				}
 			}
 		}
-	});
+	}
 };
 
 /**
@@ -234,7 +238,7 @@ Component.prototype.render_block = async function(ctx, db, blocks) {
 		var o = this.get(block.component);
 		if (o) {
 			var option = this.option_model(block);
-			var ret = await o.run('main', ctx, db, option);
+			var ret = await o.exec('main', ctx, db, option);
 			if (ret) {
 				html += "\n" + ret;
 			}
@@ -264,7 +268,7 @@ Component.prototype.render = async function(ctx, db, path, position) {
 				position
 			});
 			if (obj && obj.available) {
-				var ret = await o.run('main', ctx, db);
+				var ret = await o.exec('main', ctx, db);
 				if (ret) {
 					html += "\n" + ret;
 				}

package/core/com/db/drive.js

@@ -223,7 +223,7 @@ Drive.prototype.model = function(fields) {
  * @param {Object} db 数据库管理器
  * @param {Boolean} cover 是否覆盖文件
  */
-Drive.prototype.update_config = async function(db, cover) {
+Drive.prototype.update_file = async function(db, cover) {
 	var cg = this.config;
 	var list = [];
 

package/core/com/db/index.js

@@ -25,7 +25,7 @@ class DB extends Index {
  * 加载配置
  * @param {String} path 加载的路径
  */
-DB.prototype.load = function(path) {
+DB.prototype.update_config_all = async function(path) {
 	if (!path) {
 		path = "./app/";
 	}
@@ -35,16 +35,15 @@ DB.prototype.load = function(path) {
 	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) {
+		for (var i = 0, o; o = list_scope[i++];) {
 			// 获取所有配置文件
-			var list_file = $.file.getAll(f, "*" + _this.type + ".json");
-			_this.load_list(list_file);
-		});
+			var list_file = $.file.getAll(o, "*" + _this.type + ".json");
+			await _this.load_list(list_file);
+		}
 	} else {
-
 		// 获取所有配置文件
 		var list_file = $.file.getAll(path, "*" + _this.type + ".json");
-		_this.load_list(list_file);
+		await _this.load_list(list_file);
 	}
 };
 
@@ -73,11 +72,11 @@ DB.prototype.getObj = function(table) {
  * @param {Boolean} cover 是否覆盖文件
  * @return {String} 更新成功返回null, 失败返回错误提示
  */
-DB.prototype.update_config = async function(db, name, table, cover = true) {
+DB.prototype.update_file = async function(db, name, table, cover = true) {
 	if (name) {
 		var o = this.get(name);
 		if (o) {
-			await o.update_config(db, cover);
+			await o.exec('update_file', db, cover);
 		} else {
 			return "该配置不存在";
 		}
@@ -91,16 +90,15 @@ DB.prototype.update_config = async function(db, name, table, cover = true) {
 				var te = list[i];
 				var obj = this.getObj(te);
 				if (obj) {
-					obj.update_config(db, cover);
+					await obj.exec('update_file', db, cover);
 				} else {
 					var drive = new Drive();
 					drive.config.table = te;
-					drive.update_config(db, cover);
+					await drive.exec('update_file', db, cover);
 					this.list.push(drive);
 				}
 			}
-		}
-		else {
+		} else {
 			return "没有找到相关的数据表";
 		}
 	}
@@ -120,7 +118,7 @@ DB.prototype.update_db = async function(db, name, table, all) {
 	if (name) {
 		var o = this.get(name);
 		if (o) {
-			ret = await o.update_db(db);
+			ret = await o.exec('update_db', db);
 		} else {
 			ret = "该配置不存在";
 		}
@@ -131,13 +129,13 @@ DB.prototype.update_db = async function(db, name, table, all) {
 			if (table) {
 				for (var i = 0, o; o = list[i++];) {
 					if (o.config.table === table) {
-						ret = await o.update_db(db);
+						ret = await o.exec('update_db', db);
 						break;
 					}
 				}
 			} else if (all) {
 				for (var i = 0, o; o = list[i++];) {
-					await o.update_db(db);
+					await o.exec('update_db', db);
 				}
 			}
 		}
@@ -175,4 +173,4 @@ function db_admin(scope, title) {
 /**
  * @module 导出db管理器
  */
-$.db_admin = db_admin;
+$.db_admin = db_admin;

package/core/com/event/drive.js

@@ -15,6 +15,9 @@ class Drive extends Item {
 		super(dir, __dirname);
 		this.default_file = "./event.json";
 		
+		// 默认启用热更新
+		this.mode = 3;
+		
 		/* 通用项 */
 		// 配置参数
 		this.config = {
@@ -70,7 +73,6 @@ Drive.prototype.new_script = function(file) {
 	}
 };
 
-
 /**
  * 新建脚本
  * @param {String} 文件

package/core/com/event/index.js

@@ -19,7 +19,7 @@ class Event extends Index {
 		this.type = "event";
 		this.title = title;
 		// 默认启用热更新
-		this.mode = 2;
+		this.mode = 3;
 		/* ===  验证  === */
 		// 验证前
 		this.list_before = [];
@@ -54,70 +54,85 @@ Event.prototype.clear = function(stage) {
 	}
 };
 
+
 /**
- * 加载事件
- * @param {String} path 加载的路径
+ * 更新脚本子函数
  */
-Event.prototype.load = function(path) {
-	if (!path) {
-		path = './app/';
-	}
-	// 获取所有应用路径
-	var search_dir;
-	if (this.scope) {
-		search_dir = 'event_' + this.scope;
-	} else {
-		search_dir = "event";
+Event.prototype.update_script_sub = async function(list) {
+	for (var i = 0; i < list.length; i++) {
+		var o = list[i];
+		if (o.config.state === 1) {
+			await o.exec('load');
+		}
 	}
-	var list_scope = $.dir.getAll(path, search_dir);
+}
 
-	// 遍历目录路径
-	var _this = this;
-	list_scope.map(function(f) {
-		// 获取所有api配置文件
-		var list_file = $.file.getAll(f, "*event.json");
-		// 遍历文件路径
-		list_file.map(function(file) {
-			var dir = file.dirname();
-			// 载入文件
-			var obj = file.loadJson(dir);
-			if (obj) {
-				if (obj.constructor == Array) {
-					obj.map(function(o) {
-						var key = 'list_' + o.stage;
-						var list = _this[key];
-						if (list) {
-							// 实例化一个驱动
-							var d = new Drive(dir);
-							d.filename = file;
-							d.loadObj(o);
-							list.push(d);
-						}
-					});
-				} else {
-					var key = 'list_' + obj.stage;
-					var list = _this[key];
-					if (list) {
-						var drive = new Drive(dir);
-						drive.filename = file;
-						drive.loadObj(obj);
-						list.push(drive);
-					}
-				}
-			} else {
-				var drive = new Drive(dir);
-				drive.load(file);
+/**
+ * 更新脚本
+ */
+Event.prototype.update_script = async function() {
+	this.update_script_sub(this.list_before);
+	this.update_script_sub(this.list_check);
+	this.update_script_sub(this.list_main);
+	this.update_script_sub(this.list_render);
+	this.update_script_sub(this.list_after);
+}
+
+/**
+ * 加载项
+ * @param {String} dir 文件路径
+ * @param {Object} cg 配置参数
+ * @param {String} file 配置文件
+ */
+Event.prototype.load_item = async function(dir, cg, file) {
+	if (this.Drive) {
+		var drive = new this.Drive(dir, this.dir_base.fullname());
+		drive.mode = this.mode;
+		if (cg) {
+			await drive.exec('load_config', file, cg.name);
+			await drive.exec('set_config', cg);
+		} else {
+			await drive.exec('load_config', file);
+		}
+		var key = 'list_' + drive.config.stage;
+		var list = this[key];
+		if (!list) {
+			return;
+		}
+		list.push(drive);
+		return drive;
+	} else {
+		var json = file.loadJson();
+		if (!json) {
+			var fl = this.dir_base + "/config.tpl.json";
+			if (fl.hasFile()) {
+				fl.copyFile(file);
+				json = file.loadJson();
 			}
-		});
-	});
+		}
+		if (json) {
+			var key = 'list_' + json.stage;
+			var list = this[key];
+			if (!list) {
+				return;
+			}
+			list.push(json);
+		}
+		return json;
+	}
 };
+
 /**
  * 事件排序
  * @param {String} list 列表
  */
 Event.prototype.sort_sub = function(list) {
 	list.sort(function(o1, o2) {
-		return o1.config.sort - o2.config.sort;
+		var sort = o1.config.sort - o2.config.sort;
+		if (sort === 0) {
+			sort = o2.config.target.length - o1.config.target.length;
+		}
+		return sort;
 	});
 };
 
@@ -141,7 +156,6 @@ Event.prototype.sort = function(stage) {
 	}
 };
 
-
 /**
  * 执行事件
  */
@@ -150,8 +164,8 @@ Event.prototype.doing = async function(o, ctx, db) {
 	if (types.isPromise(ret)) {
 		ret = await ret;
 	}
-	if (this.mode > 2) {
-		o.load(o.filename);
+	if (this.mode > 4) {
+		o.exec('reload', o.filename);
 	}
 	return ret;
 }
@@ -168,8 +182,8 @@ Event.prototype.run_sub = async function(list, target, ctx, db) {
 	for (var i = 0, o; o = list[i++];) {
 		if (o.config.state === 1 && target.has(o.config.target)) {
 			var ret = await o.run(ctx, db);
-			if (this.mode > 2) {
-				o.load(o.filename);
+			if (this.mode > 4) {
+				o.exec('reload', o.filename);
 			}
 			if (ret) {
 				db.ret = ret;
@@ -204,7 +218,6 @@ Event.prototype.check = async function(target, ctx, db) {
 	return await this.run_sub(this.list_check, target, ctx, db);
 };
 
-
 /**
  * 主要
  * @param {String} target 目标
@@ -290,10 +303,10 @@ Event.prototype.get = function(name, event_type = 'main') {
  * @param {String} file 文件名
  * @return {String} 重载失败返回错误提示，重载成功返回null
  */
-Event.prototype.reload = function(name, event_type = 'main') {
+Event.prototype.reload = async function(name, event_type = 'main') {
 	var o = this.get(name, event_type);
 	if (o) {
-		o.load(o.filename);
+		await o.exec('reload');
 		return null;
 	}
 	return '没有找到模块';

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);