SyntaxSquad/DADProject#15 fix: Merge Conflicts Fixed.

websockets/events/connection.js

@@ -1,5 +1,6 @@
 import { addUser, removeUser } from "../state/connection.js";
 
+
 const HEARTBEAT_INTERVAL = 30000; // 30 seconds
 const HEARTBEAT_TIMEOUT = 10000; // 10 seconds
 
@@ -8,36 +9,36 @@ export const handleConnectionEvents = (io, socket) => {
   let heartbeatTimeout;
   const startHeartbeat = () => {
     heartbeatInterval = setInterval(() => {
-      socket.emit("heartbeat");
+      socket.emit('heartbeat');
 
       heartbeatTimeout = setTimeout(() => {
         console.log(
-          `[Heartbeat] No response from ${socket.id}, disconnecting...`
+          `[Heartbeat] No response from ${socket.id}, disconnecting...`,
         );
         socket.disconnect(true);
       }, HEARTBEAT_TIMEOUT);
     }, HEARTBEAT_INTERVAL);
   };
 
-  socket.on("heartbeat_ack", () => {
+  socket.on('heartbeat_ack', () => {
     clearTimeout(heartbeatTimeout);
     console.log(`[Heartbeat] Received pong from ${socket.id}`);
   });
 
-  socket.on("join", (user) => {
+  socket.on('join', (user) => {
     addUser(socket, user);
     console.log(`[Connection] User ${user.name} has joined the server`);
   });
 
-  socket.on("leave", () => {
+  socket.on('leave', () => {
     const user = removeUser(socket.id);
     if (user) {
       console.log(`[Connection] User ${user.name} has left the server`);
     }
   });
 
-  socket.on("disconnect", () => {
-    console.log("Connection Lost:", socket.id);
+  socket.on('disconnect', () => {
+    console.log('Connection Lost:', socket.id);
     removeUser(socket.id);
   });
 };