rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tournament): allow the creation of a tournament

Browse source 
A tournament can be created (by the "owner")
Any other players can join said tournament.
The information is currently not displayed in the frontend, but does
exists and is passed to the frontend using a socket.io event
This commit is contained in:
Maieul BOYER 2026-01-07 20:04:38 +01:00 • committed by Maix0
parent 272c6f319c
commit 2195207297
9 changed files with 558 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

6
frontend/src/pages/pong/pong.css
View file

@ -8,8 +8,8 @@
.btn-style {
@apply
w-25
h-8
min-w-25
min-h-8
border
border-gray-500
rounded-3xl
@ -188,4 +188,4 @@
inline-flex items-center justify-center
rounded-full w-8 h-8 bg-blue-500
border-10 border-blue-500
}
}

14
frontend/src/pages/pong/pong.html
View file

@ -2,8 +2,13 @@
<div id="mainbox" class="mainboxDisplay">
<button id="QueueBtn" class="btn-style absolute top-4 left-6">Queue Up</button>
<button id="LocalBtn" class="btn-style absolute top-14 left-6">Local Game</button>
<span id="queue-info" class="flex rounded-3xl border-7 border-gray-500 bg-gray-500 absolute top-4 right-6">?👤 ?⏳ ?▮•▮</span> <!-- total | in queue | games-->
<button id="play-info" class="pong-how-to-play absolute top-14 right-6">?</button> <!-- how to play?-->
<span id="queue-info" class="flex rounded-3xl border-7 border-gray-500 bg-gray-500 absolute top-4 right-6">?👤
?⏳ ?▮•▮</span> <!-- total | in queue | games-->
<button id="TourBtn"
class="min-25 min-h-8 border border-gray-500 rounded-3xl bg-gray-500 text-white cursor-pointer shadow-[0_2px_0_0_black] transition-all hover:bg-blue-200 active:bg-gray-400 active:translate-y-px active:shadow-[0_2px_0_0_black] absolute top-16 right-6">
<span class="mx-2">Create Tournament</span>
</button> <!-- Tournament Button -->
<button id="play-info" class="pong-how-to-play absolute top-26 right-6">?</button> <!-- how to play?-->
<br>
<h1 class="text-3xl font-bold text-gray-800">
Pong Box<span id="t-username"></span>
@ -25,7 +30,8 @@
down:
<kbd class="pong-protips-key">S</kbd>
<br>
You are <span class="text-red-500">red</span>. <br> Your goal is to bounce the ball back to the adversary.
You are <span class="text-red-500">red</span>. <br> Your goal is to bounce the ball back to the
adversary.
<br>
<span class="text-gray-400">local games keys for the left paddle:<br>
up:
@ -33,7 +39,7 @@
down:
<kbd class="pong-protips-key">L</kbd>
</span>
</div>
</div>
<button class="pong-rdy-screen" id="readyup-btn">ready!</button>
<div class="pong-field">
<div id="batleft" class="pong-batleft top-0"></div>

357
frontend/src/pages/pong/pong.ts
View file

