mm_os 2.8.7 → 2.8.9

package/middleware/web_event/middleware.json

@@ -1,10 +1,10 @@
-{
-	"name": "web_event",
-	"title": "web路由事件",
-	"description": "用于拓展事件API",
-	"version": "1.0",
-	"type": "web",
-	"process_type": "common_before",
-	"after": true,
-	"sort": 15
+{
+	"name": "web_event",
+	"title": "web路由事件",
+	"description": "用于拓展事件API",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_before",
+	"after": true,
+	"sort": 15
 }

package/middleware/web_proxy/index.js

@@ -1,24 +1,24 @@
-const {
-	proxy,
-	proxyTo,
-	isMatch
-} = require('mm_koa_proxy');
-
-/**
- * 应用
- * @param {Object} server 服务
- * @param {Object} config 配置参数
- */
-module.exports = function(server, config) {
-	if (config && config.proxy) {
-		var options = config.proxy;
-		if (options.targets) {
-			server.use(proxy(options, function(op, ctx, next) {
-				if (ctx.session && ctx.session.user) {
-					ctx.request.header['user_id'] = ctx.session.user.user_id;
-				}
-			}));
-		}
-	}
-	return server;
+const {
+	proxy,
+	proxyTo,
+	isMatch
+} = require('mm_koa_proxy');
+
+/**
+ * 应用
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	if (config && config.proxy) {
+		var options = config.proxy;
+		if (options.targets) {
+			server.use(proxy(options, function(op, ctx, next) {
+				if (ctx.session && ctx.session.user) {
+					ctx.request.header['user_id'] = ctx.session.user.user_id;
+				}
+			}));
+		}
+	}
+	return server;
 };

package/middleware/web_proxy/middleware.json

@@ -1,9 +1,9 @@
-{
-	"name": "web_proxy",
-	"title": "web代理服务",
-	"description": "用于将特定路由转发到别的服务端上做处理",
-	"version": "1.0",
-	"type": "web",
-	"process_type": "worker",
-	"sort": 6
+{
+	"name": "web_proxy",
+	"title": "web代理服务",
+	"description": "用于将特定路由转发到别的服务端上做处理",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "worker",
+	"sort": 6
 }

package/middleware/web_router/index.js

@@ -1,33 +1,33 @@
-/**
- * 应用
- * @param {Object} server 服务
- * @param {Object} config 配置参数
- */
-module.exports = function(server, config) {
-	"./app".fullname().addDir();
-	
-	// 追加主程序
-	server.main("/*", async (ctx, db) => {
-		var md = ctx.method.toLocaleLowerCase();
-		var list = server.routes[md];
-		return await server.run_route(ctx, db, list);
-	});
-	
-	// 使用路由(主要)
-	server.use(async (ctx, next) => {
-		var db = ctx.db;
-		if (ctx.path !== "/favicon.ico") {
-			db.ret = await server.run_event(ctx, server.events.check, db);
-			if (!db.ret) {
-				db.ret = await server.run_event(ctx, server.events.main, db);
-			}
-			db.ret = await server.run_event(ctx, server.events.render, db) || db.ret;
-			if (db.ret) {
-				ctx.body = db.ret;
-			}
-		}
-		await next();
-	});
-	
-	return server;
-};
+/**
+ * 应用
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	"./app".fullname().addDir();
+	
+	// 追加主程序
+	server.main("/*", async (ctx, db) => {
+		var md = ctx.method.toLocaleLowerCase();
+		var list = server.routes[md];
+		return await server.run_route(ctx, db, list);
+	});
+	
+	// 使用路由(主要)
+	server.use(async (ctx, next) => {
+		var db = ctx.db;
+		if (ctx.path !== "/favicon.ico") {
+			db.ret = await server.run_event(ctx, server.events.check, db);
+			if (!db.ret) {
+				db.ret = await server.run_event(ctx, server.events.main, db);
+			}
+			db.ret = await server.run_event(ctx, server.events.render, db) || db.ret;
+			if (db.ret) {
+				ctx.body = db.ret;
+			}
+		}
+		await next();
+	});
+	
+	return server;
+};

package/middleware/web_router/middleware.json

@@ -1,10 +1,10 @@
-{
-	"name": "web_router",
-	"title": "web路由拓展",
-	"description": "用于拓展web路由的基本功能和事件API",
-	"version": "1.0",
-	"type": "web",
-	"process_type": "common_after",
-	"after": true,
-	"sort": 21
+{
+	"name": "web_router",
+	"title": "web路由拓展",
+	"description": "用于拓展web路由的基本功能和事件API",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "common_after",
+	"after": true,
+	"sort": 21
 }

package/middleware/web_socket/index.js

@@ -1,21 +1,21 @@
-const websocket = require('koa-websocket');
-
-/**
- * 应用
- * @param {Object} server 服务
- */
-module.exports = function(server, config) {
-	// 引入web socket通讯
-	server = websocket(server);
-	if (config.socket && $.Socket) {
-		// console.log("已启动websocket服务！");
-		//使用 websocket 服务
-		$.socket = new $.Socket();
-		$.socket.update();
-		server.ws.use((ctx, next) => {
-			$.socket.run(ctx, next);
-		});
-	}
-
-	return server;
-};
+const websocket = require('koa-websocket');
+
+/**
+ * 应用
+ * @param {Object} server 服务
+ */
+module.exports = function(server, config) {
+	// 引入web socket通讯
+	server = websocket(server);
+	if (config.socket && $.Socket) {
+		// console.log("已启动websocket服务！");
+		//使用 websocket 服务
+		$.socket = new $.Socket();
+		$.socket.update();
+		server.ws.use((ctx, next) => {
+			$.socket.run(ctx, next);
+		});
+	}
+
+	return server;
+};

package/middleware/web_socket/middleware.json

@@ -1,9 +1,9 @@
-{
-	"name": "web_scoket",
-	"title": "webscoket通讯",
-	"description": "用于即时通讯",
-	"version": "1.0",
-	"type": "web",
-	"process_type": "master",
-	"sort": 18
+{
+	"name": "web_scoket",
+	"title": "webscoket通讯",
+	"description": "用于即时通讯",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "master",
+	"sort": 18
 }

package/middleware/web_static/index.js

@@ -1,26 +1,26 @@
-const statics = require('mm_statics');
-
-/**
- * 应用
- * @param {Object} server 服务
- * @param {Object} config 配置参数
- */
-module.exports = function(server, config) {
-	// 处理静态文件
-	if (config.static) {
-		server.use(statics(
-			config.static_path.fullname(), {
-				maxAge: config.max_age || 0,
-				gzip: config.compress || false,
-				brotli: config.compress || false
-			}));
-		// 使用多路径静态文件处理器
-		if ($.Static) {
-			const Static = $.Static;
-			$.static = new Static();
-			$.static.update();
-			server.use($.static.run);
-		}
-	}
-	return server;
+const statics = require('mm_statics');
+
+/**
+ * 应用
+ * @param {Object} server 服务
+ * @param {Object} config 配置参数
+ */
+module.exports = function(server, config) {
+	// 处理静态文件
+	if (config.static) {
+		server.use(statics(
+			config.static_path.fullname(), {
+				maxAge: config.max_age || 0,
+				gzip: config.compress || false,
+				brotli: config.compress || false
+			}));
+		// 使用多路径静态文件处理器
+		if ($.Static) {
+			const Static = $.Static;
+			$.static = new Static();
+			$.static.update();
+			server.use($.static.run);
+		}
+	}
+	return server;
 };

package/middleware/web_static/middleware.json

@@ -1,9 +1,9 @@
-{
-	"name": "web_static",
-	"title": "web静态文件处理",
-	"description": "用于处理静态文件",
-	"version": "1.0",
-	"type": "web",
-	"process_type": "worker",
-	"sort": 18
+{
+	"name": "web_static",
+	"title": "web静态文件处理",
+	"description": "用于处理静态文件",
+	"version": "1.0",
+	"type": "web",
+	"process_type": "worker",
+	"sort": 18
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "2.8.7",
+	"version": "2.8.9",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -31,29 +31,29 @@
 	"license": "ISC",
 	"dependencies": {
 		"compressing": "^1.10.1",
-		"koa": "^2.15.4",
+		"koa": "^2.16.0",
 		"koa-body": "^6.0.1",
 		"koa-compress": "^5.1.1",
 		"koa-send": "^5.0.1",
 		"koa-websocket": "^7.0.0",
 		"mm_check": "^1.4.9",
-		"mm_excel": "^1.2.0",
-		"mm_expand": "^1.7.9",
+		"mm_excel": "^1.2.1",
+		"mm_expand": "^1.8.0",
 		"mm_html": "^1.1.6",
 		"mm_koa_proxy": "^1.0.0",
 		"mm_logs": "^1.1.7",
-		"mm_machine": "^1.9.0",
+		"mm_machine": "^1.9.1",
 		"mm_mongodb": "^1.4.2",
 		"mm_mqtt": "^1.0.6",
-		"mm_mysql": "^1.8.9",
+		"mm_mysql": "^1.9.0",
 		"mm_redis": "^1.4.2",
-		"mm_ret": "^1.3.9",
+		"mm_ret": "^1.4.0",
 		"mm_session": "^1.4.8",
 		"mm_statics": "^1.4.8",
 		"mm_tpl": "^2.4.2",
 		"mm_xml": "^1.1.6",
 		"mosca": "^2.8.3",
-		"mqtt": "^5.10.3",
+		"mqtt": "^5.10.4",
 		"publish": "^0.6.0"
 	}
 }