Merge pull request 'Updated Dependencies; Added webp/avif support; adjust buzzer activation timings; always show question to host' (#3) from refactoring_loading_board_data into master

Reviewed-on: https://code.jeobeardy.com/jeobeardy/Jeobeardy/pulls/3

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM node:19.9.0-alpine
+FROM node:25.9.0-alpine
 WORKDIR /app
 COPY . .
 RUN npm install --production

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jeobeardy",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Jeobeardy (/dʒebeərdi/) is similiar to but not quite like Jeopardy. It is a quiz game where you can create your own boards with categories and then make your friends compete in a fun and interactive way",
   "keywords": [
     "jeobeardy",
@@ -29,40 +29,39 @@
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "6.5.1",
+    "@fortawesome/fontawesome-svg-core": "~7.2.0",
-    "@fortawesome/free-regular-svg-icons": "6.5.1",
+    "@fortawesome/free-regular-svg-icons": "~7.2.0",
-    "@fortawesome/free-solid-svg-icons": "6.5.1",
+    "@fortawesome/free-solid-svg-icons": "~7.2.0",
-    "@fortawesome/vue-fontawesome": "3.0.6",
+    "@fortawesome/vue-fontawesome": "~3.1.3",
-    "@popperjs/core": "2.11.8",
+    "@popperjs/core": "~2.11.8",
-    "@vitejs/plugin-vue": "5.0.4",
+    "axios": "~1.15.0",
-    "archetype": "github:LaurentGoderre/archetype#fix-lodash_set-vuln",
+    "bcryptjs": "~3.0.3",
-    "axios": "1.6.7",
+    "body-parser": "~2.2.2",
-    "bcryptjs": "2.4.3",
+    "bootstrap": "~5.3.8",
-    "body-parser": "1.20.2",
+    "connect-history-api-fallback": "~2.0.0",
-    "bootstrap": "5.3.3",
+    "connect-mongodb-session": "~5.0.0",
-    "connect-history-api-fallback": "2.0.0",
+    "cors": "~2.8.6",
-    "connect-mongodb-session": "5.0.0",
+    "dotenv": "~17.4.2",
-    "cors": "2.8.5",
+    "express": "~5.2.1",
-    "dotenv": "16.4.5",
+    "express-session": "~1.19.0",
-    "express": "4.18.2",
+    "helmet": "~8.1.0",
-    "express-session": "1.18.0",
+    "mongoose": "~9.4.1",
-    "helmet": "7.1.0",
+    "morgan": "~1.10.1",
-    "mongoose": "8.2.0",
+    "multer": "~2.1.1",
-    "morgan": "1.10.0",
+    "pinia": "~3.0.4",
-    "multer": "1.4.5-lts.1",
+    "uuid": "~13.0.0",
-    "pinia": "2.1.7",
+    "vite": "~8.0.8",
-    "uuid": "9.0.1",
+    "vue": "~3.5.32",
-    "vite": "5.1.4",
+    "vue-router": "~5.0.4",
-    "vue": "3.4.20",
+    "ws": "~8.20.0"
-    "vue-router": "4.3.0",
-    "ws": "8.16.0"
   },
   "devDependencies": {
-    "@rushstack/eslint-patch": "1.7.2",
+    "@rushstack/eslint-patch": "~1.16.1",
-    "@vue/eslint-config-prettier": "9.0.0",
+    "@vitejs/plugin-vue": "~6.0.5",
-    "eslint": "8.57.0",
+    "@vue/eslint-config-prettier": "~10.2.0",
-    "eslint-plugin-vue": "9.22.0",
+    "eslint": "~10.2.0",
-    "prettier": "3.2.5",
+    "eslint-plugin-vue": "~10.8.0",
-    "sass": "1.71.1"
+    "prettier": "~3.8.2",
+    "sass": "~1.99.0"
   }
 }

src/server/controllers/GameControllerMongoose.js

@@ -162,7 +162,7 @@ exports.findGameAndAddAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) =>
       categoryIndex: categoryIndex,
       boardEntryIndex: boardEntryIndex,
     }
