mm_os 4.0.9 → 4.1.1

package/core/app/index.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',
@@ -142,7 +142,7 @@ App.prototype._preset = function () {
  * @returns {object} 管理器实例
  */
 App.prototype._createManager = function (name, title, cls) {
-  let dir = this._getDir();
+  let dir = this.getDir();
   var manager = new Manager({
     name: name,
     title: title,
@@ -160,6 +160,7 @@ App.prototype._createManager = function (name, title, cls) {
  * @returns {Promise<void>} 初始化完成
  */
 App.prototype._initManager = async function () {
+  // console.time('[TIMING] App._initManager');
   // 管理器配置列表
   var mgr_configs = [
     { name: 'store', title: '仓储', Module: Store },
@@ -182,12 +183,13 @@ 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');
 };
 
 /**
@@ -195,6 +197,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'),
@@ -206,21 +209,23 @@ App.prototype._loadSources = async function () {
     this.manager.plugin.runAll('load')
   ];
   await Promise.all(loadPromises);
+  // console.timeEnd('[TIMING] App._loadSources');
 };
 
 /**
  * 初始化路由相关模块
  */
 App.prototype._initRouteMod = async function () {
-  Promise.all([
+  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());
-  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 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())
+  ]);
 };
 
 /**
@@ -228,10 +233,8 @@ App.prototype._initRouteMod = async function () {
  * @returns {Promise<void>} 初始化完成
  */
 App.prototype._initSources = async function () {
-  // 验证依赖关系
-  this._validateDep();
+  await this._initRouteMod();
   await this.manager.plugin.runWait('init', this, this.getEventer(), this.getLogger());
-  this._initRouteMod();
 };
 
 /**
@@ -242,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) {
@@ -261,8 +264,8 @@ App.prototype._initCore = async function (server, eventer, logger) {
   await this._initManager();
   // 加载资源
   await this._loadSources();
-  // 初始化资源
-  await this._initSources();
+  // 验证依赖关系
+  this._validateDep();
 };
 
 /**
@@ -315,6 +318,8 @@ App.prototype._startSources = async function () {
  * @private
  */
 App.prototype._startCore = async function () {
+  // 初始化资源
+  await this._initSources();
   // 启动资源
   await this._startSources();
 };
@@ -333,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/channel/index.js

@@ -102,15 +102,6 @@ Channel.prototype._initCore = async function (zone, eventer, logger) {
 
   await this._initManager();
   await this._loadSources();
-  await this._initSources();
-
-  await this._loadWorlds();
-
-  await this._initRoomAdmin();
-
-  await this._loadRooms();
-
-  await this._initMatcher();
 };
 
 /**
@@ -160,7 +151,7 @@ Channel.prototype._initMatcher = async function () {
  * 初始化管理器
  */
 Channel.prototype._initManager = async function () {
-  // var dir = this._getDir().dirname().dirname();
+  // var dir = this.getDir().dirname().dirname();
   // var game = new Manager({
   //   name: 'game',
   //   title: '游戏',
@@ -178,8 +169,8 @@ Channel.prototype._initManager = async function () {
  * 获取游戏管理器目录
  * @returns {string} 游戏管理器目录
  */
-Channel.prototype._getDir = function () {
-  return this.getZone()._getDir();
+Channel.prototype.getDir = function () {
+  return this.getZone().getDir();
 };
 
 /**
@@ -245,6 +236,16 @@ Channel.prototype._loadRooms = async function () {
  * 启动核心
  */
 Channel.prototype._startCore = async function () {
+  await this._initSources();
+
+  await this._loadWorlds();
+
+  await this._initRoomAdmin();
+
+  await this._loadRooms();
+
+  await this._initMatcher();
+
   await this.manager.game.runAll('start');
   await this.matcher.do('start');
   this._startMonitor();

package/core/com/index.js

@@ -67,6 +67,9 @@ Com.prototype._initCore = async function(server, eventer, logger) {
   await this._initManager();
   // 加载资源
   await this._loadSources();
+};
+
+Com.prototype._startCore = async function () {
   // 初始化资源
   await this._initSources();
 };

package/core/game/bat/world.js

@@ -98,7 +98,7 @@ GameWorld.prototype.getTplDir = function () {
  * 获取游戏管理器目录
  * @returns {string} 游戏管理器目录
  */
-GameWorld.prototype._getDir = function () {
+GameWorld.prototype.getDir = function () {
   return this.getGame()._
 };
 
@@ -118,7 +118,7 @@ GameWorld.prototype.genId = function () {
  * @returns {object} 管理器实例
  */
 GameWorld.prototype._createManager = function (name, title, cls) {
-  var dir = this._getDir();
+  var dir = this.getDir();
   var manager = new Manager({
     name,
     title,

package/core/game/index.js

@@ -85,8 +85,6 @@ Game.prototype._initCore = async function (server, eventer, logger) {
   await this._initManager();
   // 加载资源
   await this._loadSources();
-  // 初始化资源
-  await this._initSources();
 };
 
 /**
@@ -121,7 +119,7 @@ Game.prototype._initManager = async function () {
  * @returns {object} 管理器实例
  */
 Game.prototype._createManager = function (name, title, cls) {
-  let dir = this._getDir();
+  let dir = this.getDir();
   var manager = new Manager({
     name: name,
     title: title,
@@ -164,6 +162,8 @@ Game.prototype._initSources = async function () {
  * 启动核心
  */
 Game.prototype._startCore = async function () {
+  // 初始化资源
+  await this._initSources();
   // 启动资源
   await this._startSources();
 };

package/core/mod/index.js

@@ -75,6 +75,12 @@ Mod.prototype._initCore = async function (server, eventer, logger) {
   await this._initManager();
   // 加载资源
   await this._loadSources();
+};
+
+/**
+ * 启动核心
+ */
+Mod.prototype._startCore = async function () {
   // 初始化资源
   await this._initSources();
 };

package/core/plugin/index.js

@@ -226,7 +226,7 @@ Plugin.prototype._getCacheOptionsFile = function () {
  */
 Drive.prototype.getModel = function (type) {
   let model = { ...this.config };
-  let dir = this._getDir();
+  let dir = this.getDir();
   let l = $.slash;
   let app_name = dir.between('app' + l, l);
   let plugin_name = dir.between('plugin' + l, l);

package/core/zone/bat/index.js

@@ -214,15 +214,13 @@ Zone.prototype._initCore = async function (app, eventer, logger) {
       return app;
     };
   }
+  // // 初始化基础组件
+  // await this._initBase();
+  // // 初始化管理器
+  // await this._initManager();
+  // // 加载资源
+  // await this._loadSources();
   return this;
-  // 初始化基础组件
-  await this._initBase();
-  // 初始化管理器
-  await this._initManager();
-  // 加载资源
-  await this._loadSources();
-  // 初始化资源
-  await this._initSources();
 };
 
 /**
@@ -243,6 +241,9 @@ Zone.prototype._startSources = async function () {
  * @private
  */
 Zone.prototype._startCore = async function () {
+  // // 初始化资源
+  // await this._initSources();
+  
   // 加载所有登录玩家
   await this._loadPlayers();
 

package/core/zone/index.js

@@ -157,8 +157,6 @@ Zone.prototype._initCore = async function (server, eventer, logger) {
   await this._initManager();
   // 加载资源
   await this._loadSources();
-  // 初始化资源
-  await this._initSources();
 };
 
 /**
@@ -193,7 +191,7 @@ Zone.prototype._initBase = async function () {
  * @returns {object} 管理器实例
  */
 Zone.prototype._createManager = function (name, title, cls) {
-  let dir = this._getDir();
+  let dir = this.getDir();
   var manager = new Manager({
     name: name,
     title: title,
@@ -282,6 +280,9 @@ App.prototype._startSources = async function () {
  * @private
  */
 Zone.prototype._startCore = async function () {
+  // 初始化资源
+  await this._initSources();
+
   // 加载所有登录玩家
   await this._loadPlayers();
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "mm_os",
 	"description": "MM_OS服务端架构，用于快速构建应用程序，支持网站建设、小程序后台、AI应用、物联网(IOT/AIOT)、游戏服务端等多种场景。",
-	"version": "4.0.9",
+	"version": "4.1.1",
 	"main": "index.js",
 	"keywords": [
 		"AI",
@@ -22,8 +22,8 @@
 	"author": "qww",
 	"license": "ISC",
 	"scripts": {
-		"dev": "cross-env NODE_ENV=development nodemon ./example/index.js",
-		"test": "cross-env NODE_ENV=test node ./example/index.js"
+		"dev": "cross-env NODE_ENV=development nodemon ./example/demo.js",
+		"test": "cross-env NODE_ENV=test node ./example/demo.js"
 	},
 	"dependencies": {
 		"aedes": "^1.0.2",
@@ -44,7 +44,7 @@
 		"mm_https": "^1.6.6",
 		"mm_ip": "^1.0.4",
 		"mm_logs": "^1.6.9",
-		"mm_machine": "^2.7.4",
+		"mm_machine": "^2.7.6",
 		"mm_matchs": "^1.1.9",
 		"mm_queue": "^1.0.3",
 		"mm_session": "^1.5.8",
@@ -57,7 +57,7 @@
 	"devDependencies": {
 		"@types/jest": "^30.0.0",
 		"eslint-formatter-table": "^7.32.1",
-		"eslint-plugin-jsdoc": "^63.0.1",
+		"eslint-plugin-jsdoc": "^63.0.2",
 		"jest": "^30.4.2",
 		"mm_eslint": "^1.7.1"
 	},