mm_os 2.9.2 → 2.9.3

package/cache/route/main/config.json

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

package/cache/sys/app_admin/config.json

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

package/cache/sys/main/config.json

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

package/cache/sys/mqtt_engine/config.json

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

package/cache/sys/user/config.json

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

package/cache/user/main/config.json

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

package/core/com/mqtt/index.js

@@ -31,7 +31,7 @@ class MQTT extends Index {
 			port: "1883",
 			protocol: "mqtt",
 			clientId: "iot_test",
-			subscribe_qos: 0,
+			subscribe_qos: 1,
 			publish_qos: 1,
 			username: "iot_test",
 			password: "asd123",
@@ -125,7 +125,7 @@ MQTT.prototype.match = function(topic, top) {
 /**
  * 初始化
  */
-MQTT.prototype.update_after = function() {
+MQTT.prototype.update_after = async function() {
 	var _this = this;
 	var list = this.list;
 	for (var i = 0, o; o = list[i++];) {
@@ -135,7 +135,7 @@ MQTT.prototype.update_after = function() {
 					_this.send(topic, msg, qos, retain);
 				}
 			};
-			o.exec('init');
+			await o.exec('init');
 			var topics = o.config.topic;
 			if (topics) {
 				for (var i = 0; i < topics.length; i++) {
@@ -275,7 +275,7 @@ MQTT.prototype.receive = async function(push_topic, msg) {
 				for (var i = 0; i < topics.length; i++) {
 					var topic = topics[i];
 					if (this.match(push_topic, topic)) {
-						ret = await o.run(push_topic, msg, topic, i);
+						ret = await o.exec('handle', push_topic, msg, topic, i);
 					}
 				}
 			}

package/core/com/task/drive.js

@@ -42,7 +42,10 @@ class Drive extends Item {
 	constructor(dir) {
 		super(dir, __dirname);
 		this.default_file = "./task.json";
-
+		
+		// 更新配置并重载脚本
+		this.mode = 3;
+		
 		/// 配置参数
 		this.config = {
 			// 名称, 由中英文和下“_”组成, 用于修改或卸载 例如: demo
@@ -299,7 +302,9 @@ Drive.prototype.run = async function(func) {
 	if (func) {
 		await this.setInterval(this.setPeriod(this.setNum(func)));
 	} else {
-		await this.setInterval(this.setPeriod(this.setNum(this.main)));
+		await this.setInterval(this.setPeriod(this.setNum(() => {
+			this.main();
+		})));
 	}
 	return this;
 };

package/core/com/task/index.js

@@ -18,6 +18,8 @@ class Task extends Index {
 		this.Drive = Drive;
 		this.type = "task";
 		this.title = title;
+		// 更新配置并重载脚本
+		this.mode = 3;
 	}
 }
 

package/demo/app/dev/LICENSE

@@ -0,0 +1,201 @@
+                                 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

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

package/demo/app/dev/app.js

@@ -0,0 +1,147 @@
+/**
+ * @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

@@ -0,0 +1,12 @@
+{
+    "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

@@ -0,0 +1,10 @@
+{
+	"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

@@ -0,0 +1,17 @@
+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;

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

@@ -0,0 +1,19 @@
+[{
+	// 目标对象
+	"target": "/apis/dev*",
+	// 事件名称, 用于动态增删改
+	"name": "dev_manage",
+	// 标题, 用于开发者查看事件
+	"title": "示例事件",
+	// 描述, 用于介绍该事件是做什么用的
+	"description": "描述事件使用方法",
+	// 阶段, 分执行前before、验证check、主要main、渲染render、执行后after阶段
+	"stage": "main",
+	"state": 1,
+	// 响应方法 GET请求、POST请求、ALL所有请求，如果非API事件可自定义
+	"method": "ALL",
+	// 函数文件, 当事件触发时执行指定的脚本
+	"func_file": "./main.js",
+	// 执行顺序, 数值越小越优先执行
+	"sort": 100
+}]

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

@@ -0,0 +1,26 @@
+// 使用api管理器
+var api = $.api_admin('dev_manage', 'dev_manage');
+// 首次启动更新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/demo/app/dev/plugin/doc/static/api_list.html

@@ -0,0 +1,144 @@
+<!DOCTYPE html>
+<html lang="zh">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta http-equiv="x-dns-prefetch-control" content="on">
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+		<meta name="format-detection" content="telephone=no">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="black">
+		<meta name="description" content="这是web API文档">
+		<meta name="keywords" content="开发文档">
+		<meta name="author" content="邱文武">
+
+		<!-- 加载CSS样式 -->
+		<link rel="stylesheet" href="/css/font-awesome.min.css" async />
+		<link rel="stylesheet" href="/css/mm_base.css" async />
+		<link rel="stylesheet" href="/css/mm_layout.css" async />
+		<link rel="stylesheet" href="/css/mm_common.css" async />
+		<link rel="stylesheet" href="/css/mm_component.css" async />
+		<link rel="stylesheet" href="/css/mm_theme.css" async />
+
+		<!-- 加载JS脚本 -->
+		<script src="/js/jquery.min.js"></script>
+		<script src="/js/clipboard.min.js" async></script>
+		<script src="/js/vue.js"></script>
+		<script src="/js/mm_sdk.js"></script>
+
+		<title>接口列表</title>
+		<style>
+			body {
+				background: #fff;
+			}
+
+			main {
+				padding: 2rem;
+			}
+
+			#app h4 {
+				padding-bottom: 0.5rem;
+				border-bottom: 1px solid rgba(125, 125, 125, 0.25);
+				margin-bottom: 1rem;
+			}
+
+			.scope_list {
+				padding-left: 2rem;
+			}
+
+			.desc {
+				margin-bottom: 2rem;
+			}
+
+			.mm_btn {
+				border: 1px solid var(--color_border);
+			}
+
+			h4 a {
+				font-size: 0.875rem;
+				padding-top: 0.5rem;
+			}
+		</style>
+	</head>
+	<body>
+		<div id="app">
+			<div class="mm_page">
+				<main>
+					<div class="mm_warp">
+						<h4>API接口文档 —— <span>列表</span> <a class="fr" href="./">选择域</a></h4>
+						<p class="desc">所有的API接口都作用在不同的域下，您可以点击以下域，访问该域下的接口列表</p>
+						<table class="mm_table table-hover" v-if="list.length">
+							<thead>
+								<tr>
+									<th>#</th>
+									<th width="200">名称</th>
+									<th width="200">标题</th>
+									<th>描述</th>
+									<th width="80">操作</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr v-for="(o, k) in list" :key="k">
+									<th>{{ k + 1 }}</th>
+									<td><a :href="'./api_view.html?scope=' + query.scope + '&name=' + o.name">{{ o.name }}</a></td>
+									<td>{{ o.title }}</td>
+									<td>{{ o.description }}</td>
+									<td><a class="mm_btn btn_info-x" :href="'./api_view.html?scope=' + query.scope + '&name=' + o.name">查看</a></td>
+								</tr>
+							</tbody>
+						</table>
+						<div v-else class="desc center">
+							该域下没有定义API接口
+						</div>
+					</div>
+				</main>
+			</div>
+		</div>
+		<script>
+			var vue = new Vue({
+				el: '#app',
+				data() {
+					return {
+						url: "/api/dev_api?",
+						query: {
+							scope: "client"
+						},
+						list: []
+					}
+				},
+				methods: {
+					get_list() {
+						var _this = this;
+						$.http.get(this.url + $.toUrl(this.query), function(json, status) {
+							_this.get_list_after(json);
+						});
+					},
+					get_list_after(json) {
+						if (json.result) {
+							var list = this.list;
+							list.clear();
+							list.addList(json.result.list);
+						}
+					}
+				},
+				created() {
+					var arr = location.search.split("&");
+					var len = arr.length;
+					if (len > 0) {
+						for (var i = 0; i < len; i++) {
+							var o = arr[i];
+							if (o.indexOf('scope') !== -1) {
+								var ar = o.split("=");
+								if (ar.length > 1) {
+									this.query.scope = ar[1];
+								}
+							};
+						}
+					}
+					this.get_list();
+				}
+			});
+		</script>
+	</body>
+</html>