mm_os 2.9.0 → 2.9.2

package/core/com/static/drive.js

@@ -1,7 +1,7 @@
-const Item = require('mm_machine').Item;
-
 const fs = require("fs");
 const send = require('koa-send');
+const conf = require('mm_config');
+const Item = require('mm_machine').Item;
 
 /**
  * Plugin插件驱动类
@@ -15,10 +15,11 @@ class Drive extends Item {
 	 * @param {Object} config 配置
 	 * @constructor
 	 */
-	constructor(dir, config) {
+	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./static.json";
-
+		// 更新并重载
+		this.mode = 3;
 		/* 通用项 */
 		// 配置参数
 		this.config = {
@@ -57,25 +58,6 @@ class Drive extends Item {
 			// 是否将ES6转换AMD
 			"convert_amd": true
 		};
-
-		if (config) {
-			$.push(this.config, config);
-			this.dir = config.root.fullname();
-			var f = this.default_file.fullname(this.dir);
-			if (f.hasFile()) {
-				var obj = f.loadJson();
-				if (obj) {
-					this.loadObj(obj);
-				} else {
-					var text = "./config.tpl.json".loadText(__dirname);
-					text = text.replace('"path": "/"', '"path": "' + config.path + '"');
-					f.saveText(text);
-				}
-			}
-		}
-		if (this.config.convert_amd) {
-			this.run_mode(true);
-		}
 	}
 }
 
