gmatte/EvalueTonSavoir
1
0
Fork 0
mirror of https://github.com/ets-cfuhrman-pfe/EvalueTonSavoir.git synced 2025-08-11 21:23:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nom de la salle doiit être un majuscule

Browse source 
Supprimer des créations de socket/salle superflues
Suppression (nettoyage) des salles et socket plus robuste
diminue le bazaar de useEffect (!)
This commit is contained in:
C. Fuhrman 2025-02-27 15:49:09 -05:00
parent 38e366a7de
commit 70d6d1bc56
8 changed files with 170 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/src/App.tsx
View file

@ -13,7 +13,6 @@ import Register from './pages/Teacher/Register/Register';
import ResetPassword from './pages/Teacher/ResetPassword/ResetPassword';
import ManageRoom from './pages/Teacher/ManageRoom/ManageRoom';
import QuizForm from './pages/Teacher/EditorQuiz/EditorQuiz';
import { RoomProvider } from './pages/Teacher/ManageRoom/RoomContext';
// Pages espace étudiant
import JoinRoom from './pages/Student/JoinRoom/JoinRoom';
@ -34,8 +33,6 @@ const isLoggedIn = () => {
function App() {
return (
<RoomProvider>
{' '}
<div className="content">
<Header isLoggedIn={isLoggedIn} handleLogout={handleLogout} />
@ -64,7 +61,6 @@ function App() {
</div>
<Footer />
</div>
</RoomProvider>
);
}

2
client/src/__tests__/pages/ManageRoom/ManageRoom.test.tsx
View file

@ -98,7 +98,7 @@ describe('ManageRoom', () => {
expect(screen.getByText('Test Quiz')).toBeInTheDocument();
const roomHeader = document.querySelector('h1');
expect(roomHeader).toHaveTextContent('Salle : Test Room');
expect(roomHeader).toHaveTextContent('Salle : TEST ROOM');
expect(screen.getByText('0/60')).toBeInTheDocument();
expect(screen.getByText('Question 1/2')).toBeInTheDocument();

9
client/src/pages/Student/JoinRoom/JoinRoom.tsx
View file

@ -37,18 +37,19 @@ const JoinRoom: React.FC = () => {
console.log(`JoinRoom: handleCreateSocket: ${ENV_VARIABLES.VITE_BACKEND_SOCKET_URL}`);
const socket = webSocketService.connect(ENV_VARIABLES.VITE_BACKEND_SOCKET_URL);
socket.on('join-success', () => {
socket.on('join-success', (roomJoinedName) => {
setIsWaitingForTeacher(true);
setIsConnecting(false);
console.log('Successfully joined the room.');
console.log(`on(join-success): Successfully joined the room ${roomJoinedName}`);
});
socket.on('next-question', (question: QuestionType) => {
console.log('on(next-question): Received next-question:', question);
setQuizMode('teacher');
setIsWaitingForTeacher(false);
setQuestion(question);
});
socket.on('launch-student-mode', (questions: QuestionType[]) => {
console.log('Received launch-student-mode:', questions);
console.log('on(launch-student-mode): Received launch-student-mode:', questions);
setQuizMode('student');
setIsWaitingForTeacher(false);
@ -168,7 +169,7 @@ const JoinRoom: React.FC = () => {
label="Nom de la salle"
variant="outlined"
value={roomName}
onChange={(e) => setRoomName(e.target.value)}
onChange={(e) => setRoomName(e.target.value.toUpperCase())}
placeholder="Nom de la salle"
sx={{ marginBottom: '1rem' }}
fullWidth

60
client/src/pages/Teacher/Dashboard/Dashboard.tsx
View file

@ -13,7 +13,7 @@ import './dashboard.css';
import ImportModal from 'src/components/ImportModal/ImportModal';
//import axios from 'axios';
import { RoomType } from 'src/Types/RoomType';
import { useRooms } from '../ManageRoom/RoomContext';
// import { useRooms } from '../ManageRoom/RoomContext';
import {
Dialog,
DialogActions,
@ -62,7 +62,8 @@ const Dashboard: React.FC = () => {
const [rooms, setRooms] = useState<RoomType[]>([]);
const [openAddRoomDialog, setOpenAddRoomDialog] = useState(false);
const [newRoomTitle, setNewRoomTitle] = useState('');
const { selectedRoom, selectRoom, createRoom } = useRooms();
// const { selectedRoom, selectRoom, createRoom } = useRooms();
const [selectedRoom, selectRoom] = useState<RoomType>(); // menu
const [errorMessage, setErrorMessage] = useState('');
const [showErrorDialog, setShowErrorDialog] = useState(false);
@ -96,7 +97,7 @@ const Dashboard: React.FC = () => {
setRooms(userRooms as RoomType[]);
// select the first room if it exists
if (userRooms instanceof Array && userRooms.length > 0) {
selectRoom(userRooms[0]._id);
selectRoom(userRooms[0]);
}
const userFolders = await ApiService.getUserFolders();
@ -111,11 +112,32 @@ const Dashboard: React.FC = () => {
if (event.target.value === 'add-room') {
setOpenAddRoomDialog(true);
} else {
selectRoom(event.target.value);
selectRoomByName(event.target.value);
}
};
const handleSubmitCreateRoom = async () => {
// Créer une salle
const createRoom = async (title: string) => {
// Créer la salle et récupérer l'objet complet
const newRoom = await ApiService.createRoom(title);
// Mettre à jour la liste des salles
const updatedRooms = await ApiService.getUserRooms();
setRooms(updatedRooms as RoomType[]);
// Sélectionner la nouvelle salle avec son ID
selectRoomByName(newRoom); // Utiliser l'ID de l'objet retourné
};
// Sélectionner une salle
const selectRoomByName = (roomId: string) => {
const room = rooms.find(r => r._id === roomId);
selectRoom(room);
localStorage.setItem('selectedRoomId', roomId);
};
const handleCreateRoom = async () => {
if (newRoomTitle.trim()) {
try {
await createRoom(newRoomTitle);
@ -432,7 +454,7 @@ const Dashboard: React.FC = () => {
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenAddRoomDialog(false)}>Annuler</Button>
<Button onClick={handleSubmitCreateRoom}>Créer</Button>
<Button onClick={handleCreateRoom}>Créer</Button>
</DialogActions>
</Dialog>
<Dialog open={showErrorDialog} onClose={() => setShowErrorDialog(false)}>
@ -491,6 +513,7 @@ const Dashboard: React.FC = () => {
</Tooltip>
<Tooltip title="Renommer dossier" placement="top">
<div>
<IconButton
color="primary"
onClick={handleRenameFolder}
@ -499,9 +522,11 @@ const Dashboard: React.FC = () => {
{' '}
<Edit />{' '}
</IconButton>
</div>
</Tooltip>
<Tooltip title="Dupliquer dossier" placement="top">
<div>
<IconButton
color="primary"
onClick={handleDuplicateFolder}
@ -510,9 +535,11 @@ const Dashboard: React.FC = () => {
{' '}
<FolderCopy />{' '}
</IconButton>
</div>
</Tooltip>
<Tooltip title="Supprimer dossier" placement="top">
<div>
<IconButton
aria-label="delete"
color="primary"
@ -522,6 +549,7 @@ const Dashboard: React.FC = () => {
{' '}
<DeleteOutline />{' '}
</IconButton>
</div>
</Tooltip>
</div>
</div>
@ -554,15 +582,17 @@ const Dashboard: React.FC = () => {
<div className="quiz" key={quiz._id}>
<div className="title">
<Tooltip title="Lancer quiz" placement="top">
<Button
variant="outlined"
onClick={() => handleLancerQuiz(quiz)}
disabled={!validateQuiz(quiz.content)}
>
{`${quiz.title} (${quiz.content.length} question${
quiz.content.length > 1 ? 's' : ''
})`}
</Button>
<div>
<Button
variant="outlined"
onClick={() => handleLancerQuiz(quiz)}
disabled={!validateQuiz(quiz.content)}
>
{`${quiz.title} (${quiz.content.length} question${
quiz.content.length > 1 ? 's' : ''
})`}
</Button>
</div>
</Tooltip>
</div>

122
client/src/pages/Teacher/ManageRoom/ManageRoom.tsx
View file

@ -23,9 +23,7 @@ import DisconnectButton from 'src/components/DisconnectButton/DisconnectButton';
import QuestionDisplay from 'src/components/QuestionsDisplay/QuestionDisplay';
import ApiService from '../../../services/ApiService';
import { QuestionType } from 'src/Types/QuestionType';
import { useRooms } from '../ManageRoom/RoomContext';
import { Button } from '@mui/material';
// import { use } from 'marked';
const ManageRoom: React.FC = () => {
const navigate = useNavigate();
@ -38,39 +36,38 @@ const ManageRoom: React.FC = () => {
const [connectingError, setConnectingError] = useState<string>('');
const [currentQuestion, setCurrentQuestion] = useState<QuestionType | undefined>(undefined);
const [quizStarted, setQuizStarted] = useState(false);
const { selectedRoom } = useRooms();
const [formattedRoomName, setFormattedRoomName] = useState("");
useEffect(() => {
// verify that roomName argument is not null
if (!roomName || !quizId) {
window.alert(
`Une erreur est survenue.\n La salle ou le quiz n'a pas été spécifié.\nVeuillez réessayer plus tard.`
);
console.error('Room or Quiz not found for name:', roomName);
navigate('/teacher/dashboard');
}
}, [roomName, navigate]);
useEffect(() => {
if (selectedRoom && !socket) {
createWebSocketRoom();
}
}, [selectedRoom]);
useEffect(() => {
const fetchData = async () => {
const verifyLogin = async () => {
if (!ApiService.isLoggedIn()) {
navigate('/teacher/login');
return;
}
};
fetchData();
verifyLogin();
}, []);
useEffect(() => {
if (!roomName || !quizId) {
window.alert(
`Une erreur est survenue.\n La salle ou le quiz n'a pas été spécifié.\nVeuillez réessayer plus tard.`
);
console.error(`Room "${roomName}" or Quiz "${quizId}" not found.`);
navigate('/teacher/dashboard');
}
if (roomName && !socket) {
createWebSocketRoom();
}
return () => {
disconnectWebSocket();
};
}, [roomName, navigate]);
useEffect(() => {
if (quizId) {
const fetchquiz = async () => {
const fetchQuiz = async () => {
const quiz = await ApiService.getQuiz(quizId);
if (!quiz) {
@ -83,18 +80,9 @@ const ManageRoom: React.FC = () => {
}
setQuiz(quiz as QuizType);
if (!socket) {
console.log(`no socket in ManageRoom, creating one.`);
createWebSocketRoom();
}
// return () => {
// webSocketService.disconnect();
// };
};
fetchquiz();
fetchQuiz();
} else {
window.alert(
`Une erreur est survenue.\n Le quiz ${quizId} n'a pas été trouvé\nVeuillez réessayer plus tard`
@ -107,7 +95,7 @@ const ManageRoom: React.FC = () => {
const disconnectWebSocket = () => {
if (socket) {
webSocketService.endQuiz(roomName);
webSocketService.endQuiz(formattedRoomName);
webSocketService.disconnect();
setSocket(null);
setQuizQuestions(undefined);
@ -117,16 +105,12 @@ const ManageRoom: React.FC = () => {
};
const createWebSocketRoom = () => {
console.log('Creating WebSocket room...');
if (!selectedRoom) {
setConnectingError('Veuillez sélectionner une salle.');
return;
}
const socket = webSocketService.connect(ENV_VARIABLES.VITE_BACKEND_SOCKET_URL);
const roomNameUpper = roomName.toUpperCase();
setFormattedRoomName(roomNameUpper);
console.log(`Creating WebSocket room named ${roomNameUpper}`);
socket.on('connect', () => {
webSocketService.createRoom(selectedRoom.title);
webSocketService.createRoom(roomNameUpper);
});
socket.on('connect_error', (error) => {
@ -134,20 +118,22 @@ const ManageRoom: React.FC = () => {
console.error('ManageRoom: WebSocket connection error:', error);
});
socket.on('create-success', (roomName: string) => {
console.log(`Room created: ${roomName}`);
// setRoomName(roomName);
socket.on('create-success', (createdRoomName: string) => {
console.log(`Room created: ${createdRoomName}`);
});
socket.on('user-joined', (student: StudentType) => {
console.log(`Student joined: name = ${student.name}, id = ${student.id}`);
console.log(`Student joined: name = ${student.name}, id = ${student.id}, quizMode = ${quizMode}, quizStarted = ${quizStarted}`);
setStudents((prevStudents) => [...prevStudents, student]);
// only send nextQuestion if the quiz has started
if (!quizStarted) return;
if (quizMode === 'teacher') {
webSocketService.nextQuestion(roomName, currentQuestion);
webSocketService.nextQuestion(formattedRoomName, currentQuestion);
} else if (quizMode === 'student') {
webSocketService.launchStudentModeQuiz(roomName, quizQuestions);
webSocketService.launchStudentModeQuiz(formattedRoomName, quizQuestions);
}
});
socket.on('join-failure', (message) => {
@ -164,22 +150,9 @@ const ManageRoom: React.FC = () => {
};
useEffect(() => {
// This is here to make sure the correct value is sent when user join
if (socket) {
console.log(`Listening for user-joined in room ${roomName}`);
// eslint-disable-next-line @typescript-eslint/no-unused-vars
socket.on('user-joined', (_student: StudentType) => {
if (quizMode === 'teacher') {
webSocketService.nextQuestion(roomName, currentQuestion);
} else if (quizMode === 'student') {
webSocketService.launchStudentModeQuiz(roomName, quizQuestions);
}
});
}
if (socket) {
// handle the case where user submits an answer
console.log(`Listening for submit-answer-room in room ${roomName}`);
console.log(`Listening for submit-answer-room in room ${formattedRoomName}`);
socket.on('submit-answer-room', (answerData: AnswerReceptionFromBackendType) => {
const { answer, idQuestion, idUser, username } = answerData;
console.log(
@ -192,7 +165,6 @@ const ManageRoom: React.FC = () => {
// Update the students state using the functional form of setStudents
setStudents((prevStudents) => {
// print the list of current student names
console.log('Current students:');
prevStudents.forEach((student) => {
console.log(student.name);
@ -208,7 +180,6 @@ const ManageRoom: React.FC = () => {
);
let updatedAnswers: Answer[] = [];
if (existingAnswer) {
// Update the existing answer
updatedAnswers = student.answers.map((ans) => {
console.log(`Comparing ${ans.idQuestion} to ${idQuestion}`);
return ans.idQuestion === idQuestion
@ -224,7 +195,6 @@ const ManageRoom: React.FC = () => {
: ans;
});
} else {
// Add a new answer
const newAnswer = {
idQuestion,
answer,
@ -254,7 +224,7 @@ const ManageRoom: React.FC = () => {
if (nextQuestionIndex === undefined || nextQuestionIndex > quizQuestions.length - 1) return;
setCurrentQuestion(quizQuestions[nextQuestionIndex]);
webSocketService.nextQuestion(roomName, quizQuestions[nextQuestionIndex]);
webSocketService.nextQuestion(formattedRoomName, quizQuestions[nextQuestionIndex]);
};
const previousQuestion = () => {
@ -264,7 +234,7 @@ const ManageRoom: React.FC = () => {
if (prevQuestionIndex === undefined || prevQuestionIndex < 0) return;
setCurrentQuestion(quizQuestions[prevQuestionIndex]);
webSocketService.nextQuestion(roomName, quizQuestions[prevQuestionIndex]);
webSocketService.nextQuestion(formattedRoomName, quizQuestions[prevQuestionIndex]);
};
const initializeQuizQuestion = () => {
@ -292,7 +262,7 @@ const ManageRoom: React.FC = () => {
}
setCurrentQuestion(quizQuestions[0]);
webSocketService.nextQuestion(roomName, quizQuestions[0]);
webSocketService.nextQuestion(formattedRoomName, quizQuestions[0]);
};
const launchStudentMode = () => {
@ -304,14 +274,14 @@ const ManageRoom: React.FC = () => {
return;
}
setQuizQuestions(quizQuestions);
webSocketService.launchStudentModeQuiz(roomName, quizQuestions);
webSocketService.launchStudentModeQuiz(formattedRoomName, quizQuestions);
};
const launchQuiz = () => {
if (!socket || !roomName || !quiz?.content || quiz?.content.length === 0) {
if (!socket || !formattedRoomName || !quiz?.content || quiz?.content.length === 0) {
// TODO: This error happens when token expires! Need to handle it properly
console.log(
`Error launching quiz. socket: ${socket}, roomName: ${roomName}, quiz: ${quiz}`
`Error launching quiz. socket: ${socket}, roomName: ${formattedRoomName}, quiz: ${quiz}`
);
setQuizStarted(true);
@ -332,7 +302,7 @@ const ManageRoom: React.FC = () => {
setCurrentQuestion(quizQuestions[questionIndex]);
if (quizMode === 'teacher') {
webSocketService.nextQuestion(roomName, quizQuestions[questionIndex]);
webSocketService.nextQuestion(formattedRoomName, quizQuestions[questionIndex]);
}
}
};
@ -399,7 +369,7 @@ const ManageRoom: React.FC = () => {
return false;
}
if (!roomName) {
if (!formattedRoomName) {
return (
<div className="center">
{!connectingError ? (
@ -423,7 +393,7 @@ const ManageRoom: React.FC = () => {
return (
<div className="room">
<h1>Salle : {roomName}</h1>
<h1>Salle : {formattedRoomName}</h1>
<div className="roomHeader">
<DisconnectButton
onReturn={handleReturn}
@ -440,10 +410,10 @@ const ManageRoom: React.FC = () => {
width: '100%'
}}
>
{quizStarted && (
{(
<div
className="userCount subtitle smallText"
style={{ display: 'flex', alignItems: 'center' }}
style={{ display: "flex", justifyContent: "flex-end" }}
>
<GroupIcon style={{ marginRight: '5px' }} />
{students.length}/60

29
client/src/services/WebsocketService.tsx
View file

@ -51,13 +51,26 @@ class WebSocketService {
}
}
// deleteRoom(roomName: string) {
// console.log('WebsocketService: deleteRoom', roomName);
// if (this.socket) {
// console.log('WebsocketService: emit: delete-room', roomName);
// this.socket.emit('delete-room', roomName);
// }
// }
nextQuestion(roomName: string, question: unknown) {
console.log('WebsocketService: nextQuestion', roomName, question);
if (!question) {
throw new Error('WebsocketService: nextQuestion: question is null');
}
if (this.socket) {
this.socket.emit('next-question', { roomName, question });
}
}
launchStudentModeQuiz(roomName: string, questions: unknown) {
console.log('WebsocketService: launchStudentModeQuiz', roomName, questions, this.socket);
if (this.socket) {
this.socket.emit('launch-student-mode', { roomName, questions });
}
@ -75,21 +88,9 @@ class WebSocketService {
}
}
submitAnswer(answerData: AnswerSubmissionToBackendType
// roomName: string,
// answer: string | number | boolean,
// username: string,
// idQuestion: string
) {
submitAnswer(answerData: AnswerSubmissionToBackendType) {
if (this.socket) {
this.socket?.emit('submit-answer',
// {
// answer: answer,
// roomName: roomName,
// username: username,
// idQuestion: idQuestion
// }
answerData
this.socket?.emit('submit-answer', answerData
);
}
}

63
server/__tests__/socket.test.js
View file

@ -60,45 +60,42 @@ describe("websocket server", () => {
});
test("should create a room", (done) => {
teacherSocket.emit("create-room", "room1");
teacherSocket.on("create-success", (roomName) => {
expect(roomName).toBe("ROOM1");
done();
});
teacherSocket.emit("create-room", "room1");
});
test("should not create a room if it already exists", (done) => {
teacherSocket.emit("create-room", "room1");
teacherSocket.on("create-failure", () => {
done();
});
teacherSocket.emit("create-room", "room1");
});
test("should join a room", (done) => {
studentSocket.emit("join-room", {
enteredRoomName: "ROOM1",
username: "student1",
});
studentSocket.on("join-success", () => {
studentSocket.on("join-success", (roomName) => {
expect(roomName).toBe("ROOM1");
done();
});
studentSocket.emit("join-room", {
enteredRoomName: "room1",
username: "student1",
});
});
test("should not join a room if it does not exist", (done) => {
studentSocket.on("join-failure", () => {
done();
});
studentSocket.emit("join-room", {
enteredRoomName: "ROOM2",
username: "student1",
});
studentSocket.on("join-failure", () => {
done();
});
});
test("should launch student mode", (done) => {
teacherSocket.emit("launch-student-mode", {
roomName: "ROOM1",
questions: [{ question: "question1" }, { question: "question2" }],
});
studentSocket.on("launch-student-mode", (questions) => {
expect(questions).toEqual([
{ question: "question1" },
@ -106,26 +103,24 @@ describe("websocket server", () => {
]);
done();
});
teacherSocket.emit("launch-student-mode", {
roomName: "ROOM1",
questions: [{ question: "question1" }, { question: "question2" }],
});
});
test("should send next question", (done) => {
teacherSocket.emit("next-question", {
roomName: "ROOM1",
question: { question: "question2" },
});
studentSocket.on("next-question", (question) => {
expect(question).toEqual({ question: "question2" });
done();
});
teacherSocket.emit("next-question", {
roomName: "ROOM1",
question: { question: "question2" },
});
});
test("should send answer", (done) => {
studentSocket.emit("submit-answer", {
roomName: "ROOM1",
username: "student1",
answer: "answer1",
idQuestion: 1,
});
teacherSocket.on("submit-answer-room", (answer) => {
expect(answer).toEqual({
idUser: studentSocket.id,
@ -135,32 +130,38 @@ describe("websocket server", () => {
});
done();
});
studentSocket.emit("submit-answer", {
roomName: "ROOM1",
username: "student1",
answer: "answer1",
idQuestion: 1,
});
});
test("should not join a room if no room name is provided", (done) => {
studentSocket.on("join-failure", () => {
done();
});
studentSocket.emit("join-room", {
enteredRoomName: "",
username: "student1",
});
studentSocket.on("join-failure", () => {
done();
});
});
test("should not join a room if the username is not provided", (done) => {
studentSocket.emit("join-room", { enteredRoomName: "ROOM2", username: "" });
studentSocket.on("join-failure", () => {
done();
});
studentSocket.emit("join-room", { enteredRoomName: "ROOM2", username: "" });
});
test("should end quiz", (done) => {
teacherSocket.emit("end-quiz", {
roomName: "ROOM1",
});
studentSocket.on("end-quiz", () => {
done();
});
teacherSocket.emit("end-quiz", {
roomName: "ROOM1",
});
});
test("should disconnect", (done) => {

45
server/socket/socket.js
View file

@ -6,7 +6,7 @@ const setupWebsocket = (io) => {
io.on("connection", (socket) => {
if (totalConnections >= MAX_TOTAL_CONNECTIONS) {
console.log("Connection limit reached. Disconnecting client.");
console.log("socket.js: Connection limit reached. Disconnecting client.");
socket.emit(
"join-failure",
"Le nombre maximum de connexions a été atteint"
@ -17,46 +17,46 @@ const setupWebsocket = (io) => {
totalConnections++;
console.log(
"A user connected:",
"socket.js: A user connected:",
socket.id,
"| Total connections:",
totalConnections
);
socket.on("create-room", (sentRoomName) => {
console.log(`Demande de création de salle avec le nom : ${sentRoomName}`);
console.log(`socket.js: Demande de création de salle avec le nom : ${sentRoomName}`);
if (sentRoomName) {
const roomName = sentRoomName.toUpperCase();
if (!io.sockets.adapter.rooms.get(roomName)) {
socket.join(roomName);
socket.emit("create-success", roomName);
console.log(`Salle créée avec succès : ${roomName}`);
console.log(`socket.js: Salle créée avec succès : ${roomName}`);
} else {
socket.emit("create-failure", `La salle ${roomName} existe déjà.`);
console.log(`Échec de création : ${roomName} existe déjà`);
console.log(`socket.js: Échec de création : ${roomName} existe déjà`);
}
}
console.log(
"Salles existantes après la tentative de création : ",
Array.from(io.sockets.adapter.rooms.keys())
);
reportSalles();
});
function reportSalles() {
console.log("socket.js: Salles existantes :", Array.from(io.sockets.adapter.rooms.keys()));
}
socket.on("join-room", ({ enteredRoomName, username }) => {
const roomToCheck = enteredRoomName.toUpperCase();
console.log(
`Requête de connexion : salle="${roomToCheck}", utilisateur="${username}"`
);
console.log(
"Salles existantes :",
Array.from(io.sockets.adapter.rooms.keys())
`socket.js: Requête de connexion : salle="${roomToCheck}", utilisateur="${username}"`
);
reportSalles();
if (io.sockets.adapter.rooms.has(roomToCheck)) {
console.log("socket.js: La salle existe");
const clientsInRoom = io.sockets.adapter.rooms.get(roomToCheck).size;
if (clientsInRoom <= MAX_USERS_PER_ROOM) {
console.log("socket.js: La salle n'est pas pleine avec ", clientsInRoom, " utilisateurs");
const newStudent = {
id: socket.id,
name: username,
@ -64,17 +64,20 @@ const setupWebsocket = (io) => {
};
socket.join(roomToCheck);
socket.to(roomToCheck).emit("user-joined", newStudent);
socket.emit("join-success");
socket.emit("join-success", roomToCheck);
} else {
console.log("socket.js: La salle est pleine avec ", clientsInRoom, " utilisateurs");
socket.emit("join-failure", "La salle est remplie");
}
} else {
console.log("socket.js: La salle n'existe pas");
socket.emit("join-failure", "Le nom de la salle n'existe pas");
}
});
socket.on("next-question", ({ roomName, question }) => {
// console.log("next-question", roomName, question);
console.log("socket.js: next-question", roomName, question);
console.log("socket.js: rediffusion de la question", question);
socket.to(roomName).emit("next-question", question);
});
@ -83,22 +86,26 @@ const setupWebsocket = (io) => {
});
socket.on("end-quiz", ({ roomName }) => {
console.log("socket.js: end-quiz", roomName);
socket.to(roomName).emit("end-quiz");
io.sockets.adapter.rooms.delete(roomName);
reportSalles();
});
socket.on("message", (data) => {
console.log("Received message from", socket.id, ":", data);
console.log("socket.js: Received message from", socket.id, ":", data);
});
socket.on("disconnect", () => {
totalConnections--;
console.log(
"A user disconnected:",
"socket.js: A user disconnected:",
socket.id,
"| Total connections:",
totalConnections
);
reportSalles();
for (const [room] of io.sockets.adapter.rooms) {
if (room !== socket.id) {
io.to(room).emit("user-disconnected", socket.id);