tiaoom 0.0.12 → 0.0.14

package/src/index.d.cts

@@ -20,6 +20,24 @@ interface BaseEvents {
    */
   error: (error: Error) => void;
 }
+/**
+ * 基础事件定义（Emitter 版本）
+ */
+interface BaseEmitterEvents {
+  /**
+   * 服务初始化回调
+   */
+  ready: [];
+  /**
+   * 服务关闭回调
+   */
+  close: [];
+  /**
+   * 错误回调
+   * @param {Error} error 错误信息
+   */
+  error: [error: Error];
+}
 //#endregion
 //#region lib/events/player.d.ts
 /**
@@ -146,6 +164,22 @@ declare class Player extends EventEmitter$1 implements IPlayer {
  * player： 'command', 'message', 'join', 'leave', 'status'
  */
 declare enum MessageTypes {
+  /**
+   * 连接准备就绪事件
+   */
+  SysReady = "sys.ready",
+  /**
+   * 连接关闭事件
+   */
+  SysClose = "sys.close",
+  /**
+   * 错误事件
+   */
+  SysError = "sys.error",
+  /**
+   * 全局错误
+   */
+  GlobalError = "global.error",
   /**
    * 房间列表
    */
@@ -158,10 +192,6 @@ declare enum MessageTypes {
    * 房间更新
    */
   RoomUpdate = "room.update",
-  /**
-   * 房间准备
-   */
-  RoomReady = "room.ready",
   /**
    * 房间开始
    */
@@ -182,6 +212,10 @@ declare enum MessageTypes {
    * 房间命令
    */
   RoomCommand = "room.command",
+  /**
+   * 房间内玩家发送的指令
+   */
+  RoomPlayerCommand = "room.player-command",
   /**
    * 房间消息
    */
@@ -194,14 +228,6 @@ declare enum MessageTypes {
    * 玩家离开房间
    */
   RoomLeave = "room.leave",
-  /**
-   * 房间踢出玩家
-   */
-  RoomKick = "room.kick",
-  /**
-   * 房间转移
-   */
-  RoomTransfer = "room.transfer",
   /**
    * 房间玩家准备
    */
@@ -223,33 +249,17 @@ declare enum MessageTypes {
    */
   PlayerLogout = "player.logout",
   /**
-   * 玩家消息
+   * *玩家消息
    */
   PlayerMessage = "player.message",
   /**
-   * 玩家命令
+   * *玩家命令
    */
   PlayerCommand = "player.command",
-  /**
-   * 玩家准备
-   */
-  PlayerReady = "player.ready",
-  /**
-   * 玩家取消准备
-   */
-  PlayerUnready = "player.unready",
-  /**
-   * 全局命令
-   */
-  GlobalCommand = "global.command",
   /**
    * 全局消息
    */
   GlobalMessage = "global.message",
-  /**
-   * 全局错误
-   */
-  GlobalError = "global.error",
 }
 /**
  * 消息包接口
@@ -277,7 +287,7 @@ interface IMessageData extends IMessagePackage {
 /**
  * 消息通信接口
  */
-interface IMessage extends EventEmitter$1 {
+interface IMessage extends EventEmitter$1<IMessageEmitterEvents> {
   /**
    * 监听消息事件
    * @param event 事件名，具体见 MessageEvents
@@ -313,6 +323,17 @@ interface IMessageEvents extends BaseEvents {
    */
   message: (data: IMessageData, cb?: (...params: any) => any) => void;
 }
+/**
+ * 消息事件定义（Emitter 版本）
+ */
+interface IMessageEmitterEvents extends BaseEmitterEvents {
+  /**
+   * 服务接收数据
+   * @param {IMessagePackage} data 消息数据
+   * @param {(...params:any) => any} [cb] 回调函数
+   */
+  message: [data: IMessageData, cb?: (...params: any) => any];
+}
 //#endregion
 //#region lib/events/room.d.ts
 /**
@@ -338,7 +359,7 @@ interface RoomEvents extends BaseEvents {
    * 房间聊天
    * @param {string} data 消息内容
    **/
-  message: (data: string) => void;
+  message: (data: string, sender?: IRoomPlayer) => void;
   /**
    * 玩家发送的房间命令
    * @param {IMessagePackage} message 命令内容
@@ -419,6 +440,11 @@ interface TiaoomEvents extends BaseEvents {
   command: (data: any & {
     sender: Player;
   }) => void;
+  /**
+   * 全局聊天
+   * @param {string} data 消息内容
+   **/
+  message: (data: string, sender?: Player) => void;
 }
 //#endregion
 //#region lib/models/room.d.ts
@@ -691,5 +717,5 @@ declare class Tiaoom extends EventEmitter {
   removePlayer(sender: IPlayer): Player;
 }
 //#endregion
-export { IMessage, IMessageData, IMessageEvents, IMessagePackage, IPlayer, IPlayerOptions, IRoom, IRoomOptions, IRoomPlayer, IRoomPlayerOptions, ITiaoomOptions, MessageTypes, Player, PlayerEvents, PlayerRole, PlayerStatus, Room, RoomEvents, RoomPlayer, RoomStatus, Tiaoom, TiaoomEvents };
+export { IMessage, IMessageData, IMessageEmitterEvents, IMessageEvents, IMessagePackage, IPlayer, IPlayerOptions, IRoom, IRoomOptions, IRoomPlayer, IRoomPlayerOptions, ITiaoomOptions, MessageTypes, Player, PlayerEvents, PlayerRole, PlayerStatus, Room, RoomEvents, RoomPlayer, RoomStatus, Tiaoom, TiaoomEvents };
 //# sourceMappingURL=index.d.cts.map

package/src/index.d.mts

@@ -20,6 +20,24 @@ interface BaseEvents {
    */
   error: (error: Error) => void;
 }
+/**
+ * 基础事件定义（Emitter 版本）
+ */
+interface BaseEmitterEvents {
+  /**
+   * 服务初始化回调
+   */
+  ready: [];
+  /**
+   * 服务关闭回调
+   */
+  close: [];
+  /**
+   * 错误回调
+   * @param {Error} error 错误信息
+   */
+  error: [error: Error];
+}
 //#endregion
 //#region lib/events/player.d.ts
 /**
@@ -146,6 +164,22 @@ declare class Player extends EventEmitter$1 implements IPlayer {
  * player： 'command', 'message', 'join', 'leave', 'status'
  */
 declare enum MessageTypes {
+  /**
+   * 连接准备就绪事件
+   */
+  SysReady = "sys.ready",
+  /**
+   * 连接关闭事件
+   */
+  SysClose = "sys.close",
+  /**
+   * 错误事件
+   */
+  SysError = "sys.error",
+  /**
+   * 全局错误
+   */
+  GlobalError = "global.error",
   /**
    * 房间列表
    */
@@ -158,10 +192,6 @@ declare enum MessageTypes {
    * 房间更新
    */
   RoomUpdate = "room.update",
-  /**
-   * 房间准备
-   */
-  RoomReady = "room.ready",
   /**
    * 房间开始
    */
@@ -182,6 +212,10 @@ declare enum MessageTypes {
    * 房间命令
    */
   RoomCommand = "room.command",
+  /**
+   * 房间内玩家发送的指令
+   */
+  RoomPlayerCommand = "room.player-command",
   /**
    * 房间消息
    */
@@ -194,14 +228,6 @@ declare enum MessageTypes {
    * 玩家离开房间
    */
   RoomLeave = "room.leave",
-  /**
-   * 房间踢出玩家
-   */
-  RoomKick = "room.kick",
-  /**
-   * 房间转移
-   */
-  RoomTransfer = "room.transfer",
   /**
    * 房间玩家准备
    */
@@ -223,33 +249,17 @@ declare enum MessageTypes {
    */
   PlayerLogout = "player.logout",
   /**
-   * 玩家消息
+   * *玩家消息
    */
   PlayerMessage = "player.message",
   /**
-   * 玩家命令
+   * *玩家命令
    */
   PlayerCommand = "player.command",
-  /**
-   * 玩家准备
-   */
-  PlayerReady = "player.ready",
-  /**
-   * 玩家取消准备
-   */
-  PlayerUnready = "player.unready",
-  /**
-   * 全局命令
-   */
-  GlobalCommand = "global.command",
   /**
    * 全局消息
    */
   GlobalMessage = "global.message",
-  /**
-   * 全局错误
-   */
-  GlobalError = "global.error",
 }
 /**
  * 消息包接口
@@ -277,7 +287,7 @@ interface IMessageData extends IMessagePackage {
 /**
  * 消息通信接口
  */
-interface IMessage extends EventEmitter$1 {
+interface IMessage extends EventEmitter$1<IMessageEmitterEvents> {
   /**
    * 监听消息事件
    * @param event 事件名，具体见 MessageEvents
@@ -313,6 +323,17 @@ interface IMessageEvents extends BaseEvents {
    */
   message: (data: IMessageData, cb?: (...params: any) => any) => void;
 }
+/**
+ * 消息事件定义（Emitter 版本）
+ */
+interface IMessageEmitterEvents extends BaseEmitterEvents {
+  /**
+   * 服务接收数据
+   * @param {IMessagePackage} data 消息数据
+   * @param {(...params:any) => any} [cb] 回调函数
+   */
+  message: [data: IMessageData, cb?: (...params: any) => any];
+}
 //#endregion
 //#region lib/events/room.d.ts
 /**
@@ -338,7 +359,7 @@ interface RoomEvents extends BaseEvents {
    * 房间聊天
    * @param {string} data 消息内容
    **/
-  message: (data: string) => void;
+  message: (data: string, sender?: IRoomPlayer) => void;
   /**
    * 玩家发送的房间命令
    * @param {IMessagePackage} message 命令内容
@@ -419,6 +440,11 @@ interface TiaoomEvents extends BaseEvents {
   command: (data: any & {
     sender: Player;
   }) => void;
+  /**
+   * 全局聊天
+   * @param {string} data 消息内容
+   **/
+  message: (data: string, sender?: Player) => void;
 }
 //#endregion
 //#region lib/models/room.d.ts
@@ -691,5 +717,5 @@ declare class Tiaoom extends EventEmitter {
   removePlayer(sender: IPlayer): Player;
 }
 //#endregion
-export { IMessage, IMessageData, IMessageEvents, IMessagePackage, IPlayer, IPlayerOptions, IRoom, IRoomOptions, IRoomPlayer, IRoomPlayerOptions, ITiaoomOptions, MessageTypes, Player, PlayerEvents, PlayerRole, PlayerStatus, Room, RoomEvents, RoomPlayer, RoomStatus, Tiaoom, TiaoomEvents };
+export { IMessage, IMessageData, IMessageEmitterEvents, IMessageEvents, IMessagePackage, IPlayer, IPlayerOptions, IRoom, IRoomOptions, IRoomPlayer, IRoomPlayerOptions, ITiaoomOptions, MessageTypes, Player, PlayerEvents, PlayerRole, PlayerStatus, Room, RoomEvents, RoomPlayer, RoomStatus, Tiaoom, TiaoomEvents };
 //# sourceMappingURL=index.d.mts.map

package/src/index.mjs

@@ -1,116 +1,182 @@
 import EventEmitter$1, { EventEmitter } from "events";
 
+//#region lib/client.ts
+/**
+* 客户端发送消息包类型枚举
+* player： 'command', 'message', 'join', 'leave', 'status'
+*/
+let MessageTypes$1 = /* @__PURE__ */ function(MessageTypes$2) {
+	/**
+	* 房间列表
+	*/
+	MessageTypes$2["RoomList"] = "room.list";
+	/**
+	* 玩家列表
+	*/
+	MessageTypes$2["PlayerList"] = "player.list";
+	/**
+	* 房间创建
+	*/
+	MessageTypes$2["RoomCreate"] = "room.create";
+	/**
+	* 玩家加入房间
+	*/
+	MessageTypes$2["PlayerJoin"] = "player.join";
+	/**
+	* 玩家离开房间
+	*/
+	MessageTypes$2["PlayerLeave"] = "player.leave";
+	/**
+	* 房间获取
+	*/
+	MessageTypes$2["RoomGet"] = "room.get";
+	/**
+	* 房间开始
+	*/
+	MessageTypes$2["RoomStart"] = "room.start";
+	/**
+	* 房间踢出玩家
+	*/
+	MessageTypes$2["RoomKick"] = "room.kick";
+	/**
+	* 房间转移
+	*/
+	MessageTypes$2["RoomTransfer"] = "room.transfer";
+	/**
+	* 房间关闭
+	*/
+	MessageTypes$2["RoomClose"] = "room.close";
+	/**
+	* 玩家登录
+	*/
+	MessageTypes$2["PlayerLogin"] = "player.login";
+	/**
+	* 玩家登出
+	*/
+	MessageTypes$2["PlayerLogout"] = "player.logout";
+	/**
+	* 玩家准备
+	*/
+	MessageTypes$2["PlayerReady"] = "player.ready";
+	/**
+	* 玩家取消准备
+	*/
+	MessageTypes$2["PlayerUnready"] = "player.unready";
+	/**
+	* 房间内玩家发送的指令
+	*/
+	MessageTypes$2["RoomPlayerCommand"] = "room.player-command";
+	/**
+	* 全局命令
+	*/
+	MessageTypes$2["GlobalCommand"] = "global.command";
+	return MessageTypes$2;
+}({});
+
+//#endregion
 //#region lib/models/message.ts
 /**
 * 消息包类型枚举
 * player： 'command', 'message', 'join', 'leave', 'status'
 */
-let MessageTypes = /* @__PURE__ */ function(MessageTypes$1) {
+let MessageTypes = /* @__PURE__ */ function(MessageTypes$2) {
+	/**
+	* 连接准备就绪事件
+	*/
+	MessageTypes$2["SysReady"] = "sys.ready";
+	/**
+	* 连接关闭事件
+	*/
+	MessageTypes$2["SysClose"] = "sys.close";
+	/**
+	* 错误事件
+	*/
+	MessageTypes$2["SysError"] = "sys.error";
+	/**
+	* 全局错误
+	*/
+	MessageTypes$2["GlobalError"] = "global.error";
 	/**
 	* 房间列表
 	*/
-	MessageTypes$1["RoomList"] = "room.list";
+	MessageTypes$2["RoomList"] = "room.list";
 	/**
 	* 房间创建
 	*/
-	MessageTypes$1["RoomCreate"] = "room.create";
+	MessageTypes$2["RoomCreate"] = "room.create";
 	/**
 	* 房间更新
 	*/
-	MessageTypes$1["RoomUpdate"] = "room.update";
-	/**
-	* 房间准备
-	*/
-	MessageTypes$1["RoomReady"] = "room.ready";
+	MessageTypes$2["RoomUpdate"] = "room.update";
 	/**
 	* 房间开始
 	*/
-	MessageTypes$1["RoomStart"] = "room.start";
+	MessageTypes$2["RoomStart"] = "room.start";
 	/**
 	* 房间结束
 	*/
-	MessageTypes$1["RoomEnd"] = "room.end";
+	MessageTypes$2["RoomEnd"] = "room.end";
 	/**
 	* 房间关闭
 	*/
-	MessageTypes$1["RoomClose"] = "room.close";
+	MessageTypes$2["RoomClose"] = "room.close";
 	/**
 	* 房间全部玩家已准备
 	*/
-	MessageTypes$1["RoomAllReady"] = "room.all-ready";
+	MessageTypes$2["RoomAllReady"] = "room.all-ready";
 	/**
 	* 房间命令
 	*/
-	MessageTypes$1["RoomCommand"] = "room.command";
+	MessageTypes$2["RoomCommand"] = "room.command";
+	/**
+	* 房间内玩家发送的指令
+	*/
+	MessageTypes$2["RoomPlayerCommand"] = "room.player-command";
 	/**
 	* 房间消息
 	*/
-	MessageTypes$1["RoomMessage"] = "room.message";
+	MessageTypes$2["RoomMessage"] = "room.message";
 	/**
 	* 玩家加入房间
 	*/
-	MessageTypes$1["RoomJoin"] = "room.join";
+	MessageTypes$2["RoomJoin"] = "room.join";
 	/**
 	* 玩家离开房间
 	*/
-	MessageTypes$1["RoomLeave"] = "room.leave";
-	/**
-	* 房间踢出玩家
-	*/
-	MessageTypes$1["RoomKick"] = "room.kick";
-	/**
-	* 房间转移
-	*/
-	MessageTypes$1["RoomTransfer"] = "room.transfer";
+	MessageTypes$2["RoomLeave"] = "room.leave";
 	/**
 	* 房间玩家准备
 	*/
-	MessageTypes$1["RoomPlayerReady"] = "room.player-ready";
+	MessageTypes$2["RoomPlayerReady"] = "room.player-ready";
 	/**
 	* 房间玩家取消准备
 	*/
-	MessageTypes$1["RoomPlayerUnready"] = "room.player-unready";
+	MessageTypes$2["RoomPlayerUnready"] = "room.player-unready";
 	/**
 	* 玩家列表
 	*/
-	MessageTypes$1["PlayerList"] = "player.list";
+	MessageTypes$2["PlayerList"] = "player.list";
 	/**
 	* 玩家登录
 	*/
-	MessageTypes$1["PlayerLogin"] = "player.login";
+	MessageTypes$2["PlayerLogin"] = "player.login";
 	/**
 	* 玩家登出
 	*/
-	MessageTypes$1["PlayerLogout"] = "player.logout";
-	/**
-	* 玩家消息
-	*/
-	MessageTypes$1["PlayerMessage"] = "player.message";
+	MessageTypes$2["PlayerLogout"] = "player.logout";
 	/**
-	* 玩家命令
+	* *玩家消息
 	*/
-	MessageTypes$1["PlayerCommand"] = "player.command";
+	MessageTypes$2["PlayerMessage"] = "player.message";
 	/**
-	* 玩家准备
-	*/
-	MessageTypes$1["PlayerReady"] = "player.ready";
-	/**
-	* 玩家取消准备
-	*/
-	MessageTypes$1["PlayerUnready"] = "player.unready";
-	/**
-	* 全局命令
+	* *玩家命令
 	*/
-	MessageTypes$1["GlobalCommand"] = "global.command";
+	MessageTypes$2["PlayerCommand"] = "player.command";
 	/**
 	* 全局消息
 	*/
-	MessageTypes$1["GlobalMessage"] = "global.message";
-	/**
-	* 全局错误
-	*/
-	MessageTypes$1["GlobalError"] = "global.error";
-	return MessageTypes$1;
+	MessageTypes$2["GlobalMessage"] = "global.message";
+	return MessageTypes$2;
 }({});
 
 //#endregion
@@ -355,8 +421,9 @@ var Room = class extends EventEmitter$1 {
 			"command",
 			"start",
 			"end",
-			"close",
 			"all-ready",
+			"player-unready",
+			"player-ready",
 			"join",
 			"leave"
 		].forEach((event) => {
@@ -486,30 +553,27 @@ var Tiaoom = class extends EventEmitter {
 		(_this$messageInstance = this.messageInstance) === null || _this$messageInstance === void 0 || _this$messageInstance.on("message", (message, cb) => {
 			try {
 				switch (message.type) {
-					case "room.list": return cb === null || cb === void 0 ? void 0 : cb(null, this.rooms);
-					case "player.list": return cb === null || cb === void 0 ? void 0 : cb(null, this.players);
-					case "room.create": return this.createRoom(message.sender, message.data);
-					case "player.join": return this.joinPlayer(message.sender, message.data);
-					case "player.leave": return this.leavePlayer(message.sender, message.data);
-					case "room.get": return cb === null || cb === void 0 ? void 0 : cb(null, this.searchRoom(message.data));
-					case "room.start": return this.startRoom(message.sender, message.data);
-					case "room.kick": return this.kickPlayer(message.sender, message.data);
-					case "room.transfer": return this.transferOwner(message.sender, message.data);
-					case "room.close": return this.closeRoom(message.sender, message.data);
-					case "player.login": return this.loginPlayer(message.data);
-					case "player.logout": return this.removePlayer(message.data);
-					case "player.ready": return this.readyPlayer(message.sender, message.data);
-					case "player.unready": return this.unReadyPlayer(message.sender, message.data);
-					case "room.player-command":
+					case MessageTypes$1.RoomList: return cb === null || cb === void 0 ? void 0 : cb(null, this.rooms);
+					case MessageTypes$1.PlayerList: return cb === null || cb === void 0 ? void 0 : cb(null, this.players);
+					case MessageTypes$1.RoomCreate: return this.createRoom(message.sender, message.data);
+					case MessageTypes$1.PlayerJoin: return this.joinPlayer(message.sender, message.data);
+					case MessageTypes$1.PlayerLeave: return this.leavePlayer(message.sender, message.data);
+					case MessageTypes$1.RoomGet: return cb === null || cb === void 0 ? void 0 : cb(null, this.searchRoom(message.data));
+					case MessageTypes$1.RoomStart: return this.startRoom(message.sender, message.data);
+					case MessageTypes$1.RoomKick: return this.kickPlayer(message.sender, message.data);
+					case MessageTypes$1.RoomTransfer: return this.transferOwner(message.sender, message.data);
+					case MessageTypes$1.RoomClose: return this.closeRoom(message.sender, message.data);
+					case MessageTypes$1.PlayerLogin: return this.loginPlayer(message.data);
+					case MessageTypes$1.PlayerLogout: return this.removePlayer(message.data);
+					case MessageTypes$1.PlayerReady: return this.readyPlayer(message.sender, message.data);
+					case MessageTypes$1.PlayerUnready: return this.unReadyPlayer(message.sender, message.data);
+					case MessageTypes$1.RoomPlayerCommand:
 						var _this$searchRoom;
 						return (_this$searchRoom = this.searchRoom(message.data)) === null || _this$searchRoom === void 0 ? void 0 : _this$searchRoom.emit("player-command", {
 							...message.data,
 							sender: message.sender
 						});
-					case "room.message":
-						var _this$searchRoom2;
-						return (_this$searchRoom2 = this.searchRoom(message.data)) === null || _this$searchRoom2 === void 0 ? void 0 : _this$searchRoom2.emit("message", message.data);
-					case "global.command": return this.emit("command", {
+					case MessageTypes$1.GlobalCommand: return this.emit("command", {
 						...message.data,
 						sender: message.sender
 					});
@@ -560,11 +624,12 @@ var Tiaoom = class extends EventEmitter {
 				data: rooms
 			});
 		});
-		this.on("command", (data) => {
+		this.on("message", (data, sender) => {
 			var _this$messageInstance8;
 			(_this$messageInstance8 = this.messageInstance) === null || _this$messageInstance8 === void 0 || _this$messageInstance8.send({
-				type: MessageTypes.GlobalCommand,
-				data
+				type: MessageTypes.GlobalMessage,
+				data,
+				sender
 			});
 		});
 		return this;
@@ -692,6 +757,7 @@ var Tiaoom = class extends EventEmitter {
 			...player,
 			...roomPlayer
 		});
+		room.emit("update", room);
 		return this;
 	}
 	unReadyPlayer(sender, player) {
@@ -705,6 +771,7 @@ var Tiaoom = class extends EventEmitter {
 		roomPlayer.isReady = false;
 		playerInstance.emit("status", PlayerStatus.unready);
 		room.emit("player-unready", roomPlayer);
+		room.emit("update", room);
 		return this;
 	}
 	removePlayer(sender) {