index.js

@@ -16,7 +16,6 @@ import { Lang } from './utils/localisation.js';
 import { rateLimit } from 'express-rate-limit';
 import { RedisStore as LimiterRedisStore } from 'rate-limit-redis';
 import SessionRedisStore from 'connect-redis';
-import mysql from 'mysql';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -25,8 +24,6 @@ const app = express();
 
 const flags = process.env.flags ? process.env.flags.split(",") : null;
 
-const langs = [{ id: "en", name: "English" }, { id: "pl", name: "Polish" }];
-
 app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
@@ -96,9 +93,6 @@ app.get('/', async (req, res) => {
     } else if (req.session.nickname == null) {
         auth.getLanguage(req.session.userId).then(language => {
             var locale;
-
-            req.session.autoLang = language == null ? true : false;
-
             if (language) {
                 locale = new Lang([language]);
                 req.session.langs = [language];
@@ -236,7 +230,7 @@ app.post('/api/login', (req, res) => {
             helpers: {
                 error: "Niepoprawny adres e-mail",
                 fallback: "/login",
-                t: (key) => { return locale.t(key) }
+
             }
         });
     }
@@ -283,13 +277,7 @@ app.post('/api/nickname', (req, res) => {
             res.redirect('/');
         });
     } else {
-        res.render("error", {
+        res.sendStatus(400);
-            helpers: {
-                error: "Nazwa nie spełnia wymogów: Od 3 do 16 znaków, nie może być pusta",
-                fallback: "/nickname",
-                t: (key) => { return locale.t(key) }
-            }
-        });
     }
 });
 
@@ -357,47 +345,10 @@ io.on('connection', async (socket) => {
 
         socket.on('my profile', (callback) => {
             auth.getProfile(session.userId).then((profile) => {
-                profile.uid = session.userId;
                 callback(profile);
             });
         });
 
-        socket.on('locale options', (callback) => {
-            const locale = new Lang(session.langs);
-
-            let userLanguage = langs.find((element) => element.id == locale.lang);
-            let userLangs = langs.filter((element) => element.id != locale.lang);
-
-            if (session.autoLang) {
-                userLangs.unshift(userLanguage);
-                userLangs.unshift({ id: "null", name: "Auto" });
-            } else {
-                userLangs.unshift({ id: "null", name: "Auto" });
-                userLangs.unshift(userLanguage);
-            }
-
-            callback(userLangs);
-        });
-
-        socket.on('change locale', (locale, callback) => {
-            if (locale === "null" || langs.find((element) => element.id == locale)) {
-                locale = locale === "null" ? null : locale;
-                const conn = mysql.createConnection({ host: process.env.db_host, user: process.env.db_user, password: process.env.db_pass, database: 'statki' });
-                conn.query(`UPDATE accounts SET language = ${conn.escape(locale)} WHERE user_id = ${conn.escape(session.userId)}`, (err) => {
-                    if (err) { callback({ status: 'dbErr' }); return; }
-                    else callback({ status: 'ok' });
-
-                    req.session.reload((err) => {
-                        if (err) return socket.disconnect();
-
-                        req.session.autoLang = locale ? false : true;
-                        req.session.save();
-                    });
-                });
-                conn.end();
-            }
-        });
-
         socket.on('create lobby', (callback) => {
             if (socket.rooms.size === 1) {
                 let id = genID();
@@ -531,19 +482,12 @@ io.on('connection', async (socket) => {
                 let UTCTs = Math.floor((new Date()).getTime() / 1000 + 90);
                 io.to(playerGame.id).emit('turn update', { turn: 0, phase: "preparation", timerToUTC: UTCTs });
                 GInfo.timer(playerGame.id, 90, async () => {
-                    const members = [...roomMemberIterator(playerGame.id)];
+                    const playerGame = await GInfo.getPlayerGameData(socket);
-                    for (let i = 0; i < members.length; i++) {
+                    for (let i = 0; i < playerGame.data.boards.length; i++) {
-                        const sid = members[i][0];
+                        const ships = playerGame.data.boards[i].ships;
-                        const socket = io.sockets.sockets.get(sid);
+                        if (!ships.length) {
-
+                            AFKEnd(playerGame.id);
-                        let placedShips = await GInfo.depleteShips(socket);
+                            return;
-                        placedShips.forEach(shipData => {
-                            socket.emit("placed ship", shipData)
-                        });
-
-                        if (placedShips.length > 0) {
-                            const locale = new Lang(session.langs);
-                            socket.emit("toast", locale.t("board.Your remaining ships have been randomly placed"))
                         }
                     }
 

lang/en.json

@@ -57,9 +57,6 @@
             "winrate": "winrate",
             "No matches played": "No matches played"
         },
-        "Settings": {
-            "General": "General"
-        },
         "General": {
             "Unknown error occured": "Unknown error occured",
             "Status:": "Status:"
@@ -115,7 +112,6 @@
         "You cannot place a ship like this": "You cannot place a ship like this",
         "You have ran out of ships of that type": "You have ran out of ships of that type",
         "You have already shot at this field": "You have already shot at this field",
-        "Your remaining ships have been randomly placed": "Your remaining ships have been automatically placed",
     
         "Victory": "Victory",
         "Defeat": "Defeat"

lang/pl.json

@@ -43,7 +43,7 @@
         "PvP/Loading": {
             "PvP / Loading": "PvP / Wczytywanie",
             "Wait": "Czekaj...",
-            "You will be redirected soon": "Wkrótce nastąpi przekierowanie",
+            "You will be redirected soon": "Wkrótce zostaniesz przekierowany(-a)",
             "Opponent:": "Przeciwnik"
         },
         "Profile": {
@@ -56,11 +56,9 @@
             "total matches played": "meczy zagranych łącznie",
             "winrate": "winrate",
 
-            "No matches played": "Nie zagrano żadnych meczy"
+            "No matches played": "Nie zagrano meczy"
-        },
-        "Settings": {
-            "General": "Ogólne"
         },
+
         "General": {
             "Unknown error occured": "Wystąpił nieznany błąd",
             "Status:": "Status:"
@@ -116,7 +114,6 @@
         "You cannot place a ship like this": "Nie możesz tak postawić statku",
         "You have ran out of ships of that type": "Skończyły ci się statki tego typu",
         "You have already shot at this field": "Już strzelałeś w to pole",
-        "Your remaining ships have been randomly placed": "Twoje pozostałe statki zostały automatycznie rozstawione",
     
         "Victory": "Zwycięstwo",
         "Defeat": "Porażka"

nodemon.json

@@ -2,7 +2,6 @@
     "ignore": [
         "public/*",
         "views/*",
-        "utils/mail/*",
+        "utils/mail/*"
-        "lang/*"
     ]
 }

public/assets/css/main.css

@@ -246,6 +246,8 @@ nav span:hover {
     flex-direction: column;
     gap: 2rem;
     flex: 2;
+
+    overflow-y: scroll;
 }
 
 #profileView .matchList::-webkit-scrollbar {
@@ -322,19 +324,3 @@ nav span:hover {
 .tippyTemplate {
     display: none;
 }
-
-#settingsView label {
-    font-size: 1.2rem;
-}
-
-#settingsView select {
-    padding: 0.5rem 1rem;
-    padding: 0.5rem 2rem;
-    font-size: 1rem;
-    background-color: black;
-    border: solid 1px white;
-    color: white;
-    border-radius: 15px;
-    outline: none;
-    margin-left: 2rem;
-}

public/assets/js/socket.js

@@ -29,38 +29,7 @@ socket.on("gameReady", (gameId) => {
 
 var nickname;
 
-socket.emit('locale options', (langs) => {
-    console.log("Fetching available locale options");
-    let menu = "";
-    langs.forEach(lang => {
-        menu += `<option value="${lang.id}">${lang.name}</option>`;
-    });
-
-    $("#languages").html(menu);
-    console.log("Locale options fetched");
-});
-
-$("#languages").on("change", function() {
-    lockUI(true);
-    console.log("Switching language to", $(this).val());
-    socket.emit("change locale", $(this).val(), (response) => {
-        switch (response.status) {
-            case "ok":
-                console.log("Switched languages, refreshing");
-                window.location.reload();
-                break;
-
-            default:
-                alert(`${window.locale["Unknown error occured"]}\n${window.locale["Status:"]} ${response.status}`);
-                lockUI(false);
-                break;
-        }
-    });
-});
-
 socket.emit("my profile", (profile) => {
-    console.log("Received user data. UID:", profile.uid);
-
     // General profile data
     let options = { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' };
     $("#playerSince").html(new Date(profile.profile.account_creation).toLocaleDateString(undefined, options));
@@ -90,7 +59,7 @@ socket.emit("my profile", (profile) => {
         matchHistoryDOM += `<div class="match" data-matchid="${match.match_id}"><div><h1 class="dynamic${match.won === 1 ? "" : " danger"}">${match.won === 1 ? window.locale["Victory"] : window.locale["Defeat"]}</h1><span> vs. ${match.match_type === "pvp" ? match.opponent : "AI"}</span></div><h2 class="statsButton">${window.locale["Click to view match statistics"]}</h2><span>${date}</span><br><span>${duration}</span></div>`;
     }
 
-    if (!matchHistoryDOM) {
+    if (matchHistoryDOM === "") {
         matchHistoryDOM = `<h2>${window.locale["No matches played"]}</h2>`;
     }
 

utils/auth.js

@@ -84,10 +84,10 @@ export class MailAuth {
                 const row = response[0];
 
                 resolve({ status: 1, uid: row.user_id });
-            });
 
                 conn.end();
             });
+        });
     }
 
     getLanguage(userId) {
@@ -101,10 +101,10 @@ export class MailAuth {
                 } else {
                     resolve(null);
                 }
-            });
 
                 conn.end();
             });
+        });
     }
 
     startVerification(email, ip, agent) {
@@ -191,10 +191,10 @@ export class MailAuth {
                 
 
                 resolve({ status: 1, uid: row.user_id });
-            });
 
                 conn.end();
             });
+        });
     }
 
     saveMatch(matchId, duration, type, hostId, guestId, boards, winnerIdx) {
@@ -205,11 +205,11 @@ export class MailAuth {
                 else conn.query(`INSERT INTO statistics(match_id, user_id, board, won) VALUES (${conn.escape(matchId)}, ${conn.escape(hostId)}, ${conn.escape(JSON.stringify(boards[0]))}, ${conn.escape(!winnerIdx ? 1 : 0)}), (${conn.escape(matchId)}, ${conn.escape(guestId)}, ${conn.escape(JSON.stringify(boards[1]))}, ${conn.escape(winnerIdx ? 1 : 0)})`, async (error, response) => {
                     if (error) reject(error);
                     else resolve();
-                });
-            });
 
                     conn.end();
                 });