@ -1,14 +1,20 @@
import { addRoute, navigateTo, setTitle, type RouteHandlerParams, type RouteHandlerReturn } from "@app/routing";
import authHtml from './pong.html?raw';
import io from 'socket.io-client';
import {
addRoute,
navigateTo,
setTitle,
type RouteHandlerParams,
type RouteHandlerReturn,
} from "@app/routing";
import authHtml from "./pong.html?raw";
import io from "socket.io-client";
import type { CSocket, GameMove, GameUpdate } from "./socket";
import { showError, showInfo } from "@app/toast";
import { showError, showInfo, showSuccess } from "@app/toast";
import { getUser, type User } from "@app/auth";
import { isNullish } from "@app/utils";
import client from "@app/api";
import "./pong.css";
declare module 'ft_state' {
declare module "ft_state" {
interface State {
pongSock?: CSocket;
}
@ -20,96 +26,176 @@ enum QueueState {
Ready = "Ready-ing",
Iddle = "Queue Up",
In_local = "In Local",
};
}
enum ReadyState {
readyUp = "ready ok",
readyDown = "not ready",
};
}
enum TourBtnState {
Joined = "Joined",
Started = "Started",
AbleToJoin = "Join Tournament",
AbleToCreate = "Create Tournament",
AbleToStart = "Start Tournament",
AbeToProcreate = "He would be proud",
}
document.addEventListener("ft:pageChange", (newUrl) => {
if (newUrl.detail.startsWith('/app/pong') || newUrl.detail.startsWith('/pong')) return;
if (
newUrl.detail.startsWith("/app/pong") ||
newUrl.detail.startsWith("/pong")
)
return;
if (window.__state.pongSock !== undefined) window.__state.pongSock.close();
window.__state.pongSock = undefined;
});
export function getSocket(): CSocket {
if (window.__state.pongSock === undefined)
window.__state.pongSock = io(window.location.host, { path: "/api/pong/socket.io/" }) as any as CSocket;
window.__state.pongSock = io(window.location.host, {
path: "/api/pong/socket.io/",
}) as any as CSocket;
return window.__state.pongSock;
}
function pongClient(_url: string, _args: RouteHandlerParams): RouteHandlerReturn {
setTitle('Pong Game Page');
function pongClient(
_url: string,
_args: RouteHandlerParams,
): RouteHandlerReturn {
setTitle("Pong Game Page");
return {
html: authHtml, postInsert: async (app) => {
html: authHtml,
postInsert: async (app) => {
const DEFAULT_COLOR = "white";
const SELF_COLOR = "red";
const user = getUser();
let currentGame: GameUpdate | null = null;
let opponent: User | null = null;
const rdy_btn = document.querySelector<HTMLButtonElement>('#readyup-btn');
const rdy_btn =
document.querySelector<HTMLButtonElement>("#readyup-btn");
const batLeft = document.querySelector<HTMLDivElement>("#batleft");
const batRight = document.querySelector<HTMLDivElement>("#batright");
const batRight =
document.querySelector<HTMLDivElement>("#batright");
const ball = document.querySelector<HTMLDivElement>("#ball");
const score = document.querySelector<HTMLDivElement>("#score-board");
const playerL = document.querySelector<HTMLDivElement>('#player-left');
const playerR = document.querySelector<HTMLDivElement>('#player-right');
const queueBtn = document.querySelector<HTMLButtonElement>("#QueueBtn");
const LocalGameBtn = document.querySelector<HTMLButtonElement>("#LocalBtn");
const gameBoard = document.querySelector<HTMLDivElement>("#pongbox");
const queue_infos = document.querySelector<HTMLSpanElement>("#queue-info");
const how_to_play_btn = document.querySelector<HTMLButtonElement>("#play-info");
const protips = document.querySelector<HTMLDivElement>("#protips-box");
const score =
document.querySelector<HTMLDivElement>("#score-board");
const playerL =
document.querySelector<HTMLDivElement>("#player-left");
const playerR =
document.querySelector<HTMLDivElement>("#player-right");
const queueBtn =
document.querySelector<HTMLButtonElement>("#QueueBtn");
const LocalGameBtn =
document.querySelector<HTMLButtonElement>("#LocalBtn");
const gameBoard =
document.querySelector<HTMLDivElement>("#pongbox");
const queue_infos =
document.querySelector<HTMLSpanElement>("#queue-info");
const how_to_play_btn =
document.querySelector<HTMLButtonElement>("#play-info");
const protips =
document.querySelector<HTMLDivElement>("#protips-box");
const tournamentBtn =
document.querySelector<HTMLButtonElement>("#TourBtn");
let socket = getSocket();
if (isNullish(user)) { // if no user (no loggin / other) : GTFO
if (isNullish(user)) {
// if no user (no loggin / other) : GTFO
navigateTo("/app");
return ;
return;
}
if (!batLeft || !batRight || !ball || !score || !queueBtn || !playerL || !playerR || !gameBoard || !queue_infos || !LocalGameBtn || !rdy_btn) // sanity check
return showError('fatal error');
if (!how_to_play_btn || !protips)
showError('missing protips'); // not a fatal error
if (
!batLeft ||
!batRight ||
!ball ||
!score ||
!queueBtn ||
!playerL ||
!playerR ||
!gameBoard ||
!queue_infos ||
!LocalGameBtn ||
!rdy_btn ||
!tournamentBtn
)
// sanity check
return showError("fatal error");
if (!how_to_play_btn || !protips) showError("missing protips"); // not a fatal error
tournamentBtn.addEventListener("click", () => {
showInfo(`Button State: ${tournamentBtn.innerText}`);
switch (tournamentBtn.innerText) {
case TourBtnState.AbleToStart:
//socket.emit('')
break;
case TourBtnState.AbleToJoin:
socket.emit("tourRegister");
break;
case TourBtnState.AbleToCreate:
socket.emit("tourCreate");
break;
case TourBtnState.AbeToProcreate:
showError("We are developpers, this is impossible !");
break;
case TourBtnState.Joined:
socket.emit("tourUnregister");
break;
case TourBtnState.Started:
showInfo("tournament Started");
//socket.emit("tourStart");
break;
}
});
// ---
// keys handler
// ---
const keys: Record<string, boolean> = {};
if (how_to_play_btn && protips)
how_to_play_btn.addEventListener("click", ()=>{
how_to_play_btn.addEventListener("click", () => {
protips.classList.toggle("hidden");
how_to_play_btn.innerText = how_to_play_btn.innerText === '?' ? 'x' : '?';
how_to_play_btn.innerText =
how_to_play_btn.innerText === "?" ? "x" : "?";
});
document.addEventListener("keydown", (e) => {keys[e.key.toLowerCase()] = true;});
document.addEventListener("keyup", (e) => {keys[e.key.toLowerCase()] = false;});
document.addEventListener("keydown", (e) => {
keys[e.key.toLowerCase()] = true;
});
document.addEventListener("keyup", (e) => {
keys[e.key.toLowerCase()] = false;
});
setInterval(() => { // key sender
if (keys['escape'] === true && protips && how_to_play_btn) {
setInterval(() => {
// key sender
if (keys["escape"] === true && protips && how_to_play_btn) {
protips.classList.add("hidden");
how_to_play_btn.innerText = '?';
how_to_play_btn.innerText = "?";
}
if (queueBtn.innerText !== QueueState.InGame)//we're in game ? continue | gtfo
return ;
if (queueBtn.innerText !== QueueState.InGame)
//we're in game ? continue | gtfo
return;
if (currentGame === null) return;
let packet: GameMove = {
move: null,
moveRight: null,
}
};
if (queueBtn.innerText !== QueueState.InGame)//we're in game ? continue | gtfo
return ;
if (queueBtn.innerText !== QueueState.InGame)
//we're in game ? continue | gtfo
return;
if (currentGame === null) return;
if ((keys['w'] !== keys['s']))
packet.move = keys['w'] ? 'up' : 'down';
if (currentGame.local && (keys['o'] !== keys['l']))
packet.moveRight = keys['o'] ? 'up' : 'down';
socket.emit('gameMove', packet);
if (keys["w"] !== keys["s"])
packet.move = keys["w"] ? "up" : "down";
if (currentGame.local && keys["o"] !== keys["l"])
packet.moveRight = keys["o"] ? "up" : "down";
socket.emit("gameMove", packet);
}, 1000 / 60);
// ---
// keys end
@ -118,15 +204,28 @@ function pongClient(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
// ---
// position logic (client)
// ---
const DEFAULT_POSITIONS : GameUpdate = {
gameId:"",
ball:{size:16, x:800/2, y:450/2},
left:{id:"", paddle:{x:40, y:185, width:12, height:80}, score:0},
right:{id:"", paddle:{x:748, y:185, width:12, height:80}, score:0},
local:false
const DEFAULT_POSITIONS: GameUpdate = {
gameId: "",
ball: { size: 16, x: 800 / 2, y: 450 / 2 },
left: {
id: "",
paddle: { x: 40, y: 185, width: 12, height: 80 },
score: 0,
},
right: {
id: "",
paddle: { x: 748, y: 185, width: 12, height: 80 },
score: 0,
},
local: false,
};
function resetBoard(batLeft : HTMLDivElement, batRight : HTMLDivElement, playerL : HTMLDivElement, playerR : HTMLDivElement) {
function resetBoard(
batLeft: HTMLDivElement,
batRight: HTMLDivElement,
playerL: HTMLDivElement,
playerR: HTMLDivElement,
) {
render(DEFAULT_POSITIONS);
batLeft.style.backgroundColor = DEFAULT_COLOR;
batRight.style.backgroundColor = DEFAULT_COLOR;
@ -154,115 +253,131 @@ function pongClient(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
ball.style.height = `${state.ball.size * 2}px`;
ball.style.width = `${state.ball.size * 2}px`;
score.innerText = `${state.left.score} | ${state.right.score}`
}
socket.on('gameUpdate', (state: GameUpdate) => {
render(state);});
score.innerText = `${state.left.score} | ${state.right.score}`;
};
socket.on("gameUpdate", (state: GameUpdate) => {
render(state);
});
// ---
// position logic (client) end
// ---
// ---
// queue evt
// queue evt
// ---
// utils
function set_pretty(batU : HTMLDivElement, txtU : HTMLDivElement, txtO : HTMLDivElement, colorYou : string) {
function set_pretty(
batU: HTMLDivElement,
txtU: HTMLDivElement,
txtO: HTMLDivElement,
colorYou: string,
) {
batU.style.backgroundColor = colorYou;
txtU.style.color = colorYou;
txtU.innerText = isNullish(user) ? "you" : user.name;
txtO.innerText = isNullish(opponent) ? "the mechant" : opponent.name;
txtO.innerText = isNullish(opponent)
? "the mechant"
: opponent.name;
}
async function get_opponent(opponent_id : string) {
let t = await client.getUser({user:opponent_id});
async function get_opponent(opponent_id: string) {
let t = await client.getUser({ user: opponent_id });
switch (t.kind) {
case "success" :
case "success":
opponent = t.payload;
break ;
default :
break;
default:
opponent = null;
}
}
// btn setup
queueBtn.addEventListener("click", ()=>{
queueBtn.addEventListener("click", () => {
if (queueBtn.innerText !== QueueState.Iddle) {
if (queueBtn.innerText === QueueState.InQueu) {
socket.emit("dequeue");
queueBtn.innerText = QueueState.Iddle;
}
return ;
return;
}
queueBtn.innerText = QueueState.InQueu;
socket.emit('enqueue');
socket.emit("enqueue");
});
LocalGameBtn.addEventListener("click", () => {
if (queueBtn.innerText !== QueueState.Iddle || currentGame !== null) {
showError("cant launch a local game while in queue/in game");
return ;
if (
queueBtn.innerText !== QueueState.Iddle ||
currentGame !== null
) {
showError(
"cant launch a local game while in queue/in game",
);
return;
}
socket.emit("localGame");
queueBtn.innerText = QueueState.In_local;
LocalGameBtn.innerText = "playing";
});
rdy_btn.addEventListener("click", ()=>{
rdy_btn.addEventListener("click", () => {
showInfo("rdy-evt");
switch (rdy_btn.innerText) {
case ReadyState.readyDown:
socket.emit('readyUp');
socket.emit("readyUp");
rdy_btn.innerText = ReadyState.readyUp;
rdy_btn.classList.remove("text-red-600");
rdy_btn.classList.add("text-green-600");
break ;
break;
case ReadyState.readyUp:
socket.emit('readyDown');
socket.emit("readyDown");
rdy_btn.innerText = ReadyState.readyDown;
rdy_btn.classList.remove("text-green-600");
rdy_btn.classList.add("text-red-600");
break ;
break;
default:
showError("error on ready btn");
}
});
socket.on('newGame', async (state) => {
socket.on("newGame", async (state) => {
render(state);
await get_opponent(state.left.id == user.id ? state.right.id : state.left.id);
await get_opponent(
state.left.id == user.id ? state.right.id : state.left.id,
);
queueBtn.innerText = QueueState.InGame;
queueBtn.style.color = 'red';
queueBtn.style.color = "red";
batLeft.style.backgroundColor = DEFAULT_COLOR;
batRight.style.backgroundColor = DEFAULT_COLOR;
if (state.left.id === user.id) {
set_pretty(batLeft, playerL, playerR, SELF_COLOR);
} else if (state.right.id === user.id) {
set_pretty(batRight, playerR, playerL, SELF_COLOR);
} else
showError("couldn't find your id in game");
rdy_btn.classList.remove('hidden');
} else showError("couldn't find your id in game");
rdy_btn.classList.remove("hidden");
rdy_btn.classList.add("text-red-600");
rdy_btn.innerText = ReadyState.readyDown;
});
socket.on('rdyEnd', () => {
socket.on("rdyEnd", () => {
rdy_btn.classList.remove("text-green-600");
rdy_btn.classList.remove("text-red-600");
rdy_btn.classList.add('hidden');
rdy_btn.classList.add("hidden");
});
socket.on("gameEnd", (winner) => {
rdy_btn.classList.add('hidden');
rdy_btn.classList.add("hidden");
queueBtn.innerHTML = QueueState.Iddle;
queueBtn.style.color = 'white';
queueBtn.style.color = "white";
if (!isNullish(currentGame)) {
let new_div = document.createElement('div');
let new_div = document.createElement("div");
let end_txt = "";
if ((user.id === currentGame.left.id && winner === 'left') ||
(user.id === currentGame.right.id && winner === 'right'))
end_txt = 'won! #yippe';
else
end_txt = 'lost #sadge';
new_div.innerText = 'you ' + end_txt;
if (
(user.id === currentGame.left.id &&
winner === "left") ||
(user.id === currentGame.right.id && winner === "right")
)
end_txt = "won! #yippe";
else end_txt = "lost #sadge";
new_div.innerText = "you " + end_txt;
new_div.className = "pong-end-screen";
gameBoard.appendChild(new_div);
setTimeout(() => {
@ -270,25 +385,61 @@ function pongClient(_url: string, _args: RouteHandlerParams): RouteHandlerReturn
}, 3 * 1000);
if (currentGame.local) {
LocalGameBtn.innerText = "Local Game"
LocalGameBtn.innerText = "Local Game";
}
}
resetBoard(batLeft, batRight, playerL, playerR);
})
socket.on('updateInformation', (e) => {
});
socket.on("updateInformation", (e) => {
queue_infos.innerText = `${e.totalUser}👤 ${e.inQueue}⏳ ${e.totalGames}▮•▮`;
});
socket.on('queueEvent', (e) => showInfo(`QueueEvent: ${e}`)); // MAYBE: play a sound? to notify user that smthing happend
socket.on("queueEvent", (e) => showInfo(`QueueEvent: ${e}`)); // MAYBE: play a sound? to notify user that smthing happend
// ---
// queue evt end
// ---
socket.on("tournamentInfo", (s) => {
// no tournament => we can create it !
if (s === null) {
tournamentBtn.innerText = TourBtnState.AbleToCreate;
// create tournament
return;
}
let weIn = s.players.some((p) => p.id === user.id);
let imOwner = s.ownerId === user.id;
switch (s.state) {
case "ended":
tournamentBtn.innerText = TourBtnState.AbleToCreate;
break;
case "playing":
tournamentBtn.innerText = TourBtnState.Started;
break;
case "prestart":
if (imOwner) {
tournamentBtn.innerText = TourBtnState.AbleToStart;
} else {
tournamentBtn.innerText = weIn
? TourBtnState.Joined
: TourBtnState.AbleToJoin;
}
break;
}
console.log(s.players);
});
socket.on("tournamentRegister", ({ kind, msg }) => {
if (kind === "success") showSuccess(msg ?? "Success");
if (kind === "failure") showError(msg ?? "An error Occured");
});
// init
rdy_btn.classList.add('hidden');
rdy_btn.classList.add("hidden");
queueBtn.innerText = QueueState.Iddle;
rdy_btn.innerText = ReadyState.readyUp;
resetBoard(batLeft, batRight, playerL, playerR);
}
}
};
addRoute('/pong', pongClient);
},
};
}
addRoute("/pong", pongClient);

74
frontend/src/pages/pong/socket.ts
View file

@ -1,56 +1,80 @@
import { Socket } from 'socket.io-client';
export type UpdateInfo = {
inQueue: number,
totalUser: number,
totalGames : number
}
inQueue: number;
totalUser: number;
totalGames: number;
};
export type PaddleData = {
x: number,
y: number,
x: number;
y: number;
width: number,
height: number,
width: number;
height: number;
};
export type GameUpdate = {
gameId: string;
left: { id: string, paddle: PaddleData, score: number };
right: { id: string, paddle: PaddleData, score: number };
left: { id: string; paddle: PaddleData; score: number };
right: { id: string; paddle: PaddleData; score: number };
ball: { x: number, y: number, size: number };
local: boolean,
}
ball: { x: number; y: number; size: number };
local: boolean;
};
export type GameMove = {
move: 'up' | 'down' | null,
move: 'up' | 'down' | null;
// only used in local games
moveRight: 'up' | 'down' | null,
}
moveRight: 'up' | 'down' | null;
};
export type TourInfo = {
ownerId: string;
state: 'prestart' | 'playing' | 'ended';
players: { id: string; name: string; score: number }[];
currentGameInfo: GameUpdate | null;
};
// TODO: add new evt such as "local play", "ready-up" see: ./pong.ts
export interface ClientToServer {
enqueue: () => void;
dequeue: () => void;
readyUp: () => void;
readyDown:() => void;
readyDown: () => void;
debugInfo: () => void;
gameMove: (up: GameMove) => void;
connectedToGame: (gameId: string) => void;
localGame: () => void,
};
localGame: () => void;
// TOURNAMENT
tourRegister: () => void;
tourUnregister: () => void;
tourCreate: () => void;
}
export interface ServerToClient {
forceDisconnect: (reason: string) => void;
queueEvent: (msg: 'registered' | 'unregistered') => void;
rdyEnd:() => void,
updateInformation: (info: UpdateInfo) => void,
newGame: (initState: GameUpdate) => void, // <- consider this the gameProc eg not start of game but wait for client to "ready up"
gameUpdate: (state: GameUpdate) => void,
rdyEnd: () => void;
updateInformation: (info: UpdateInfo) => void;
newGame: (initState: GameUpdate) => void;
gameUpdate: (state: GameUpdate) => void;
gameEnd: (winner: 'left' | 'right') => void;
};
// TOURNAMENT
tournamentRegister: (res: {
kind: 'success' | 'failure';
msg?: string;
}) => void;
tournamentCreateMsg: (res: {
kind: 'success' | 'failure';
msg?: string;
}) => void;
tournamentInfo: (info: TourInfo | null) => void;
}
export type SSocket = Socket<ClientToServer, ServerToClient>;
export type CSocket = Socket<ServerToClient, ClientToServer>;