Merge pull request #49 from CS3219-AY2425S1/PEER-221-Matching-WS-Notifications

Match Notification WS Server (Success/Failure Notifs)

Author: SeeuSim

backend/matching/src/services/create-notif-socket.ts

@@ -1,4 +1,5 @@
 export const createNotifSocket = (userId: string) => {
-  // TODO: Assign proper socket room
-  return userId;
+  const dateString = Date.now().toString(36);
+  const roomId = `${userId}_${dateString}`;
+  return roomId;
 };

backend/matching/src/ws.ts

@@ -9,17 +9,34 @@ export const createWs = (server: ReturnType<(typeof http)['createServer']>) => {
   io.on('connection', (socket) => {
     logger.info(`${socket.id} connected`);
 
-    socket.on('joinRoom', (room) => {
-      socket.join(room);
-      logger.info(`Client joined room: ${room}`);
-      socket.to(room).emit('message', `A new user has joined room: ${room}`);
+    socket.on('joinRoom', (roomId) => {
+      if (!roomId) {
+        logger.warn('joinRoom event received without a roomId');
+        return;
+      }
+
+      socket.join(roomId);
+      logger.info(`Socket ${socket.id} joined room: ${roomId}`);
+      socket.emit('joinedRoom', roomId);
     });
     // socket.on('create', (room) => {
     //   socket.join(room);
     // });
+    socket.on('cancelRoom', (roomId) => {
+      if (roomId) {
+        io.in(roomId).socketsLeave(roomId);
+        logger.info(`Room ${roomId} has been cancelled and closed.`);
+        socket.emit('roomCancelled', roomId);
+      } else {
+        logger.warn('No room ID provided for cancellation');
+      }
+    });
     socket.on('leave', (room) => {
       socket.leave(room);
     });
+    socket.on('disconnect', () => {
+      logger.info(`Client disconnected: ${socket.id}`);
+    });
   });
   return io;
 };