mm_os 4.1.2 → 4.1.4

package/com/db/drive.js

@@ -29,7 +29,7 @@ class Drive extends Item {
     'fields': [
       /* */
     ],
-    'index‌': [],
+    'index': [],
     // 主程序文件 - 默认为空
     'main': ''
   };
@@ -61,7 +61,7 @@ Drive.prototype._reset = function () {
   this.get_not = ['password', 'salt', 'content'];
 
   // 是否设置以下字段为getObj查对象SQL时不可见
-  this.getobj_not = ['password', 'salt', 'display'];
+  this.get_obj_not = ['password', 'salt', 'display'];
 
   // 是否设置默认该表仅用户可访问
   this.query_default_table = ['user'];
@@ -78,10 +78,10 @@ Drive.prototype._parseFieldType = function (type) {
   var max = 0;
   var decimal = 0;
   if (len) {
-    max = number(len.left(',', true));
+    max = Number(len.left(',', true));
     var d = len.right(',');
     if (d) {
-      decimal = number(d);
+      decimal = Number(d);
     }
   }
   return { tp, max, decimal };
@@ -110,11 +110,11 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
     if (range) {
       var min_str = range.left(',', true);
       if (min_str) {
-        min = number(min_str);
+        min = Number(min_str);
       }
       var max_str = range.right(',');
       if (max_str) {
-        var n = number(max_str);
+        var n = Number(max_str);
         if (tp === 'varchar') {
           if (n < local_max_length) {
             local_max_length = n;
@@ -126,8 +126,11 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
     }
     map = desc.between('(', ')');
   }
-
-  return { title, description, map, min, max, max_length: local_max_length };
+  let min_length = 0;
+  if (min > 0) {
+    min_length = min;
+  }
+  return { title, description, map, min, max, min_length, max_length: local_max_length };
 };
 
 /**
@@ -137,7 +140,7 @@ Drive.prototype._parseFieldNote = function (note, tp, max_length) {
  * @param {number} max_length 最大长度
  * @returns {number} 计算后的最大值
  */
-Drive.prototype._calculateMaxValue = function (tp, max, max_length) {
+Drive.prototype._calcMaxValue = function (tp, max, max_length) {
   var local_max = max;
   if (local_max === 0) {
     switch (tp) {
@@ -275,6 +278,7 @@ Drive.prototype.model = function (fields) {
     map,
     min,
     max: parsedMax,
+    min_length,
     max_length: parsedMaxLength
   } = this._parseFieldNote(note, tp, max_length);
 
@@ -309,7 +313,7 @@ Drive.prototype.model = function (fields) {
  * @property {string} o.Manager_comment 索引备注
  * @returns {object} 返回索引模型
  */
-Drive.prototype.modelmanager = function (o) {
+Drive.prototype.newIndexModel = function (o) {
   return {
     'name': o.Key_name,
     'type': o.Non_unique ? 'unique' : 'index',
@@ -323,16 +327,16 @@ Drive.prototype.modelmanager = function (o) {
  * @param {object} db 数据库管理器
  * @returns {Array} 索引列表
  */
-Drive.prototype.updateFilemanager = function (db) {
+Drive.prototype._updateFile = async function (db) {
   var sql = 'SHOW INDEX FROM `' + this.config.table + '`';
-  var rows = db.run(sql);
+  var rows = await db.run(sql);
   var dict = {};
   for (var i = 0; i < rows.length; i++) {
     var o = rows[i];
     if (o.Key_name !== 'PRIMARY') {
       if (!dict[o.Key_name]) {
         dict[o.Key_name] = {
-          column_name: []
+          Column_name: []
         };
       }
       dict[o.Key_name].Column_name.push(o.Column_name);
@@ -340,7 +344,7 @@ Drive.prototype.updateFilemanager = function (db) {
   }
   var list = [];
   for (var k in dict) {
-    var m = this.modelmanager(dict[k]);
+    var m = this.newIndexModel(dict[k]);
     list.push(m);
   }
 
@@ -381,7 +385,7 @@ Drive.prototype.updateFile = async function (db, cover) {
     list.push(field);
   }
   cg.fields = list;
-  cg.index‌ = await this.updateFilemanager(db);
+  cg.index‌ = await this._updateFile(db);
   if (!cg.name) {
     cg.name = cg.table;
   }
@@ -392,14 +396,14 @@ Drive.prototype.updateFile = async function (db, cover) {
  * 更新索引
  * @param {object} db 数据库管理器
  */
-Drive.prototype.updateDbmanager = async function (db) {
+Drive.prototype._updateDb = async function (db) {
   var cg = this.config;
   let index = cg.index || [];
   // 更新索引
   if (index) {
     var len = index.length;
     for (var i = 0; i < len; i++) {
-      var o = index‌[i];
+      var o = index[i];
       var sql_start = '';
       if (o.type === 'unique') {
         sql_start = 'CREATE UNIQUE INDEX `';
@@ -470,7 +474,6 @@ Drive.prototype._generateFieldSql = function (o) {
   var notnull = this._getNotNullSql(o);
   var value = this._getValueSql(o);
   var note = this._getNoteSql(o);
-
   return this._buildFieldSql(o.name, type, notnull, value, note);
 };
 
@@ -715,8 +718,7 @@ Drive.prototype._addOrUpdateField = async function (db, table, o, fields) {
  */
 Drive.prototype.updateDb = async function (db) {
   var cg = this.config;
-  db.table = cg.table + '';
-  var table = cg.table;
+  var table = cg.table + '';
   var list = cg.fields;
 
   var fields = await this._initTable(db, cg, list);
@@ -742,14 +744,14 @@ Drive.prototype.updateDb = async function (db) {
  * @returns {object} 目录信息
  * @private
  */
-Drive.prototype._deteDire = function (cg) {
+Drive.prototype._deteDir = function (cg) {
+  var arr = cg.table.split('_');
+  var scope = arr[0];
   var p = './app/'.fullname();
-  var dir_arr = cg.table.split('_');
-  var scope = dir_arr[0];
-  var dir = p + scope;
-  var dir_api = dir + '/plugin/server';
-  var db_dir = dir_api + '/db';
-  var config_file = db_dir.fullname() + cg.table.replace(scope + '_', '') + '.db.json';
+  var dir = ('./' + scope).fullname(p);
+  var dir_api = ('./plugin/server').fullname(dir);
+  var db_dir = ('./db').fullname(dir_api);
+  var config_file = ('./' + cg.table.replace(scope + '_', '') + '.db.json').fullname(db_dir);
 
   return {
     scope,
@@ -790,7 +792,7 @@ Drive.prototype._handleConfigFile = function (f, cover) {
       delete o.description;
     }
     $.push(jobj, o, true);
-    f.saveText(JSON.stringify(jobj, null, 4));
+    f.saveText(JSON.stringify(jobj, null, 2));
   }
 };
 
@@ -804,14 +806,12 @@ Drive.prototype.updateApp = async function (cover) {
   var dir_api;
 
   if (!this.config_file) {
-    var dirs = this._deteDire(cg);
-
+    var dirs = this._deteDir(cg);
     this._ensureDir(dirs.dir);
     this._ensureDir(dirs.dir + '/plugin');
     this._ensureDir(dirs.dir_api);
     this._ensureDir(dirs.db_dir);
-
-    this.dir = dirs.db_dir.fullname();
+    this._dir = dirs.db_dir;
     this.config_file = dirs.config_file;
     f = dirs.config_file;
     dir_api = dirs.dir_api;
@@ -820,16 +820,10 @@ Drive.prototype.updateApp = async function (cover) {
   }
 
   if (f) {
-    if (!this.dir) {
-      this.dir = f.dirname();
-      if (!fs.existsSync(this.dir)) {
-        fs.mkdirSync(this.dir);
-      }
-    }
+    f.addDir();
     if (!dir_api) {
-      dir_api = this.dir.dirname();
+      dir_api = f.dirname().dirname();
     }
-
     this._handleConfigFile(f, cover);
     this.updateApi(dir_api, cover);
   }
@@ -855,9 +849,10 @@ Drive.prototype._ensureApiDir = function (dir) {
  * @returns {string} 完整目录路径
  * @private
  */
-Drive.prototype._deteApiDir = function (dir, app, type, name) {
+Drive.prototype._getApiDir = function (dir, app, type, name) {
   var l = $.slash;
-  var o = $.pool.api[app + '_' + type];
+  let event_api = $.admin.event('api');
+  var o = event_api.getMod(app + '_' + type);
   var api_dir;
 
   if (o) {
@@ -888,8 +883,8 @@ Drive.prototype.updateApi = async function (dir, cover) {
   }
   var app = arr[0];
 
-  var client = this._deteApiDir(dir, app, 'client', name);
-  var manage = this._deteApiDir(dir, app, 'manage', name);
+  var client = this._getApiDir(dir, app, 'client', name);
+  var manage = this._getApiDir(dir, app, 'manage', name);
 
   this.newSql(client, manage, cover);
   await this.newParam(client, manage, cover);
@@ -1050,7 +1045,7 @@ Drive.prototype._procFieldSel = function (field_name, field_type) {
   if (this.isCan(field_name, this.get_not, field_type)) {
     res.field += ',`' + field_name + '`';
   }
-  if (this.isCan(field_name, this.getObj_not)) {
+  if (this.isCan(field_name, this.get_obj_not)) {
     res.field_obj += ',`' + field_name + '`';
   }
 
@@ -1104,7 +1099,7 @@ Drive.prototype._procNumberQuery = function (
     update: { ...update_obj }
   };
 
-  if (!field_name.end('id')) {
+  if (!field_name.endsWith('id')) {
     query[field_name + '_min'] = '`' + field_name + '` >= {0}';
     query[field_name + '_max'] = '`' + field_name + '` <= {0}';
     res.update[field_name + '_add'] = '`' + field_name + '` = `' + field_name + '` + {0}';
@@ -1324,7 +1319,7 @@ Drive.prototype._saveClientConfig = function (client, base_model, orderby, uid,
   if (orderby) {
     oj.orderby_default = orderby;
   }
-  if (oj.query_default[uid] && table.indexOf('user_') !== -1) {
+  if (oj.orderby_default && oj.query_default[uid] && table.indexOf('user_') !== -1) {
     oj.filter = {
       'table': 'table',
       'page': 'page',
@@ -1351,7 +1346,7 @@ Drive.prototype._saveManageConfig = function (manage, base_model, cover) {
   delete m.method;
   m.field_hide = [];
   m.name += 2;
-  m.field_obj = m.field_obj.replace(',`time_create`', '').replace(',`time_update`', '')
+  m.field_obj = (m.field_obj || '*').replace(',`time_create`', '').replace(',`time_update`', '')
     .replace(',`create_time`', '').replace(',`update_time`', '');
   delete m.query_default;
   this.saveFile(manage + '/sql.json', m, cover);
@@ -1388,7 +1383,7 @@ Drive.prototype.newSql = async function (client, manage, cover) {
  */
 Drive.prototype.saveFile = function (file, model, cover) {
   if (!file.hasFile()) {
-    file.saveText(JSON.stringify(model, null, 4));
+    file.saveText(JSON.stringify(model, null, 2));
   } else if (cover) {
     var jobj = file.loadJson();
     for (var k in model) {
@@ -1398,7 +1393,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
       }
     }
     $.push(jobj, model, true);
-    file.saveText(JSON.stringify(jobj, null, 4));
+    file.saveText(JSON.stringify(jobj, null, 2));
   }
 };
 
@@ -1408,7 +1403,7 @@ Drive.prototype.saveFile = function (file, model, cover) {
  * @param {string} manage 管理端配置保存路径
  * @param {boolean} cover 是否覆盖文件
  */
-Drive.prototype.new = async function (client, manage, cover) {
+Drive.prototype.newParam = async function (client, manage, cover) {
   var cg = this.config;
   var lt = cg.fields;
   var cm = this._initParamConfig(cg);
@@ -1665,7 +1660,7 @@ Drive.prototype._addDateTimeRange = function (cm, m, n) {
  */
 Drive.prototype._processNumberField = function (cm, m, o, n, cg) {
   m.type = 'number';
-  m.default = number(o.default) + '';
+  m.default = Number(o.default) + '';
   m.number = {};
 
   this._addNumberRange(m, o);
@@ -1738,7 +1733,7 @@ Drive.prototype._processNonPrimaryKey = function (cm, m, n) {
  */
 Drive.prototype._processNonTinyInt = function (cm, m, n) {
   var ne = n;
-  if (!ne.end('id')) {
+  if (!ne.endsWith('id')) {
     this._addNumberRangeFields(cm, m, n);
   } else {
     cm.get.query.push(n);
@@ -1826,6 +1821,9 @@ Drive.prototype._saveParamFiles = function (cm, client, manage, cover) {
  * @returns {boolean} 是否设置
  */
 Drive.prototype.isSet = function (name, arr) {
+  if (!arr) {
+    return false;
+  }
   var bl = false;
   for (var i = 0; i < arr.length; i++) {
     if (name.indexOf(arr[i]) !== -1) {
@@ -1847,6 +1845,9 @@ Drive.prototype.isCan = function (name, arr, type) {
   if (type === 'longtext') {
     return false;
   }
+  if (!arr) {
+    return false;
+  }
   var bl = false;
   for (var i = 0; i < arr.length; i++) {
     if (name.indexOf(arr[i]) !== -1) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mm_os",
 	"description": "MM_OS服务端架构，用于快速构建应用程序，支持网站建设、小程序后台、AI应用、物联网(IOT/AIOT)、游戏服务端等多种场景。",
-	"version": "4.1.2",
+	"version": "4.1.4",
 	"main": "index.js",
 	"keywords": [
 		"AI",

package/server.js

@@ -12,8 +12,8 @@ const {
   Config
 } = require('mm_config');
 
-const { TCP } = require('./tpc');
-const { Software } = require('./software');
+const { TCP } = require('./tcp.js');
+const { Software } = require('./software.js');
 
 const {
   Com

package/tcp.js

@@ -0,0 +1,276 @@
+const {
+  Manager
+} = require('mm_machine');
+const {
+  Web
+} = require('./adapter/web.js');
+const {
+  Mqtt
+} = require('./adapter/mqtt.js');
+const {
+  Socket
+} = require('./adapter/socket.js');
+const {
+  WebSocket
+} = require('./adapter/websocket.js');
+
+const {
+  Middleware
+} = require('./core/middleware/index.js');
+const {
+  Notifier
+} = require('./core/notifier/index.js');
+const {
+  Pusher
+} = require('./core/pusher/index.js');
+const {
+  Sender
+} = require('./core/sender/index.js');
+
+/**
+ * TCP类
+ * 负责管理整个应用的服务端架构
+ */
+class TCP {
+  constructor(config, parent) {
+    this.getParent = function () {
+      return parent;
+    };
+  }
+}
+
+/**
+ * 获取适配器
+ */
+TCP.prototype.getAdapter = function () {
+  return this.getParent().adapter;
+};
+
+/**
+ * 获取管理器
+ */
+TCP.prototype.getManager = function () {
+  return this.getParent().manager;
+};
+
+/**
+ * 加载
+ */
+TCP.prototype.load = async function () {
+  // 初始化管理器
+  await this._initManager();
+  // 加载资源
+  await this._loadSources();
+};
+
+/**
+ * 加载资源
+ */
+TCP.prototype._loadSources = async function () {
+  let manager = this.getManager();
+  await Promise.all([
+    manager.middleware.runAll('load'),
+    manager.notifier.runAll('load'),
+    manager.sender.runAll('load'),
+    manager.pusher.runAll('load')
+  ]);
+};
+
+/**
+ * 初始化
+ */
+TCP.prototype.init = async function () {
+  // 初始化适配器
+  await this._initAdapter();
+  // 初始化管理器
+  await this._initManager();
+  // 初始化资源
+  await this._initSources();
+};
+
+/**
+ * 初始化资源
+ */
+TCP.prototype._initSources = async function () {
+  let server = this.getParent();
+  let manager = server.manager;
+  let adapter = server.adapter;
+  await Promise.all([
+    manager.notifier.runAll('init', adapter, server.eventer, server.logger),
+    manager.sender.runAll('init', adapter, server.eventer, server.logger),
+    manager.pusher.runAll('init', adapter, server.eventer, server.logger),
+    manager.middleware.runWait('init', adapter, server.eventer, server.logger)
+  ]);
+};
+
+/**
+ * 初始化适配器
+ */
+TCP.prototype._initAdapter = async function () {
+  let server = this.getParent();
+  let config  = server.config;
+  // http服务器
+  var web = new Web(config.web);
+  let adapter = server.adapter;
+  adapter.web = web;
+  web.init(server);
+  if (config.web.socket) {
+    // websocket服务器 - 与web服务器共享同一个端口
+    adapter.ws = await new WebSocket(config.web).init(web);
+  }
+  if (config.mqtt && config.mqtt.state) {
+    // mqtt服务器
+    adapter.mqtt = await new Mqtt(config.mqtt).init(server);
+  }
+  if (config.socket && config.socket.state) {
+    // socket服务器
+    adapter.socket = await new Socket(config.socket || {}).init(server);
+  }
+};
+
+/**
+ * 初始化管理器
+ */
+TCP.prototype._initManager = async function () {
+  // console.time('[TIMING] _initManager');
+  // 管理器配置列表
+  var infos = [
+    { name: 'middleware', title: '中间件', Module: Middleware },
+    { name: 'notifier', title: '通知器', Module: Notifier },
+    { name: 'sender', title: '消息发送器', Module: Sender },
+    { name: 'pusher', title: '广播器', Module: Pusher }
+  ];
+
+  // 管理器实例集合
+  var managers = [];
+
+  // 使用for循环初始化所有管理器
+  for (var i = 0; i < infos.length; i++) {
+    var config = infos[i];
+    var manager = this._createManager(config.name, config.title, config.Module);
+    managers.push(manager);
+  }
+
+  // 并行执行所有管理器的初始化操作
+  var list = [];
+  for (var j = 0; j < managers.length; j++) {
+    list.push(managers[j].do('init'));
+  }
+
+  await Promise.all(list);
+  // console.timeEnd('[TIMING] _initManager');
+};
+
+/**
+ * 创建管理器实例
+ * @param {string} name 管理器名称
+ * @param {string} title 管理器标题
+ * @param {Function} cls 管理器类
+ * @returns {object} 管理器实例
+ */
+TCP.prototype._createManager = function (name, title, cls) {
+  let server = this.getParent();
+  var manager = new Manager(
+    {
+      name: name,
+      title: title,
+      filename: name + '.json',
+      tpl_dir: `./core/${name}/`.fullname(__dirname),
+      base_dir: `./common/${name}/`.fullname(__dirname),
+      dir: `./${name}`.fullname()
+    },
+    server,
+    server[name],
+    cls
+  );
+  // 设置到对应的管理器属性
+  server.manager[name] = manager;
+  return manager;
+}
+
+/**
+ * 启动
+ */
+TCP.prototype.start = async function () {
+  await this._startSources();
+  await this._startAdapter();
+};
+
+/**
+ * 启动资源
+ */
+TCP.prototype._startSources = async function () {
+  let manager = this.getManager();
+  await Promise.all([
+    manager.middleware.runAll('start'),
+    manager.notifier.runAll('start'),
+    manager.sender.runAll('start'),
+    manager.pusher.runAll('start')
+  ]);
+};
+
+/**
+ * 启动适配器
+ */
+TCP.prototype._startAdapter = async function () {
+  let list = [];
+  let adapter = this.getAdapter();
+  for (var k in adapter) {
+    try {
+      list.push(adapter[k].start());
+    } catch (error) {
+      this.log('error', '启动适配器失败:', error);
+    }
+  }
+  await Promise.all(list);
+};
+
+/**
+ * 停止
+ */
+TCP.prototype.stop = async function () {
+  // 停止适配器
+  await this._stopAdapter();
+  // 停止资源
+  await this._stopSources();
+};
+
+/**
+ * 停止适配器
+ */
+TCP.prototype._stopAdapter = async function () {
+  for (var k in this.getAdapter()) {
+    try {
+      await this.getAdapter()[k].stop();
+    } catch (error) {
+      this.log('error', '停止适配器失败:', error);
+    }
+  }
+};
+
+/**
+ * 停止资源
+ */
+TCP.prototype._stopSources = async function () {
+  let manager = this.getManager();
+  await Promise.all([
+    manager.middleware.runAll('stop'),
+    manager.notifier.runAll('stop'),
+    manager.pusher.runAll('stop'),
+    manager.sender.runAll('stop')
+  ]);
+};
+
+/**
+ * 运行
+ */
+TCP.prototype.run = async function () {
+  await this.load();
+  await this.init();
+  await this.start();
+  return this;
+};
+
+module.exports = {
+  TCP
+};