mm_os 4.2.6 → 4.2.8

package/com/event/index.js

@@ -1,5 +1,5 @@
-const Manager = require('mm_machine').Manager;
-const Drive = require('./drive');
+const Manager = require("mm_machine").Manager;
+const Drive = require("./drive");
 
 /**
  * Event事件类
@@ -16,22 +16,22 @@ class Event extends Manager {
      * 名称
      * @type {string}
      */
-    name: '',
+    name: "",
     /**
      * 标题
      * @type {string}
      */
-    title: '事件管理',
+    title: "事件管理",
     /**
      * 描述
      * @type {string}
      */
-    description: '这是事件管理器',
+    description: "这是事件管理器",
     /**
      * 检索文件名
      * @type {string}
      */
-    filename: 'event.json',
+    filename: "event.json",
     /**
      * 模板目录
      * @type {string}
@@ -41,17 +41,17 @@ class Event extends Manager {
      * 基础目录
      * @type {string}
      */
-    base_dir: '../common/event'.fullname(__dirname),
+    base_dir: "../common/event".fullname(__dirname),
     /**
      * 自定义目录，加载项目自定义资源
      * @type {string}
      */
-    dir: './app'.fullname(),
+    dir: "./app".fullname(),
     /**
      * 搜索模式 dir按目录搜索 | file按文件名搜索
      * @type {string}
      */
-    search_way: 'dir',
+    search_way: "dir",
     /**
      * 是否懒加载
      * @type {boolean}
@@ -66,7 +66,7 @@ class Event extends Manager {
      * 5.热更新+重载模式，改变配置文件重新加载配置和脚本，执行完后重新加载脚本
      * @type {number}
      */
-    mode: 3
+    mode: process.env.NODE_ENV === "production" ? 1 : 3,
   };
 
   /**
@@ -101,16 +101,42 @@ Event.prototype._preset = function () {
  */
 Event.prototype.Drive = Drive;
 
