mm_os 3.3.0 → 4.0.0

package/core/zone/zone_bat.js

@@ -0,0 +1,136 @@
+
+/**
+ * 玩家进入频道
+ * @param {string} player_id 玩家ID
+ * @param {number} channel_id 频道ID
+ * @returns {boolean} 是否进入成功
+ */
+Zone.prototype.enterChannel = async function (player_id, channel_id) {
+  // 参数校验
+  if (!player_id || typeof player_id !== 'string') {
+    throw new TypeError('玩家ID必须是有效字符串');
+  }
+
+  if (!channel_id || typeof channel_id !== 'number') {
+    throw new TypeError('频道ID必须是有效数字');
+  }
+
+  // 获取玩家对象
+  var player = this.getPlayer(player_id);
+
+  // 检查频道是否存在
+  if (!this.channel.has(channel_id)) {
+    throw new Error(`频道 ${channel_id} 不存在`);
+  }
+
+  // 如果玩家已在其他频道，先退出
+  if (player.channel_id && this.channel.get(player.channel_id)) {
+    await this.channel.get(player.channel_id).leave(player_id);
+  }
+
+  // 玩家进入频道
+  await this.channel.get(channel_id).enter(player_id);
+
+  // 更新玩家频道ID
+  player.channel_id = channel_id;
+
+  return true;
+};
+
+/**
+ * 切换频道
+ * @param {string} player_id 玩家ID
+ * @param {number} channel_id 频道ID
+ * @returns {boolean} 是否切换成功
+ */
+Zone.prototype.switchChannel = async function (player_id, channel_id) {
+  // 参数校验
+  if (!player_id || typeof player_id !== 'string') {
+    throw new TypeError('玩家ID必须是有效字符串');
+  }
+
+  if (!channel_id || typeof channel_id !== 'number') {
+    throw new TypeError('频道ID必须是有效数字');
+  }
+
+  // 获取玩家对象
+  var player = this.getPlayer(player_id);
+
+  // 检查目标频道是否存在
+  if (!this.channel[channel_id]) {
+    throw new Error(`频道 ${channel_id} 不存在`);
+  }
+
+  // 如果玩家已在目标频道，直接返回
+  if (player.channel_id === channel_id) {
+    return true;
+  }
+
+  // 退出当前频道
+  if (player.channel_id && this.channel.get(player.channel_id)) {
+    await this.channel.get(player.channel_id).leave(player_id);
+  }
+
+  // 进入目标频道
+  await this.channel.get(channel_id).enter(player_id);
+
+  // 更新玩家频道ID
+  player.channel_id = channel_id;
+
+  return true;
+};
+
+/**
+ * 频道数据发送
+ * @param {number} channel_id 频道ID
+ * @param {object} data 发送数据
+ * @param {string} msg_type 消息类型
+ * @param {string} msg_group 消息范围
+ * @param {string} sender_id 发送者ID
+ * @returns {object} 发送结果
+ */
+Zone.prototype.sendToChannel = async function (channel_id, data, msg_type = 'text', msg_group = 'channel', sender_id = 'system') {
+  // 参数校验
+  if (!channel_id || typeof channel_id !== 'number') {
+    throw new TypeError('频道ID必须是有效数字');
+  }
+
+  if (!data || typeof data !== 'object') {
+    throw new TypeError('发送数据必须是有效对象');
+  }
+
+  try {
+    // 检查频道是否存在
+    var channel = this.channel.get(channel_id);
+    if (!channel) {
+      throw new Error(`频道 ${channel_id} 不存在`);
+    }
+
+    // 创建发送对象
+    var send_obj = {
+      data: data,
+      msg_type: msg_type,
+      msg_group: msg_group,
+      sender_id: sender_id,
+      timestamp: Date.now(),
+      channel_id: channel_id,
+      zone_name: this.config.name,
+      msg_id: this._generateMsgId()
+    };
+
+    // 触发频道数据发送事件，由业务层处理具体的发送逻辑
+    this.emitEvent('channel_send', {
+      ...send_obj
+    });
+
+    return {
+      players: channel.getPlayerNum(),
+      success: 0,
+      fail: 0,
+      failed_players: []
+    };
+  } catch (error) {
+    this.log('error', `频道数据发送失败: `, error);
+    throw error;
+  }
+};

package/core//345/237/272/347/261/273/346/250/241/345/235/227/346/270/205/345/215/225.md