+            });
+        });
     }
 
     getProfile(userId) {
@@ -227,10 +227,10 @@ export class MailAuth {
 
                     resolve({ profile, stats, matchHistory });
                 }
-            });
 
                 conn.end();
             });
+        });
     }
 
     async finishVerification(uid, authCode) {
@@ -251,10 +251,10 @@ export class MailAuth {
             conn.query(`UPDATE accounts SET nickname = ${conn.escape(nickname)} WHERE user_id = ${conn.escape(uid)}`, (error) => {
                 if (error) reject(error);
                 resolve();
-            });
 
                 conn.end();
             });
+        });
     }
 
     getNickname(uid) {
@@ -263,10 +263,10 @@ export class MailAuth {
             conn.query(`SELECT nickname FROM accounts WHERE user_id = ${conn.escape(uid)}`, (error, response) => {
                 if (error) reject(error);
                 resolve(response[0].nickname);
-            });
 
                 conn.end();
             });
+        });
     }
 }
 

utils/battleships.js

@@ -46,6 +46,7 @@ export class GameInfo {
         const boards = await this.redis.json.get(`game:${socket.session.activeGame}`, { path: ".boards" });
         let stats = [];
 
+        console.log(boards);
         boards.forEach(board => {
             stats.push(board.stats);            
         });
@@ -99,113 +100,6 @@ export class GameInfo {
         await this.redis.json.arrAppend(key, `.boards[${playerIdx}].ships`, shipData);
     }
 
-    async depleteShips(socket) {
-        const gameId = socket.session.activeGame;
-        const key = `game:${gameId}`;
-        const hostId = (await this.redis.json.get(key, { path: '.hostId' }));
-
-        const playerIdx = socket.request.session.id === hostId ? 0 : 1;
-
-        var playerShips = (await this.redis.json.get(key, { path: `.boards[${playerIdx}].ships` }));
-
-        const availableShips = getShipsAvailable(playerShips);
-
-        const boardRender = [];
-        const subtrahents = [[0, 0], [0, 1], [1, 0], [0, -1], [-1, 0], [1, 1], [-1, -1], [1, -1], [-1, 1]];
-
-        for (let i = 0; i < 10; i++) {
-            var array = [];
-            for (let i = 0; i < 10; i++) {
-                array.push(false);
-            }
-            boardRender.push(array);
-        }
-
-        playerShips.forEach(ship => {
-            let multips;
-
-            switch (ship.rot) {
-                case 0:
-                    multips = [1, 0];
-                    break;
-
-                case 1:
-                    multips = [0, 1];
-                    break;
-
-                case 2:
-                    multips = [-1, 0];
-                    break;
-
-                case 3:
-                    multips = [0, -1];
-                    break;
-            }
-
-            for (let i = 0; i <= ship.type; i++) {
-                for (let l = 0; l < subtrahents.length; l++) {
-                    const idxX = ship.posX - subtrahents[l][0] + multips[0] * i;
-                    const idxY = ship.posY - subtrahents[l][1] + multips[1] * i;
-                    if (!(idxX < 0 || idxX > 9 || idxY < 0 || idxY > 9)) {
-                        boardRender[idxX][idxY] = true;
-                    }
-                }
-            }
-        });
-
-        const placedShips = [];
-
-        for (let i = 0; i < availableShips.length; i++) {
-            let availableShipsOfType = availableShips[i];
-            for (let j = 0; j < availableShipsOfType; j++) {
-                playerShips = (await this.redis.json.get(key, { path: `.boards[${playerIdx}].ships` }));
-                for (let y = 0; y < 10; y++) {
-                    let row = "";
-                    for (let x = 0; x < 10; x++) {
-                        row += `${boardRender[x][y] ? "\x1b[31m" : "\x1b[32m"}${boardRender[x][y]}\x1b[0m\t`;
-                    }
-                }
-                const search = findEmptyFields(boardRender, i+1);
-
-                const rPos = search[Math.floor(Math.random() * search.length)];
-
-                placedShips.push({ type: i, posX: rPos.posX, posY: rPos.posY, rot: rPos.rot });
-                await this.redis.json.arrAppend(key, `.boards[${playerIdx}].ships`, { type: i, posX: rPos.posX, posY: rPos.posY, rot: rPos.rot, hits: Array.from(new Array(i + 1), () => false) });
-                let multips;
-
-                switch (rPos.rot) {
-                    case 0:
-                        multips = [1, 0];
-                        break;
-
-                    case 1:
-                        multips = [0, 1];
-                        break;
-
-                    case 2:
-                        multips = [-1, 0];
-                        break;
-
-                    case 3:
-                        multips = [0, -1];
-                        break;
-                }
-
-                for (let k = 0; k <= i; k++) {
-                    for (let l = 0; l < subtrahents.length; l++) {
-                        const idxX = rPos.posX - subtrahents[l][0] + multips[0] * k;
-                        const idxY = rPos.posY - subtrahents[l][1] + multips[1] * k;
-                        if (!(idxX < 0 || idxX > 9 || idxY < 0 || idxY > 9)) {
-                            boardRender[idxX][idxY] = true;
-                        }
-                    }
-                }
-            }
-        }
-
-        return placedShips;
-    }
-
     async removeShip(socket, posX, posY) {
         const gameId = socket.session.activeGame;
         const key = `game:${gameId}`;
@@ -281,6 +175,30 @@ export function isPlayerInRoom(socket) {
     return !socket.rooms.size === 1;
 }
 
+var lastTimeChange = new Date().getTime();
+
+// export function getShipsLeft(data, playerIdx) {
+//     let shipsLeft = [4, 3, 2, 1];
+
+//     const playerShips = shipsLeft.boards[playerIdx].ships;
+
+//     playerShips.forEach(ship => {
+//         var isSunk = true;
+//         ship.hits.every(isHit => {
+//             isSunk = isHit;
+//             return isHit;
+//         });
+//         switch (ship.type) {
+//             case 0:
+//                 shipsLeft[0]--;
+//                 break;
+        
+//             default:
+//                 break;
+//         }
+//     });
+// }
+
 export function getShipsAvailable(ships) {
     let shipsLeft = [4, 3, 2, 1];
 
@@ -422,52 +340,6 @@ export function checkTurn(data, playerId) {
     }
 }
 
-function findEmptyFields(grid, len) {
-    const rowPlacements = [];
-
-    // Helper function to check if a row can be placed horizontally at a given position
-    function canPlaceHorizontally(x, y) {
-        if (x + len >= grid[0].length) {
-            return false; // Ship exceeds board boundaries
-        }
-        for (let i = x; i <= x + len; i++) {
-            if (grid[i][y]) {
-                return false; // One of ship's fields is already occupied
-            }
-        }
-        return true;
-    }
-
-    // Helper function to check if a row can be placed vertically at a given position
-    function canPlaceVertically(x, y) {
-        if (y + len >= grid.length) {
-            return false; // Ship exceeds board boundaries
-        }
-        for (let i = y; i <= y + len; i++) {
-            if (grid[x][i]) {
-                return false; // One of ship's fields is already occupied
-            }
-        }
-        return true;
-    }
-
-    for (let i = 0; i < grid.length; i++) {
-        for (let j = 0; j < grid[0].length; j++) {
-            if (grid[j][i] === false) {
-                if (canPlaceHorizontally(j, i)) {
-                    rowPlacements.push({ posX: j, posY: i, rot: 0 });
-                }
-
-                if (canPlaceVertically(j, i)) {
-                    rowPlacements.push({ posX: j, posY: i, rot: 1 });
-                }
-            }
-        }
-    }
-
-    return rowPlacements;
-}
-
 function clamp(n, min, max) {
     return Math.min(Math.max(n, min), max);
 }

utils/localisation.js

@@ -8,23 +8,18 @@ const __dirname = path.dirname(__filename);
 export class Lang {
     constructor(langs) {
         const languagesPath = path.join(__dirname, '../lang');
-        this.allText = null;
         for (let i = 0; i < langs.length; i++) {
             const lang = langs[i];
 
             if (fs.readdirSync(languagesPath).includes(`${lang}.json`)) {
                 try {
                     this.allText = JSON.parse(fs.readFileSync(path.join(languagesPath, `${lang}.json`), 'utf8'));
-                    this.lang = lang;
                     return;
                 } catch (e) {
                     console.log(e);
                 }
             }
         }
-
-        this.allText = JSON.parse(fs.readFileSync(path.join(languagesPath, 'en.json'), 'utf8'));
-        this.lang = 'en';
     }
 
     t(key) {
@@ -42,7 +37,5 @@ export class Lang {
             }
         }
     }
-
-
 }
 

views/index.handlebars

@@ -93,14 +93,9 @@
     </div>
 </div>
 
-<div class="container" id="settingsView" data-path="/settings">
+<div class="container" id="settingsView" data-path="/match">
     <div>
-        <h1>{{ t 'menu.Settings.Settings' }}</h1>
-        <h2>{{ t 'menu.Settings.General' }}</h2>
-        <label for="language">Language: </label>
-        <select name="language" id="languages">
         
-        </select>
     </div>
 </div>
 
@@ -111,7 +106,6 @@
         "Victory": "{{ t 'menu.Profile.Victory' }}",
         "Defeat": "{{ t 'menu.Profile.Defeat' }}",
         "Click to view match statistics": "{{ t 'menu.Profile.Click to view match statistics' }}",
-        "No matches played": "{{ t 'menu.Profile.No matches played' }}",
 
         "Reconnecting": "{{ t 'errors.Reconnecting' }}",
         "Reconnected": "{{ t 'errors.Reconnected' }}",