mm_os 4.1.7 → 4.1.9

package/core/app/{bat.js → index copy.js }

@@ -37,11 +37,11 @@ class App extends Drive {
     'author': 'qww',
     'scope': 'server',
     'dir': '',
-    // 游戏配置，非游戏模块不需要配置
-    'game': {
-      // 游戏类型
-      'type': 'card_game'
-    },
+    // // 游戏配置，非游戏模块不需要配置
+    // 'game': {
+    //   // 游戏类型
+    //   'type': 'card_game'
+    // },
     'dependencies': [],
     // // 压缩目录
     // 'zip_dir': './static/file/zip',
@@ -183,12 +183,12 @@ App.prototype._initManager = async function () {
   }
 
   // 并行执行所有管理器的初始化操作
-  var init_promises = [];
+  var list = [];
   for (var j = 0; j < managers.length; j++) {
-    init_promises.push(managers[j].do('init'));
+    list.push(managers[j].do('init'));
   }
 
-  await Promise.all(init_promises);
+  await Promise.all(list);
   // console.timeEnd('[TIMING] App._initManager');
 };
 
@@ -216,29 +216,16 @@ App.prototype._loadSources = async function () {
  * 初始化路由相关模块
  */
 App.prototype._initRouteMod = async function () {
-  // console.time('[TIMING] App._initRouteMod');
-
-  // console.time('[TIMING] App._initRouteMod/store+view+model');
   await Promise.all([
     this.manager.store.runAll('init', this.sql, this.cache, this.getLogger()),
     this.manager.view.runAll('init', this.getLogger()),
     this.manager.model.runAll('init', this.getEventer(), this.getLogger())
   ]);
-  // console.timeEnd('[TIMING] App._initRouteMod/store+view+model');
-
-  // console.time('[TIMING] App._initRouteMod/service');
   await this.manager.service.runAll('init', this.model, this.getEventer(), this.getLogger());
-  // console.timeEnd('[TIMING] App._initRouteMod/service');
-
-  // console.time('[TIMING] App._initRouteMod/controller+handler');
-
   await Promise.all([
     this.manager.controller.runAll('init', this.model, this.service, this.view, this.getEventer(), this.getLogger()),
     this.manager.handler.runAll('init', this, this.getEventer(), this.getLogger())
   ]);
-  // console.timeEnd('[TIMING] App._initRouteMod/controller+handler');
-
-  // console.timeEnd('[TIMING] App._initRouteMod');
 };
 
 /**
@@ -246,15 +233,8 @@ App.prototype._initRouteMod = async function () {
  * @returns {Promise<void>} 初始化完成
  */
 App.prototype._initSources = async function () {
-  // console.time('[TIMING] App._initSources');
-
-  // console.time('[TIMING] App._initSources/plugin');
-  // await this.manager.plugin.runWait('init', this, this.getEventer(), this.getLogger());
-  await this.manager.plugin.runAll('init', this, this.getEventer(), this.getLogger());
-  // console.timeEnd('[TIMING] App._initSources/plugin');
-
   await this._initRouteMod();
-  // console.timeEnd('[TIMING] App._initSources');
+  await this.manager.plugin.runWait('init', this, this.getEventer(), this.getLogger());
 };
 
 /**
@@ -265,7 +245,7 @@ App.prototype._initSources = async function () {
  * @private
  */
 App.prototype._initCore = async function (server, eventer, logger) {
-   if (logger) {
+  if (logger) {
     this.setLogger(logger);
   }
   if (eventer) {
@@ -358,32 +338,6 @@ App.prototype._validateDep = function () {
   }
 };
 
-/**
- * 记录初始化结果
- * @param {Array} results 初始化结果数组
- * @private
- */
-App.prototype._logInitResults = function (results) {
-  var success = 0;
-  var error = 0;
-  var error_modules = [];
-
-  for (var result of results) {
-    if (result.result && result.result.error_count > 0) {
-      error += result.result.error_count;
-      error_modules.push(result.name);
-    } else {
-      success++;
-    }
-  }
-
-  if (error > 0) {
-    this.log('warn', `资源初始化完成，成功: ${success}, 失败: ${error}, 失败模块: ${error_modules.join(', ')}`);
-  } else {
-    this.log('info', `所有资源初始化成功，共 ${success} 个模块`);
-  }
-};
-
 /**
  * 压缩插件
  * @param {string} name 插件名称

package/core/app/index.js

@@ -3,24 +3,6 @@ const {
   Manager,
   Drive
 } = require('mm_machine');
-const {
-  Controller
-} = require('../controller/index.js');
-const {
-  View
-} = require('../view/index.js');
-const {
-  Handler
-} = require('../handler/index.js');
-const {
-  Service
-} = require('../service/index.js');
-const {
-  Model
-} = require('../model/index.js');
-const {
-  Store
-} = require('../store/index.js');
 const {
   Plugin
 } = require('../plugin/index.js');
@@ -94,21 +76,6 @@ class App extends Drive {
     // 管理器集合
     this.manager = {};
 
-    /** == 业务类 == */
-    // MVC 架构
-    // 控制器集合
-    this.controller = {};
-    // 视图集合
-    this.view = {};
-    // 操作器集合
-    this.handler = {};
-    // 领域服务
-    this.service = {};
-    // 富血模型
-    this.model = {};
-    // 仓储
-    this.store = {};
-
     // 插件，用于功能扩展
     this.plugin = {};
   }
@@ -163,12 +130,6 @@ App.prototype._initManager = async function () {
   // console.time('[TIMING] App._initManager');
   // 管理器配置列表
   var mgr_configs = [
-    { name: 'store', title: '仓储', Module: Store },
-    { name: 'model', title: '模型', Module: Model },
-    { name: 'service', title: '服务', Module: Service },
-    { name: 'handler', title: '操作器', Module: Handler },
-    { name: 'view', title: '视图', Module: View },
-    { name: 'controller', title: '控制器', Module: Controller },
     { name: 'plugin', title: '插件', Module: Plugin }
   ];
 
@@ -197,35 +158,7 @@ App.prototype._initManager = async function () {
  * @returns {Promise<void>} 加载完成
  */
 App.prototype._loadSources = async function () {
-  // console.time('[TIMING] App._loadSources');
-  // 加载无需依赖关系，所以可以同时加载，内部并行执行
-  let loadPromises = [
-    this.manager.store.runAll('load'),
-    this.manager.model.runAll('load'),
-    this.manager.service.runAll('load'),
-    this.manager.handler.runAll('load'),
-    this.manager.view.runAll('load'),
-    this.manager.controller.runAll('load'),
-    this.manager.plugin.runAll('load')
-  ];
-  await Promise.all(loadPromises);
-  // console.timeEnd('[TIMING] App._loadSources');
-};
-
-/**
- * 初始化路由相关模块
- */
-App.prototype._initRouteMod = async function () {
-  await Promise.all([
-    this.manager.store.runAll('init', this.sql, this.cache, this.getLogger()),
-    this.manager.view.runAll('init', this.getLogger()),
-    this.manager.model.runAll('init', this.getEventer(), this.getLogger())
-  ]);
-  await this.manager.service.runAll('init', this.model, this.getEventer(), this.getLogger());
-  await Promise.all([
-    this.manager.controller.runAll('init', this.model, this.service, this.view, this.getEventer(), this.getLogger()),
-    this.manager.handler.runAll('init', this, this.getEventer(), this.getLogger())
-  ]);
+  await this.manager.plugin.runAll('load');
 };
 
 /**
@@ -233,8 +166,7 @@ App.prototype._initRouteMod = async function () {
  * @returns {Promise<void>} 初始化完成
  */
 App.prototype._initSources = async function () {
-  await this._initRouteMod();
-  await this.manager.plugin.runWait('init', this, this.getEventer(), this.getLogger());
+  await this.manager.plugin.runAll('init', this, this.getEventer(), this.getLogger());
 };
 
 /**
@@ -245,7 +177,7 @@ App.prototype._initSources = async function () {
  * @private
  */
 App.prototype._initCore = async function (server, eventer, logger) {
-   if (logger) {
+  if (logger) {
     this.setLogger(logger);
   }
   if (eventer) {
@@ -301,16 +233,7 @@ App.prototype._initBase = async function () {
  * 启动资源
  */
 App.prototype._startSources = async function () {
-  // 启动无顺序的管理器（保持并行执行）
-  let startPromises = [
-    this.manager.handler.runAll('start'),
-    this.manager.service.runAll('start'),
-    this.manager.store.runAll('start'),
-    this.manager.plugin.runAll('start')
-  ];
-
-  // 等待其他管理器启动完成
-  await Promise.all(startPromises);
+  await this.manager.plugin.runAll('start');
 };
 
 /**
@@ -329,7 +252,7 @@ App.prototype._startCore = async function () {
  * @private
  */
 App.prototype._validateDep = function () {
-  var required_managers = ['store', 'model', 'service', 'handler', 'view', 'controller', 'plugin'];
+  var required_managers = ['plugin'];
 
   for (var name of required_managers) {
     if (!this.manager[name]) {

package/core/channel/index.js

@@ -1,6 +1,5 @@
 const {
-  Drive,
-  Manager
+  Drive
 } = require('mm_machine');
 const {
   RoomAdmin

package/core/controller/index.js

@@ -335,9 +335,7 @@ Controller.prototype._after = async function (req, res, result) {
 /**
  * 格式化响应
  * 优化：复用响应对象，减少GC压力
- * @param {number} code 响应码
- * @param {string} message 响应消息
- * @param {object} data 响应数据
+ * @param {object} result 响应数据
  * @returns {object} 格式化后的响应对象
  */
 Controller.prototype._formatResponse = function (result) {

package/core/game/bat/world.js

@@ -99,7 +99,7 @@ GameWorld.prototype.getTplDir = function () {
  * @returns {string} 游戏管理器目录
  */
 GameWorld.prototype.getDir = function () {
-  return this.getGame()._
+  return this.getGame().getDir();
 };
 
 /**

package/core/game/index.js

@@ -73,7 +73,7 @@ Game.prototype._initCore = async function (server, eventer, logger) {
       return server;
     };
   }
-   if (logger) {
+  if (logger) {
     this.setLogger(logger);
   }
   if (eventer) {

package/core/middleware/index.js

@@ -34,12 +34,12 @@ Middleware.prototype.getTplDir = function () {
 
 /**
  * 初始化核心
- * @param {object} apapter 适配器
+ * @param {object} adapter 适配器
  * @param {object} eventer 事件总线
  * @param {object} logger 日志管理器
  * @returns {Promise<void>}
  */
-Middleware.prototype._initCore = async function (apapter, eventer, logger) {
+Middleware.prototype._initCore = async function (adapter, eventer, logger) {
   // 初始化依赖项
   if (logger) {
     this.setLogger(logger);
@@ -49,9 +49,9 @@ Middleware.prototype._initCore = async function (apapter, eventer, logger) {
       return eventer;
     };
   }
-  if (apapter) {
+  if (adapter) {
     this.getAdapter = function () {
-      return apapter[this.config.type];
+      return adapter[this.config.type];
     };
   }
   this._register();

package/core/middleware/script.tpl.js

@@ -4,11 +4,11 @@
 module.exports = {
   /**
    * 中间件初始化
-   * @param {object} apapter 适配器
+   * @param {object} adapter 适配器
    * @param {object} eventer 事件处理器
    */
-  async _init(apapter, eventer) {
-    this.log('debug', 'middleware _init 被调用', { apapter, eventer });
+  async _init(adapter, eventer) {
+    this.log('debug', 'middleware _init 被调用', { adapter, eventer });
     // 初始化代码写在这
     // 可在这里注入其他中间件
   },

package/core/plugin/index.js

@@ -108,51 +108,109 @@ Plugin.prototype._initOptions = function () {
   this.backupOptions();
 };
 
+/**
+ * 转换数字类型值
+ * @param {*} value 原始值
+ * @returns {number} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertNumber = function (value) {
+  if (value === 'null') return 0;
+  return Number(value || '0');
+};
+
+/**
+ * 转换布尔类型值
+ * @param {*} value 原始值
+ * @returns {boolean} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertBoolean = function (value) {
+  if (!value) return false;
+  if (typeof value === 'boolean') return value;
+  if (typeof value === 'string') {
+    return value === '1' || value === 'true';
+  }
+  return false;
+};
+
+/**
+ * 转换对象类型值
+ * @param {*} value 原始值
+ * @returns {object} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertObject = function (value) {
+  if (value === 'null') return {};
+  return value.toJSON ? value.toJSON() : {};
+};
+
+/**
+ * 转换数组类型值
+ * @param {*} value 原始值
+ * @returns {Array} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertArray = function (value) {
+  if (value === 'null') return [];
+  return value.toJSON ? value.toJSON() : [];
+};
+
+/**
+ * 转换字符串类型值
+ * @param {*} value 原始值
+ * @returns {string} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertString = function (value) {
+  if (value === 'null') return null;
+  return value || '';
+};
+
+/**
+ * 转换单个配置项的值
+ * @param {object} option 配置项
+ * @returns {*} 转换后的值
+ * @private
+ */
+Plugin.prototype._convertOptionValue = function (option) {
+  var val = option.value;
+  if (val === 'null') return null;
+
+  var type = option.type;
+  switch (type) {
+    case 'number':
+      return this._convertNumber(val);
+    case 'boolean':
+      return this._convertBoolean(val);
+    case 'object':
+      return this._convertObject(val);
+    case 'array':
+      return this._convertArray(val);
+    case 'string':
+      return this._convertString(val);
+    default:
+      return val;
+  }
+};
+
 /**
  * 获取配置参数
- * @return {Object} 返回配置参数
+ * @returns {object} 返回配置参数
  */
 Plugin.prototype.getConfigOptions = function () {
   var op = this.config.options || [];
   var dict = {};
   for (var i = 0; i < op.length; i++) {
     var o = op[i];
-    if (o.type === "number") {
-      var val = o.value === 'null' ? '0' : o.value;
-      dict[o.name] = Number(val || '0');
-    } else if (o.type === "boolean") {
-      var val = false;
-      if (o.value) {
-        if (typeof (o.value) == "string") {
-          if (o.value == '1' || o.value == 'true') {
-            val = true;
-          }
-        } else if (typeof (o.value) == "boolean") {
-          val = o.value;
-        }
-      }
-      dict[o.name] = val;
-    } else if (o.type === "object") {
-      var val = o.value === 'null' ? '{}' : o.value;
-      dict[o.name] = o.value.toJSON();
-    } else if (o.type === "array") {
-      var val = o.value === 'null' ? '[]' : o.value;
-      dict[o.name] = o.value.toJSON();
-    } else if (o.value === "null") {
-      dict[o.name] = null;
-    } else if (o.type === "string") {
-      dict[o.name] = o.value || "";
-    } else {
-      dict[o.name] = o.value;
-    }
+    dict[o.name] = this._convertOptionValue(o);
   }
   return dict;
 };
 
 /**
  * 设计配置
- * @param {Object} 设置配置
- * @return {Object} 返回配置参数
+ * @param {object} body 配置参数
  */
 Plugin.prototype.designOptions = function (body) {
   var cg = this.config;
@@ -174,6 +232,7 @@ Plugin.prototype.designOptions = function (body) {
 
 /**
  * 保存配置
+ * @param {object} options 配置参数
  */
 Plugin.prototype.saveOptions = function (options) {
   this.options = options;
@@ -192,7 +251,8 @@ Plugin.prototype.backupOptions = function () {
 
 /**
  * 合并配置
- * @param {Object} cg 配置
+ * @param {object} options 配置参数
+ * @returns {object} 返回配置参数
  */
 Plugin.prototype.mergeOptions = function (options) {
   var file = this._getCacheOptionsFile();
@@ -208,10 +268,6 @@ Plugin.prototype.mergeOptions = function (options) {
  * @returns {string} 缓存配置文件
  */
 Plugin.prototype._getCacheOptionsFile = function () {
-  // let app = this.getApp();
-  // let app_name = app.config.name;
-  // let plugin_name = this.config.name;
-  var l = $.slash;
   let plugin_name = this.config.name;
   let app_name = this.getApp().config.name;
   var file = `/cache/${app_name}/${plugin_name}/config.json`.fullname();
@@ -234,7 +290,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/core/room/room.js

@@ -21,7 +21,7 @@ class Room {
   
   /**
    * 房间类构造函数
-   * @param {Object} config 房间配置对象
+   * @param {object} config 房间配置对象
    */
   constructor(config) {
     // 房间ID
@@ -42,7 +42,7 @@ class Room {
 
 /**
  * 设置房间配置
- * @param {Object} config 房间配置对象
+ * @param {object} config 房间配置对象
  */
 Room.prototype.setConfig = function (config) {
   Object.assign(this.config, config);

package/core/scene/index.js

@@ -21,6 +21,7 @@ class Scene extends Drive {
   /**
    * 构造函数
    * @param {object} config 配置参数
+   * @param {object} parent 父场景对象
    */
   constructor(config, parent) {
     super({ ...Scene.config, ...config || {} }, parent);

package/core/zone/bat/index.js

@@ -88,6 +88,7 @@ class Zone extends Drive {
    * @param {number} config.diy_cache 自定义缓存
    * @param {object} config.sql sql 配置
    * @param {object} config.cache 缓存配置
+   * @param {object} parent 父分区对象
    */
   constructor(config, parent) {
     super({ ...Zone.config, ...config }, parent);
@@ -198,6 +199,7 @@ Zone.prototype._initBase = async function () {
  * @param {object} app 游戏应用
  * @param {object} eventer 事件总线
  * @param {object} logger 日志管理器
+ * @returns {object} 返回分区对象
  */
 Zone.prototype._initCore = async function (app, eventer, logger) {
   // 初始化依赖项

package/core/zone/index.js

@@ -94,6 +94,7 @@ class Zone extends Drive {
    * @param {number} config.diy_cache 自定义缓存
    * @param {object} config.sql sql 配置
    * @param {object} config.cache 缓存配置
+   * @param {object} parent 父分区对象
    */
   constructor(config, parent) {
     super({ ...Zone.config, ...config }, parent);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mm_os",
 	"description": "MM_OS服务端架构，用于快速构建应用程序，支持网站建设、小程序后台、AI应用、物联网(IOT/AIOT)、游戏服务端等多种场景。",
-	"version": "4.1.7",
+	"version": "4.1.9",
 	"main": "index.js",
 	"keywords": [
 		"AI",
@@ -31,7 +31,7 @@
 		"js-beautify": "^1.15.4",
 		"koa": "^3.2.1",
 		"koa-body": "^8.0.0",
-		"koa-compress": "^5.2.1",
+		"koa-compress": "^5.2.2",
 		"koa-send": "^5.0.1",
 		"koa-websocket": "^7.0.0",
 		"markdown": "^0.5.0",
@@ -52,14 +52,14 @@
 		"mm_statics": "^1.8.4",
 		"mm_xml": "^1.1.7",
 		"mqtt": "^5.15.1",
-		"openai": "^6.42.0"
+		"openai": "^6.44.0"
 	},
 	"devDependencies": {
 		"@types/jest": "^30.0.0",
 		"eslint-formatter-table": "^7.32.1",
-		"eslint-plugin-jsdoc": "^63.0.2",
+		"eslint-plugin-jsdoc": "^63.0.6",
 		"jest": "^30.4.2",
-		"mm_eslint": "^1.7.1"
+		"mm_eslint": "^1.7.5"
 	},
 	"repository": {
 		"type": "git",
@@ -81,4 +81,4 @@
 		"tcp.js",
 		"software.js"
 	]
-}
+}

package/server.js

@@ -75,7 +75,7 @@ class Server {
       expire: 0,
       max: 0,
       persist: false, // 是否启用持久化
-      saveInterval: 60000 // 保存间隔（毫秒）
+      save_interval: 60000 // 保存间隔（毫秒）
     },
     // 缓存配置
     redis: {
@@ -88,7 +88,7 @@ class Server {
       // 数据库
       database: 0,
       // 前缀
-      prefix: "mm_",
+      prefix: 'mm_',
       // 连接超时时间(ms)
       connect_timeout: 5000,
       // 重试次数
@@ -160,7 +160,7 @@ class Server {
         // 是否开启gzip压缩
         gzip: false,
         // 静态文件根目录
-        root: "./static",
+        root: './static',
         // 编译vue文件，启动后会将vue转为js，可让前端通过 import xxx from './xxx.vue' 引入
         compile_vue: true,
         // 编译markdown文件，启动后会将markdown转为html
@@ -414,6 +414,7 @@ Server.prototype._stop = async function () {
 
 /**
  * 运行
+ * @returns {object} 服务器实例
  */
 Server.prototype.run = async function () {
   // 初始化