@@ -0,0 +1,24 @@
+# 基类模块清单
+1. 中间件middleware，如身份验证、日志记录等，调用控制器controller
+2. 控制器controller，如用户控制器、订单控制器等，调用处理器handler，视图view
+3. 视图view，渲染器renderer、渲染上下文context等
+4. 静态资源static，如图片、音频、视频等
+5. 应用处理器handler（主要是命令处理器、事件处理器等），如用户注册处理器、订单支付处理器等，调用服务service、模型model、仓储store，订阅事件总线eventer，发布事件到事件总线eventer
+6. 领域服务service，如订单服务、用户服务等，调用模型model、其他领域服务service、复杂业务逻辑logic
+7. 富血模型model，如用户、订单等
+8. 仓储store，如数据库、缓存等，调用db、cache、第三方API等
+9. 事件总线eventer，如事件监听、事件发布等
+10. 游戏循环gameLoop，如帧循环、时间循环等，调用系统system的update方法
+11. 游戏系统system，如物理系统、渲染系统、AI系统等，调用游戏实体entity、游戏组件component、游戏逻辑logic
+12. 游戏逻辑logic，如游戏规则、游戏状态等
+13. 游戏实体entity，如玩家、NPC、怪物等
+14. 游戏组件component，如位置组件、动画组件、状态组件等
+15. 游戏场景scene，如主菜单、游戏关卡等，调用系统system
+16. 任务task，定时任务、异步任务等，发布事件到事件总线eventer
+17. 通知器notifier，邮箱email、短信sms通知等，订阅事件总线eventer
+18. 消息发送器sender，转发消息到外部服务器，订阅事件总线eventer
+19. 广播器pusher，广播到websocket、socket等，订阅事件总线eventer
+20. 应用app，如内容管理系统cms、游戏game、商城mail，引入模组mod、应用处理器handler、模型model、仓储store、游戏循环gameLoop、游戏场景scene、游戏系统system、游戏实体entity、游戏组件component、任务task，引用上级server等
+21. 插件plugin，如支付插件pay、邮件插件mail、短信插件sms
+22. 模组mod，如游戏道具模块、游戏装备模块等
+23. 服务端server，程序唯一，引入适配器adapter（web/socket/mqtt），通知器notifier、消息发送器sender、广播器pusher、日志管理器logger、管理器manager、应用app、插件plugin、事件总线eventer、缓存cache、数据库操作db等

package/index.js