@@ -85,36 +67,17 @@ class Drive extends Item {
 Drive.prototype.send = send;
 
 /**
- * 加载配置对象
- * @param {Object} obj 配置对象
+ * 加载配置对象前
+ * @param {Object} config 配置对象
  */
-Drive.prototype.loadObj = function(obj) {
-	if (obj.maxAge) {
-		obj.maxAge *= 1000;
-	}
-	$.push(this.config, obj, true);
-	var cg = this.config;
-	if (cg.convert_amd) {
-		this.run_mode(true);
-	}
-	var f = cg.func_file;
-	if (f) {
-		var file = f.fullname(this.dir);
-		if (file.hasFile()) {
-			var cs = require(file);
-			if (cs) {
-				var name = cg.func_name;
-				if (name) {
-					this.main = cs[name];
-				} else {
-					$.push(this, cs);
-				}
-			}
-		} else {
-			var fl = __dirname + "/script.js";
-			fl.copyFile(file);
+Drive.prototype.set_config = function(config) {
+	if (config) {
+		if (config.maxAge) {
+			config.maxAge *= 1000;
 		}
 	}
+	this.config = conf(Object.assign({}, this.config, config || {}), this.filename);
+	this.run_mode(this.config.convert_amd);
 };
 
 /**
@@ -150,7 +113,7 @@ Drive.prototype.run_mode = async function(convert_amd) {
 	if (convert_amd) {
 		this.main = async function main(ctx, path) {
 			if (path.endsWith('.vue') || path.endsWith('.js')) {
-				var file = (this.dir + path).fullname();
+				var file = ("." + path).fullname(this.dir);
 				var code;
 				var str = file.loadText();
 				try {
@@ -223,7 +186,7 @@ Drive.prototype.run = async function(ctx, path, next) {
 
 					// 取到物理路径
 					var root = this.dir;
-					var dir = (root + p).fullname();
+					var dir = p.fullname(root);
 					if (!p) {
 						file = dir + '/' + cg.index;
 					} else if (p.endWith('/')) {

package/core/com/static/index.js

@@ -21,6 +21,9 @@ class Static extends Index {
 	constructor(scope, title) {
 		super(scope, __dirname);
 		this.Drive = Drive;
+		
+		// 更新并重载
+		this.mode = 3;
 		this.type = "static";
 		this.title = title;
 		var $this = this;
@@ -87,8 +90,8 @@ class Static extends Index {
  * @param {Object} dir 目录
  * @return {Drive} 静态文件驱动类
  */
-Static.prototype.getObj = function(dir) {
-	var d = join(dir).replace($.runPath, '/');
+Static.prototype.getObj = async function(dir) {
+	var d = join(dir).replace(process.cwd() + $.slash, '/');
 	var app = d.between(join('app/'), join('/'));
 	var plugin = d.between(join('/plugin/'), join('/'));
 	var path = '/' + app;
@@ -101,14 +104,18 @@ Static.prototype.getObj = function(dir) {
 		root: d.substring(0, d.length - 1).fullname(),
 		path: path
 	};
-	return new Drive(dir, obj);
+	var file = ("./" + this.type + ".json").fullname(obj.root);
+	var drive = new Drive(dir, obj);
+	await drive.exec('load_config', file);
+	await drive.exec('set_config', obj);
+	return drive
 };
 
 /**
  * 加载接口
  * @param {String} path 加载的路径
  */
-Static.prototype.load = function(path) {
+Static.prototype.update_config_all = async function(path) {
 	if (!path) {
 		path = $.runPath + 'app' + $.slash;
 	}
@@ -117,10 +124,11 @@ Static.prototype.load = function(path) {
 	var list_scope = $.dir.getAll(path, search_dir);
 	// 遍历目录路径
 	var _this = this;
-	list_scope.map(function(o) {
-		var obj = _this.getObj(o);
+	for (var i = 0; i < list_scope.length; i++) {
+		var dir = list_scope[i];
+		var obj = await _this.getObj(dir);
 		_this.list.push(obj);
-	});
+	}
 };
 
 /**

package/core/com/task/index.js

@@ -31,7 +31,7 @@ Task.prototype.run = async function(name) {
 		for (var i = 0, o; o = lt[i++];) {
 			if (o.config.state === 1 && o.config.name === name) {
 				try {
-					o.run();
+					await o.run();
 				} catch (error) {
 					$.log.error("定时任务错误", o.name, error);
 				}
@@ -42,7 +42,7 @@ Task.prototype.run = async function(name) {
 		for (var i = 0, o; o = lt[i++];) {
 			if (o.config.state === 1) {
 				try {
-					o.run();
+					await o.run();
 				} catch (error) {
 					$.log.error("定时任务错误", o.name, error);
 				}
@@ -57,44 +57,22 @@ Task.prototype.run = async function(name) {
  * @param {Object} cg 配置参数
  * @param {String} file 配置文件
  */
-Task.prototype.load_item = function(dir, cg, file) {
-	var drive = new this.Drive(dir);
-	drive.loadObj(cg);
-	drive.filename = file;
+Task.prototype.load_item = async function(dir, cg, file) {
 	var _this = this;
+	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);
+	}
+
 	drive.admin = function() {
-		return this;
+		return _this;
 	};
 	this.list.push(drive);
-};
-
-/**
- * 加载列表
- * @param {Array} list 文件列表
- */
-Task.prototype.load_list = function(list) {
-	var _this = this;
-	// 遍历文件路径
-	list.map(function(file) {
-		var dir = file.dirname();
-		// 载入文件
-		var obj = file.loadJson(dir);
-		if (obj) {
-			if (obj.constructor == Array) {
-				obj.map(function(o) {
-					// 实例化一个驱动
-					_this.load_item(dir, o, file);
-				});
-			} else {
-				_this.load_item(dir, obj, file);
-			}
-		} else {
-			var fl = _this.dir_base + "/config.tpl.json";
-			if (fl.hasFile()) {
-				fl.copyFile(file);
-			}
-		}
-	});
+	return drive;
 };
 
 exports.Task = Task;

package/core/com/tpl/com.js

@@ -8,11 +8,11 @@ class Controller extends Base {
 		super();
 
 		// 检索的文件路径
-		this.path = "./apps/controller".fullname();
+		this.path = "./app/controller".fullname();
 		// 文件拓展名
 		this.extension = "controller.json";
 		// 文件存放目录
-		this.dir = "./apps";
+		this.dir = "./app";
 	}
 }
 

package/index.js

@@ -87,15 +87,14 @@ class OS {
  */
 OS.prototype.initData = function(config) {
 	var p = config.runPath;
-	if(!p) {
+	if (!p) {
 		config.runPath = $.runPath
-	}
-	else if (p.substring(p.length - 1) !== $.slash) {
+	} else if (p.substring(p.length - 1) !== $.slash) {
 		config.runPath += $.slash;
 	}
-	
+
 	$.runPath = config.runPath;
-	
+
 	// 修改默认模板路径，改为static下，方便读取css和js
 	$.Tpl.prototype.init_main = function(cg) {
 		if (cg) {
@@ -159,7 +158,7 @@ OS.prototype.init = function(config) {
  */
 OS.prototype.initBase = function(cg) {
 	var middleware = $.middleware;
-	middleware.init();
+	middleware.update();
 	var mqtt, web;
 	if (cg.web && cg.web.state) {
 		web = new WEB(cg.web);
@@ -203,8 +202,8 @@ OS.prototype.initBase = function(cg) {
 		}
 	}
 
+	$.sql = $.mysql_admin('sys', $.runPath);
 	if (cg.mysql) {
-		$.sql = $.mysql_admin('sys', $.runPath);
 		$.sql.setConfig(cg.mysql);
 		if (cg.mysql.state === 1) {
 			$.sql.open();
@@ -215,7 +214,6 @@ OS.prototype.initBase = function(cg) {
 	$.timer.run();
 }
 
-
 /**
  * 运行主程序
  * @param {String} state 状态
@@ -230,6 +228,8 @@ OS.prototype.main = async function(state) {
 		if (cg.web.socket) {
 			tip += " socket";
 		}
+		var eventer = $.event_admin('api');
+		eventer.update();
 		this.web.run();
 	}
 
@@ -242,6 +242,7 @@ OS.prototype.main = async function(state) {
 		$.task.update().then(() => {
 			$.task.run();
 		});
+		tip += " task";
 	}
 	console.log(tip);
 };

package/middleware/cors/index.js

@@ -1,5 +1,5 @@
 /**
- * 应用
+ * 跨域请求
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/cors/middleware.json

@@ -3,5 +3,7 @@
 	"title": "web跨域请求",
 	"description": "用于跨域请求限制",
 	"version": "1.0",
-	"sort": 4
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 50
 }

package/middleware/log/index.js

@@ -1,5 +1,5 @@
 /**
- * 应用
+ * web日志
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/log/middleware.json

@@ -5,5 +5,5 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "common_before",
-	"sort": 13
+	"sort": 40
 }

package/middleware/mqtt_base/index.js

@@ -1,7 +1,7 @@
 const MQTT = require('mm_mqtt');
 
 /**
- * 中间件
+ * MQTT基础
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/mqtt_base/middleware.json

@@ -4,5 +4,7 @@
 	"title": "MQTT通讯器",
 	"description": "用于MQTT通讯",
 	"version": "1.0",
-	"sort": 3
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 30
 }

package/middleware/waf/index.js

@@ -44,7 +44,7 @@ function getClientIP(req) {
 };
 
 /**
- * 应用
+ * web防火墙
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/waf/middleware.json

@@ -5,5 +5,5 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "common_before",
-	"sort": 3
+	"sort": 20
 }

package/middleware/waf_ip/index.js

@@ -48,7 +48,7 @@ function setting_blacklist(ip) {
 }
 
 /**
- * 应用
+ * IP防火墙
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/waf_ip/middleware.json

@@ -5,6 +5,6 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "common_before",
-	"sort": 1,
+	"sort": 10,
 	"state": 0
 }

package/middleware/web_after/index.js

@@ -0,0 +1,20 @@
+/**
+ * web请求之后
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	server.use(async (ctx, next) => {
+		await next();
+		if (ctx.path !== "/favicon.ico") {
+			await $.eventer.run('web_after', ctx, ctx.db);
+			var event = $.event_admin('api');
+			var ret = await event.after(ctx.path, ctx, ctx.db);
+			if (ret) {
+				ctx.body = ret;
+			}
+		}
+	});
+
+	return server;
+};

package/middleware/web_after/middleware.json

@@ -0,0 +1,9 @@
+{
+	"name": "web_after",
+	"title": "web请求后",
+	"description": "用于追加处理",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 150
+}

package/middleware/web_base/index.js

@@ -5,7 +5,7 @@ const { koaBody } = require('koa-body');
 const send = require('koa-send');
 
 /**
- * 应用
+ * web基础
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/web_base/middleware.json

@@ -5,5 +5,5 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "common_before",
-	"sort": 12
+	"sort": 70
 }

package/middleware/web_before/index.js

@@ -0,0 +1,27 @@
+/**
+ * web请求之前
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	// 使用路由(主要)
+	server.use(async (ctx, next) => {
+		if (!ctx.db) {
+			ctx.db = {
+				ret: null
+			};
+		}
+		if (ctx.path !== "/favicon.ico") {
+			await $.eventer.run('web_before', ctx, ctx.db);
+			var event = $.event_admin('api');
+			var ret = await event.before(ctx.path, ctx, ctx.db);
+			// console.log("before阶段", ret);
+			if (ret) {
+				ctx.body = ret;
+			}
+		}
+		await next();
+	});
+
+	return server;
+};

package/middleware/web_before/middleware.json

@@ -0,0 +1,9 @@
+{
+	"name": "web_berofe",
+	"title": "web请求前",
+	"description": "用于",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 80
+}

package/middleware/web_check/index.js

@@ -0,0 +1,22 @@
+/**
+ * web验证
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	// 使用路由(主要)
+	server.use(async (ctx, next) => {
+		if (ctx.path !== "/favicon.ico") {
+			await $.eventer.run('web_check', ctx, ctx.db);
+			var event = $.event_admin('api');
+			var ret = await event.check(ctx.path, ctx, ctx.db);
+			// console.log("check阶段", ret);
+			if (ret) {
+				ctx.body = ret;
+			}
+		}
+		await next();
+	});
+
+	return server;
+};

package/middleware/web_check/middleware.json

@@ -0,0 +1,9 @@
+{
+	"name": "web_check",
+	"title": "web请求验证",
+	"description": "用于验证请求，拦截不符合调条件的请求",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 90
+}

package/middleware/web_main/index.js

@@ -0,0 +1,22 @@
+/**
+ * web请求
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	// 使用路由(主要)
+	server.use(async (ctx, next) => {
+		if (ctx.path !== "/favicon.ico") {
+			await $.eventer.run('web_main', ctx, ctx.db);
+			var event = $.event_admin('api');
+			var ret = await event.main(ctx.path, ctx, ctx.db);
+			// console.log("main阶段", ret);
+			if (ret) {
+				ctx.body = ret;
+			}
+		}
+		await next();
+	});
+
+	return server;
+};

package/middleware/web_main/middleware.json

@@ -0,0 +1,9 @@
+{
+	"name": "web_main",
+	"title": "web请求主要",
+	"description": "用于处理主要请求",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 100
+}

package/middleware/web_proxy/index.js

@@ -5,7 +5,7 @@ const {
 } = require('mm_koa_proxy');
 
 /**
- * 应用
+ * 代理请求
  * @param {Object} server 服务
  * @param {Object} config 配置参数
  */

package/middleware/web_proxy/middleware.json

@@ -5,5 +5,5 @@
 	"version": "1.0",
 	"type": "web",
 	"process_type": "worker",
-	"sort": 6
+	"sort": 110
 }

package/middleware/web_render/index.js

@@ -0,0 +1,81 @@
+/**
+ * 调用函数
+ * @param {Object} ret 设置响应结果
+ * @param {Object} res 响应器
+ * @param {String} t 请求类型
+ * @return {String} 处理后的响应结果
+ */
+function render_body(ret, res, t) {
+	var type;
+	if (res.type) {
+		type = res.type;
+	}
+	var tp = typeof(ret);
+	if (tp === "object") {
+		if (!type) {
+			/// 设置响应头
+			if (t.indexOf('xml') !== -1) {
+				type = t;
+			} else {
+				type = "application/json; charset=utf-8";
+			}
+			res.type = type;
+		} else {
+			if (type.indexOf('json') !== -1) {
+				type = "application/json; charset=utf-8";
+			} else if (type.indexOf('html') !== -1) {
+				type = "text/html";
+			} else if (type.indexOf('xml') !== -1) {
+				type = "text/xml; charset=utf-8";
+			} else {
+				type = "text/plain; charset=utf-8";
+			}
+			res.type = type;
+		}
+
+		if (type.indexOf('/xml') !== -1) {
+			return $.toXml(ret);
+		} else {
+			return JSON.stringify(ret);
+		}
+	} else if (tp === "string") {
+		ret = ret.trim();
+		if (!type) {
+			if (ret.startWith('{') && ret.endWith('}')) {
+				res.type = "application/json; charset=utf-8";
+			} else if (ret.startWith('[') && ret.endWith(']')) {
+				res.type = "application/json; charset=utf-8";
+			} else if (ret.endWith("</html>")) {
+				res.type = "text/html";
+			} else {
+				res.type = "text/plain; charset=utf-8";
+			}
+		}
+	}
+	return ret;
+};
+
+/**
+ * web渲染
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	// 使用路由(主要)
+	server.use(async (ctx, next) => {
+		if (ctx.path !== "/favicon.ico") {
+			await $.eventer.run('web_render', ctx, ctx.db);
+			var event = $.event_admin('api');
+			var ret = await event.render(ctx.path, ctx, ctx.db);
+			if (!ctx.body && ret) {
+				ctx.body = ret;
+			}
+			if (ctx.body) {
+				ctx.body = render_body(ctx.body, ctx.response, ctx.request.type);
+			}
+		}
+		await next();
+	});
+
+	return server;
+};

package/middleware/web_render/middleware.json

@@ -0,0 +1,9 @@
+{
+	"name": "web_render",
+	"title": "web请求渲染",
+	"description": "用于响应请求是加工响应的数据",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"sort": 120
+}