tiaoom 0.0.11 → 0.0.13

package/src/index.d.mts

@@ -20,24 +20,30 @@ interface BaseEvents {
    */
   error: (error: Error) => void;
 }
+/**
+ * 基础事件定义（Emitter 版本）
+ */
+interface BaseEmitterEvents {
+  /**
+   * 服务初始化回调
+   */
+  ready: [];
+  /**
+   * 服务关闭回调
+   */
+  close: [];
+  /**
+   * 错误回调
+   * @param {Error} error 错误信息
+   */
+  error: [error: Error];
+}
 //#endregion
 //#region lib/events/player.d.ts
 /**
  * 玩家事件定义
  */
 interface PlayerEvents extends BaseEvents {
-  /**
-   * 加入房间
-   * @param {Room} room 房间信息
-   * @param {Player} player 玩家信息
-   **/
-  join: (room: Room, player: Player) => void;
-  /**
-   * 离开房间
-   * @param {Room} room 房间信息
-   * @param {Player} player 玩家信息
-   **/
-  leave: (room: Room, player: Player) => void;
   /**
    * 玩家状态变化
    * @param {PlayerStatus} status 玩家状态
@@ -45,9 +51,9 @@ interface PlayerEvents extends BaseEvents {
   status: (status: PlayerStatus) => void;
   /**
    * 玩家命令
-   * @param {MessagePackage} message 命令内容
+   * @param {IMessagePackage} message 命令内容
    */
-  command: (message: MessagePackage) => void;
+  command: (message: any) => void;
   /**
    * 玩家私信
    * @param {string} data 消息内容
@@ -60,7 +66,7 @@ interface PlayerEvents extends BaseEvents {
 /**
  * 玩家选项接口
  */
-interface PlayerOptions {
+interface IPlayerOptions {
   /**
    * 玩家ID
    */
@@ -102,7 +108,7 @@ declare enum PlayerStatus {
 /**
  * 玩家接口
  */
-interface IPlayer extends PlayerOptions {
+interface IPlayer extends IPlayerOptions {
   /**
    * 玩家状态
    */
@@ -136,7 +142,7 @@ declare class Player extends EventEmitter$1 implements IPlayer {
     name,
     attributes,
     sender
-  }: PlayerOptions);
+  }: IPlayerOptions);
   toJSON(): {
     id: string;
     name: string;
@@ -155,60 +161,153 @@ declare class Player extends EventEmitter$1 implements IPlayer {
 //#region lib/models/message.d.ts
 /**
  * 消息包类型枚举
+ * player： 'command', 'message', 'join', 'leave', 'status'
  */
 declare enum MessageTypes {
+  /**
+   * 房间列表
+   */
   RoomList = "room.list",
+  /**
+   * 房间创建
+   */
   RoomCreate = "room.create",
+  /**
+   * 房间更新
+   */
+  RoomUpdate = "room.update",
+  /**
+   * 房间准备
+   */
   RoomReady = "room.ready",
+  /**
+   * 房间开始
+   */
   RoomStart = "room.start",
+  /**
+   * 房间结束
+   */
   RoomEnd = "room.end",
+  /**
+   * 房间关闭
+   */
   RoomClose = "room.close",
-  RoomAllReady = "room.allready",
+  /**
+   * 房间全部玩家已准备
+   */
+  RoomAllReady = "room.all-ready",
+  /**
+   * 房间命令
+   */
   RoomCommand = "room.command",
+  /**
+   * 房间消息
+   */
   RoomMessage = "room.message",
-  PlayerOffline = "player.offline",
+  /**
+   * 玩家加入房间
+   */
+  RoomJoin = "room.join",
+  /**
+   * 玩家离开房间
+   */
+  RoomLeave = "room.leave",
+  /**
+   * 房间踢出玩家
+   */
+  RoomKick = "room.kick",
+  /**
+   * 房间转移
+   */
+  RoomTransfer = "room.transfer",
+  /**
+   * 房间玩家准备
+   */
+  RoomPlayerReady = "room.player-ready",
+  /**
+   * 房间玩家取消准备
+   */
+  RoomPlayerUnready = "room.player-unready",
+  /**
+   * 玩家列表
+   */
   PlayerList = "player.list",
+  /**
+   * 玩家登录
+   */
   PlayerLogin = "player.login",
+  /**
+   * 玩家登出
+   */
   PlayerLogout = "player.logout",
-  PlayerJoin = "player.join",
-  PlayerLeave = "player.leave",
+  /**
+   * 玩家消息
+   */
+  PlayerMessage = "player.message",
+  /**
+   * 玩家命令
+   */
+  PlayerCommand = "player.command",
+  /**
+   * 玩家准备
+   */
   PlayerReady = "player.ready",
+  /**
+   * 玩家取消准备
+   */
   PlayerUnready = "player.unready",
-  PlayerCommand = "player.command",
+  /**
+   * 全局命令
+   */
+  GlobalCommand = "global.command",
+  /**
+   * 全局消息
+   */
+  GlobalMessage = "global.message",
+  /**
+   * 全局错误
+   */
+  GlobalError = "global.error",
 }
 /**
  * 消息包接口
  */
-interface MessagePackage {
+interface IMessagePackage {
   /**
    * 消息类型
    */
-  type: MessageTypes | string;
+  type: MessageTypes;
   /**
    * 消息数据
    */
-  data?: PlayerOptions | IRoomOptions | IPlayer | IRoom | IRoomPlayer | any;
+  data?: IPlayerOptions | IRoomOptions | IPlayer | IRoom | IRoomPlayer | any;
   /**
-   * 消息发送者
+   * 发送者信息
    */
-  sender?: IPlayer | IRoom | IRoomPlayer;
+  sender?: IPlayer | IRoomPlayer | IRoom;
+}
+/**
+ * 消息数据接口，包含发送者信息
+ */
+interface IMessageData extends IMessagePackage {
+  sender: IPlayer | IRoomPlayer | IRoom;
 }
 /**
  * 消息通信接口
  */
-interface Message extends EventEmitter$1 {
+interface IMessage extends EventEmitter$1<IMessageEmitterEvents> {
   /**
    * 监听消息事件
    * @param event 事件名，具体见 MessageEvents
    * @param listener 监听器
    */
-  on<K extends keyof MessageEvents>(event: K, listener: MessageEvents[K]): this;
+  on<K extends keyof IMessageEvents>(event: K, listener: IMessageEvents[K]): this;
   /**
    * 触发消息事件
    * @param event 事件名，具体见 MessageEvents
    * @param args 参数
    */
-  emit<K extends keyof MessageEvents>(event: K, ...args: Parameters<MessageEvents[K]>): boolean;
+  emit<K extends keyof IMessageEvents>(event: K, ...args: Parameters<IMessageEvents[K]>): boolean;
   /**
    * 关闭连接
    */
@@ -217,20 +316,31 @@ interface Message extends EventEmitter$1 {
    * 发送消息包
    * @param message 消息包
    */
-  send(message: MessagePackage): void;
+  send(message: IMessagePackage): void;
 }
 //#endregion
 //#region lib/events/message.d.ts
 /**
  * 消息事件定义
  */
-interface MessageEvents extends BaseEvents {
+interface IMessageEvents extends BaseEvents {
+  /**
+   * 服务接收数据
+   * @param {IMessagePackage} data 消息数据
+   * @param {(...params:any) => any} [cb] 回调函数
+   */
+  message: (data: IMessageData, cb?: (...params: any) => any) => void;
+}
+/**
+ * 消息事件定义（Emitter 版本）
+ */
+interface IMessageEmitterEvents extends BaseEmitterEvents {
   /**
    * 服务接收数据
-   * @param {MessagePackage} data 消息数据
+   * @param {IMessagePackage} data 消息数据
    * @param {(...params:any) => any} [cb] 回调函数
    */
-  message: (data: MessagePackage, cb?: (...params: any) => any) => void;
+  message: [data: IMessageData, cb?: (...params: any) => any];
 }
 //#endregion
 //#region lib/events/room.d.ts
@@ -260,14 +370,14 @@ interface RoomEvents extends BaseEvents {
   message: (data: string) => void;
   /**
    * 玩家发送的房间命令
-   * @param {MessagePackage} message 命令内容
+   * @param {IMessagePackage} message 命令内容
    */
-  'player-command': (message: MessagePackage) => void;
+  'player-command': (message: IMessagePackage) => void;
   /**
    * 房间命令
-   * @param {MessagePackage} message 命令内容
+   * @param {IMessagePackage} message 命令内容
    */
-  command: (message: MessagePackage) => void;
+  command: (message: any) => void;
   /**
    * 房间更新
    * @param {IRoom} room 房间信息
@@ -292,7 +402,7 @@ interface RoomEvents extends BaseEvents {
    * 房间开始游戏
    * @param {IRoom} room 房间信息
    */
-  start: (room: IRoom) => void;
+  start: (room: IRoom, sender: IRoomPlayer) => void;
   /**
    * 房间结束游戏
    * @param {IRoom} room 房间信息
@@ -408,7 +518,7 @@ interface IRoom extends IRoomOptions {
 /**
  * 房间玩家选项接口
  */
-interface IRoomPlayerOptions extends PlayerOptions {
+interface IRoomPlayerOptions extends IPlayerOptions {
   /**
    * 房间Id
    */
@@ -559,7 +669,7 @@ declare class Room extends EventEmitter$1 implements IRoom {
   /**
    * 开始游戏
    */
-  start(): boolean;
+  start(sender: IPlayer): boolean;
   /**
    * 结束游戏
    */
@@ -573,12 +683,12 @@ declare class Room extends EventEmitter$1 implements IRoom {
 //#endregion
 //#region lib/index.d.ts
 interface ITiaoomOptions {
-  socket: Message;
+  socket: IMessage;
 }
 declare class Tiaoom extends EventEmitter {
   rooms: Room[];
   players: Player[];
-  messageInstance?: Message;
+  messageInstance?: IMessage;
   constructor({
     socket
   }: ITiaoomOptions);
@@ -586,7 +696,7 @@ declare class Tiaoom extends EventEmitter {
   emit<K extends keyof TiaoomEvents>(event: K, ...args: Parameters<TiaoomEvents[K]>): boolean;
   run(): this;
   searchPlayer(player: string): Player | undefined;
-  searchPlayer(player: PlayerOptions | IRoomPlayerOptions): Player | undefined;
+  searchPlayer(player: IPlayerOptions | IRoomPlayerOptions): Player | undefined;
   searchRoom(room: string): Room | undefined;
   searchRoom(room: Partial<IRoomOptions>): Room | undefined;
   createRoom(sender: IPlayer, options: IRoomOptions): Room;
@@ -600,7 +710,7 @@ declare class Tiaoom extends EventEmitter {
     roomId: string;
     playerId: string;
   }): Room | undefined;
-  loginPlayer(player: PlayerOptions, cb?: (data: {
+  loginPlayer(player: IPlayerOptions, cb?: (data: {
     player: Player;
   }) => void): Player;
   joinPlayer(sender: IPlayer, player: IRoomPlayerOptions, isCreator?: boolean): RoomPlayer;
@@ -610,5 +720,5 @@ declare class Tiaoom extends EventEmitter {
   removePlayer(sender: IPlayer): Player;
 }
 //#endregion
-export { IPlayer, IRoom, IRoomOptions, IRoomPlayer, IRoomPlayerOptions, ITiaoomOptions, Message, MessageEvents, MessagePackage, MessageTypes, Player, PlayerEvents, PlayerOptions, 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,5 +1,119 @@
 import EventEmitter$1, { EventEmitter } from "events";
 
+//#region lib/models/message.ts
+/**
+* 消息包类型枚举
+* player： 'command', 'message', 'join', 'leave', 'status'
+*/
+let MessageTypes = /* @__PURE__ */ function(MessageTypes$1) {
+	/**
+	* 房间列表
+	*/
+	MessageTypes$1["RoomList"] = "room.list";
+	/**
+	* 房间创建
+	*/
+	MessageTypes$1["RoomCreate"] = "room.create";
+	/**
+	* 房间更新
+	*/
+	MessageTypes$1["RoomUpdate"] = "room.update";
+	/**
+	* 房间准备
+	*/
+	MessageTypes$1["RoomReady"] = "room.ready";
+	/**
+	* 房间开始
+	*/
+	MessageTypes$1["RoomStart"] = "room.start";
+	/**
+	* 房间结束
+	*/
+	MessageTypes$1["RoomEnd"] = "room.end";
+	/**
+	* 房间关闭
+	*/
+	MessageTypes$1["RoomClose"] = "room.close";
+	/**
+	* 房间全部玩家已准备
+	*/
+	MessageTypes$1["RoomAllReady"] = "room.all-ready";
+	/**
+	* 房间命令
+	*/
+	MessageTypes$1["RoomCommand"] = "room.command";
+	/**
+	* 房间消息
+	*/
+	MessageTypes$1["RoomMessage"] = "room.message";
+	/**
+	* 玩家加入房间
+	*/
+	MessageTypes$1["RoomJoin"] = "room.join";
+	/**
+	* 玩家离开房间
+	*/
+	MessageTypes$1["RoomLeave"] = "room.leave";
+	/**
+	* 房间踢出玩家
+	*/
+	MessageTypes$1["RoomKick"] = "room.kick";
+	/**
+	* 房间转移
+	*/
+	MessageTypes$1["RoomTransfer"] = "room.transfer";
+	/**
+	* 房间玩家准备
+	*/
+	MessageTypes$1["RoomPlayerReady"] = "room.player-ready";
+	/**
+	* 房间玩家取消准备
+	*/
+	MessageTypes$1["RoomPlayerUnready"] = "room.player-unready";
+	/**
+	* 玩家列表
+	*/
+	MessageTypes$1["PlayerList"] = "player.list";
+	/**
+	* 玩家登录
+	*/
+	MessageTypes$1["PlayerLogin"] = "player.login";
+	/**
+	* 玩家登出
+	*/
+	MessageTypes$1["PlayerLogout"] = "player.logout";
+	/**
+	* 玩家消息
+	*/
+	MessageTypes$1["PlayerMessage"] = "player.message";
+	/**
+	* 玩家命令
+	*/
+	MessageTypes$1["PlayerCommand"] = "player.command";
+	/**
+	* 玩家准备
+	*/
+	MessageTypes$1["PlayerReady"] = "player.ready";
+	/**
+	* 玩家取消准备
+	*/
+	MessageTypes$1["PlayerUnready"] = "player.unready";
+	/**
+	* 全局命令
+	*/
+	MessageTypes$1["GlobalCommand"] = "global.command";
+	/**
+	* 全局消息
+	*/
+	MessageTypes$1["GlobalMessage"] = "global.message";
+	/**
+	* 全局错误
+	*/
+	MessageTypes$1["GlobalError"] = "global.error";
+	return MessageTypes$1;
+}({});
+
+//#endregion
 //#region lib/models/player.ts
 /**
 * 玩家状态枚举
@@ -60,8 +174,6 @@ var Player = class extends EventEmitter$1 {
 		[
 			"command",
 			"message",
-			"join",
-			"leave",
 			"status"
 		].forEach((event) => {
 			this.on(event, (...data) => {
@@ -244,10 +356,7 @@ var Room = class extends EventEmitter$1 {
 			"start",
 			"end",
 			"close",
-			"error",
 			"all-ready",
-			"player-unready",
-			"player-ready",
 			"join",
 			"leave"
 		].forEach((event) => {
@@ -325,7 +434,7 @@ var Room = class extends EventEmitter$1 {
 	/**
 	* 开始游戏
 	*/
-	start() {
+	start(sender) {
 		if (!this.isReady) throw new Error("room is not ready.");
 		if (this.status === RoomStatus.playing) throw new Error("room is already started.");
 		this.players.forEach((player) => {
@@ -333,7 +442,7 @@ var Room = class extends EventEmitter$1 {
 			player.emit("status", PlayerStatus.playing);
 		});
 		this.emit("update", this);
-		return this.emit("start", this);
+		return this.emit("start", this, this.searchPlayer(sender));
 	}
 	/**
 	* 结束游戏
@@ -356,33 +465,6 @@ var Room = class extends EventEmitter$1 {
 	}
 };
 
-//#endregion
-//#region lib/models/message.ts
-/**
-* 消息包类型枚举
-*/
-let MessageTypes = /* @__PURE__ */ function(MessageTypes$1) {
-	MessageTypes$1["RoomList"] = "room.list";
-	MessageTypes$1["RoomCreate"] = "room.create";
-	MessageTypes$1["RoomReady"] = "room.ready";
-	MessageTypes$1["RoomStart"] = "room.start";
-	MessageTypes$1["RoomEnd"] = "room.end";
-	MessageTypes$1["RoomClose"] = "room.close";
-	MessageTypes$1["RoomAllReady"] = "room.allready";
-	MessageTypes$1["RoomCommand"] = "room.command";
-	MessageTypes$1["RoomMessage"] = "room.message";
-	MessageTypes$1["PlayerOffline"] = "player.offline";
-	MessageTypes$1["PlayerList"] = "player.list";
-	MessageTypes$1["PlayerLogin"] = "player.login";
-	MessageTypes$1["PlayerLogout"] = "player.logout";
-	MessageTypes$1["PlayerJoin"] = "player.join";
-	MessageTypes$1["PlayerLeave"] = "player.leave";
-	MessageTypes$1["PlayerReady"] = "player.ready";
-	MessageTypes$1["PlayerUnready"] = "player.unready";
-	MessageTypes$1["PlayerCommand"] = "player.command";
-	return MessageTypes$1;
-}({});
-
 //#endregion
 //#region lib/index.ts
 var Tiaoom = class extends EventEmitter {
@@ -434,48 +516,54 @@ var Tiaoom = class extends EventEmitter {
 					default: throw new Error("unknown message type.");
 				}
 			} catch (error) {
+				var _this$messageInstance2;
 				cb === null || cb === void 0 || cb(error);
+				(_this$messageInstance2 = this.messageInstance) === null || _this$messageInstance2 === void 0 || _this$messageInstance2.send({
+					type: MessageTypes.GlobalError,
+					data: error,
+					sender: message.sender
+				});
 			}
 		});
 		this.on("player", (player, online) => {
-			var _this$messageInstance2;
-			(_this$messageInstance2 = this.messageInstance) === null || _this$messageInstance2 === void 0 || _this$messageInstance2.send({
-				type: online ? "player.login" : "player.logout",
+			var _this$messageInstance3;
+			(_this$messageInstance3 = this.messageInstance) === null || _this$messageInstance3 === void 0 || _this$messageInstance3.send({
+				type: online ? MessageTypes.PlayerLogin : MessageTypes.PlayerLogout,
 				data: player
 			});
 		});
 		this.on("players", (players) => {
-			var _this$messageInstance3;
-			(_this$messageInstance3 = this.messageInstance) === null || _this$messageInstance3 === void 0 || _this$messageInstance3.send({
-				type: "player.list",
+			var _this$messageInstance4;
+			(_this$messageInstance4 = this.messageInstance) === null || _this$messageInstance4 === void 0 || _this$messageInstance4.send({
+				type: MessageTypes.PlayerList,
 				data: players
 			});
 		});
 		this.on("room", (room) => {
-			var _this$messageInstance4;
-			(_this$messageInstance4 = this.messageInstance) === null || _this$messageInstance4 === void 0 || _this$messageInstance4.send({
-				type: "room.create",
+			var _this$messageInstance5;
+			(_this$messageInstance5 = this.messageInstance) === null || _this$messageInstance5 === void 0 || _this$messageInstance5.send({
+				type: MessageTypes.RoomCreate,
 				data: room
 			});
 		});
 		this.on("room-player", (room) => {
-			var _this$messageInstance5;
-			(_this$messageInstance5 = this.messageInstance) === null || _this$messageInstance5 === void 0 || _this$messageInstance5.send({
-				type: "room.update",
+			var _this$messageInstance6;
+			(_this$messageInstance6 = this.messageInstance) === null || _this$messageInstance6 === void 0 || _this$messageInstance6.send({
+				type: MessageTypes.RoomUpdate,
 				data: room
 			});
 		});
 		this.on("rooms", (rooms) => {
-			var _this$messageInstance6;
-			(_this$messageInstance6 = this.messageInstance) === null || _this$messageInstance6 === void 0 || _this$messageInstance6.send({
-				type: "room.list",
+			var _this$messageInstance7;
+			(_this$messageInstance7 = this.messageInstance) === null || _this$messageInstance7 === void 0 || _this$messageInstance7.send({
+				type: MessageTypes.RoomList,
 				data: rooms
 			});
 		});
 		this.on("command", (data) => {
-			var _this$messageInstance7;
-			(_this$messageInstance7 = this.messageInstance) === null || _this$messageInstance7 === void 0 || _this$messageInstance7.send({
-				type: "global.command",
+			var _this$messageInstance8;
+			(_this$messageInstance8 = this.messageInstance) === null || _this$messageInstance8 === void 0 || _this$messageInstance8.send({
+				type: MessageTypes.GlobalCommand,
 				data
 			});
 		});
@@ -495,8 +583,8 @@ var Tiaoom = class extends EventEmitter {
 		if (this.rooms.some((r) => r.players.some((p) => p.id === sender.id))) throw new Error("you are already in a room.");
 		const room = new Room(options);
 		room.setSender((type, message) => {
-			var _this$messageInstance8;
-			(_this$messageInstance8 = this.messageInstance) === null || _this$messageInstance8 === void 0 || _this$messageInstance8.send({
+			var _this$messageInstance9;
+			(_this$messageInstance9 = this.messageInstance) === null || _this$messageInstance9 === void 0 || _this$messageInstance9.send({
 				type: `room.${type}`,
 				data: message,
 				sender: room
@@ -513,7 +601,7 @@ var Tiaoom = class extends EventEmitter {
 	startRoom(sender, room) {
 		const roomInstance = this.searchRoom(room);
 		if (!roomInstance) throw new Error("room not found.");
-		roomInstance.start();
+		roomInstance.start(sender);
 		return this.emit("room-player", roomInstance);
 	}
 	closeRoom(sender, room) {
@@ -555,8 +643,8 @@ var Tiaoom = class extends EventEmitter {
 		if (!playerInstance) {
 			playerInstance = new Player(player);
 			playerInstance.setSender((type, message) => {
-				var _this$messageInstance9;
-				(_this$messageInstance9 = this.messageInstance) === null || _this$messageInstance9 === void 0 || _this$messageInstance9.send({
+				var _this$messageInstance10;
+				(_this$messageInstance10 = this.messageInstance) === null || _this$messageInstance10 === void 0 || _this$messageInstance10.send({
 					type: `player.${type}`,
 					data: message,
 					sender: playerInstance