Fix connection error for code collaboration PORT 1234

Author: qiaoen17

Backend/CollabService/app.js

@@ -1,22 +1,21 @@
 const express = require('express');
 const http = require('http');
-const { setupWebSocket } = require('./websocket/collabSocket');
-// const { WebsocketServer } = require('y-websockets-server');
-
+const { setupWebSocket } = require('./websocket/roomManagerSocket');
+const { setUpYjsSocket } = require('./websocket/collabSocket');
 const app = express();
-//const PORT = 1234;
 
 const server = http.createServer(app);
+const yjsPORT = 1234
 
 // Set up WebSocket server and attach to HTTP server
 setupWebSocket(server);
-
-//const wss = new WebsocketServer(PORT);
-//console.log(`Yjs WebSocket server is running on ws://localhost:${PORT}`)
+setUpYjsSocket(yjsPORT);
 
 // Basic route to test the server
 app.get('/', (req, res) => {
     res.send('CollabService using Yjs is running');
 });
 
+
+
 module.exports = { server };

Backend/CollabService/websocket/collabSocket.js

@@ -1,34 +1,17 @@
 const WebSocket = require('ws');
-const { manageRoom } = require('../utils/roomManager');
 
-function setupWebSocket(server) {
-    const wss = new WebSocket.Server({ server });
+function setUpYjsSocket(port) {
+    const wss = new WebSocket.Server({ port: 1234 });
 
     wss.on('connection', (ws) => {
-        console.log('User connected to the collaboration space');
-
-        ws.on('message', (message) => {
-            const data = JSON.parse(message);
-
-            switch (data.type) {
-                case 'joinRoom':
-                    // add user into room with roomId
-                    manageRoom(ws, data.roomId, data.userId, "join");
-                    break;
-                case 'leaveRoom':
-                    // remove user from room with roomId
-                    manageRoom(ws, data.roomId, data.userId, "leave");
-                    break;
-                default:
-                    console.error('Unknown message type');
-            }
-        });
+        console.log('New client connected');
 
         ws.on('close', () => {
-            console.log('User disconnected from collaboration space');
+            console.log('Client disconnected');
         });
     });
 
+    console.log('Websocket server is listening on ws://localhost:1234')
 }
 
-module.exports = { setupWebSocket };
+module.exports = { setUpYjsSocket };

Backend/CollabService/websocket/roomManagerSocket.js

@@ -0,0 +1,34 @@
+const WebSocket = require('ws');
+const { manageRoom } = require('../utils/roomManager');
+
+function setupWebSocket(server) {
+    const wss = new WebSocket.Server({ server });
+
+    wss.on('connection', (ws) => {
+        console.log('User connected to the collaboration space');
+
+        ws.on('message', (message) => {
+            const data = JSON.parse(message);
+
+            switch (data.type) {
+                case 'joinRoom':
+                    // add user into room with roomId
+                    manageRoom(ws, data.roomId, data.userId, "join");
+                    break;
+                case 'leaveRoom':
+                    // remove user from room with roomId
+                    manageRoom(ws, data.roomId, data.userId, "leave");
+                    break;
+                default:
+                    console.error('Unknown message type');
+            }
+        });
+
+        ws.on('close', () => {
+            console.log('User disconnected from collaboration space');
+        });
+    });
+
+}
+
+module.exports = { setupWebSocket };

Frontend/src/components/collab/CollaborationSpace.jsx

@@ -76,7 +76,6 @@ const CollaborationSpace = () => {
         const wsProvider = new WebsocketProvider("ws://localhost:1234", roomId, doc);
         setProvider(wsProvider);
 
-
         // Create a shared type in Yjs for collaborative code editing
         const yText = doc.getText('monacoEditor');