[add] Room 完成

package.json

@@ -10,7 +10,7 @@
 		"build": "tsrpc-cli build",
 		"doc": "tsrpc-cli doc",
 		"test": "mocha test/**/*.test.ts",
-		"api": "tsrpc-cli api && tsrpc-cli proto",
+		"api": "tsrpc-cli proto && tsrpc-cli api",
 		"proto": "tsrpc-cli proto",
 		"sync": "tsrpc-cli sync"
 	},

src/api/ApiLobbyList.ts

@@ -1,12 +0,0 @@
-import { ApiCall } from "tsrpc";
-import Lobby from "../component/Lobby/Lobby";
-import { ReqLobbyList, ResLobbyList } from "../shared/protocols/PtlLobbyList";
-
-export default async function (call: ApiCall<ReqLobbyList, ResLobbyList>) {
-	const data: any[] = []
-	for (let i = 0; i < Lobby.Room.length; i++) {
-		const room = Lobby.Room[i]
-		data.push(room.RoomId)
-	}
-	call.succ(data)
-}

src/api/ApiSend.ts

@@ -1,26 +0,0 @@
-import { ApiCall } from "tsrpc";
-import { server } from "..";
-import { ReqSend, ResSend } from "../shared/protocols/PtlSend";
-
-// This is a demo code file
-// Feel free to delete it
-
-export default async function (call: ApiCall<ReqSend, ResSend>) {
-    // Error
-    if (call.req.content.length === 0) {
-        call.error('Content is empty')
-        return;
-    }
-
-    // Success
-    let time = new Date();
-    call.succ({
-        time: time
-    });
-
-    // Broadcast
-    server.broadcastMsg('Chat', {
-        content: call.req.content,
-        time: time
-    })
-}

src/api/account/ApiLogin.ts

@@ -1,5 +1,6 @@
 import { ApiCall, BaseConnection } from "tsrpc";
 import { ReqLogin, ResLogin } from "../../shared/protocols/account/PtlLogin";
