mm_os 2.9.3 → 2.9.5

package/core/com/cmd/index.js

@@ -19,128 +19,245 @@ class Cmd extends Index {
 		this.type = "cmd";
 		this.title = title;
 		this.list_before = [];
+		this.list_check = [];
 		this.list_main = [];
+		this.list_render = [];
 		this.list_after = [];
 		// 默认启用热更新
 		this.mode = 3;
+
+		/**
+		 * 配置参数
+		 */
+		this.config = {
+			table: "wechat_message",
+			key: "message_id",
+			// 聊天间隔时长，单位：秒，600秒为10分钟
+			interval: 600
+		};
 	}
 }
 
+/**
+ * 设置配置
+ * @param {Object} config 配置参数
+ */
+Cmd.prototype.set_config = function(config) {
+	Object.assign(this.config, config);
+}
+
 /**
  * 执行指令
- * @param {Object} msg 消息
- * @param {Object} db 数据管理器
- * @param {String} table 表名
- * @return {Object|String}
+ * @param {Object} msg 消息对象
+ * @param {Object} db 数据库对象
+ * @param {Object} list 数据库对象
+ * @return {Object} 返回值
  */
-Cmd.prototype.run = async function(msg, db, table) {
+Cmd.prototype.run_cmd_sub = async function(msg, db, tense = 'main') {
+	var list = this['list_' + tense];
+	if (!list) {
+		return
+	}
 	var ret;
-	// 判断是否含有消息和消息正文
-	if (msg && msg.content) {
-		db.msg = {
-			content: "",
-			content_last: msg.content,
-			form: "",
-			stage: 1
-		};
-
-		// 判断是否启用数据库存储消息，如果表名为空则不存储消息
-		if (table) {
-			db.table = table;
-			db.key = "message_id";
-			var query = {
-				from_user: msg.from_user,
-				to_user: msg.to_user,
-				group: msg.group,
-				type: msg.type,
-				end: 0
-			};
-			// 获取当前未结束的会话记录
-			var msg_log = await db.getObj(query);
-			// 如果不存在未结束会话，则创建新会话记录
-			if (!msg_log) {
-				var bl = await db.add(msg);
-				if (bl) {
-					msg_log = await db.getObj(query);
-					if (msg_log) {
-						msg_log.time_create = new Date().toStr('yyyy-MM-dd hh:mm:ss');
-					}
-				} else {
-					$.log.error('添加微信消息到wechat_message表失败！', msg_log);
-					return null;
+	for (var i = 0, o; o = list[i++];) {
+		if (o.config.state === 1) {
+			ret = await o.run(msg, db);
+			if (ret) {
+				db.ret = ret;
+				// 如果匹配指令则将该消息定义为使用该指令
+				msg.cmd = o.config.name;
+				if (o.config.end) {
+					break;
 				}
-			} else if (msg_log.content_last !== msg.content) {
-				// 判断是否重复会话内容，如果未重复则添加新内容
-				msg_log.content += '\r\n' + msg.content;
 			}
-			msg_log.content_last = msg.content;
-			db.msg = msg_log;
-
-			var lt = this.list_before;
-			for (var i = 0, o; o = lt[i++];) {
-				if (o.config.state === 1) {
-					ret = await o.run_cmd(msg, db);
-					if (ret) {
-						break;
-					}
-				}
-			}
-			if (!ret) {
-				// 判断会话记录是否锁定了指令, 如果存在则继续执行该指令程序
-				if (msg_log.cmd) {
-					// 检索指令驱动是否存在
-					var drive = this.list.getObj({
-						config: {
-							name: msg_log.cmd
-						}
-					});
-
-					if (drive) {
-						// 如果存在则执行指令
-						ret = await drive.run(msg, db);
-					} else {
-						// 如果不存在则结束会话, 并创建新会话
-						db.msg.end = 1;
-						var bl = await db.add(msg);
-						if (bl) {
-							msg_log = await db.getObj(query);
-							if (msg_log) {
-								msg_log.time_create = new Date().toStr('yyyy-MM-dd hh:mm:ss');
-							}
-							db.msg = msg_log;
-						}
-					}
-				}
+		}
+	}
+	return ret;
+}
 
-				if (db.msg.keyword) {
-					// 添加消息
-					msg.content = db.msg.keyword + "\r\n" + msg.content;
-				}
-			}
+
+
+// // 获取当前未结束的会话记录
+// var log = await db.getObj(query);
+// // 如果不存在未结束会话，则创建新会话记录
+// if (!log) {
+// 	var bl = await db.add(msg);
+// 	if (bl) {
+// 		log = await db.getObj(query);
+// 		if (log) {
+// 			log.time_create = new Date().toStr('yyyy-MM-dd hh:mm:ss');
+// 		}
+// 	} else {
+// 		$.log.error('添加微信消息到wechat_message表失败！', log);
+// 		return null;
+// 	}
+// } else if (log.content_last !== msg.content) {
+// 	// 判断是否重复会话内容，如果未重复则添加新内容
+// 	log.content += '\r\n' + msg.content;
+// }
+// log.content_last = msg.content;
+// db.msg = log;
+
+// var lt = this.list_before;
+// for (var i = 0, o; o = lt[i++];) {
+// 	if (o.config.state === 1) {
+// 		ret = await o.run_cmd(msg, db);
+// 		if (ret) {
+// 			break;
+// 		}
+// 	}
+// }
+// if (!ret) {
+// 	// 判断会话记录是否锁定了指令, 如果存在则继续执行该指令程序
+// 	if (msg_log.cmd) {
+// 		// 检索指令驱动是否存在
+// 		var drive = this.list.getObj({
+// 			config: {
+// 				name: msg_log.cmd
+// 			}
+// 		});
+
+// 		if (drive) {
+// 			// 如果存在则执行指令
+// 			ret = await drive.run(msg, db);
+// 		} else {
+// 			// 如果不存在则结束会话, 并创建新会话
+// 			db.msg.end = 1;
+// 			var bl = await db.add(msg);
+// 			if (bl) {
+// 				msg_log = await db.getObj(query);
+// 				if (msg_log) {
+// 					msg_log.time_create =;
+// 				}
+// 				db.msg = msg_log;
+// 			}
+// 		}
+// 	}
+
+// 	if (db.msg.keyword) {
+// 		// 添加消息
+// 		msg.content = db.msg.keyword + "\r\n" + msg.content;
+// 	}
+// }
+
+/**
+ * 获取上下文
+ * @param {Object} msg 消息
+ * @param {Object} db 数据管理器
+ * @return {Object}
+ */
+Cmd.prototype.get_context = async function(msg, db) {
+	var cg = this.config;
+	var now = new Date();
+	var query = {
+		from_user: msg.from_user,
+		to_user: msg.to_user,
+		group: msg.group,
+		type: msg.type,
+		time_create_max: now.addSeconds(cg.interval).toStr('yyyy-MM-dd hh:mm:ss')
+	};
+	var db1 = db.new(cg.table, cg.key);
+	var log = await db1.getObj(query, '`time_create` desc');
+	if(log && !log.end)
+	{
+		return log;
+	}
+	return null;
+}
+
+/**
+ * 合并消息
+ * @param {Object} msg
+ * @param {Array} log
+ */
+Cmd.prototype.merge_msg = function(msg, log) {
+	var m = Object.assign({}, msg, log);
+	m.content = log.content + "\r\n" + msg.content;
+	m.content_last = msg.content;
+	return m;
+}
+
+/**
+ * 保存消息
+ * @param {Object} msg 消息
+ * @param {Object} db 数据管理器
+ */
+Cmd.prototype.save_msg = async function(msg, db) {
+	var cg = this.config;
+	var db1 = db.new(cg.table, cg.key);
+	var ret = db.ret;
+	if (ret) {
+		if (typeof(ret) == "object") {
+			ret = JSON.stringify(ret);
 		}
-		if (!ret) {
-			var lt = this.list_main;
-			for (var i = 0, o; o = lt[i++];) {
-				if (o.config.state === 1) {
-					ret = await o.run_first(msg, db);
-					if (ret) {
-						break;
-					}
-				}
-			}
+		msg.result = ret;
+	}
+	if (msg[cg.key]) {
+		var qy = {};
+		qy[cg.key] = msg[cg.key];
+		return await db1.set(qy, msg);
+	} else {
+		return await db1.add(msg);
+	}
+}
+
+/**
+ * 执行指令
+ * @param {Object} msg 消息
+ * @param {Object} db 数据管理器
+ * @return {Object|String}
+ */
+Cmd.prototype.run = async function(msg, db) {
+	// 判断是否含有消息和消息正文
+	if (!msg || !msg.content) {
+		return;
+	}
+	db.table = this.config.table;
+	db.key = this.config.key;
+	msg.stage = 1;
+
+	// 1.先执行前时态指令
+	var ret = await this.run_cmd_sub(msg, db, 'before');
+	db.ret = ret;
+	// console.log("执行前", ret);
+	// 2.先执行验证时态指令，如果通过则返回空，否则返回验证失败结果。
+	var ret_check = await this.run_cmd_sub(msg, db, 'check');
+	// console.log("执行检查", ret_check);
+	if (ret_check || ret_check === "") {
+		ret = ret_check;
+	} else {
+		// 3-1.先判断本次内容是否为指令，如果是则执行指令。
+		var ret_main = await this.run_cmd_sub(msg, db, 'main');
+		console.log("执行", ret_main);
+		if (ret_main) {
+			ret = ret_main;
 		}
 		if (!ret) {
-			var lt = this.list_after;
-			for (var i = 0, o; o = lt[i++];) {
-				if (o.config.state === 1) {
-					ret = await o.run_first(msg, db);
-					if (ret) {
-						break;
-					}
+			// 3-2.如果本次内容非指令，则先获取历史未完成的指令。拼接本次内容，并执行指令。
+			var log = await this.get_context(msg, db);
+			if (log) {
+				msg = this.merge_msg(msg, log);
+				ret_main = await this.run_cmd_sub(msg, db, 'main');
+				console.log("合并执行", ret_main);
+				if (ret_main) {
+					ret = ret_main;
 				}
 			}
 		}
 	}
+
+	// 4.执行后时态指令
+	var ret_after = await this.run_cmd_sub(msg, db, 'after');
+	if (ret_after) {
+		ret = ret_after;
+		// console.log("执行后", ret);
+	}
+	if (ret) {
+		db.ret = ret;
+	}
+
+	// 5.记录本次消息
+	await this.save_msg(msg, db);
 	return ret;
 };
 
@@ -161,8 +278,10 @@ Cmd.prototype.sort = async function() {
  */
 Cmd.prototype.sort_tense = async function() {
 	this.list_before.clear();
-	this.list_after.clear();
+	this.list_check.clear();
 	this.list_main.clear();
+	this.list_render.clear();
+	this.list_after.clear();
 
 	var lt = this.list;
 	for (var i = 0; i < lt.length; i++) {
@@ -171,6 +290,12 @@ Cmd.prototype.sort_tense = async function() {
 			case "before":
 				this.list_before.push(o);
 				break;
+			case "check":
+				this.list_check.push(o);
+				break;
+			case "render":
+				this.list_render.push(o);
+				break;
 			case "after":
 				this.list_after.push(o);
 				break;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_os",
-	"version": "2.9.3",
+	"version": "2.9.5",
 	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
 	"main": "index.js",
 	"scripts": {
@@ -45,7 +45,7 @@
 		"mm_machine": "^1.9.7",
 		"mm_mongodb": "^1.4.2",
 		"mm_mqtt": "^1.0.6",
-		"mm_mysql": "^1.9.2",
+		"mm_mysql": "^1.9.3",
 		"mm_redis": "^1.4.2",
 		"mm_ret": "^1.4.0",
 		"mm_session": "^1.4.8",

package/cache/route/main/config.json

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

package/cache/sys/app_admin/config.json

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

package/cache/sys/main/config.json

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

package/cache/sys/mqtt_engine/config.json

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

package/cache/sys/user/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 @@
-## 开发者工具