joshuafhiggins/connect4-moderator-observer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 8 Activity

stability

Browse Source
This commit is contained in:
Joshua Higgins
2026-03-27 10:38:07 -04:00
Unverified
parent 3f7810e159
commit 2495f41df9
4 changed files with 106 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
connect4-ui/app/play/page.tsx
View File

@@ -67,10 +67,14 @@ export default function PlayPage() {
}, []);
useEffect(() => {
if (status === "disconnected" && shouldRedirectToConnect) {
if (status === "disconnected" && shouldRedirectToConnect) {
clearRedirectFlag();
router.replace("/");
}
}
if (status === "idle") {
router.replace("/");
}
if (role !== "player" && status !== "idle") {
router.replace("/spectate");
@@ -80,8 +84,6 @@ export default function PlayPage() {
if (status === "connected" && gamePhase === "idle") {
setGamePhase("connected");
}
}, [
role,
status,
@@ -236,6 +238,8 @@ export default function PlayPage() {
myColor === 1 ? "🔴 Red" : myColor === 2 ? "🟡 Yellow" : null;
const opponentColor: 1 | 2 | null =
myColor === 1 ? 2 : myColor === 2 ? 1 : null;
const redPlayerName = myColor === 1 ? username : "Opponent";
const yellowPlayerName = myColor === 2 ? username : "Opponent";
return (
<div className="flex flex-col gap-6">
@@ -418,8 +422,8 @@ export default function PlayPage() {
<Board
board={board}
lastMove={lastMove}
player1={username}
player2="Opponent"
player1={redPlayerName}
player2={yellowPlayerName}
currentTurnColor={
gamePhase === "playing" && myColor
? isMyTurn

69
connect4-ui/app/spectate/page.tsx
View File

@@ -82,12 +82,14 @@ export default function SpectatePage() {
}, []);
useEffect(() => {
if (status === "disconnected" && shouldRedirectToConnect) {
if (status === "disconnected" && shouldRedirectToConnect) {
clearRedirectFlag();
router.replace("/");
} else if (status === "idle") {
}
if (status === "idle") {
router.replace("/");
}
}
if (role !== "observer" && status !== "idle") {
router.replace("/play");
@@ -147,37 +149,36 @@ export default function SpectatePage() {
}
case "GAME_MOVE": {
const gamesSnapshot = liveGamesRef.current;
for (const [id, game] of gamesSnapshot) {
if (
game.player1 === msg.username ||
game.player2 === msg.username
) {
const color: 1 | 2 = msg.username === game.player1 ? 1 : 2;
const { board: next, row } = placeToken(
game.board,
color,
msg.column,
);
updateGame(id, {
board: next,
lastMove: { column: msg.column, row },
currentTurnColor: (color === 1 ? 2 : 1) as 1 | 2,
});
break;
}
if (typeof msg.matchId !== "number") {
addLog("Protocol error: GAME_MOVE missing matchId");
break;
}
const game = liveGamesRef.current.get(msg.matchId);
if (!game) break;
const color: 1 | 2 = msg.username === game.player1 ? 1 : 2;
const { board: next, row } = placeToken(
game.board,
color,
msg.column,
);
updateGame(msg.matchId, {
board: next,
lastMove: { column: msg.column, row },
currentTurnColor: (color === 1 ? 2 : 1) as 1 | 2,
});
break;
}
case "GAME_WIN": {
const gamesSnapshot = liveGamesRef.current;
for (const [id, game] of gamesSnapshot) {
if (game.player1 === msg.winner || game.player2 === msg.winner) {
updateGame(id, { result: { kind: "win", winner: msg.winner } });
break;
}
if (typeof msg.matchId !== "number") {
addLog("Protocol error: GAME_WIN missing matchId");
break;
}
updateGame(msg.matchId, {
result: { kind: "win", winner: msg.winner },
});
setTimeout(() => {
send(cmd.gameList());
send(cmd.playerList());
@@ -186,15 +187,19 @@ export default function SpectatePage() {
}
case "GAME_DRAW":
if (selectedGame !== null) {
updateGame(selectedGame, { result: { kind: "draw" } });
if (typeof msg.matchId !== "number") {
addLog("Protocol error: GAME_DRAW missing matchId");
break;
}
updateGame(msg.matchId, { result: { kind: "draw" } });
break;
case "GAME_TERMINATED":
if (selectedGame !== null) {
updateGame(selectedGame, { result: { kind: "terminated" } });
if (typeof msg.matchId !== "number") {
addLog("Protocol error: GAME_TERMINATED missing matchId");
break;
}
updateGame(msg.matchId, { result: { kind: "terminated" } });
send(cmd.gameList());
break;