+/**
+ * 更新配置，注册模块后重建事件列表
+ * @param {string} dir 检索路径
+ * @param {boolean} clear 是否清除缓存
+ */
+Event.prototype.update = async function (dir, clear = true) {
+  try {
+    if (clear) {
+      this.clearMods();
+    }
+    var search_dir = dir || this.config.dir;
+    var files = await this._findFiles(search_dir);
+    this.regMods(files);
+    this.updateInfo();
+    if (!this.config.lazy_load) {
+      await this.loadMods();
+    }
+    this._is_loaded = true;
+  } catch (err) {
+    this.log("error", "更新配置失败", err);
+  }
+};
+
 /**
  * 清除事件
  * @param {string} stage 阶段
  */
 Event.prototype.clear = function (stage) {
   if (stage) {
-    if (this['list_' + stage]) {
-      this['list_' + stage] = [];
+    if (this["list_" + stage]) {
+      this["list_" + stage] = [];
     } else {
-      this.log('debug', '清空失败，事件发展阶段{0}不存在！'.replace('{0}', stage));
+      this.log(
+        "debug",
+        "清空失败，事件发展阶段{0}不存在！".replace("{0}", stage),
+      );
     }
   } else {
     this.list_before = [];
@@ -125,12 +151,20 @@ Event.prototype.clear = function (stage) {
  * 更新模块信息
  */
 Event.prototype.updateInfo = function () {
+  this._preset();
+  this.infos = [];
   for (let name in this.mods) {
     let o = this.mods[name];
-    let info = this.newInfo(name, o.config.sort, o.config.state, o.config_file);
+    let info = {
+      name: o.config.name,
+      sort: o.config.sort,
+      state: o.config.state,
+      config_file: o.config_file,
+    };
+    this.infos.push(info);
     this.pushList(o.config.stage, info);
   }
-  this.sort();
+  this._sort();
 };
 
 /**
@@ -140,19 +174,19 @@ Event.prototype.updateInfo = function () {
  */
 Event.prototype.pushList = function (stage, info) {
   switch (stage) {
-    case 'before':
+    case "before":
       this.list_before.push(info);
       break;
-    case 'check':
+    case "check":
       this.list_check.push(info);
       break;
-    case 'main':
+    case "main":
       this.list_main.push(info);
       break;
-    case 'render':
+    case "render":
       this.list_render.push(info);
       break;
-    case 'after':
+    case "after":
       this.list_after.push(info);
       break;
     default:
@@ -176,7 +210,7 @@ Event.prototype._sort = function () {
  * @param {Array} list 列表
  */
 Event.prototype._sortSub = function (list) {
-  var sort_key = this.config.sort_key || 'sort';
+  var sort_key = this.config.sort_key || "sort";
   list.sort((o1, o2) => {
     let s1 = o1[sort_key] || 100;
     let s2 = o2[sort_key] || 100;
@@ -194,21 +228,18 @@ Event.prototype._sortSub = function (list) {
 
 /**
  * 执行事件
- * @param {object} o 事件项
+ * @param {object} mod 模块
  * @param {object} ctx 请求上下文
  * @param {object} db 数据管理器
  * @returns {object} 执行结果
  */
-Event.prototype.doing = async function (o, ctx, db) {
-  if (o.isLoaded()) {
-    await o.call('loadScript');
-  }
-  var ret = o.run(ctx, db);
-  if (types.isPromise(ret)) {
-    ret = await ret;
+Event.prototype.doing = async function (mod, ctx, db) {
+  if (!mod.isLoaded()) {
+    await mod.do("load");
   }
+  var ret = await mod.run(ctx, db);
   if (this.mode > 4) {
-    o.do('reload');
+    mod.do("reload");
   }
   return ret;
 };
@@ -222,18 +253,17 @@ Event.prototype.doing = async function (o, ctx, db) {
 Event.prototype.isMatch = function (str, pattern) {
   if (str === pattern) {
     return true;
-  } else if (pattern.startsWith('*')) {
-    let clean = pattern.replaceAll('*', '');
-    if (pattern.endsWith('*')) {
+  } else if (pattern.startsWith("*")) {
+    let clean = pattern.replaceAll("*", "");
+    if (pattern.endsWith("*")) {
       return str.indexOf(clean) !== -1;
     } else {
       return str.endsWith(clean);
     }
-  } else if (pattern.endsWith('*')) {
-    let clean = pattern.replaceAll('*', '');
+  } else if (pattern.endsWith("*")) {
+    let clean = pattern.replaceAll("*", "");
     return str.startsWith(clean);
-  }
-  else {
+  } else {
     return false;
   }
 };
@@ -247,18 +277,12 @@ Event.prototype.isMatch = function (str, pattern) {
  * @returns {object} 执行结果
  */
 Event.prototype.runSub = async function (list, target, ctx, db) {
-  for (var i = 0, info; info = list[i++];) {
+  for (var i = 0, info; (info = list[i++]);) {
     if (info.state === 1) {
       let mod = this.getMod(info.name);
       if (mod && this.isMatch(target, mod.config.target)) {
         try {
-          if (!mod.isLoaded()) {
-            await mod.call('loadScript');
-          }
-          var ret = await mod.run(ctx, db);
-          if (this.mode > 4) {
-            mod.do('reload');
-          }
+          let ret = await this.doing(mod, ctx, db);
           if (ret) {
             db.ret = ret;
             if (mod.config.end) {
@@ -267,7 +291,7 @@ Event.prototype.runSub = async function (list, target, ctx, db) {
           }
         } catch (error) {
           // 事件执行异常时继续执行下一个事件
-          this.log('error', `事件${info.name}执行失败`, error);
+          this.log("error", `事件${info.name}执行失败`, error);
         }
       }
     }
@@ -358,9 +382,9 @@ Event.prototype.run = async function (target, ctx, db = {}) {
  * @param {string} stage 阶段
  * @returns {object} 返回单项配置
  */
-Event.prototype.get = function (name, stage = 'main') {
+Event.prototype.get = function (name, stage = "main") {
   var obj;
-  var lt = this['list_' + stage];
+  var lt = this["list_" + stage];
   var len = lt.length;
   for (var i = 0; i < len; i++) {
     var o = lt[i];
@@ -391,7 +415,7 @@ if (!$.pool.event) {
  * @returns {object} 返回一个事件类
  */
 function eventAdmin(scope, title) {
-  var sc = scope || $.val.scope + '';
+  var sc = scope || $.val.scope + "";
   var obj = $.pool.event[sc];
   if (!obj) {
     $.pool.event[sc] = new Event({

package/com/event/script.tpl.js

@@ -20,4 +20,4 @@ exports = {
     $.push(db, sql.db(), true);
     return api.run(ctx, db);
   }
-}
+};

package/com/mqtt/config.tpl.json

@@ -7,12 +7,20 @@
 	"description": "${description || '描述mqtt服务使用方法'}",
 	// 状态 0未启用，1启用
 	"state": 1,
-	// 订阅的主题
-	"topic": ["mqtt/face/#", "face/+/response", "mqtt/server/#"],
+	// 订阅的主题 {产品类型}/{设备ID}/{数据类型}/{子类型}
+	// 接收设备状态、事件、命令回复、设备请求
+	"topic": [
+		"face/+/status",
+		"face/+/event/recognition",
+		"face/+/cmd/+/response",
+		"face/+/request/+"
+	],
 	// 回复订阅主题
-	"topic_receive": ["mqtt/face/${clientid}", "face/${clientid}/request"],
+	"topic_receive": [
+		"face/${clientid}/response/${method}"
+	],
 	// 给客户端推送的主题
-	"topic_push": "mqtt/face/${clientid}",
+	"topic_push": "face/${clientid}/cmd/${method}",
 	// 接收方式
 	"qos": 2,
 	// 保持接收
@@ -22,13 +30,13 @@
 	// 客户端ID
 	"clientid": "clientid",
 	// 消息ID
-	"msgid": "messageId",
+	"msgid": "msgid",
 	// 请求方法
-	"method": "operator",
+	"method": "method",
 	// 参数
-	"params": "info",
+	"params": "params",
 	// 结果
 	"result": "result",
 	// 回复方法
-	"method_receive": "${method}-Ack"
+	"method_receive": "${method}_ask"
 }