@20syldev/api 3.4.3 → 3.4.4

package/README.md

@@ -2,7 +2,7 @@
   <a href="https://api.sylvain.pro"><img src="https://api.sylvain.pro/favicon.ico" alt="Logo" width="25%" height="auto"/></a>
 
   # API Personnelle
-  [![Version](https://custom-icon-badges.demolab.com/badge/Version%20:-v3.4.3-6479ee?logo=api.sylvain.pro&labelColor=23272A)](https://github.com/20syldev/api/releases/latest)
+  [![Version](https://custom-icon-badges.demolab.com/badge/Version%20:-v3.4.4-6479ee?logo=api.sylvain.pro&labelColor=23272A)](https://github.com/20syldev/api/releases/latest)
 </div>
 
 ---
@@ -72,7 +72,7 @@ Enfin, **exécutez** le script de build, qui installera les **dépendances** et
 $ npm run build
 ```
 ```console
-> @20syldev/api@3.4.3 build
+> @20syldev/api@3.4.4 build
 > npm install && node app.js
 
 [...]

package/modules/v3/tic_tac_toe.js

@@ -63,30 +63,31 @@ function playMove(params, games, sessions, u, now) {
     }
 
     // Initialize game if needed
-    games[game] = games[game] || [];
+    games[game] = games[game] || { moves: [], players: [] };
+    const moves = games[game].moves;
 
     // Check if game is full
-    const players = [...new Set(games[game].map(play => play.username))];
+    const players = [...new Set(moves.map(play => play.username))];
     if (players.length >= 2 && !players.includes(params.username)) {
         throw new Error('Game is full, you can only watch.');
     }
 
     // Check if it's player's turn
-    if (games[game].length > 0 && games[game][games[game].length - 1].username === params.username) {
+    if (moves.length > 0 && moves[moves.length - 1].username === params.username) {
         throw new Error('Please wait for the other player to make a move.');
     }
 
     // Check if move is already made
-    if (games[game].some(play => play.move === move)) {
+    if (moves.some(play => play.move === move)) {
         throw new Error('Move already made. Please choose a different move.');
     }
 
     // Add move to game
     const play = { username: params.username, move, session };
-    games[game].push(play);
+    moves.push(play);
 
     // Check game result
-    const result = checkGame(games[game]);
+    const result = checkGame(moves);
     if (result.winner || result.tie) {
         setTimeout(() => delete games[game], 600000);
         return {
@@ -110,18 +111,33 @@ function playMove(params, games, sessions, u, now) {
  * Fetch a game state
  */
 function fetchGame(params, games, u) {
-    const ID = params.game || generateGameId();
+    const id = params.game || generateGameId();
 
-    // Initialize game if needed
-    if (!games[ID]) games[ID] = [];
-
-    const data = games[ID];
-    const last = data.length ? data[data.length - 1].username : null;
-    const players = [...new Set(data.map(p => p.username))];
-    const turn = players.find(p => p !== last);
-    const result = data.length ? checkGame(data) : {};
+    if (!games[id]) {
+        games[id] = {
+            moves: [],
+            players: []
+        };
+    }
+    if (!games[id].players.includes(u)) {
+        games[id].players.push(u);
+    }
 
-    return { game: data, turn, ID, ...result };
+    const moves = games[id].moves;
+    const players = games[id].players;
+    const lastPlayer = moves.length ? moves[moves.length - 1].username : null;
+    const turn = players.find(p => p !== lastPlayer) || players[0];
+    const status = players.length >= 2 ? 'ready' : 'waiting';
+    const result = moves.length ? checkGame(moves) : {};
+
+    return {
+        id,
+        moves,
+        players,
+        turn,
+        status,
+        ...result
+    };
 }
 
 /**

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "3.4.3",
+    "version": "3.4.4",
     "name": "@20syldev/api",
     "description": "Node.js API with multiple features. Check the documentation at https://docs.sylvain.pro",
     "main": "app.js",