mm_os 4.1.7 → 4.1.9

package/adapter/mqtt.js

@@ -31,6 +31,7 @@ class Mqtt extends Adapter {
 /**
  * 初始化适配器
  * @param {object} cache 缓存管理器
+ * @returns {object} 适配器实例
  * @private
  */
 Mqtt.prototype._init = function (cache) {

package/adapter/socket.js

@@ -21,6 +21,7 @@ class Socket extends Adapter {
 
 /**
  * 初始化适配器
+ * @returns {object} 适配器实例
  * @private
  */
 Socket.prototype._init = function () {

package/adapter/web.js

@@ -32,7 +32,7 @@ Web.prototype._preset = function () {
 
 /**
  * 使用中间件
- * @param {function} middleware 中间件函数
+ * @param {Function} middleware 中间件函数
  */
 Web.prototype.use = function (middleware) {
   this.web.use(middleware);
@@ -41,6 +41,7 @@ Web.prototype.use = function (middleware) {
 /**
  * 初始化
  * @param {object} server 服务器实例
+ * @returns {object} 适配器实例
  */
 Web.prototype.init = function (server) {
   if (server) {

package/adapter/websocket.js

@@ -137,7 +137,7 @@ WebSocket.prototype._onError = function (client_id, error) {
 
 /**
  * 使用中间件
- * @param {function} middleware 中间件函数
+ * @param {Function} middleware 中间件函数
  */
 WebSocket.prototype.use = function (middleware) {
   this.broker.use(middleware);

package/com/api/drive.js

@@ -50,8 +50,8 @@ class Drive extends Item {
   };
   /**
    * 构造函数
-   * @param {Object} config 配置项
-   * @param {Object} parent 父对象
+   * @param {object} config 配置项
+   * @param {object} parent 父对象
    * @class
    */
   constructor(config, parent) {
@@ -701,7 +701,7 @@ Drive.prototype.getModel = function (type) {
   model.app = app_name;
   model.plugin = plugin_name;
   model.name = model.name || name;
-  model.path = "/" + app_name + "/" + name;
+  model.path = '/' + app_name + '/' + name;
   return model;
 };
 

package/com/api/index.js

@@ -114,14 +114,14 @@ Api.prototype.isMatch = function (str, pattern) {
   if (str === pattern) {
     return true;
   } else if (pattern.startsWith('*')) {
-    const clean = pattern.replaceAll('*', '');
+    let clean = pattern.replaceAll('*', '');
     if (pattern.endsWith('*')) {
       return str.indexOf(clean) !== -1;
     } else {
       return str.endsWith(clean);
     }
   } else if (pattern.endsWith('*')) {
-    const clean = pattern.replaceAll('*', '');
+    let clean = pattern.replaceAll('*', '');
     return str.startsWith(clean);
   }
   else {

package/com/cmd/drive.js

@@ -177,8 +177,8 @@ Drive.prototype.enhancedMatch = function (msg, db) {
 Drive.prototype._contextAwareMatch = function (msg, db) {
   var name = this.config.name.toLowerCase();
   var title = this.config.title.toLowerCase();
-  var description = this.config.description.toLowerCase();
-  var content = (msg.content || '').toLowerCase();
+  // var description = this.config.description.toLowerCase();
+  // var content = (msg.content || '').toLowerCase();
 
   // 1. 基于消息类型的匹配
   if (this._matchByMsgType(msg, name, title)) {

package/com/cmd/index.js

@@ -204,7 +204,7 @@ Cmd.prototype._fullList = async function () {
  * @returns {object|string} 返回指令执行结果
  */
 Cmd.prototype.cmd = async function (name, state, ...params) {
-  var obj = this.get(name);
+  var obj = this.getMod(name);
   if (!obj) {
     return '错误: 指令不存在';
   }

package/com/cmd/script.tpl.js

@@ -21,12 +21,13 @@ module.exports = {
   async main(msg, db) {
     let form = msg.form;
     return {
-      "location": "梅州",
-      "datetime": "2023-08-25 12:00",
-      "weather": "晴朗",
-      "temperature": "25",
-      "humidity": "60%",
-      "wind": "3级"
+      location: '梅州',
+      datetime: '2023-08-25 12:00',
+      weather: '晴朗',
+      temperature: '25',
+      humidity: '60%',
+      wind: '3级',
+      ...form
     }
   }
 };

package/com/db/drive.js

@@ -65,7 +65,7 @@ Drive.prototype._preset = function () {
 
   // 是否设置默认该表仅用户可访问
   this.query_default_table = ['user'];
-}
+};
 
 /**
  * 解析字段类型

package/com/event/index.js

@@ -220,14 +220,14 @@ Event.prototype.isMatch = function (str, pattern) {
   if (str === pattern) {
     return true;
   } else if (pattern.startsWith('*')) {
-    const clean = pattern.replaceAll('*', '');
+    let clean = pattern.replaceAll('*', '');
     if (pattern.endsWith('*')) {
       return str.indexOf(clean) !== -1;
     } else {
       return str.endsWith(clean);
     }
   } else if (pattern.endsWith('*')) {
-    const clean = pattern.replaceAll('*', '');
+    let clean = pattern.replaceAll('*', '');
     return str.startsWith(clean);
   }
   else {

package/com/mqtt/index.js

@@ -533,7 +533,7 @@ Mqtt.prototype.req = function (topic, method, params, func, timeout = 0) {
 
     // 设置超时移除定时器
     var _this = this;
-    data.timer = setTimeout(function () {
+    data.timer = setTimeout(() => {
       _this._delMsgById(data.id);
     }, data.timeout);
   }
@@ -586,17 +586,17 @@ Mqtt.prototype._handleResponse = function (msg) {
   }
 
   for (var i = 0; i < this.list_msg.length; i++) {
-    var msg_item = this.list_msg[i];
-    if (msg_item.id === msg.id && msg_item.func) {
+    let o = this.list_msg[i];
+    if (o.id === msg.id && o.func) {
       try {
         // 执行回调函数
-        msg_item.func(msg);
+        o.func(msg);
       } catch (error) {
         console.error('MQTT回调函数执行错误:', error);
       }
 
       // 从列表中移除已处理的消息
-      this._delMsgById(msg.id);
+      this._delMsgById(o.id);
       break;
     }
   }
@@ -642,7 +642,7 @@ Mqtt.prototype.updateOnline = async function () {
 
   // 获取所有客户端
   var drives = await this.getClients();
-  var { list_online, list_offline, list_has } = this._processDeviceStatus(drives, now, online_expires);
+  var { list_online, list_offline } = this._processDeviceStatus(drives, now, online_expires);
 
   // 处理未出现的设备
   // this._processUnseenDevices(drives, list_offline, list_has);

package/com/mqtt/mm_mqtt.js

@@ -1,8 +1,4 @@
 const MQTT = require('mqtt');
-const {
-  v4
-} = require('uuid');
-
 
 /**
  * @module MQTT客户端
@@ -32,7 +28,6 @@ class Mqtt {
    */
   constructor(config) {
     this.config = {...Mqtt.config, ...config};
-    var client_id = v4();
     // mqtt客户端服务器
     this.client = null;
 

package/com/param/index.js

@@ -7,7 +7,7 @@ const Drive = require('./drive');
  * @class
  */
 class Param extends Manager {
-/**
+  /**
    * 配置参数
    * @type {object}
    */
@@ -102,7 +102,7 @@ Param.prototype.sort = function() {
  * @returns {object} 验证失败返回错误信息，成功返回null
  */
 Param.prototype.run = async function(db, name, query, body) {
-  var obj = this.get(name);
+  var obj = this.getMod(name);
   if (obj) {
     // 检查参数状态，状态为0时跳过执行
     if (obj.config && obj.config.state === 0) {
@@ -111,6 +111,7 @@ Param.prototype.run = async function(db, name, query, body) {
     try {
       return await obj.run(db, query, body);
     } catch (error) {
+      this.log('error', 'Param验证异常:', error);
       // 参数验证异常时返回null
       return null;
     }

package/com/pendant/index.js

@@ -360,7 +360,7 @@ Pendant.prototype.renderBlock = async function (ctx, db, blocks) {
   var html = '';
   for (var i = 0; i < blocks.length; i++) {
     var block = blocks[i];
-    var o = this.get(block.Pendant);
+    var o = this.getMod(block.pendant);
     if (o) {
       var option = this.optionModel(block);
       var ret = await o.call('main', ctx, db, option);

package/com/socket/drive.js

@@ -39,7 +39,7 @@ Drive.prototype._getStorageKey = function () {
  * 确保数据引用有效（热更新后调用）
  * @private
  */
-Drive.prototype._ensureDataRefs = function () {
+Drive.prototype._ensureRefs = function () {
   var storage_key = this._getStorageKey();
   
   // 检查全局存储是否存在
@@ -291,7 +291,7 @@ Drive.prototype.add = async function (ctx) {
  */
 Drive.prototype.send = function (token, method, params) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   var list = this.clients[token];
   if (list && list.length > 0) {
@@ -319,7 +319,7 @@ Drive.prototype.send = function (token, method, params) {
  */
 Drive.prototype.sendAll = function (method, params) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   var data = {
     method: method,
@@ -349,7 +349,7 @@ Drive.prototype.sendAll = function (method, params) {
  */
 Drive.prototype.req = function (token, method, params, func, timeout = 0) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   var list = this.clients[token];
   if (list && list.length > 0) {
@@ -369,7 +369,7 @@ Drive.prototype.req = function (token, method, params, func, timeout = 0) {
       
       // 设置超时移除定时器
       var _this = this;
-      data.timer = setTimeout(function() {
+      data.timer = setTimeout(() => {
         _this._delMsgById(data.id);
       }, data.timeout);
     }
@@ -395,7 +395,7 @@ Drive.prototype.req = function (token, method, params, func, timeout = 0) {
  */
 Drive.prototype.reqAll = function (method, params, func, timeout = 0) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   var data = {
     id: this._genMsgId(),
@@ -413,7 +413,7 @@ Drive.prototype.reqAll = function (method, params, func, timeout = 0) {
     
     // 设置超时移除定时器
     var _this = this;
-    data.timer = setTimeout(function() {
+    data.timer = setTimeout(() => {
       _this._delMsgById(data.id);
     }, data.timeout);
   }
@@ -446,7 +446,7 @@ Drive.prototype._genMsgId = function () {
  */
 Drive.prototype._delMsgById = function (msg_id) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   for (var i = 0; i < this.list_msg.length; i++) {
     if (this.list_msg[i].id === msg_id) {
@@ -467,24 +467,24 @@ Drive.prototype._delMsgById = function (msg_id) {
  */
 Drive.prototype._handleResponse = function (msg) {
   // 确保数据引用有效（热更新保护）
-  this._ensureDataRefs();
+  this._ensureRefs();
   
   if (!msg || !msg.id) {
     return;
   }
   
   for (var i = 0; i < this.list_msg.length; i++) {
-    var msg_item = this.list_msg[i];
-    if (msg_item.id === msg.id && msg_item.func) {
+    let o = this.list_msg[i];
+    if (o.id === msg.id && o.func) {
       try {
         // 执行回调函数
-        msg_item.func(msg);
+        o.func(msg);
       } catch (error) {
         console.error('Socket驱动回调函数执行错误:', error);
       }
       
       // 从列表中移除已处理的消息
-      this._delMsgById(msg.id);
+      this._delMsgById(o.id);
       break;
     }
   }

package/com/socket/index.js

@@ -7,7 +7,7 @@ const Drive = require('./drive');
  * @class
  */
 class Socket extends Manager {
-/**
+  /**
    * 配置参数
    * @type {object}
    */
@@ -282,17 +282,17 @@ Socket.prototype._handleResponse = function (msg) {
   }
   
   for (var i = 0; i < this.list_msg.length; i++) {
-    var msg_item = this.list_msg[i];
-    if (msg_item.id === msg.id && msg_item.func) {
+    let o = this.list_msg[i];
+    if (o.id === msg.id && o.func) {
       try {
         // 执行回调函数
-        msg_item.func(msg);
+        o.func(msg);
       } catch (error) {
         console.error('Socket回调函数执行错误:', error);
       }
       
       // 从列表中移除已处理的消息
-      this._delMsgById(msg.id);
+      this._delMsgById(o.id);
       break;
     }
   }

package/com/sql/index.js

@@ -102,7 +102,7 @@ Sql.prototype.sort = function () {
  * @returns {object} 执行结果
  */
 Sql.prototype.run = async function (name, query, body, db) {
-  var obj = this.get(name);
+  var obj = this.getMod(name);
   if (obj) {
     var ret = await obj.run(query, body, db);
     if (this.mode > 4) {

package/com/template/drive.js

@@ -3,43 +3,44 @@ const Item = require('mm_machine').Item;
 
 /**
  * 主题模板驱动类
- * @extends {Item}
  * @class
  */
 class Drive extends Item {
-	static config = {
-		"name": "",
-		"title": "",
-		"preview": "",
-		"preview_large": "",
-		"description": "",
-		"version": "1.0.0",
-		"git": ""
-	};
+  static config = {
+    name: '',
+    title: '',
+    description: '',
+    version: '1.0.0',
+    preview: '',
+    preview_large: '',
+    git: ''
+  };
 
-	/**
-	 * 主题模板驱动类
-	 * @param {object} config 主题模板配置
-	 * @param {object} parent 父项
-	 */
-	constructor(config, parent) {
-		super({ ...Drive.config, ...config }, parent);
-		// this.default_file = "./template.json";
-		// dir, "/static/template".fullname()
-	}
+  /**
+   * 主题模板驱动类
+   * @param {object} config 主题模板配置
+   * @param {object} parent 父项
+   */
+  constructor(config, parent) {
+    super({ ...Drive.config, ...config }, parent);
+    // this.default_file = "./template.json";
+    // dir, "/static/template".fullname()
+  }
 }
 
 /**
  * 压缩主题模板
+ * @param {string} zip_dir 压缩目录
+ * @returns {object} 压缩后的文件对象
  */
-Drive.prototype.zip = async function (zip_dir = "/static/file/zip/") {
-	var file = ("./" + this.config.name + '.zip').fullname(zip_dir);
-	file.addDir();
-	var done = await compressing.zip.compressDir(this.getDir(), file);
-	if (file.hasFile()) {
-		return file;
-	}
-	return null;
+Drive.prototype.zip = async function (zip_dir = '/static/file/zip/') {
+  var file = ('./' + this.config.name + '.zip').fullname(zip_dir);
+  file.addDir();
+  await compressing.zip.compressDir(this.getDir(), file);
+  if (file.hasFile()) {
+    return file;
+  }
+  return null;
 };
 
 /**
@@ -75,6 +76,6 @@ Drive.prototype.getModel = function (type) {
 };
 
 module.exports = {
-	Drive
+  Drive
 };
 

package/com/template/index.js

@@ -3,12 +3,11 @@ const Index = require('mm_machine').Index;
 const Drive = require('./drive').Drive;
 
 /**
- * 参数类
- * @extends {Index}
+ * 主题模板管理类
  * @class
  */
 class Template extends Index {
-	/**
+  /**
    * 配置参数
    * @type {object}
    */
@@ -70,28 +69,26 @@ class Template extends Index {
     mode: 3
   };
 
-	/**
-	 * 构造函数
-	 * @param {String} scope 作用域
-	 * @param {String} title 标题
-	 * @constructor
-	 */
-	constructor(config, parent) {
-		super({ ...Template.config, ...config }, parent);
-		this.type = "template";
-		this.title = config.title;
-	}
+  /**
+   * 构造函数
+   * @param {object} config 配置参数
+   * @param {object} parent 父项
+   */
+  constructor(config, parent) {
+    super({ ...Template.config, ...config }, parent);
+  }
 }
 
 Template.prototype.Drive = Drive;
 
 /**
  * 解压模板
- * @param {Object} file 模板压缩文件
+ * @param {string} file 模板压缩文件
+ * @returns {object} 解压后的文件对象
  */
 Template.prototype.unzip = async function(file) {
-	var done = await compressing.zip.uncompress(file, "/static/template".fullname());
-	return done;
+  var done = await compressing.zip.uncompress(file, '/static/template'.fullname());
+  return done;
 };
 
 /**
@@ -107,7 +104,7 @@ Template.prototype.get = function(key) {
  * 主题模板模板池
  */
 if (!$.pool.template) {
-	$.pool.template = {};
+  $.pool.template = {};
 }
 
 /**
@@ -117,25 +114,25 @@ if (!$.pool.template) {
  * @returns {object} 返回一个缓存类
  */
 function templateAdmin(scope, title) {
-	var sc = scope || $.val.scope + '';
-	var obj = $.pool.template[sc];
-	if (!obj) {
-		$.pool.template[sc] = new Template({
-			name: sc,
-			title: title
-		});
-		obj = $.pool.template[sc];
-	}
-	return obj;
+  var sc = scope || $.val.scope + '';
+  var obj = $.pool.template[sc];
+  if (!obj) {
+    $.pool.template[sc] = new Template({
+      name: sc,
+      title: title
+    });
+    obj = $.pool.template[sc];
+  }
+  return obj;
 }
 
 /**
  * @module 导出模板管理器
  */
 if ($.admin) {
-	$.admin.template = templateAdmin;
+  $.admin.template = templateAdmin;
 }
 
 module.exports = {
-	Template
+  Template
 };

package/common/middleware/web_after/index.js

@@ -4,10 +4,10 @@
 module.exports = {
   /**
    * 中间件初始化
-   * @param {object} apapter 适配器
+   * @param {object} adapter 适配器
    * @param {object} eventer 事件处理器
    */
-  async _init(apapter, eventer) {
+  async _init(adapter, eventer) {
     var event = $.admin.event('api', 'API事件');
     // await event.call('update', 'app/');
     await event.do('init');