@@ -1,316 +1,19 @@
-// 增强版补丁：彻底解决util._extend API弃用警告
-const util = require('util');
-// 完全替换util._extend为Object.assign的包装函数，确保行为一致
-util._extend = function(target, source) {
-    return Object.assign({}, target, source);
-};
-
-require('mm_logs');
-require('mm_ret');
-$.Tpl = require('mm_tpl');
-$.mongodb_admin = require("mm_mongodb").mongoDB_admin;
-$.redis_admin = require("mm_redis").redis_admin;
-$.mysql_admin = require('mm_mysql').mysql_admin;
-const conf = require("mm_config");
-var Com = require("./lib/com.js");
-var WEB = require("./core/base/web/index.js");
-var MQTT = require("./core/base/mqtt/index.js");
-
-/**
- * 服务端系统
- */
-class OS {
-	/**
-	 * 构造函数
-	 * @param {Object} config 配置参数
-	 */
-	constructor(config) {
-		this.config = {
-			"runPath": "",
-			"sys": {
-				"name": "mm",
-				"title": "超级美眉",
-				"cache": "memory",
-				"lang": "zh_CN",
-				"game": false,
-				"task": false,
-				"hot_reload": true,
-				"log": false
-			},
-			"web": {
-				"state": true,
-				"host": "0.0.0.0",
-				"port": 8000,
-				"socket": true,
-				"compress": true,
-				"event": true,
-				"log": true,
-				"static": true,
-				"maxAge": 7200,
-				"static_path": "./static",
-				"proxy": {}
-			},
-			"mqtt": {
-				"state": true,
-				"socket_port": 1883,
-				"http_port": 8083,
-				"cache": "redis",
-				"db": 12
-			},
-			"mqtt_client": {
-				"state": true,
-				"host": "127.0.0.1",
-				"port": "8083",
-				"protocol": "ws",
-				"clientId": "system",
-				"username": "admin",
-				"password": "asd123",
-				"clean": false
-			},
-			"redis": {
-				"host": "127.0.0.1",
-				"port": 6379,
-				"password": "asd159357",
-				"database": 0,
-				"prefix": "mm_"
-			},
-			"mongodb": {
-				"host": "127.0.0.1",
-				"port": 27017,
-				"database": "mm",
-				"user": "admin",
-				"password": "asd123"
-			},
-			"modules": {
-				"hotReload": true,
-				"watchInterval": 5000,
-				"autoLoad": true
-			}
-		};
-		this.init(config);
-	}
-}
-
-/**
- * 初始化数据
- * @param {Object} config 配置参数
- */
-OS.prototype.initData = function(config) {
-	var p = config.runPath;
-	if (!p) {
-		config.runPath = $.runPath
-	} else if (p.substring(p.length - 1) !== $.slash) {
-		config.runPath += $.slash;
-	}
-
-	$.runPath = config.runPath;
-
-	// 初始化公共函数
-	$.func = {};
-
-	// 初始化变量
-	$.var = {};
-	$.conf = conf(null, '/conf.json'.fullname());
-	$.config = config;
-
-	// 修改默认模板路径，改为static下，方便读取css和js
-	$.Tpl.prototype.init_main = function(cg) {
-		if (cg) {
-			if (!cg.default_dir) {
-				cg.default_dir = "./template/".fullname(config.web.static_path)
-			}
-		} else {
-			cg = {
-				default_dir: "./template/".fullname(config.web.static_path)
-			}
-		}
-		this.set_config(cg);
-		this.dir = cg.default_dir;
-	}
-}
-
-/**
- * 加载核心模块
- * @param {Object} cg 配置参数
- */
-OS.prototype.loadModule = function(cg) {
-	$.com = new Com();
-	this.com = $.com;
-
-	$.task = $.task_admin('sys');
-
-	if (cg.sys) {
-		var cache = cg.sys.cache;
-		// 选择缓存方式,默认memory缓存
-		if (cache === 'redis') {
-			// 将Api的缓存改为redis方式，如果不用redis可以将以下4行注释掉
-			var redis = $.redis_admin('sys');
-			redis.setConfig(cg.redis);
-			redis.open();
-			$.cache = redis;
-		} else if (cache === 'cache') {
-			// 将Api的缓存改为cache方式, 本地缓存方式
-			$.cache_admin = require('mm_cache').cache_admin;
-			$.push($.cache, $.cache_admin('sys'), true);
-		} else if (cache === 'mongodb') {
-			var mongodb = $.mongodb_admin('sys');
-			mongodb.setConfig(cg.mongodb);
-			mongodb.open();
-			$.cache = mongodb;
-		}
-	}
-
-	$.sql = $.mysql_admin('sys', $.runPath);
-	if (cg.mysql) {
-		$.sql.setConfig(cg.mysql);
-	}
-
-	if (!cg.sys.hot_reload) {
-		$.mod.config.watch = false;
-	}
-}
-
-/**
- * 初始化全局错误处理机制
- */
-OS.prototype.initErrorHandler = function() {
-	// 全局未捕获异常处理
-	process.on('uncaughtException', (error) => {
-		if ($.log && $.log.error) {
-			$.log.error('全局未捕获异常:', error);
-		} else {
-			console.error('全局未捕获异常:', error);
-		}
-	});
-	
-	// 全局未处理Promise拒绝处理
-	process.on('unhandledRejection', (reason, promise) => {
-		if ($.log && $.log.error) {
-			$.log.error('全局未处理Promise拒绝:', reason);
-		} else {
-			console.error('全局未处理Promise拒绝:', reason);
-		}
-	});
-};
-
-/**
- * 初始化
- * @param {Object} config - 配置参数
- */
-OS.prototype.init = function(config) {
-	this.config = Object.assign(this.config, config);
-	this.initData(this.config);
-	this.loadModule(this.config);
-	// 提供简单的日志功能替代方案
-	if (!$.log) {
-		$.log = {
-			debug: console.debug,
-			info: console.info,
-			warn: console.warn,
-			error: console.error,
-			log: console.log
-		};
-	}
-	this.initBase(this.config);
-	// 初始化全局错误处理机制
-	this.initErrorHandler();
+const {
+  Server
+} = require('./server.js');
+
+/**
+ * 操作系统核心类
+ */
+class MM_os {
+  /**
+   * 构造函数
+   * @param {object} config 配置对象
+   */
+  constructor(config) {
+    $.server = new Server(config);
+    return $.server;
+  }
 }
 
-/**
- * 运行基础数据
- * @param {Object} cg - 配置对象
- */
-OS.prototype.initBase = function(cg) {
-	var middleware = $.middleware;
-	middleware.update();
-	var mqtt, web;
-	if (cg.web && cg.web.state) {
-		web = new WEB(cg.web);
-		web.list = middleware.list.filter((o) => {
-			return !o.mode || o.mode == "web"
-		});
-		web.init();
-		this.web = web;
-	}
-
-	if (cg.mqtt && cg.mqtt.state) {
-		mqtt = new MQTT(Object.assign(cg.mqtt, {
-			redis: cg.redis,
-			mongodb: cg.mongodb
-		}));
-		mqtt.list = middleware.list.filter((o) => {
-			return o.mode == "mqtt"
-		});
-		mqtt.init();
-		this.mqtt = mqtt;
-	}
-}
-
-/**
- * 运行主程序
- * @param {String} state 状态
- */
-OS.prototype.main = async function(state) {
-	// 启动计时器
-	$.timer.run();
-
-	var cg = this.config;
-	var tip = "启动";
-	if (cg.web && cg.web.state) {
-		tip += " web";
-		if (cg.web.socket) {
-			tip += " socket";
-		}
-		var eventer = $.event_admin('api');
-		eventer.update();
-		this.web.run();
-	}
-
-	if (cg.mqtt && cg.mqtt.state) {
-		this.mqtt.run();
-		tip += " mqtt";
-	}
-
-	if (cg.sys && cg.sys.task) {
-		$.task.update().then(() => {
-			$.task.run();
-		});
-		tip += " task";
-	}
-	console.log(tip);
-};
-
-/**
- * 运行主程序前
- * @param {String} state 状态
- */
-OS.prototype.before = async function(state) {
-	var mysql = this.config.mysql;
-	if (mysql && mysql.state) {
-		await $.sql.open();
-	}
-	this.app = $.app_admin('sys');
-	await this.app.update();
-};
-
-/**
- * 运行主程序后
- * @param {String} state 状态
- */
-OS.prototype.after = async function(state) {
-	this.app.exec(null, 'init').then(() => {
-		this.app.run(null, 'start');
-	});
-};
-
-/**
- * 运行
- * @param {String} state 状态
- */
-OS.prototype.run = async function(state = 'start') {
-	await this.before(state);
-	await this.main(state);
-	await this.after(state);
-};
-
-module.exports = OS;
+exports.MM_os = MM_os;

package/os.js

@@ -0,0 +1,57 @@
+const cluster = require('cluster');
+const os = require('os');
+const { Server } = require('./server.js');
+
+/**
+ * 操作系统核心类
+ */
+class MM_os {
+  /**
+   * 构造函数
+   * @param {object} config 配置对象
+   */
+  constructor(config) {
+    this.config = config;
+    this.server = null;
+    this.num_cpus = os.cpus().length;
+  }
+
+  /**
+   * 初始化方法
+   * @returns {Promise<void>}
+   */
+  async init() {
+    if (cluster.isPrimary) {
+      console.log(`主进程 ${process.pid} 正在运行，创建 ${this.num_cpus} 个工作进程`);
+
+      for (let i = 0; i < this.num_cpus; i++) {
+        cluster.fork();
+      }
+
+      cluster.on('exit', (worker) => {
+        console.log(`工作进程 ${worker.process.pid} 已退出，正在重启...`);
+        cluster.fork();
+      });
+    } else {
+      this.server = new Server(this.config);
+      await this.server.init();
+    }
+  }
+
+  /**
+   * 启动方法
+   * @returns {Promise<void>}
+   */
+  async start() {
+    if (cluster.isPrimary) {
+      console.log(`主进程 ${process.pid} 已启动，管理 ${this.num_cpus} 个工作进程`);
+    } else {
+      if (!this.server) {
+        throw new Error('请先调用 init() 方法初始化');
+      }
+      await this.server.start();
+    }
+  }
+}
+
+module.exports = { MM_os };

package/package.json

@@ -1,69 +1,71 @@
 {
 	"name": "mm_os",
-	"version": "3.3.0",
-	"description": "这是超级美眉服务端框架，用于快速构建应用程序。",
+	"description": "超级美眉服务端框架，用于快速构建应用程序，可快速构建网站、小程序后台、AI应用、物联网应用、中小型游戏服务端。",
+	"version": "4.0.0",
 	"main": "index.js",
+	"author": "qww",
+	"license": "ISC",
 	"scripts": {
-		"test": "cross-env NODE_ENV=test node --no-warnings=DEP0060 ./demo/index.js",
-		"start": "node --trace-warnings --no-warnings=DEP0060 ./demo/index.js",
-		"dev": "cross-env NODE_ENV=development nodemon --no-warnings=DEP0060 ./demo/index.js"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://gitee.com/qiuwenwu91/mm_os.git"
+		"dev": "cross-env NODE_ENV=development nodemon ./example/index.js",
+		"test": "cross-env NODE_ENV=test node ./example/index.js"
 	},
-	"keywords": [
-		"超级美眉",
-		"游戏",
-		"系统",
-		"物联网",
-		"服务端",
-		"框架",
-		"函数式",
-		"公众号",
-		"MM",
-		"game",
-		"iot",
-		"server",
-		"framework"
-	],
-	"author": "邱文武",
-	"license": "ISC",
-	"files": [
-		"index.js",
-		"core/**",
-		"lib/**",
-		"middleware/**",
-		"conf.json",
-		"README.md",
-		"README.en.md",
-		"LICENSE"
-	],
 	"dependencies": {
-		"compressing": "^2.0.0",
-		"koa": "^3.0.1",
-		"koa-body": "^6.0.1",
-		"koa-compress": "^5.1.1",
+		"aedes": "^1.0.2",
+		"compressing": "^2.1.1",
+		"js-beautify": "^1.15.4",
+		"koa": "^3.2.1",
+		"koa-body": "^8.0.0",
+		"koa-compress": "^5.2.1",
 		"koa-send": "^5.0.1",
 		"koa-websocket": "^7.0.0",
-		"mm_check": "^1.5.0",
-		"mm_email": "^1.0.3",
+		"markdown": "^0.5.0",
+		"mm_check": "^1.5.2",
+		"mm_email": "^1.0.8",
 		"mm_excel": "^1.2.2",
-		"mm_expand": "^1.8.3",
+		"mm_expand": "^2.3.4",
+		"mm_git": "^1.0.2",
 		"mm_html": "^1.1.7",
-		"mm_koa_proxy": "^1.0.1",
-		"mm_logs": "^1.2.0",
-		"mm_machine": "^2.0.1",
-		"mm_mongodb": "^1.4.4",
-		"mm_mqtt": "^1.0.7",
-		"mm_mysql": "^2.0.2",
-		"mm_redis": "^1.4.2",
-		"mm_ret": "^1.4.1",
-		"mm_session": "^1.5.0",
-		"mm_statics": "^1.5.1",
-		"mm_tpl": "^2.4.3",
+		"mm_https": "^1.6.6",
+		"mm_ip": "^1.0.4",
+		"mm_logs": "^1.6.9",
+		"mm_machine": "^2.7.4",
+		"mm_matchs": "^1.1.9",
+		"mm_queue": "^1.0.3",
+		"mm_session": "^1.5.8",
+		"mm_sql": "^1.5.6",
+		"mm_statics": "^1.8.4",
 		"mm_xml": "^1.1.7",
-		"mosca": "^2.8.3",
-		"mqtt": "^5.14.1"
-	}
-}
+		"mqtt": "^5.15.1",
+		"openai": "^6.39.0",
+		"sharp": "^0.34.5",
+		"cos-nodejs-sdk-v5": "^2.15.4",
+		"jimp": "^1.6.1",
+		"qq-guild-bot": "^2.9.5",
+		"tencentcloud-sdk-nodejs-faceid": "^4.1.233",
+		"tinify": "^1.8.2"
+	},
+	"devDependencies": {
+		"@types/jest": "^30.0.0",
+		"eslint-formatter-table": "^7.32.1",
+		"eslint-plugin-jsdoc": "^63.0.0",
+		"jest": "^30.4.2",
+		"mm_eslint": "^1.7.1"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://gitee.com/qiuwenwu91/mm_os.git"
+	},
+	"files": [
+		"index.js",
+		"os.js",
+		"server.js",
+		"com.js",
+		"README.md",
+		"README_EN.md",
+		"LICENSE",
+		"adapter/",
+		"com/",
+		"common/",
+		"core/"
+	]
+}