Merge pull request #43 from CS3219-AY2425S1/collab-space-patch

Fix cross browser code collaboration issue

Author: yuxuanleong

Backend/CollabService/Dockerfile

@@ -8,4 +8,6 @@ RUN npm install
 COPY . .
 
 EXPOSE 3004
+EXPOSE 1234
+
 CMD ["npm", "start"]

Backend/CollabService/app.js

@@ -5,11 +5,13 @@ const { setUpYjsSocket } = require('./websocket/collabSocket');
 const app = express();
 
 const server = http.createServer(app);
-const yjsPORT = 1234
+
+// Set up Yjs server 
+setUpYjsSocket();
 
 // Set up WebSocket server and attach to HTTP server
 setupWebSocket(server);
-setUpYjsSocket(yjsPORT);
+
 
 // Basic route to test the server
 app.get('/', (req, res) => {

Backend/CollabService/websocket/collabSocket.js

@@ -1,17 +1,26 @@
 const WebSocket = require('ws');
+const http = require('http')
+const { setupWSConnection } = require('y-websocket/bin/utils');
 
-function setUpYjsSocket(port) {
-    const wss = new WebSocket.Server({ port: 1234 });
+function setUpYjsSocket() {
 
-    wss.on('connection', (ws) => {
+    const server = http.createServer();
+    
+    const wss = new WebSocket.Server({ server });
+
+    wss.on('connection', (ws, req) => {
         console.log('New client connected');
 
+        setupWSConnection(ws, req);
+
         ws.on('close', () => {
             console.log('Client disconnected');
         });
     });
 
-    console.log('Websocket server is listening on ws://localhost:1234')
+    server.listen(1234, () => {
+        console.log('Websocket server is listening on ws://localhost:1234')
+    })
 }
 
 module.exports = { setUpYjsSocket };

docker-compose.yml

@@ -26,6 +26,7 @@ services:
       dockerfile: Dockerfile
     ports:
       - "3004:3004" # change the first port number xxxx:3004 to suit your needs
+      - "1234:1234"
 
   frontend:
     build: