mm_os 5.0.0 → 5.0.1

package/README.md

@@ -7,7 +7,8 @@
 - `OS` 类：初始化日志、管理、适配器、存储与应用加载器
 - 输入适配器：web / mqtt / socket / websocket
 - 输出适配器：redis / mongodb / mysql / sqlite / jsondb / file
-- 工具与管理：lang / tpl / ret / service / handle / event / api / param / sql / templete / pendant / timer / statics
+- 工具：lang / tpl / ret 
+- 管理：service / handle / event / api / param / dao / templete / pendant / timer / statics
 - `Loader` 类：扫描应用目录，加载应用与插件的配置、生命周期和资源清单
 - `osAdmin(scope, config)` 按作用域缓存系统实例，相同 `scope` 返回同一实例
 

package/index.js

@@ -1,5 +1,5 @@
 const OS = require('./lib/os');
-const Loader = require('./lib/loader');
+const { Loader } = require('mm_loader');
 const Admin = require('mm_corejs').Admin;
 
 let admin = new Admin();

package/lib/os.js

@@ -1,6 +1,10 @@
-const { Mod, Store } = require('mm_corejs');
+const path = require('path');
+const { Mod } = require('mm_mod');
+const { containerAdmin } = require('mm_container');
 const { getLogger } = require('mm_logger');
-const Loader = require('./loader');
+const { Loader } = require('mm_loader');
+const { appAdmin } = require('mm_apps');
+const { eventAdmin } = require('mm_event');
 
 /**
  * OS类
@@ -8,18 +12,85 @@ const Loader = require('./loader');
 class OS extends Mod {
   static config = {
     name: 'os',
-    in_adapters: ['web', 'mqtt', 'socket', 'websocket'],
-    out_adapters: ['redis', 'mongodb', 'mysql', 'sqlite', 'jsondb', 'file'],
-    tools: ['lang', 'tpl', 'ret'],
-    admins: ['handle', 'event', 'api', 'param', 'service', 'template', 'pendant', 'timer', 'statics'],
+    in_adapters: [{
+      name: 'web',
+      module: 'mm_web_server'
+    }, {
+      name: 'mqtt',
+      module: 'mm_mqtt_server'
+    }, {
+      name: 'socket',
+      module: 'mm_socket_server'
+    }, {
+      name: 'websocket',
+      module: 'mm_websocket_server'
+    }],
+    // 输出适配器
+    out_adapters: [{
+      name: 'redis',
+      module: 'mm_redis'
+    }, {
+      name: 'mongodb',
+      module: 'mm_mongodb'
+    }, {
+      name: 'mysql',
+      module: 'mm_mysql'
+    }, {
+      name: 'sqlite',
+      module: 'mm_sqlite'
+    }, {
+      name: 'jsondb',
+      module: 'mm_jsondb'
+    }, {
+      name: 'file',
+      module: 'mm_files'
+    }],
+    tools: [{
+      name: 'lang',
+      module: 'mm_lang'
+    }, {
+      name: 'tpl',
+      module: 'mm_tpl'
+    }, {
+      name: 'ret',
+      module: 'mm_ret'
+    }],
+    admins: [{
+      name: 'event',
+      module: 'mm_event'
+    }, {
+      name: 'api',
+      module: 'mm_api'
+    }, {
+      name: 'param',
+      module: 'mm_param'
+    }, {
+      name: 'dao',
+      module: 'mm_dao'
+    }, {
+      name: 'service',
+      module: 'mm_service'
+    }, {
+      name: 'template',
+      module: 'mm_template'
+    }, {
+      name: 'pendant',
+      module: 'mm_pendant'
+    }, {
+      name: 'timer',
+      module: 'mm_timer'
+    }, {
+      name: 'static',
+      module: 'mm_statics'
+    }],
     cache: {
       type: 'redis'
     },
-    db: {
+    sql: {
       type: 'mysql'
     },
     web: {
-      port: 8080
+      port: 8000
     },
     mqtt: {
       port: 1883
@@ -68,6 +139,9 @@ class OS extends Mod {
     tpl: {
       dir: './static/template',
       ext: '.html'
+    },
+    loader: {
+      dir: ''
     }
   }
 
@@ -78,20 +152,11 @@ class OS extends Mod {
   constructor(config) {
     super(config);
     /**
-     * 管理列表
-     * @type {Store}
-     */
-    this.admins = new Store();
-    /**
-     * 输入适配器列表
-     * @type {Store}
-     */
-    this.in_adapters = new Store();
-    /**
-     * 输出适配器列表
-     * @type {Store}
+     * 实例容器（按作用域共享）
+     * @type {object}
      */
-    this.out_adapters = new Store();
+    this.container = containerAdmin('os', { name: 'os' });
+    this.container.server = this;
   }
 
   /**
@@ -99,21 +164,49 @@ class OS extends Mod {
    * @returns {void} 无返回值
    */
   async onInit() {
+    this.initConfig();
     this.initLogger();
     // 初始化事件总线
     this.initEventBus();
+    // 存储需先于管理器初始化：mm_dao 等管理器会通过 mm_sql 的 getSql() 复用同名 SQL 实例，
+    // 若管理器先创建，则会以默认（空库名）配置占用实例，导致后续 SQL 报 No database selected
+    await this.initpStorage();
     await this.initAdmins();
     await this.initAdapter();
-    await this.initpStorage();
     await this.initLoader();
   }
 }
 
+/**
+ * 初始化配置管理器
+ */
+OS.prototype.initConfig = function () {
+  const { admin } = require('mm_config');
+  admin.setServer(this);
+  admin.get('os', this.config);
+  admin.get('cache', { ...this.config.cache, redis: this.config.redis, mongodb: this.config.mongodb });
+  admin.get('sql', { ...this.config.sql, mysql: this.config.mysql, sqlite: this.config.sqlite, jsondb: this.config.jsondb });
+  admin.get('web', this.config.web);
+  admin.get('mqtt', this.config.mqtt);
+  admin.get('socket', this.config.socket);
+  admin.get('websocket', this.config.websocket);
+  admin.get('jsondb', this.config.jsondb);  
+  admin.get('redis', this.config.redis);
+  admin.get('mongodb', this.config.mongodb);
+  admin.get('sqlite', this.config.sqlite);
+  admin.get('mysql', this.config.mysql);
+  admin.get('ret', this.config.ret);
+  admin.get('lang', this.config.lang);
+  admin.get('tpl', this.config.tpl);
+  admin.get('loader', this.config.loader);
+  this.reg('config', admin);
+};
+
 /**
  * 初始化日志记录器
  */
 OS.prototype.initLogger = function () {
-  this.logger = getLogger(this.config.log || { level: 'info' });
+  this.reg('logger', getLogger(this.config.log || { level: 'info' }));
 };
 
 /**
@@ -123,7 +216,7 @@ OS.prototype.initLogger = function () {
  * @param {...*} args 日志参数
  */
 OS.prototype.log = function (type, msg, ...args) {
-  this.logger[type](msg, ...args);
+  this.container.get('logger')[type](msg, ...args);
 };
 
 /**
@@ -132,7 +225,7 @@ OS.prototype.log = function (type, msg, ...args) {
  * @param {object} admin 管理对象
  */
 OS.prototype.reg = function (name, admin) {
-  this.admins.add({ id: name, name: name, admin });
+  this.container.set(name, admin);
 };
 
 /**
@@ -151,75 +244,54 @@ OS.prototype.require = function (mod_name) {
 OS.prototype.initAdapter = async function () {
   // 入站适配器
   let adapters = this.config.in_adapters || [];
-  for (let name of adapters) {
+  for (let mod of adapters) {
     try {
-      let admin = this.require(`mm_${name}_server`).admin;
+      let admin = this.require(mod.module).admin;
       admin.setServer(this);
-      let manager = admin.get('os', this.config[name]);
-      this._useMiddleware(name, manager);
+      let manager = admin.get('os', this.config[mod.name]);
       if (typeof manager.init === 'function') {
         await manager.init();
       }
-      this.in_adapters.add({ id: name, name: name, admin: manager });
+      this.reg(mod.name, manager);
     } catch (error) {
-      this.log('error', `初始化适配器 ${name} 失败: ${error}`);
+      this.log('error', `初始化适配器 ${mod.name} 失败: ${error}`);
     }
   }
 
   // 出站适配器
   let out_adapters = this.config.out_adapters || [];
-  for (let name of out_adapters) {
+  for (let mod of out_adapters) {
     try {
-      let admin = this.require(`mm_${name}`).admin;
+      let admin = this.require(mod.module).admin;
       admin.setServer(this);
-      let manager = admin.get('os', this.config[name]);
+      let manager = admin.get('os', this.config[mod.name]);
       if (typeof manager.init === 'function') {
         await manager.init();
       }
-      this.out_adapters.add({ id: name, name: name, admin: manager });
+      this.reg(mod.name, manager);
     } catch (error) {
-      this.log('error', `初始化适配器 ${name} 失败: ${error}`);
+      this.log('error', `初始化适配器 ${mod.name} 失败: ${error}`);
     }
   }
 };
 
-/**
- * 装配中间件：web 适配器挂载页面渲染中间件与静态资源插件，
- * 使 HTML 页面以正确内容类型输出，并让注册到 mm_statics 的静态文件可被直接访问
- * @param {string} name 适配器名称（web / socket / mqtt / websocket）
- * @param {object} manager 适配器管理器实例
- * @returns {void} 无返回值
- * @private
- */
-OS.prototype._useMiddleware = function (name, manager) {
-  if (name !== 'web' || !manager || typeof manager.use !== 'function') return;
-  try {
-    const { Render } = this.require('mm_render');
-    manager.use(new Render());
-    const statics_mod = this.require('mm_statics');
-    manager.use(new statics_mod.StaticsPlugin({ admin: statics_mod.admin }));
-  } catch (error) {
-    this.log('error', `装配渲染中间件失败: ${error.message}`);
-  }
-};
-
 /**
  * 初始化工具
  * @returns {void} 无返回值
  */
 OS.prototype.initTools = async function () {
   let tools = this.config.tools || [];
-  for (let name of tools) {
+  for (let mod of tools) {
     try {
-      let admin = this.require(`mm_${name}`).admin;
+      let admin = this.require(mod.module).admin;
       admin.setServer(this);
-      let manager = admin.get('os', this.config[name]);
+      let manager = admin.get('os', this.config[mod.name]);
       if (typeof manager.init === 'function') {
         await manager.init();
       }
-      this.reg(name, manager);
+      this.reg(mod.name, manager);
     } catch (error) {
-      this.log('error', `初始化工具 ${name} 失败: ${error}`);
+      this.log('error', `初始化工具 ${mod.name} 失败: ${error}`);
     }
   }
 };
@@ -230,17 +302,17 @@ OS.prototype.initTools = async function () {
  */
 OS.prototype.initAdmins = async function () {
   let admins = this.config.admins || [];
-  for (let name of admins) {
+  for (let mod of admins) {
     try {
-      let admin = this.require(`mm_${name}`).admin;
+      let admin = this.require(mod.module).admin;
       admin.setServer(this);
-      let manager = admin.get('os', this.config[name]);
+      let manager = admin.get('os', this.config[mod.name]);
       if (typeof manager.init === 'function') {
         await manager.init();
       }
-      this.reg(name, manager);
+      this.reg(mod.name, manager);
     } catch (error) {
-      this.log('error', `初始化管理 ${name} 失败: ${error}`);
+      this.log('error', `初始化管理 ${mod.name} 失败: ${error}`);
     }
   }
 };
@@ -257,7 +329,7 @@ OS.prototype.initpStorage = async function () {
   if (typeof cache.init === 'function') {
     await cache.init();
   }
-  this.cache = cache;
+  this.reg('cache', cache);
 
   // 初始化数据库
   let sqlAdmin = this.require('mm_sql').admin;
@@ -266,7 +338,7 @@ OS.prototype.initpStorage = async function () {
   if (typeof sql.init === 'function') {
     await sql.init();
   }
-  this.sql = sql;
+  this.reg('sql', sql);
 };
 
 /**
@@ -280,90 +352,185 @@ OS.prototype._setAdminServer = function (admin) {
 };
 
 /**
- * 初始化应用加载器
+ * 初始化应用加载器（协调层：只创建加载器与应用管理器，装配逻辑在 mm_apps/mm_plugins）
  * @returns {void} 无返回值
  */
 OS.prototype.initLoader = async function () {
-  let loader = new Loader(this.config.loader || {}, this);
-  loader.setLogger(this.logger);
-  await loader.init();
-  this.loader = loader;
+  // 配置加载器：注入 socket/mqtt 类型，其余类型由 mm_loader 默认提供
+  const loader = new Loader(this.config.loader || {});
+  loader.addType('socket', 'socket.json');
+  loader.addType('mqtt', 'mqtt.json');
+  this.reg('loader', loader);
+
+  // 应用管理器：装配应用由 AppManager.load 负责，插件随 App.onInit 引入
+  const app = appAdmin('os');
+  app.setServer(this);
+  app.setLogger(this.container.get('logger'));
+  this.reg('app', app);
+
+  const dir = this.config.loader.dir || path.join(__dirname, '..', 'example', 'app');
+  await app.load(dir, loader);
+  await app.init();
+
+  // 注入 Web 请求路由
+  this._initWeb();
 };
 
 /**
- * 初始化事件总线
+ * 初始化 Web 适配器：注入跨作用域事件路由
  * @returns {void} 无返回值
  */
-OS.prototype.initEventBus = function () {
-  let admin = this.require('mm_eventer').admin;
-  admin.setServer(this);
-  this.eventer = admin.get('os');
+OS.prototype._initWeb = function () {
+  const web = this.container.get('web');
+  if (!web) return;
+  web.setEventManager(this._createEventRouter());
 };
 
 /**
- * 启动入站适配器
- * @returns {void} 无返回值
+ * 创建跨作用域事件路由：Web 适配器只持有 web 作用域，需转发到各应用作用域
+ * @returns {object} 含 run 方法的事件管理器
  */
-OS.prototype._startInAdapters = async function () {
-  let in_adapters = this.in_adapters.list();
-  for (let item of in_adapters) {
-    try {
-      await item.admin.start();
-      this._printAddress(item);
-    } catch (error) {
-      this.log('error', `启动适配器 ${item.name} 失败: ${error}`);
+OS.prototype._createEventRouter = function () {
+  return {
+    run: (target, params, ctx, options) => this._routeRequest(target, params, ctx, options)
+  };
+};
+
+/**
+ * 路由请求：先尝试静态资源，未命中再按应用顺序执行事件
+ * @param {string} target 请求路径
+ * @param {object} params 请求参数
+ * @param {object} ctx 请求上下文
+ * @param {object} options 事件运行选项
+ * @returns {Promise<*>} 事件执行结果
+ */
+OS.prototype._routeRequest = async function (target, params, ctx, options = {}) {
+  const statics = this.container.get('static');
+  if (!statics || typeof statics.run !== 'function') {
+    return await this._runAppEvents(target, params, ctx, options);
+  }
+  let result;
+  await statics.run(ctx, async () => {
+    result = await this._runAppEvents(target, params, ctx, options);
+  });
+  return result;
+};
+
+/**
+ * 按应用排序依次执行事件：命中结果、响应已写出或发生错误时中止
+ * @param {string} target 请求路径
+ * @param {object} params 请求参数
+ * @param {object} ctx 请求上下文
+ * @param {object} options 事件运行选项
+ * @returns {Promise<*>} 事件执行结果
+ */
+OS.prototype._runAppEvents = async function (target, params, ctx, options = {}) {
+  const app = this.container.get('app');
+  if (!app || typeof app.list !== 'function') return undefined;
+
+  const apps = app.list().slice().sort((a, b) => this._getSort(a) - this._getSort(b));
+  for (const item of apps) {
+    if (this._isRequestHandled(ctx) || ctx.error) return undefined;
+    const name = item.config && item.config.name;
+    if (!name) continue;
+    const app_options = {};
+    const result = await eventAdmin(name).run(target, params, ctx, app_options);
+    if (app_options.error) {
+      ctx.error = ctx.error || app_options.error;
+      options.error = options.error || app_options.error;
+      return undefined;
     }
+    if (result !== undefined && result !== null) return result;
   }
+  return undefined;
 };
 
 /**
- * 启动出站适配器
+ * 判断请求是否已处理完毕：事件或中间件已写出响应
+ * @param {object} ctx 请求上下文
+ * @returns {boolean} 响应是否已写出
+ */
+OS.prototype._isRequestHandled = function (ctx) {
+  if (!ctx) return false;
+  if (ctx.handled === true) return true;
+  const res = ctx.res;
+  return !!(res && (res.writableEnded || res.headersSent));
+};
+
+/**
+ * 获取应用执行顺序
+ * @param {object} app 应用驱动实例
+ * @returns {number} 排序值，缺省 100
+ */
+OS.prototype._getSort = function (app) {
+  const sort = app && app.config ? app.config.sort : undefined;
+  return typeof sort === 'number' ? sort : 100;
+};
+
+/**
+ * 初始化事件总线
+ * @returns {void} 无返回值
+ */
+OS.prototype.initEventBus = function () {
+  let admin = this.require('mm_eventer').admin;
+  admin.setServer(this);
+  this.reg('eventer', admin.get('os'));
+};
+
+/**
+ * 启动适配器：按配置中的入站、出站适配器名称从容器取出管理器并启动
  * @returns {void} 无返回值
  */
-OS.prototype._startOutAdapters = async function () {
-  let out_adapters = this.out_adapters.list();
-  for (let item of out_adapters) {
+OS.prototype._startAdapters = async function () {
+  let mods = this.config.in_adapters;
+  for (let mod of mods) {
+    let manager = this.container.get(mod.name);
+    if (!manager || typeof manager.start !== 'function') continue;
     try {
-      await item.admin.start();
-      this._printAddress(item);
+      await manager.start();
+      this._printAddress(mod.name, manager);
     } catch (error) {
-      this.log('error', `启动适配器 ${item.name} 失败: ${error}`);
+      this.log('error', `启动适配器 ${mod.name} 失败: ${error}`);
     }
   }
 };
 
 /**
- * 启动适配器
+ * 启动
  * @returns {void} 无返回值
  */
 OS.prototype.start = async function () {
-  // 启动入站适配器
-  await this._startInAdapters();
-  // 启动出站适配器
-  await this._startOutAdapters();
+  // 启动适配器
+  await this._startAdapters();
 
   // 启动缓存存储
-  await this.cache.start();
+  await this.container.get('cache').start();
   // 启动数据库
-  await this.sql.start();
+  await this.container.get('sql').start();
 
   // 启动应用
-  if (this.loader) {
-    await this.loader.start();
+  const app = this.container.get('app');
+  if (app) {
+    await app.start();
   }
 };
 
 /**
  * 打印适配器监听地址
- * @param {object} item 适配器存储项，含 name 与 admin
+ * @param {string} name 适配器名称
+ * @param {object} manager 适配器管理器实例
  */
-OS.prototype._printAddress = function (item) {
-  let { host, port } = item.admin.config || {};
+OS.prototype._printAddress = function (name, manager) {
+  let { host, port } = manager.config || {};
   if (!host || host === '0.0.0.0' || host === '::') {
     host = 'localhost';
   }
-  let protocol = { web: 'http', websocket: 'ws', socket: 'tcp', mqtt: 'mqtt' }[item.name] || item.name;
-  this.log('info', `适配器 ${item.name} 已启动: ${protocol}://${host}:${port}`);
+  let protocol = { web: 'http', websocket: 'ws', socket: 'tcp', mqtt: 'mqtt' }[name] || name;
+  let address = `${protocol}://${host}`;
+  if (port) {
+    address += `:${port}`;
+  }
+  this.log('info', `适配器 ${name} 已启动: ${address}`);
 };
 
 module.exports = OS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mm_os",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "这是OS系统",
   "repository": {
     "type": "git",
@@ -26,30 +26,35 @@
   },
   "dependencies": {
     "markdown": "^0.5.0",
-    "mm_app": "^1.0.0",
-    "mm_cache": "^1.5.4",
-    "mm_corejs": "^1.1.4",
+    "mm_apps": "^1.0.2",
+    "mm_cache": "^1.5.5",
+    "mm_container": "^1.0.1",
+    "mm_corejs": "^1.1.5",
+    "mm_dao": "^1.8.0",
     "mm_es6_to_amd": "^1.5.9",
-    "mm_event": "^2.2.0",
-    "mm_file": "^1.0.0",
+    "mm_event": "^2.2.4",
+    "mm_files": "^1.0.0",
     "mm_handle": "^1.0.0",
     "mm_jsondb": "^1.0.0",
+    "mm_loader": "^1.1.0",
     "mm_logger": "^1.0.0",
+    "mm_mod": "^1.0.2",
     "mm_mongodb": "^2.0.3",
-    "mm_mqtt_server": "^1.0.2",
+    "mm_mqtt_server": "^2.0.0",
     "mm_mysql": "^2.5.6",
-    "mm_param": "^1.1.0",
-    "mm_pendant": "^1.1.0",
-    "mm_plugin": "^1.0.0",
+    "mm_param": "^1.1.3",
+    "mm_pendant": "^1.1.1",
+    "mm_plugins": "^1.0.2",
     "mm_redis": "^2.1.7",
     "mm_render": "^1.0.0",
-    "mm_socket_server": "^1.0.2",
-    "mm_sql": "^1.8.0",
+    "mm_socket_server": "^3.0.0",
+    "mm_sql": "^1.8.2",
     "mm_sqlite": "^1.5.5",
-    "mm_statics": "^1.9.0",
-    "mm_timer": "^1.1.0",
-    "mm_tpl": "^2.7.2",
-    "mm_web_server": "^1.0.2",
-    "mm_websocket_server": "^1.0.2"
+    "mm_statics": "^1.9.1",
+    "mm_template": "^1.2.1",
+    "mm_timer": "^1.4.4",
+    "mm_tpl": "^2.7.3",
+    "mm_web_server": "^2.0.1",
+    "mm_websocket_server": "^2.0.0"
   }
 }