Fix after merge

Author: alvinlim277

collab/main.go

@@ -22,6 +22,7 @@ const (
 	AUTH_FAIL      = "auth_fail"
 	CLOSE_SESSION  = "close_session"
 	CONTENT_CHANGE = "content_change"
+	PING = "ping"
 )
 
 var upgrader = websocket.Upgrader{
@@ -299,8 +300,8 @@ func handleMessages(
 
 			log.Println("Client authenticated successfully")
 		}
-		// i can comment out this whole block and it would work
 
+		// old logic before type changes
 		// if msgData["type"] == "ping" {
 		// 	//receives ping from client1, need to send a ping to client2
 		// 	//eventually, if present, client2 will send the ping back, which will be broadcasted back to client1.
@@ -343,6 +344,13 @@ func handleMessages(
 				Type:    msgData.Type,
 				UserID:  msgData.UserID,
 			}
+		} else if msgData.Type == PING {
+			// Broadcast the message to other clients
+			hub.broadcast <- Message{
+				RoomID:  client.roomID,
+				Type:    msgData.Type,
+				UserID:  msgData.UserID,
+			}
 		} else {
 			log.Printf("Unknown message type: %s", msgData.Type)
 		}

peerprep/Dockerfile

@@ -6,6 +6,6 @@ WORKDIR /frontend
 COPY package*.json ./
 RUN npm install --force
 COPY . .
-#RUN npm run build
+RUN npm run build
 EXPOSE 3000
-CMD ["npm", "run", "dev"]
+CMD ["npm", "run", "start"]

peerprep/components/questionpage/CollabEditor.tsx

@@ -21,7 +21,7 @@ import { callFormatter } from "@/app/api/internal/formatter/helper";
 import { Ace } from "ace-builds";
 import { connect } from "http2";
 
-const PING_INTERVAL_MILLISECONDS = 15000;
+const PING_INTERVAL_MILLISECONDS = 5000;
 const languages: Language[] = ["javascript", "python", "c_cpp"];
 
 const themes = [
@@ -162,8 +162,8 @@ export default function CollabEditor({
     };
 
     newSocket.onmessage = (event) => {
-      // console.log("Event is", event);
-      console.error(event.data);
+      console.log("Event is", event);
+      // console.error(event.data);
 
       const message: Message = JSON.parse(event.data);
 
@@ -248,7 +248,6 @@ export default function CollabEditor({
       console.log("PINGING WS FROM " + userId);
       const msg: Message = {
         type: MessageTypes.PING.valueOf(),
-        data: "pinging",
         userId: userId,
       };
       socket.send(JSON.stringify(msg));
@@ -272,6 +271,7 @@ export default function CollabEditor({
         clearInterval(disconnectCheckInterval);
       }
     }, PING_INTERVAL_MILLISECONDS);
+
     return () => {
       clearInterval(interval);
       clearInterval(disconnectCheckInterval);