-    GameModel.findByIdAndUpdate(id, { $addToSet: { "answeredBoardEntries": dbEntry } }, { new: true } ).populate("board")
+    GameModel.findByIdAndUpdate(id, { $addToSet: { "answeredBoardEntries": dbEntry } }, { returnDocument: 'after' } ).populate("board")
     .then( ( game ) => {
       if( game === null ){
         let gameNotFoundError = new Error(`No game found with id "${id}"`);
@@ -187,7 +187,7 @@ exports.findGameAndAddAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) =>
  */
 exports.findGameAndRemoveAnsweredEntry = ( id, categoryIndex, boardEntryIndex ) => {
   return new Promise((resolve, reject) => {
-    GameModel.findByIdAndUpdate(id, { $pull: { answeredBoardEntries: { categoryIndex: categoryIndex, boardEntryIndex: boardEntryIndex } } }, { new: true } ).populate("board")
+    GameModel.findByIdAndUpdate(id, { $pull: { answeredBoardEntries: { categoryIndex: categoryIndex, boardEntryIndex: boardEntryIndex } } }, { returnDocument: 'after' } ).populate("board")
     .then( ( game ) => {
       if( game === null ){
         let gameNotFoundError = new Error(`No game found with id "${id}"`);
@@ -205,7 +205,7 @@ exports.findGameAndRemoveAnsweredEntry = ( id, categoryIndex, boardEntryIndex )
 
 exports.findAcceptingGameAndSetNotAccepting = ( id ) => {
   return new Promise((resolve, reject) => {
-    GameModel.findOneAndUpdate({ _id : id, acceptAnswers: true }, { acceptAnswers: false }, { new: true })
+    GameModel.findOneAndUpdate({ _id : id, acceptAnswers: true }, { acceptAnswers: false }, { returnDocument: 'after' })
       .then((game) => {
         if( game === null){
           resolve( false );
@@ -221,7 +221,7 @@ exports.findAcceptingGameAndSetNotAccepting = ( id ) => {
 
 exports.findGameAndSetAccepting = ( id, isAccepting ) => {
   return new Promise((resolve, reject) => {
-    GameModel.findByIdAndUpdate( id, { acceptAnswers: isAccepting }, { new: true }).populate("players")
+    GameModel.findByIdAndUpdate( id, { acceptAnswers: isAccepting }, { returnDocument: 'after' }).populate("players")
       .then((game) => {
         if( game === null){
           let gameNotFoundError = new Error(`No game found with code "${id}"`);
@@ -264,7 +264,7 @@ exports.setPlayerPointsAndReturnGame = ( gameId, playerId, pointsAdjusted ) => {
           points: pointsAdjusted,
         }
       },
-      { new: true }
+      { returnDocument: 'after' }
     )
     .then( ( player ) => {
       if( player === null ){

src/server/controllers/PlayerControllerMongoose.js

@@ -93,7 +93,7 @@ exports.checkPlayerAcceptAnswers = ( playerId ) => {
  */
 exports.checkPlayerAcceptAnswersAndSetAccepting = ( playerId, canAcceptAfter ) => {
   return new Promise((resolve, reject) => {
-    PlayerModel.findByIdAndUpdate( playerId, { acceptAnswers: canAcceptAfter }, { new: false } )
+    PlayerModel.findByIdAndUpdate( playerId, { acceptAnswers: canAcceptAfter }, { returnDocument: 'before' } )
     .then( ( player ) => {
       if( player ){
         resolve( player.acceptAnswers );

src/server/controllers/UserControllerMongoose.js

@@ -159,7 +159,7 @@ exports.updateProfilePicture = ( userId, pfpFilename ) => {
         }
       })
       .then( () => {
-        return UserModel.findById( userId , {}, { new: true });
+        return UserModel.findById( userId , {}, { returnDocument: 'after' });
       })
       .then( ( user ) => {
         resolve( user );

src/server/routes/UserRouter.js

@@ -12,11 +12,20 @@ const storage = multer.diskStorage({
     destination: (req, file, cb) => {
         cb( null, 'public/uploads' )
     },
+    limits: {
+      fileSize: 1024 * 1024 * 2,
+    },
     filename: (req, file, cb) => {
         let fileExtension = '.jpg';
         if( file.mimetype === 'image/png' ){
             fileExtension = '.png';
         }
+        if( file.mimetype === 'image/webp' ){
+            fileExtension = '.webp';
+        }
+        if( file.mimetype === 'image/avif' ){
+            fileExtension = '.avif';
+        }
         if( file.mimetype === 'image/gif' ){
             fileExtension = '.gif';
         }
@@ -50,13 +59,12 @@ const fileFilterFn = function( req, file, cb ){
         return;
     }
 
-    if( !["image/jpeg","image/jpg","image/png","image/gif","audio/mpeg"].includes( file.mimetype ) ){
+    if( !["image/jpeg","image/jpg","image/png","image/gif","image/webp","image/avif","audio/mpeg"].includes( file.mimetype ) ){
         cb( new Error( "MIME Type not supported!" ) );
         return;
     }
-    
+    if( file.size > 1024 * 1024 * 2){
-    if( file.size > 1024 * 1024 * 5){
+        cb( new Error( "File is too large! Must be less than 2MB" ) );
-        cb( new Error( "File is too large! Must be less than 5MB" ) );
         return;
     }
 

src/server/websocket/handler.js

@@ -161,9 +161,19 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
         break;
       case "selectBoardEntry":
         if( socket.locals.isHost ){
-          let message = `BoardEntry ${payload.boardEntryIndex} selected in Category ${payload.categoryIndex}`;
+          gameController.findGameAndSetAccepting( socket.locals.game, true )
-          let sendingData = { categoryIndex: payload.categoryIndex, boardEntryIndex: payload.boardEntryIndex };
+          .then( ( game ) => {
-          sendAllPlayers( socket, gameSocketList, "boardEntrySelected", message, sendingData );
+            return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), true )
+          })
+          .then( () => {
+            let message = `BoardEntry ${payload.boardEntryIndex} selected in Category ${payload.categoryIndex}`;
+            let sendingData = { categoryIndex: payload.categoryIndex, boardEntryIndex: payload.boardEntryIndex };
+            sendAllPlayers( socket, gameSocketList, "boardEntrySelected", message, sendingData );
+            resolve();
+          })
+          .catch( ( err ) => {
+            reject( err );
+          });
           resolve();
         } else {
           reject( new Error("Message not sent by host") );
@@ -235,27 +245,27 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
         break;
       case "selectBoard":
         if( socket.locals.isHost ){
-          let message = "Board selected";
+          gameController.findGameAndSetAccepting( socket.locals.game, false )
-          sendAllPlayers( socket, gameSocketList, "boardSelected", message, {});
+          .then( ( game ) => {
-          resolve();
+            return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), false )
+          })
+          .then( () => {
+            let message = "Board selected";
+            sendAllPlayers( socket, gameSocketList, "boardSelected", message, {});
+            resolve();
+          })
+          .catch( ( err ) => {
+            reject( err );
+          });
         } else {
           reject( new Error("Message not sent by host") );
         }
         break;
       case "showQuestion":
         if( socket.locals.isHost ){
-          gameController.findGameAndSetAccepting( socket.locals.game, true )
+          let message = "Question revealed";
-          .then( ( game ) => {
+          sendAllPlayers( socket, gameSocketList, "questionRevealed", message, {});
-            return playerController.setAllPlayersAcceptAnswers( game.players.map( playerEntry => playerEntry._id ), true )
+          resolve();
-          })
-          .then( () => {
-            let message = "Question revealed";
-            sendAllPlayers( socket, gameSocketList, "questionRevealed", message, {});
-            resolve();
-          })
-          .catch( ( err ) => {
-            reject( err );
-          });
         } else {
           reject( new Error("Message not sent by host") );
         }
@@ -280,15 +290,9 @@ exports.handleMessage = ( gameSocketList, socket, dataRaw ) => {
         break;
       case "hideQuestion":
         if( socket.locals.isHost ){
-          gameController.findGameAndSetAccepting( socket.locals.game, false )
+          let message = "Question hidden";
-          .then( ( _game ) => {
-            let message = "Question hidden";
           sendAllPlayers( socket, gameSocketList, "questionHidden", message, {});
           resolve();
-          })
-          .catch( ( err ) => {
-            reject( err );
-          });
         } else {
           reject( new Error("Message not sent by host") );
         }

src/webapp/components/blocks/ChangeProfilePicture.vue

@@ -81,8 +81,8 @@ function handleModalButtonClick( buttonIndex ){
         <div class="col-auto border-start">
             <div class="h-100 d-flex flex-column justify-content-evenly">
                 <div>
-                    <label class="form-label fs-5" for="question-image">Upload new profile picture</label>
+                    <label class="form-label fs-5" for="question-image">Upload new profile picture <span style="font-size: 0.6em;">(max. 2MB)</span></label>
-                    <input ref="imageInput" class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="newImageUploaded" accept="image/*">
+                    <input ref="imageInput" class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="newImageUploaded" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
                 </div>
                 <div>
                     <button class="btn btn-pink-accent-primary me-3" :disabled="uploadedFileObj === null" @click="saveProfilePicture">

src/webapp/components/pages/Game.vue

@@ -68,17 +68,21 @@ function boardSelected(){
   selectedObject.value = gameStore.board;
   categoryIndex.value = -1;
   boardEntryIndex.value = -1;
+  gameStore.acceptAnswers = false;
+  for(const playerIdx in gameStore.players ){
+    gameStore.players[playerIdx].isAnswering = false;
+  }
 }
 function selectBoardEntryWithCategory( cIndex, entryIndex ){
   categoryIndex.value = cIndex;
   boardEntryIndex.value = entryIndex;
   questionIndex.value = 0;
   selectedObject.value = gameStore.board.categories[cIndex].boardEntries[entryIndex];
+  gameStore.acceptAnswers = true;
 }
 
 function setUpListeners(){
   gameStore.addSocketListener("boardEntrySelected", ( data ) => {
-    gameStore.acceptAnswers = false;
     showingAnswer.value = false;
     showingQuestion.value = false;
     selectBoardEntryWithCategory( data.payload.categoryIndex, data.payload.boardEntryIndex );
@@ -134,11 +138,9 @@ function setUpListeners(){
     }
   });
   gameStore.addSocketListener("questionRevealed", ( _data ) => {
-    gameStore.acceptAnswers = true;
     showingQuestion.value = true;
   });
   gameStore.addSocketListener("questionHidden", ( _data ) => {
-    gameStore.acceptAnswers = false;
     showingQuestion.value = false;
   });
   gameStore.addSocketListener("answerRevealed", ( _data ) => {
@@ -314,7 +316,7 @@ function questionAnsweredRevert( cIndex, bEIndex ){
 
 function manualPointsAdjustment( playerId, playerName, points ){
   let payload = {
-    reopenQuestion: false,
+    reopenQuestion: gameStore.acceptAnswers,
     playerId: playerId,
     playerName: playerName,
     pointsAdjustment: points,

src/webapp/components/pages/Lobby.vue

@@ -116,9 +116,8 @@ onBeforeRouteLeave((to, from) => {
             Start Game
           </span>
           <font-awesome-layers class="ms-1" fixed-width>
-            <font-awesome-icon icon="fa-solid fa-square" size="xl" />
+            <font-awesome-icon icon="fa-solid fa-square" size="xl"/>
-            <font-awesome-icon class="text-pink-accent-primary" icon="fa-solid fa-play" size="sm" />
+            <font-awesome-icon class="text-pink-accent-primary ms-1" icon="fa-solid fa-play" />
-            <!-- <font-awesome-icon class="align-middle border-dark rounded" icon="fa-solid fa-play" border /> -->
           </font-awesome-layers>
         </button>
       </div>

src/webapp/components/views/BoardEditView.vue

@@ -13,7 +13,7 @@ function addCategoryButtonClicked(_event){
   if( newCategoryName.value === "" ){
     return;
   }
-  let category = new Category( newCategoryName.value, "New Category", [] );
+  let category = new Category( newCategoryName.value, "", [] );
   gameCreationStore.$patch((state)=>{
     state.board.categories.push( category );
   })

src/webapp/components/views/BoardEntryEditView.vue

@@ -151,12 +151,12 @@ watch(
                       </template>
                     </div>
                     <div v-if="question.questionType === 'imageQuestion'">
-                      <label class="form-label fs-4 mt-3" for="question-image">Question Image</label>
+                      <label class="form-label fs-4 mt-3" for="question-image">Question Image <span style="font-size: 0.5em;">(max. 2MB)</span></label>
-                      <input class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="onQuestionImageChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
+                      <input class="form-control bg-dark-blue" type="file" name="question-image" id="question-image" @change="onQuestionImageChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
                     </div>
                     <div v-if="question.questionType === 'audioQuestion'">
-                      <label class="form-label fs-4 mt-3" for="question-audio">Question Audio</label>
+                      <label class="form-label fs-4 mt-3" for="question-audio">Question Audio <span style="font-size: 0.5em;">(max. 2MB)</span></label>
-                      <input ref="questionImageInput" class="form-control bg-dark-blue" type="file" name="question-audio" id="question-audio" @change="onQuestionAudioChanged( questionIndex, $event )" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
+                      <input ref="questionImageInput" class="form-control bg-dark-blue" type="file" name="question-audio" id="question-audio" @change="onQuestionAudioChanged( questionIndex, $event )" accept="audio/mpeg">
                     </div>
                     <div class="row mt-3">
                       <div class="col-xxl-4 col-12 mb-1 px-1">
@@ -194,8 +194,8 @@ watch(
           <input v-model="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerText" class="form-control bg-dark-blue" type="text">
         </div>
         <div v-if="gameCreationStore.board.categories[props.categoryIndex].boardEntries[props.boardEntryIndex].answer.answerType === 'imageAnswer'">
-          <label class="form-label fs-4 mt-3" for="answer-image">Answer Image</label>
+          <label class="form-label fs-4 mt-3" for="answer-image">Answer Image <span style="font-size: 0.5em;">(max. 2MB)</span></label>
-          <input ref="answerImageInput" class="form-control bg-dark-blue" type="file" name="answer-image" id="answer-image" @change="onAnswerImageChanged" accept="image/jpeg, image/jpg, image/png, image/gif, audio/mpeg">
+          <input ref="answerImageInput" class="form-control bg-dark-blue" type="file" name="answer-image" id="answer-image" @change="onAnswerImageChanged" accept="image/jpeg, image/jpg, image/png, image/gif, image/webp, image/avif">
         </div>
       </div>
     </div>

src/webapp/components/views/BoardEntryView.vue

@@ -77,7 +77,7 @@ function stopAudio(){
 
 <template>
   <div class="container-fluid h-100 d-flex justify-content-center align-items-center">
-    <div v-show="showingQuestion" class="w-100 h-100">
+    <div v-show="showingQuestion || props.isHost" class="w-100 h-100">
       <QuestionView
       :cIndex="props.cIndex"
       :bEIndex="props.bEIndex"
@@ -85,6 +85,7 @@ function stopAudio(){
       :questions="boardEntry.questions"
       :board="props.board"
       :isHost="props.isHost"
+      :isBeingShown="showingQuestion"
       @specificQuestionLayerSelected="specificQuestionLayerSelected"
       @playAudio="playAudio"
       @stopAudio="stopAudio"

src/webapp/components/views/QuestionView.vue

@@ -12,7 +12,8 @@ const props = defineProps({
   isHost: {
     type: Boolean,
     default: false,
-  }
+  },
+  isBeingShown: Boolean,
 });
 
 let emit = defineEmits(["specificQuestionLayerSelected", "playAudio", "stopAudio"])
@@ -69,7 +70,7 @@ watch(
 
 <template>
   <template v-for="(question, questionIndex) in props.questions" :key="questionIndex">
-    <div v-if="props.questionIndex === questionIndex" class="d-flex flex-column justify-content-center align-items-center h-100 w-100">
+    <div v-if="props.questionIndex === questionIndex" class="d-flex flex-column justify-content-center align-items-center h-100 w-100" :class="[{'opacity-50': props.isHost && !props.isBeingShown}]">
       <h1 class="text-center" :class="[{ 'white-space-show-nl': question.questionType === 'multilineQuestion'}]">
         {{ question.questionText }}
       </h1>