mm_os 2.9.1 → 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,29 +58,6 @@ class Drive extends Item {
 			// 是否将ES6转换AMD
 			"convert_amd": true
 		};
-
-		this.init(config);
-	}
-}
-
-Drive.prototype.init = function(config) {
-	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);
 	}
 }
 
@@ -89,36 +67,17 @@ Drive.prototype.init = function(config) {
 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);
 };
 
 /**

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,7 +90,7 @@ class Static extends Index {
  * @param {Object} dir 目录
  * @return {Drive} 静态文件驱动类
  */
-Static.prototype.getObj = function(dir) {
+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('/'));
@@ -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

@@ -158,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);
@@ -214,7 +214,6 @@ OS.prototype.initBase = function(cg) {
 	$.timer.run();
 }
 
-
 /**
  * 运行主程序
  * @param {String} state 状态
@@ -243,6 +242,7 @@ OS.prototype.main = async function(state) {
 		$.task.update().then(() => {
 			$.task.run();
 		});
+		tip += " task";
 	}
 	console.log(tip);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "2.9.1",
+	"version": "2.9.2",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -42,7 +42,7 @@
 		"mm_html": "^1.1.6",
 		"mm_koa_proxy": "^1.0.0",
 		"mm_logs": "^1.1.7",
-		"mm_machine": "^1.9.1",
+		"mm_machine": "^1.9.7",
 		"mm_mongodb": "^1.4.2",
 		"mm_mqtt": "^1.0.6",
 		"mm_mysql": "^1.9.2",

package/cache/sys/main/config.json

@@ -1 +0,0 @@
-{}

package/cache/user/main/config.json

@@ -1 +0,0 @@
-{}

package/demo/app/dev/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/demo/app/dev/README.md

@@ -1 +0,0 @@
-## 开发者工具

package/demo/app/dev/app.js

@@ -1,147 +0,0 @@
-/**
- * @fileOverview dev
- * @author <a href="作者主页地址">插件作者</a>
- * @version 1.0
- */
-
-/**
- * @description 插件对象
- */
-module.exports = {
-	/**
-	 * @description 初始化
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null, 否则返回错误提示
-	 */
-	init(option) {
-		// 创建数据库管理器
-		var db = $.db_admin('sys');
-		db.update(__dirname);
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 安装
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	install(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 卸载
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	uninstall(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 更新
-	 * @param {Object} option 配置参数
-	 * @return {String} 成功返回null, 否则返回错误提示
-	 */
-	update(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 启动
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	start(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 暂停
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	stop(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 结束
-	 * @param {Object} opiton 配置参数
-	 * @return {String} 成功返回null,否则返回错误提示
-	 */
-	end(option) {
-		var msg = null;
-		return msg;
-	},
-
-	/**
-	 * @description 插件
-	 * @param {String} item 插件项
-	 * @return {Object} 旗下插件和信息
-	 */
-	help(item) {
-		var tip = "";
-		switch (item) {
-			case "run":
-				break;
-			default:
-				break;
-		}
-		return tip;
-	},
-
-	/**
-	 * @description 主程序
-	 * @param {Object} param1 参数1
-	 * @param {Object} param2 参数2
-	 * @return {Object} 返回执行结果
-	 */
-	main(param1, param2) {
-		var ret = null;
-		return ret;
-	},
-
-	/**
-	 * @description 指令（类似命令提示符）
-	 * @param {String} content 指令内容
-	 * @return {String} 执行结果
-	 */
-	cmd(content) {
-		var ret = "";
-		return ret;
-	},
-
-	/**
-	 * @description API接口（用于其他插件调用该插件时）
-	 * @param {Object} ctx HTTP上下文
-	 * @param {Object} db 数据库管理器
-	 * @return {Object} 执行结果
-	 */
-	api(ctx, db) {
-		var ret = "";
-		return ret;
-	},
-
-	/**
-	 * @description 聊天（通过聊天的方式驱动插件, 用于机器人开发）
-	 * @param {String} from_user 发送消息人
-	 * @param {String} to_user 接收消息人
-	 * @param {String} content 内容
-	 * @param {String} group 群组 如果是个人，群组为空
-	 * @param {Number} type 群类型, 1永久会话/群、2临时会话/群
-	 * @param {String} msg_type 消息类型, event事件型、message消息型。默认消息型
-	 * @param {Object} 数据管理器
-	 * @return {String} 回复内容
-	 */
-	async chat(from_user, to_user, group, content, type, msg_type, db) {
-		var ret = "";
-		return ret;
-	}
-};

package/demo/app/dev/app.json

@@ -1,12 +0,0 @@
-{
-    "name": "dev",
-    "title": "开发工具",
-    "description": "该应用便于开发和管理自由人服务端，可管理“应用、插件、事件、接口、任务、数据库”等",
-    "version": "1.0",
-    "identifier": "dev",
-    "lang_path": "./lang/",
-    "icon": "/dev/img/logo.png",
-    "script": "./app.js",
-    "sort": 10,
-    "state": 1
-}

package/demo/app/dev/event_api/client/event.json

@@ -1,10 +0,0 @@
-{
-	"target": "/api/dev*",
-	"name": "dev_client",
-	"title": "开发者客户端调用的接口事件",
-	"description": "用于开发者访问服务端时调用的接口",
-	"stage": "main",
-	"func_file": "./main.js",
-	"sort": 99,
-	"end": true
-}

package/demo/app/dev/event_api/client/main.js

@@ -1,17 +0,0 @@
-var api = $.api_admin('dev_client', '开发者客户端');
-// 首次启动更新api接口;
-api.update('dev/');
-
-/**
- * @description 接口主函数
- * @param {Object} ctx HTTP上下文
- * @param {Object} db 数据管理器,如: { next: async function{}, ret: {} }
- * @return {Object} 执行结果
- */
-async function main(ctx, db) {
-	// 在这定义要访问的数据库 (分布式开发时设置不同的数据库名)
-	$.push(db, $.sql.db(), true);
-	return api.run(ctx, db);
-};
-
-exports.main = main;