Invitations changes.

Now require confirmation from both side to start game.
2023-01-15 19:02:16 +01:00
parent a2b2168884
commit e3407b8a9d
4 changed files with 34 additions and 49 deletions
--- a/srcs/requirements/game_server/game_back/src/server/wsServer.ts
+++ b/srcs/requirements/game_server/game_back/src/server/wsServer.ts
@@ -107,6 +107,7 @@ async function clientAnnounceListener(this: WebSocket, data: string)
 					console.log("catch /game/gameserver/validate: ", error);
 					this.send(JSON.stringify( new ev.EventError("validate token error") ));
 					clientTerminate(clientsMap.get(this.id));
+					return;
 				});

 				player.matchOptions = announce.matchOptions;
@@ -350,6 +351,7 @@ async function playerReadyConfirmationListener(this: WebSocket, data: string)
 						client.gameSession = null;
 						clientTerminate(client);
 					});
+					return;
 				});

 				gameSession.playersMap.forEach( (client) => {
--- a/srcs/requirements/nestjs/api_back/src/game/entity/tokenGame.entity.ts
+++ b/srcs/requirements/nestjs/api_back/src/game/entity/tokenGame.entity.ts
@@ -15,8 +15,6 @@ export class TokenGame {
 	isGameIsWithInvitation : boolean
 	@Column({default: 0, nullable: true})
 	numberOfRegisteredUser : number
-	@Column({default : false})
-	isSecondUserAcceptedRequest : boolean
 	@Column()
 	token : string
 }
--- a/srcs/requirements/nestjs/api_back/src/game/game.service.ts
+++ b/srcs/requirements/nestjs/api_back/src/game/game.service.ts
@@ -72,10 +72,11 @@ export class GameService {
 		return encryptedTextToReturn
 	}

-	async deleteToken(user : User){
+	async deletePublicTokens(user : User){
 		const tokenGame  = await this.tokenGameRepository.createQueryBuilder('tokengame')
 		.where('tokengame.playerTwoUsername = :playerTwoUsername', {playerTwoUsername : user.username})
 		.orWhere('tokengame.playerOneUsername = :playerOneUsername', {playerOneUsername : user.username})
+		.where('tokengame.isGameIsWithInvitation = :isGameIsWithInvitation', {isGameIsWithInvitation : false})
 		.getMany();
 		if (tokenGame)
 			return this.tokenGameRepository.remove(tokenGame);
@@ -86,7 +87,7 @@ export class GameService {
 		console.log(user.status);
 		if (user.status === STATUS.IN_POOL || user.status === STATUS.IN_GAME)
 		{
-			await this.deleteToken(user);
+			await this.deletePublicTokens(user);
 			if (user.status === STATUS.IN_POOL) {
 				user.status = STATUS.CONNECTED;
 			}
@@ -106,7 +107,6 @@ export class GameService {
 			const encryptedTextToReturn = await this.encryptToken(user.username + '_' + secondUser.username + '_'
 			+ grantTicketDto.gameOptions + '_' + grantTicketDto.isGameIsWithInvitation + '_' + new Date())
 			const tok = this.tokenGameRepository.create(grantTicketDto);
-			tok.isSecondUserAcceptedRequest = false;
 			tok.numberOfRegisteredUser = 0;
 			tok.token = encryptedTextToReturn;
 			this.tokenGameRepository.save(tok);
@@ -130,34 +130,30 @@ export class GameService {
 	async validateToken(validateTicketDto : ValidateTicketDto) {
 		if (validateTicketDto.isGameIsWithInvitation === true)
 		{
+			console.log("validateToken() PRIVATE");
 			const tokenGame : TokenGame  = await this.tokenGameRepository.createQueryBuilder('tokengame')
 			.where('tokengame.playerOneUsername = :playerOneUsername', {playerOneUsername : validateTicketDto.playerOneUsername})
 			.andWhere('tokengame.playerTwoUsername = :playerTwoUsername', {playerTwoUsername : validateTicketDto.playerTwoUsername})
 			.andWhere('tokengame.gameOptions = :gameOption', {gameOption : validateTicketDto.gameOptions})
 			.andWhere('tokengame.isGameIsWithInvitation = :isGameIsWithInvitation', {isGameIsWithInvitation: true})
-			.andWhere('tokengame.isSecondUserAcceptedRequest = :choice', {choice : true})
 			.andWhere('tokengame.token = :token', {token : validateTicketDto.token})
 			.getOne();
 			if (tokenGame)
 			{
+				console.log("playerOneUsername: " + tokenGame.playerOneUsername + "| playerTwoUsername: " + tokenGame.playerTwoUsername);
+
 				tokenGame.numberOfRegisteredUser++;
+				this.tokenGameRepository.save(tokenGame);
 				if (tokenGame.numberOfRegisteredUser === 2)
 				{
 					this.tokenGameRepository.remove(tokenGame)
-					const userOne : User = await this.userRepository.createQueryBuilder('user')
-					.where("user.username = :username", {username : tokenGame.playerOneUsername})
-					.getOne();
-					const userTwo : User = await this.userRepository.createQueryBuilder('user')
-					.where("user.username = :username", {username : tokenGame.playerTwoUsername})
-					.getOne();
-					this.deleteToken(userOne)
-					this.deleteToken(userTwo)
 				}
 				return true;
 			}
 		}
 		else if (validateTicketDto.isGameIsWithInvitation === false)
 		{
+			console.log("validateToken() PUBLIC");
 			const tokenGame : TokenGame  = await this.tokenGameRepository.createQueryBuilder('tokengame')
 			.where('tokengame.playerOneUsername = :playerOneUsername', {playerOneUsername : validateTicketDto.playerOneUsername})
 			.andWhere('tokengame.gameOptions = :gameOption', {gameOption : validateTicketDto.gameOptions})
@@ -168,10 +164,6 @@ export class GameService {
 			{
 				this.tokenGameRepository.remove(tokenGame)
 				console.log("USERNAME : " + tokenGame.playerOneUsername)
-				const user : User = await this.userRepository.createQueryBuilder('user')
-				.where("user.username = :username", {username : tokenGame.playerOneUsername})
-				.getOne();
-				this.deleteToken(user)
 				return true;
 			}
 		}
@@ -181,8 +173,8 @@ export class GameService {
 	async findInvitations(user : User, @Res() res : Response) {
 		const game  = await this.tokenGameRepository.createQueryBuilder('tokengame')
 		.where('tokengame.playerTwoUsername = :playerTwoUsername', {playerTwoUsername : user.username})
+		.orWhere('tokengame.playerOneUsername = :playerOneUsername', {playerOneUsername : user.username})
 		.andWhere('tokengame.isGameIsWithInvitation = :invit', {invit : true})
-		.andWhere('tokengame.isSecondUserAcceptedRequest = :choice', {choice : false})
 		.getMany();
 		if (!game)
 			return res.status(HttpStatus.NOT_FOUND).send({message : "No invitation found"});
@@ -200,14 +192,9 @@ export class GameService {

 	async declineInvitation(user : User, token : string, @Res() res : Response)
 	{
-		/* Luke: le check de user.status n'est pas fonctionnel avec l'implémentation des invitations dans le front.
-		Ça me semble dispensable, je désactive donc pour le moment plutôt que de refaire l'implémentation front. */
-		// if (user.status !== STATUS.CONNECTED)
-			// return res.status(HttpStatus.FORBIDDEN).json({message : "You must not be in game to decline an invitation"});
 		console.log("On décline l'invitation")
 		const tokenGame  = await this.tokenGameRepository.createQueryBuilder('tokengame')
-		.andWhere('tokengame.playerTwoUsername = :playerTwoUsername', {playerTwoUsername : user.username})
-		.andWhere('tokengame.token = :token', {token : token})
+		.where('tokengame.token = :token', {token : token})
 		.getOne();
 		if (tokenGame)
 		{
@@ -238,17 +225,11 @@ export class GameService {

 	async acceptInvitation(user : User, token : string, @Res() res : Response)
 	{
-		/* Luke: le check de user.status n'est pas fonctionnel avec l'implémentation des invitations dans le front.
-		Ça me semble dispensable, je désactive donc pour le moment plutôt que de refaire l'implémentation front. */
-		// if (user.status !== STATUS.CONNECTED)
-			// return res.status(HttpStatus.FORBIDDEN).send("")
 		const tokenGame  = await this.tokenGameRepository.createQueryBuilder('tokenGame')
-		.andWhere('tokenGame.playerTwoUsername = :playerTwoUsername', {playerTwoUsername : user.username})
-		.andWhere('tokenGame.token = :token', {token : token})
+		.where('tokenGame.token = :token', {token : token})
 		.getOne();
 		if (tokenGame)
 		{
-			tokenGame.isSecondUserAcceptedRequest = true;
 			this.tokenGameRepository.save(tokenGame)
 			return res.status(HttpStatus.OK).json({message : "Invitation accepted."});
 		}
--- a/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/game/Game.svelte
@@ -24,7 +24,6 @@

 	//boolean for html page
 	let hiddenGame = true;
-	let optionsAreNotSet = true;
 	let showGameOptions = true;
 	let showInvitations = false;
 	let showError = false;
@@ -63,7 +62,6 @@

 	function resetPage() {
 		hiddenGame = true;
-		optionsAreNotSet = true;
 		showGameOptions = true;
 		showInvitations = false;
 		showError = false;
@@ -74,7 +72,6 @@

 	const initGame = async() =>
 	{
-		optionsAreNotSet = false;
 		showWaitPage = true;
 		const matchOptions = pong.computeMatchOptions(options);
 		try {
@@ -91,13 +88,18 @@
 			console.log("status : " + response.status);
 			const responseBody = await response.json();
 			const token : string = responseBody.token;
-			showWaitPage = false;
 			if (response.ok && token)
 			{
-				watchMatchStartInterval = setInterval(watchMatchStart, watchMatchStartIntervalRate);
-				watchGameStateInterval = setInterval(watchGameState, watchGameStateIntervalRate);
-				pong.init(matchOptions, options, gameAreaId, token);
-				hiddenGame = false;
+				if (options.isSomeoneIsInvited) {
+					options.reset(user.username);
+					fetchInvitations();
+				}
+				else {
+					watchMatchStartInterval = setInterval(watchMatchStart, watchMatchStartIntervalRate);
+					watchGameStateInterval = setInterval(watchGameState, watchGameStateIntervalRate);
+					pong.init(matchOptions, options, gameAreaId, token);
+					hiddenGame = false;
+				}
 			}
 			else
 			{
@@ -107,7 +109,6 @@
 				showError = true;
 				options.reset(user.username);
 				setTimeout(() => {
-					optionsAreNotSet = true;
 					showError = false;
 					errorMessage = "";
 				}, 5000);
@@ -115,11 +116,11 @@
 		} catch (e) {
 			console.log(e);
 		}
+		showWaitPage = false;
 	}

-	const initGameForInvitedPlayer = async(invitation : any) =>
+	const initInvitationGame = async(invitation : any) =>
 	{
-		optionsAreNotSet = false;
 		showWaitPage = true;
 		console.log("invitation : ");
 		console.log(invitation);
@@ -130,7 +131,9 @@
 			options.playerOneUsername = invitation.playerOneUsername;
 			options.playerTwoUsername = invitation.playerTwoUsername;
 			options.isSomeoneIsInvited = true;
-			options.isInvitedPerson = true;
+			if (user.username === invitation.playerTwoUsername) {
+				options.isInvitedPerson = true;
+			}
 			pong.init(invitation.gameOptions, options, gameAreaId, invitation.token);
 			showWaitPage = false;
 			hiddenGame = false;
@@ -169,10 +172,11 @@
 	}

 	const fetchInvitations = async() => {
-		showGameOptions = false;
-		showInvitations = true;
+		console.log("fetchInvitations");
 		invitations = await fetch(`http://${process.env.WEBSITE_HOST}:${process.env.WEBSITE_PORT}/api/v2/game/invitations`)
 		.then(x => x.json());
+		showGameOptions = false;
+		showInvitations = true;
 	}

 	const rejectInvitation = async(invitation) => {
@@ -199,7 +203,7 @@
 		}).catch(error => console.log(error));

 		if (res && res.ok) {
-			initGameForInvitedPlayer(invitation);
+			initInvitationGame(invitation);
 		}
 	}

@@ -273,7 +277,7 @@

 <!--  -->

-	{#if optionsAreNotSet}
+	{#if hiddenGame}
 		{#if showGameOptions}
 			<div id="game_option">
 				<div class="div_game">
@@ -332,7 +336,7 @@
 					{#if invitations.length !== 0}
 						{#each invitations as invitation}
 							<div>
-								{invitation.playerOneUsername} has invited you to play a pong !
+								{invitation.playerOneUsername} VS {invitation.playerTwoUsername}
 								<button class="pong_button" on:click={() => acceptInvitation(invitation)}>V</button>
 								<button class="pong_button" on:click={() => rejectInvitation(invitation)}>X</button>
 							</div>