Merge pull request 'chore: force websocket transport' (#1) from chore/force-ws into main

Reviewed-on: #1

.gitignore

@@ -0,0 +1 @@
+node_modules

README.md

@@ -6,5 +6,6 @@ To run TheChaseBuzzer yourself, complete the following steps:
 2. Install node.js from https://nodejs.org/en/
 3. Download all project files for TheChaseBuzzer from this github repository
 4. Open the main folder of TheChaseBuzzer in cmd (this is the folder containing app.js)
-5. Enter the command: `node app.js`
+5. Install the node modules using the command: `npm install`
-6. You should then be able to connect to the server in a browser by entering your public ip, followed by `:8080`
+6. Run the app with the command: `node app.js`
+7. You should then be able to connect to the server in a browser by entering your public ip, followed by `:8080`

app.js

@@ -20,8 +20,33 @@ let anyObjections = false;
 const teamsList = ["Players","Chasers"]
 const teamsScore = [0,0];
 let currentTeamNumber = 0;
+let sockets = []
+
+async function resetApp() {
+	console.log("resetting app")
+	io.emit("resetApp")
+	Object.keys(options).forEach(x => delete options[x])
+	userMap.clear()
+	buzzInfo.splice(0, buzzInfo.length)
+	idkList.splice(0, buzzInfo.length)
+	Object.keys(userMap).forEach(x => delete userMap[x])
+	Object.keys(userInfo).forEach(x => delete userInfo[x])
+	anyObjections = false
+	teamsList.splice(0, buzzInfo.length, "Players", "Chasers")
+	teamsScore.splice(0, teamsScore.length, 0, 0)
+	currentTeamNumber = 0
+
+	const oldSockets = sockets
+	sockets = []
+
+	await new Promise(ok => setTimeout(ok, 1000))
+	oldSockets.forEach(x => x.disconnect(true))
+	oldSockets.splice(0, oldSockets.length)
+}
+
 io.on("connection", (socket) => {
   console.log("a user connected");
+  sockets.push(socket)
 
   socket.on("disconnect", () => {
       console.log("user disconnected");
@@ -97,9 +122,15 @@ io.on("connection", (socket) => {
     io.emit("userInfoToClient", userInfo);
   });
 
+  //used by the host when they refresh the page.
+  socket.on("refreshUserInfo", () => {
+    io.emit("userInfoToClient", userInfo);
+  });
+
   socket.on("unregisterUsers", () => {
     userInfo = new Object();
     io.emit("userInfoToClient", userInfo);
+    io.emit("reconnectUsers");
   });
 
   socket.on("objectionToServer", (userName) => {
@@ -135,6 +166,11 @@ app.get("/browserFunctions.js", (request, response) => {
   response.sendFile("/browserFunctions.js", {root: __dirname });
 });
 
+app.post("/reset", (request, response) => {
+	resetApp()
+	response.redirect("/")
+});
+
 //all files in these folders can be accessed with a GET request of the filename
 let assetFolders = ["styles","pages","images","images/buzzers","audio","fonts"];
 assetFolders.forEach((folderName) => {

browserFunctions.js

@@ -1,6 +1,13 @@
+var buzzerCache = new Map();
+
 function userInfoToClient(userInfo) {
     for (const user in userInfo) {
-        const userId = user.replaceAll(" ","_");
+        re = new RegExp("\\W","g");
+        const userId = user.replaceAll(re,"_");
+        
+        
+        buzzerCache.set(userInfo[user].buzzerId, new Audio(userInfo[user].buzzerId+".wav"));
+
         if ($("#userListPanel").find("#"+userId).length >= 1) {
             //update buzzer icon of existing user
             $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId",userInfo[user].buzzerId);
@@ -33,7 +40,7 @@ function buzzInfoToClient(buzzInfo, soundOn) {
         $("#firstBuzz").html(buzzInfo[0].userName);
         const userId = buzzInfo[0].userName.replaceAll(" ","_");
         let buzzerId = $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId");
-        let buzzerSound = new Audio(buzzerId+".wav");
+        let buzzerSound = buzzerCache.get(buzzerId);
         if (soundOn == true) {
             buzzerSound.play();
         }