Add Kick player & Validators

socket/package-lock.json

@@ -7,7 +7,8 @@
     "": {
       "version": "0.1.0",
       "dependencies": {
-        "socket.io": "^4.7.4"
+        "socket.io": "^4.7.4",
+        "yup": "^1.3.3"
       }
     },
     "node_modules/@socket.io/component-emitter": {
@@ -160,6 +161,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/property-expr": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz",
+      "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA=="
+    },
     "node_modules/socket.io": {
       "version": "4.7.4",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.4.tgz",
@@ -197,6 +203,27 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/tiny-case": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-case/-/tiny-case-1.0.3.tgz",
+      "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q=="
+    },
+    "node_modules/toposort": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz",
+      "integrity": "sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="
+    },
+    "node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -229,6 +256,17 @@
           "optional": true
         }
       }
+    },
+    "node_modules/yup": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/yup/-/yup-1.3.3.tgz",
+      "integrity": "sha512-v8QwZSsHH2K3/G9WSkp6mZKO+hugKT1EmnMqLNUcfu51HU9MDyhlETT/JgtzprnrnQHPWsjc6MUDMBp/l9fNnw==",
+      "dependencies": {
+        "property-expr": "^2.0.5",
+        "tiny-case": "^1.0.3",
+        "toposort": "^2.0.2",
+        "type-fest": "^2.19.0"
+      }
     }
   }
 }

socket/package.json

@@ -6,6 +6,7 @@
     "start": "node ./src/index.js"
   },
   "dependencies": {
-    "socket.io": "^4.7.4"
+    "socket.io": "^4.7.4",
+    "yup": "^1.3.3"
   }
 }

socket/src/index.js

@@ -29,7 +29,7 @@ io.on("connection", (socket) => {
     Manager.createRoom(gameState, io, socket),
   )
   socket.on("manager:kickPlayer", (playerId) =>
-    Manager.kickPlayer(gameState, socket, io, playerId),
+    Manager.kickPlayer(gameState, io, socket, playerId),
   )
 
   socket.on("manager:startGame", () => Manager.startGame(gameState, io, socket))

socket/src/roles/player.js

@@ -1,23 +1,43 @@
 import convertTimeToPoint from "../utils/convertTimeToPoint.js"
 import { abortCooldown } from "../utils/cooldown.js"
+import { inviteCodeValidator, usernameValidator } from "../validator.js"
 
 const Player = {
-  checkRoom: (game, io, socket, roomId) => {
-    if (!game.room || roomId !== game.room) {
-      io.to(socket.id).emit("game:errorMessage", "Room not found")
-      console.log("zaza")
+  checkRoom: async (game, io, socket, roomId) => {
+    try {
+      await inviteCodeValidator.validate(roomId)
+    } catch (error) {
+      socket.emit("game:errorMessage", error.errors[0])
       return
     }
 
-    io.to(socket.id).emit("game:successRoom", roomId)
+    if (!game.room || roomId !== game.room) {
+      socket.emit("game:errorMessage", "Room not found")
+      return
+    }
+
+    socket.emit("game:successRoom", roomId)
   },
 
-  join: (game, io, socket, player) => {
-    if (!player.room || !player.room || game.started) {
+  join: async (game, io, socket, player) => {
+    try {
+      await usernameValidator.validate(player.username)
+    } catch (error) {
+      socket.emit("game:errorMessage", error.errors[0])
       return
     }
 
-    console.log("joined", player)
+    if (!game.room || player.room !== game.room) {
+      socket.emit("game:errorMessage", "Room not found")
+      return
+    }
+
+    if (game.started) {
+      socket.emit("game:errorMessage", "Game already started")
+      return
+    }
+
+    console.log("New Player", player)
 
     socket.join(player.room)
 

socket/src/utils/cooldown.js

@@ -23,4 +23,4 @@ export const cooldown = (ms, io, room) => {
   })
 }
 
-export const sleep = (sec) => new Promise((r) => setTimeout(r, sec * 1000))
+export const sleep = (sec) => new Promise((r) => setTimeout(r, sec * 1000))

socket/src/validator.js

@@ -0,0 +1,12 @@
+import yup from "yup"
+
+export const usernameValidator = yup
+  .string()
+  .required("Username is required")
+  .min(4, "Username cannot be less than 4 characters")
+  .max(20, "Username cannot exceed 20 characters")
+
+export const inviteCodeValidator = yup
+  .string()
+  .required("Invite code is required")
+  .length(6, "Invalid invite code")