+import { ServiceType } from "../../shared/protocols/serviceProto";
 
 export default async function (call: ApiCall<ReqLogin, ResLogin>) {
 	// Error
@@ -11,7 +12,7 @@ export default async function (call: ApiCall<ReqLogin, ResLogin>) {
 	// Success
 	const { sn, req } = call
 	const { name } = req
-	const conn: BaseConnection<any> = call.conn
+	const conn: BaseConnection<ServiceType> = call.conn
 	console.log(`name: ${name} is Login`)
 	conn.UserId = sn
 	conn.NickName = name

src/api/room/ApiCreate.ts

@@ -0,0 +1,12 @@
+import { ApiCall, BaseConnection } from "tsrpc";
+import Room from "../../component/Room/Room";
+import { ReqCreate, ResCreate } from "../../shared/protocols/room/PtlCreate";
+import { ServiceType } from "../../shared/protocols/serviceProto";
+
+export default async function (call: ApiCall<ReqCreate, ResCreate>) {
+	const conn: BaseConnection<ServiceType> = call.conn
+	const room = new Room()
+	room.Join(conn)
+	conn.Room = room
+	call.succ(room.RoomId)
+}

src/api/room/ApiExit.ts

@@ -0,0 +1,7 @@
+import { ApiCall } from "tsrpc";
+import { ReqExit, ResExit } from "../../shared/protocols/room/PtlExit";
+
+export default async function (call: ApiCall<ReqExit, ResExit>) {
+    // TODO
+    call.error('API Not Implemented');
+}

src/api/room/ApiJoin.ts

@@ -0,0 +1,25 @@
+import { ApiCall, BaseConnection } from "tsrpc";
+import Room from "../../component/Room/Room";
+import { ReqJoin, ResJoin } from "../../shared/protocols/room/PtlJoin";
+import { ServiceType } from "../../shared/protocols/serviceProto";
+
+export default async function (call: ApiCall<ReqJoin, ResJoin>) {
+	const { roomId } = call.req
+	const conn: BaseConnection<ServiceType> = call.conn
+	const room = Room.GetRoom(roomId)
+	if (room) {
+		if (room.ConnCount() >= 2) {
+			call.error('房間已滿');
+			return;
+		}
+		room.Join(conn)
+		conn.Room = room
+		call.succ(0)
+
+		if (room.ConnCount() >= 2) {
+			room.GotoGame();
+		}
+	} else {
+		call.error('roomId 錯誤');
+	}
+}

src/api/room/ApiList.ts

@@ -0,0 +1,12 @@
+import { ApiCall } from "tsrpc";
+import Lobby from "../../component/Lobby/Lobby";
+import { ReqList, ResList } from "../../shared/protocols/room/PtlList";
+
+export default async function (call: ApiCall<ReqList, ResList>) {
+	const data: any[] = []
+	for (let i = 0; i < Lobby.Room.length; i++) {
+		const room = Lobby.Room[i]
+		data.push(room.RoomId)
+	}
+	call.succ(data)
+}

src/component/Client/Client.ts

@@ -8,7 +8,7 @@
 
 // 	//#region private
 
-// 	private conn: BaseConnection<any> = undefined
+// 	private conn: BaseConnection<ServiceType> = undefined
 // 	private ws: any = undefined
 // 	private sn: number = undefined
 
@@ -30,7 +30,7 @@
 // 	/**
 // 	 *
 // 	 */
-// 	constructor(conn: BaseConnection<any>, sn: number) {
+// 	constructor(conn: BaseConnection<ServiceType>, sn: number) {
 // 		this.conn = conn
 // 		this.ws = conn["ws"]
 // 		this.sn = sn

src/component/Room/Room.ts

@@ -1,4 +1,6 @@
-import { BaseConnection } from "tsrpc";
+import { BaseConnection, WsConnection } from "tsrpc";
+import { server } from "../..";
+import { ServiceType } from "../../shared/protocols/serviceProto";
 
 
 /**
@@ -6,10 +8,10 @@ import { BaseConnection } from "tsrpc";
  */
 export default class Room {
 
-	//#region public
+	//#region static
 
-	static maxRoomId: number = 0;
+	private static maxRoomId: number = 0;
-	static rooms: { [roomId: number]: Room } = {};
+	private static rooms: { [roomId: number]: Room } = {};
 
 	//#endregion
 
@@ -33,6 +35,16 @@ export default class Room {
 	constructor() {
 		// 给每个新房间生成一个唯一的 ID
 		this.RoomId = ++Room.maxRoomId;
+		Room.rooms[this.RoomId] = this;
+	}
+
+	//#endregion
+
+	//#region Custom
+
+	/** GetRoom */
+	public static GetRoom(roomId: number): Room {
+		return this.rooms[roomId]
 	}
 
 	//#endregion
@@ -44,5 +56,20 @@ export default class Room {
 		this.conns.push(conn);
 	}
 
+	/** Exit */
+	public Exit(conn: BaseConnection): void {
+		server.broadcastMsg('room/Exit', 0, <WsConnection<ServiceType>[]>this.conns)
+	}
+
+	/** GotoGame */
+	public GotoGame(): void {
+		server.broadcastMsg('room/GoToGame', 0, <WsConnection<ServiceType>[]>this.conns)
+	}
+
+	/** ConnCount */
+	public ConnCount(): number {
+		return this.conns.length;
+	}
+
 	//#endregion
 }

src/component/User/User.ts

@@ -1,3 +1,4 @@
+import Room from "../Room/Room"
 
 
 /**
@@ -5,27 +6,16 @@
  */
 export default class User {
 
-	//#region get set
+	//#region User
 
-	// public get NickName(): string {
-	// 	return this.nickName
-	// }
-
-	// private nickName: string = undefined
 	public UserId: number = undefined
 	public NickName: string = undefined
 
 	//#endregion
 
-	//#region Lifecycle
+	//#region Room
 
-	// constructor(nickName: string) {
+	public Room: Room = undefined
-	// 	this.nickName = nickName
-	// }
-
-	//#endregion
-
-	//#region Custom
 
 	//#endregion
 }