mm_os 3.2.9 → 3.3.1

package/core/com/event/script.js

@@ -1,26 +1,26 @@
-// 使用api管理器
-var api = $.api_admin('{0}', '{0}');
-// 首次启动更新api接口;
-api.update();
-
-// 使用mysql数据库管理器
-var sql = $.mysql_admin('sys', __dirname);
-// sql.setConfig($.config.mysql);
-// sql.open();
-
-/**
- * @description 接口主函数
- * @param {Object} ctx HTTP上下文
- * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
- * @return {Object} 执行结果
- */
-async function main(ctx, db) {
-	// 使用模板引擎
-	db.tpl = new $.Tpl();
-	
-	// 在这定义要访问的数据库 (分布式开发时设置不同的数据库名)
-	$.push(db, sql.db(), true);
-	return api.run(ctx, db);
-};
-
+// 使用api管理器
+var api = $.api_admin('{0}', '{0}');
+// 首次启动更新api接口;
+api.update();
+
+// 使用mysql数据库管理器
+var sql = $.mysql_admin('sys', __dirname);
+// sql.setConfig($.config.mysql);
+// sql.open();
+
+/**
+ * @description 接口主函数
+ * @param {Object} ctx HTTP上下文
+ * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
+ * @return {Object} 执行结果
+ */
+async function main(ctx, db) {
+	// 使用模板引擎
+	db.tpl = new $.Tpl();
+	
+	// 在这定义要访问的数据库 (分布式开发时设置不同的数据库名)
+	$.push(db, sql.db(), true);
+	return api.run(ctx, db);
+};
+
 exports.main = main;

package/core/com/middleware/com.js

