TypeWord updates and endpoint

changelog.txt

@@ -1 +1 @@
-New mayor project: TypeWord. Check it out in the projects tab
+Make TypeWord room api endpoint

src/index.ts

@@ -143,7 +143,7 @@ io.on("connection", async (socket) => {
             const response = await fetch("https://random-word-api.herokuapp.com/word");
             const json = await response.json();
             if(response.ok){
-                io.emit("typewordstart", {"room": data.room, "word": json[0]});
+                io.emit("typewordstart", {"room": data.room, "word": json[0].toLowerCase()});
             }
             else{
                 io.emit("typewordstart", {"room": data.room, "word": "error"});
@@ -156,7 +156,12 @@ io.on("connection", async (socket) => {
 
     socket.on("typewordfinish", (data) => {
         typeWordRooms[data.room].winner = data.player;
-        io.emit("typewordwinner", {"room": data.room, "player": data.player});
+        io.emit("typewordwinner", {"room": data.room, "player": data.player, "time": data.time});
+    });
+
+    socket.on("typeworddelete", (data) => {
+        delete typeWordRooms[data.room];
+        io.emit("typeworddelete", {"room": data.room});
     });
 });
 

src/routes/api/v1/authed.ts

@@ -2,7 +2,7 @@ import express, { Request, Response, NextFunction } from "express";
 const router = express.Router();
 import { getClicks, verifyKey } from "../../../functions.js";
 import { rooms } from "../../ttt.js";
-import { time } from "console";
+import { typeWordRooms } from "../../typeword.js";
 
 router.use(async (req: Request, res: Response, next: NextFunction) => {
     const { auth } = req.headers;
@@ -38,7 +38,7 @@ router.get("/clicks", async (req: Request, res: Response) => {
     });
 });
 
-router.get("/rooms", (req: Request, res: Response) => {
+router.get("/ttt/rooms", (req: Request, res: Response) => {
     const { room } = req.query;
 
     if(room){
@@ -117,4 +117,31 @@ router.post("/decode", (req: Request, res: Response) => {
     });
 });
 
+router.get("/typeword/rooms", (req: Request, res: Response) => {
+    const room = req.query.room;
+
+    if(room){
+        if(typeWordRooms[String(room)]){
+            res.json({
+                room: {
+                    name: typeWordRooms[String(room)].name,
+                    host: typeWordRooms[String(room)].host,
+                    player: typeWordRooms[String(room)].player || "no player",
+                    winner: typeWordRooms[String(room)].winner || "no winner yet"
+                }
+            })
+        }
+        else{
+            res.status(404).json({
+                error: "Room not found"
+            })
+        }
+    }
+    else{
+        res.status(400).json({
+            error: "Missing room"
+        })
+    }
+});
+
 export default router;

src/routes/typeword.ts

@@ -47,9 +47,14 @@ router.post("/join", async (req: Request, res: Response) => {
     if(username && room){
         if(await verify(req)){
             if(typeWordRooms[room]){
-                typeWordRooms[room].player = username;
-                io.emit("typewordjoin", {"room": room, "username": username});
-                res.render("projects/typeword/game", { room: room, user: username, host: typeWordRooms[room].host, player: username });
+                if(username != typeWordRooms[room].host){
+                    typeWordRooms[room].player = username;
+                    io.emit("typewordjoin", {"room": room, "username": username});
+                    res.render("projects/typeword/game", { room: room, user: username, host: typeWordRooms[room].host, player: username });
+                }
+                else{
+                    res.render("error", { error: "Username cannot be the host's username" });
+                }
             }
             else{
                 res.status(404).render("error", { error: "Room doesn't exists" })

views/projects/typeword/game.ejs

@@ -16,18 +16,21 @@
     <hr>
 
     <p><b>Word:</b></p>
-    <p id="wordText"></p>
+    <p id="wordText" style="user-select: none;"></p>
     <div class="d-flex justify-content-center mt-4">
         <input type="text" class="form-control w-25" id="wordInp">
     </div>
     <br>
     <p id="timeText">Time: 0s</p>
+    <p id="winnerText"></p>
 
 
     <br>
 
-    <div>
+    <p><b>Controls (host only):</b></p>
+    <div class="btn-group">
         <button id="startGameBtn" class="btn btn-success" disabled>Start</button>
+        <button id="deleteRoomBtn" class="btn btn-danger" disabled>Delete Room</button>
     </div>
     <script src="/socket.io/socket.io.js"></script>
     <script>
@@ -40,21 +43,25 @@
         const startGameBtn = document.getElementById("startGameBtn");
         const timeText = document.getElementById("timeText");
         const wordInp = document.getElementById("wordInp");
+        const deleteRoomBtn = document.getElementById("deleteRoomBtn");
+        const winnerText = document.getElementById("winnerText");
         let word;
         let time = 0;
 
         if(you == host){
             startGameBtn.disabled = false;
+            deleteRoomBtn.disabled = false;
         }
 
         function startGame(){
             socket.emit("typewordstart", {"room": room});
         }
 
         function checkWord(){
-            if(wordInp.value == word){
+            if(wordInp.value.toLowerCase() == word){
                 const finishTime = time;
-                time = undefined;
+                word = undefined;
+                time = 0;
                 socket.emit("typewordfinish", {"room": room, "time": finishTime, "player": you});
             }
         }
@@ -74,11 +81,17 @@
             }
         });
 
+        socket.on("typeworddelete", (data) => {
+            if(data.room == room){
+                location.href = "/error/Host deleted the room";
+            }
+        });
+
         socket.on("typewordwinner", (data) => {
-            if(data.room = room){
+            if(data.room == room){
                 word = undefined;
                 time = 0;
-                timeText.textContent = `Winner: ${data.player}`;
+                winnerText.textContent = `${data.player} won with ${data.time.toFixed(2)}`;
             }
         });
 
@@ -98,6 +111,10 @@
             }
         });
 
+        deleteRoomBtn.addEventListener("click", () => {
+            socket.emit("typeworddelete", {"room": room});
+        });
+
         startGameBtn.addEventListener("click", () => startGame());
     </script>
 </body>