Merge pull request #14 from turkmenkaan/kaan

Bug fixes for rooms

Author: turkmenkaan

.gitignore

@@ -1,2 +1,3 @@
 .env
-node_modules/*
+node_modules/*
+service-account-file.json

index.js

@@ -2,6 +2,7 @@ const app = require('express')();
 const http = require('http').createServer(app);
 const io = require('socket.io')(http);
 const mongoose = require('mongoose');
+const admin = require('firebase-admin');
 const { v4: uuidv4 } = require('uuid');
 
 const Question = require('./model');
@@ -10,17 +11,20 @@ require('dotenv').config();
 
 const port = process.env.PORT || 3000;
 
-const rooms = {};
-let waitingUsers = [];
-
 /**
  * {
- *  socket : room
+ *  socket : room (object)
  *  ...
  * }
  */
 const connectedUsers = {};
 
+/**
+ * roomId: room (object)
+ */
+const rooms = {};
+let waitingUsers = [];
+
 mongoose.connect(process.env.DB_URI, {
   useNewUrlParser: true,
   useUnifiedTopology: true,
@@ -64,10 +68,18 @@ io.on('connection', (socket) => {
   console.log('[CONNECTED]');
   connectedUsers[socket] = null;
 
-  // TODO: Oyun sırasında bir kişi disconnect ederse handle'la
   socket.on('disconnect', () => {
     console.log('[DISCONNECTED]');
 
+    // If the user is in a room
+    if (connectedUsers[socket]) {
+      const activeRoom = connectedUsers[socket];      
+      console.log("[DISCONNECTED] In a room");
+      activeRoom.endGame(socket);
+      connectedUsers.delete(socket);
+      rooms = rooms.filter(room => !Object.is(room, activeRoom))
+    }
+
     // Remove the user from the waiting list
     // Time complexity O(n)
     waitingUsers = waitingUsers.filter(user => !(Object.is(socket, user.socket)));
@@ -85,6 +97,7 @@ io.on('connection', (socket) => {
   socket.on("JOIN ROOM", (object) => {
     console.log(`[JOIN ROOM] ${object.username} is looking for room`);
 
+
     // If there is another user waiting for a game
     // put them in the same room and start the game
     if (waitingUsers.length > 0) {
@@ -107,9 +120,11 @@ io.on('connection', (socket) => {
       users.set(waitingUsers[0].socket, {
         username: waitingUsers[0].username
       });
+      
+      // console.log(users);
+      // console.log(`${JSON.stringify(users)}`);
 
-      console.log(`${JSON.stringify(users)}`);
-
+      
       /* 
       {
         'socket' : { username: 'kaan' }
@@ -131,7 +146,8 @@ io.on('connection', (socket) => {
         username: object.username,
         socket,
       });
-    }
+    }   
+    
   });
 
   socket.on("READY", (object) => {
@@ -160,7 +176,7 @@ io.on('connection', (socket) => {
   // TODO: Oyun bitince oyunu rooms'dan sil
   // TODO: LEAVE GAME mesajını handle'la
   socket.on("LEAVE GAME", (object) => {
-
+    console.log("[LEAVE GAME]")
   });
 })
 

messages.txt

@@ -2,6 +2,11 @@
 JOIN ROOM
 {
     'username' : 'sahircan',
+    'languages' : {
+        'from' : 'en',
+        'to' : 'tr'
+    },
+    'category' : 'fruits',
 }
 
 START GAME - Server to user.
@@ -39,22 +44,13 @@ ANSWER - User to Server. User 1's answer
 
 END QUESTION - Server to room.
 {
-    'answers' : [
-        {
-            'user' : 'kaan',
-            'answer' : null,
-        },
-        {
-            'user' : 'sahircan',
-            'answer' : 'avokado'
-        }
-    ],
-    'correct-answer' : 'merhaba'
+    'correct-answer' : 'merhaba',
+    'timeout' : true
 }
 
 QUESTION
 
-ENDGAME
+END GAME
 {
     'scoreboard' : [
         {
@@ -67,4 +63,6 @@ ENDGAME
         }
     ],
     'winner' : 'kaan'
-}
+}
+
+LEAVE GAME