@@ -1,153 +1,154 @@
-class Middleware {
-	/**
-	 * 构造函数
-	 * @param {Object} config 配置参数
-	 */
-	constructor(config) {
-		// 中间件列表
-		this.list = [];
-
-		this.config = {
-			path: "./middleware".fullname($.runPath),
-			file: "middleware.json",
-			mode: "web"
-		};
-		this.init(config);
-	}
-}
-
-Middleware.prototype.init = function(config) {
-	if (config) {
-		Object.assign(this.config, config);
-	}
-}
-
-/**
- * 新建脚本
- * @param {String} 文件
- */
-Middleware.prototype.new_script = function(file) {
-	var fl = __dirname + "/script.js";
-	if (fl.hasFile()) {
-		var text = fl.loadText();
-		if (text) {
-			var l = $.slash;
-			if (file.indexOf('middleware' + l) !== -1) {
-				var name = file.between('middleware' + l, l);
-				text = text.replaceAll("{0}", name);
-			}
-			file.saveText(text);
-		}
-	}
-};
-
-/**
- * 新建配置
- * @param {String} 文件
- */
-Middleware.prototype.new_config = function(file) {
-	var fl = __dirname + "/config.tpl.json";
-	if (fl.hasFile()) {
-		var text = fl.loadText();
-		if (text) {
-			var l = $.slash;
-			if (file.indexOf('middleware' + l) !== -1) {
-				var name = file.between('middleware' + l, l);
-				text = text.replaceAll("{0}", name);
-			}
-			file.saveText(text);
-		}
-	}
-};
-
-/**
- * 加载配置
- * @param {String} file 配置文件路径
- */
-Middleware.prototype.load_item = function(file) {
-	var config = file.loadJson();
-	if (config) {
-		var cg = this.list.getObj({
-			name: config.name
-		});
-		if (cg) {
-			$.push(cg, config, true);
-		} else {
-			cg = {
-				func_file: file.replace(this.config.file, 'index.js')
-			}
-			$.push(cg, config, true);
-			this.list.push(cg);
-		}
-	} else {
-		this.new_config(file);
-	}
-	var script_file = file.replace('middleware.json', 'index.js');
-	if (!script_file.hasFile()) {
-		this.new_script(script_file);
-	}
-};
-
-/**
- * 遍历加载配置
- * @param {Object} path
- */
-Middleware.prototype.update_config_all = function(path, accurate) {
-	if (path.hasDir()) {
-		var dirs = $.dir.getAll(path);
-		// 遍历目录路径
-		var file = this.config.file;
-		for (var i = 0; i < dirs.length; i++) {
-			var d = dirs[i];
-			this.load_item(d + file);
-		}
-	}
-};
-
-/**
- * 排序
- */
-Middleware.prototype.sort = function() {
-	return this.list.sortBy('asc', 'sort');
-};
-
-/**
- * 清除接口缓存
- */
-Middleware.prototype.clear = function() {
-	this.list = [];
-};
-
-/**
- * 遍历加载配置
- */
-Middleware.prototype.update_config = function(path, accurate = true, clear = true) {
-	if (clear) {
-		this.clear();
-	}
-	this.update_config_all("../../../middleware/".fullname(__dirname));
-	if (path) {
-		this.update_config_all(path);
-	}
-	this.update_config_all(this.config.path);
-	var p = "./middleware".fullname($.runPath);
-	if (this.config.path !== 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();
-}
+class Middleware {
+	/**
+	 * 构造函数
+	 * @param {Object} config 配置参数
+	 */
+	constructor(config) {
+		// 中间件列表
+		this.list = [];
+
+		this.config = {
+			path: "./middleware".fullname($.runPath),
+			file: "middleware.json",
+			mode: "web"
+		};
+		this.init(config);
+	}
+}
 
+
+Middleware.prototype.init = function(config) {
+	if (config) {
+		Object.assign(this.config, config);
+	}
+}
+
+/**
+ * 新建脚本
+ * @param {String} 文件
+ */
+Middleware.prototype.new_script = function(file) {
+	var fl = __dirname + "/script.js";
+	if (fl.hasFile()) {
+		var text = fl.loadText();
+		if (text) {
+			var l = $.slash;
+			if (file.indexOf('middleware' + l) !== -1) {
+				var name = file.between('middleware' + l, l);
+				text = text.replaceAll("{0}", name);
+			}
+			file.saveText(text);
+		}
+	}
+};
+
+/**
+ * 新建配置
+ * @param {String} 文件
+ */
+Middleware.prototype.new_config = function(file) {
+	var fl = __dirname + "/config.tpl.json";
+	if (fl.hasFile()) {
+		var text = fl.loadText();
+		if (text) {
+			var l = $.slash;
+			if (file.indexOf('middleware' + l) !== -1) {
+				var name = file.between('middleware' + l, l);
+				text = text.replaceAll("{0}", name);
+			}
+			file.saveText(text);
+		}
+	}
+};
+
+/**
+ * 加载配置
+ * @param {String} file 配置文件路径
+ */
+Middleware.prototype.load_item = function(file) {
+	var config = file.loadJson();
+	if (config) {
+		var cg = this.list.getObj({
+			name: config.name
+		});
+		if (cg) {
+			$.push(cg, config, true);
+		} else {
+			cg = {
+				func_file: file.replace(this.config.file, 'index.js')
+			}
+			$.push(cg, config, true);
+			this.list.push(cg);
+		}
+	} else {
+		this.new_config(file);
+	}
+	var script_file = file.replace('middleware.json', 'index.js');
+	if (!script_file.hasFile()) {
+		this.new_script(script_file);
+	}
+};
+
+/**
+ * 遍历加载配置
+ * @param {Object} path
+ */
+Middleware.prototype.update_config_all = function(path, accurate) {
+	if (path.hasDir()) {
+		var dirs = $.dir.getAll(path);
+		// 遍历目录路径
+		var file = this.config.file;
+		for (var i = 0; i < dirs.length; i++) {
+			var d = dirs[i];
+			this.load_item(d + file);
+		}
+	}
+};
+
+/**
+ * 排序
+ */
+Middleware.prototype.sort = function() {
+	return this.list.sortBy('asc', 'sort');
+};
+
+/**
+ * 清除接口缓存
+ */
+Middleware.prototype.clear = function() {
+	this.list = [];
+};
+
+/**
+ * 遍历加载配置
+ */
+Middleware.prototype.update_config = function(path, accurate = true, clear = true) {
+	if (clear) {
+		this.clear();
+	}
+	this.update_config_all("../../../middleware/".fullname(__dirname));
+	if (path) {
+		this.update_config_all(path);
+	}
+	this.update_config_all(this.config.path);
+	var p = "./middleware".fullname($.runPath);
+	if (this.config.path !== 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;

package/core/com/socket/config.tpl.json

@@ -1,5 +1,5 @@
 {
-	// webscoket请求路由地址
+	// websocket请求路由地址
 	"path": "/ws/{0}",
 	// 名称
 	"name": "{0}",
@@ -7,7 +7,7 @@
 	"title": "示例websocket",
 	// 描述，用来介绍该websocket程序是做什么用的
 	"description": "用来测试",
-	// webscoket调用的脚本文件
+	// websocket调用的脚本文件
 	"func_file": "./index.js",
 	// 同步消息循环发送的时间间隔
 	"interval": 1000

package/core/com/socket/drive.js

@@ -336,7 +336,7 @@ Drive.prototype.run = async function(bodyStr, ctx, token) {
 		}
 		return await this.main(bodyStr, ws, request);
 	} catch (err) {
-		$.log.error("webscoket 错误", err);
+		$.log.error("websocket 错误", err);
 		return $.log.error(10000, "代码错误！原因：" + err.toString());
 	}
 };
@@ -400,4 +400,4 @@ Drive.prototype.plugin = function(app, name) {
 	return plus
 }
 
-module.exports = Drive;
+module.exports = Drive;

package/core/com/socket/index.js

@@ -32,7 +32,7 @@ Socket.prototype.run = async function(ctx, next) {
 	var list = this.list;
 	const path = ctx.path.toLocaleLowerCase();
 	for (var i = 0, o; o = list[i++];) {
-		// console.log("监听webscoket路径是否正确", path === o.config.path);
+		// console.log("监听websocket路径是否正确", path === o.config.path);
 		if (path === o.config.path) {
 			o.add(ctx);
 			break;

package/core/com/sql/drive.js

@@ -592,10 +592,10 @@ Drive.prototype.get_params = async function(db, fields) {
 				var list = dt.config.fields;
 				for (var i = 0; i < list.length; i++) {
 					var o = list[i];
-					var name = o.replace(/`/g, '');
+					var name = o.name.replace(/`/g, '');
 					lt.push({
 						name,
-						title: name
+						title: o.title
 					});
 				}
 			}
@@ -790,7 +790,7 @@ Drive.prototype.export_main = async function(db, query, body) {
 	var {
 		path,
 		file,
-		fields
+		field
 	} = body;
 	var table = db.table || this.config.table;
 	var date = new Date();
@@ -806,17 +806,17 @@ Drive.prototype.export_main = async function(db, query, body) {
 	if (!file) {
 		file = this.save_dir + name;
 	}
-	if (!fields) {
+	if (!field) {
 		if (query.field) {
-			fields = query.field;
+			field = query.field;
 		} else {
 			var f = this.config.field_default;
 			if (f.length !== "*") {
-				fields = f;
+				field = f;
 			}
 		}
 	}
-	var params = await this.get_params(db, fields);
+	var params = await this.get_params(db, field);
 	var format = await this.get_format(db);
 	file = file.fullname(path);
 	file.addDir();

package/core/com/static/index.js

@@ -117,7 +117,7 @@ Static.prototype.getObj = async function(dir) {
  */
 Static.prototype.update_config_all = async function(path) {
 	if (!path) {
-		path = $.runPath + 'app' + $.slash;
+		path = './app'.fullname();
 	}
 	// 获取所有应用路径
 	var search_dir = "static";

package/index.js

@@ -1,3 +1,10 @@
+// 增强版补丁：彻底解决util._extend API弃用警告
+const util = require('util');
+// 完全替换util._extend为Object.assign的包装函数，确保行为一致
+util._extend = function(target, source) {
+    return Object.assign({}, target, source);
+};
+
 require('mm_logs');
 require('mm_ret');
 $.Tpl = require('mm_tpl');
@@ -73,6 +80,11 @@ class OS {
 				"database": "mm",
 				"user": "admin",
 				"password": "asd123"
+			},
+			"modules": {
+				"hotReload": true,
+				"watchInterval": 5000,
+				"autoLoad": true
 			}
 		};
 		this.init(config);
@@ -86,7 +98,7 @@ class OS {
 OS.prototype.initData = function(config) {
 	var p = config.runPath;
 	if (!p) {
-		config.runPath = $.runPath
+		config.runPath = $.runPath;
 	} else if (p.substring(p.length - 1) !== $.slash) {
 		config.runPath += $.slash;
 	}
@@ -210,13 +222,32 @@ OS.prototype.init = function(config) {
  */
 OS.prototype.initBase = function(cg) {
 	var middleware = $.middleware;
+	// 更新中间件配置，并且加载JS文件
 	middleware.update();
 	var mqtt, web;
 	if (cg.web && cg.web.state) {
 		web = new WEB(cg.web);
+		// 过滤出web模式的中间件
 		web.list = middleware.list.filter((o) => {
 			return !o.mode || o.mode == "web"
 		});
+		// 预加载中间件函数，确保list中的每个中间件都有func属性
+		if (web.list && web.list.length > 0) {
+			for (var i = 0; i < web.list.length; i++) {
+				var o = web.list[i];
+				try {
+					if (o.func_file && !o.func) {
+						o.func = require(o.func_file);
+					}
+				} catch (error) {
+					if ($.log && $.log.error) {
+						$.log.error(`预加载中间件失败: ${o.name}`, error);
+					} else {
+						console.error(`预加载中间件失败: ${o.name}`, error);
+					}
+				}
+			}
+		}
 		web.init();
 		this.web = web;
 	}
@@ -243,16 +274,14 @@ OS.prototype.main = async function(state) {
 	$.timer.run();
 
 	var cg = this.config;
-	var web_server = this.web_server;
-	var mqtt_server = this.mqtt_server;
 	var tip = "启动";
 	if (cg.web && cg.web.state) {
 		tip += " web";
 		if (cg.web.socket) {
 			tip += " socket";
 		}
-		var eventer = $.event_admin('api');
-		eventer.update();
+		var evt = $.event_admin('api');
+		evt.update();
 		this.web.run();
 	}