Merge branch 'collab-post-ms6-risky' into deploy-risky

Author: modembcc

collab/main.go

@@ -23,7 +23,7 @@ const (
 	AUTH_FAIL      = "auth_fail"
 	CLOSE_SESSION  = "close_session"
 	CONTENT_CHANGE = "content_change"
-	PING = "ping"
+	PING           = "ping"
 )
 
 var upgrader = websocket.Upgrader{
@@ -140,7 +140,9 @@ func (h *Hub) Run() {
 		case message := <-h.broadcast:
 			h.mutex.Lock()
 			// Update the current workspace for this RoomID
-			h.workspaces[message.RoomID] = message.Content
+			if message.Content != "" {
+				h.workspaces[message.RoomID] = message.Content
+			}
 			for client := range h.clients {
 				if client.roomID == message.RoomID {
 
@@ -163,8 +165,6 @@ func (h *Hub) Run() {
 			h.mutex.Unlock()
 		}
 
-
-
 	}
 }
 
@@ -306,14 +306,14 @@ func handleMessages(
 		// 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.
-			
+
 		// 	userID, _ := msgData["userId"].(string)
 		// 	request := Message {
 		// 		RoomID: client.roomID,
 		// 		UserID: userID,
 		// 		Content: []byte("ping request"),
 		// 	}
-			
+
 		// 	hub.broadcast <- request
 		// }
 
@@ -324,17 +324,30 @@ func handleMessages(
 				Type:    msgData.Type,
 			}
 			targetId := msgData.UserID
-			data, err := persistMappings.Conn.HGetAll(context.Background(), targetId).Result()
+			ownData, err := persistMappings.Conn.HGetAll(context.Background(), targetId).Result()
 			if err != nil {
 				log.Printf("Error retrieving data for userID %s: %v", targetId, err)
 			} else {
-				_, err1 := persistMappings.Conn.Del(context.Background(), targetId).Result()
-				if err1 != nil {
-					log.Printf("Error deleting data for userID %s: %v", targetId, err1)
+				// delete room under user id if it curr matches the room ID
+				ownRoomId := ownData["roomId"]
+				if ownRoomId == client.roomID {
+					_, err := persistMappings.Conn.Del(context.Background(), targetId).Result()
+					if err != nil {
+						log.Printf("Error deleting data for userID %s: %v", targetId, err)
+					}
 				}
-				_, err2 := persistMappings.Conn.Del(context.Background(), data["otherUser"]).Result()
-				if err2 != nil {
-					log.Printf("Error deleting data for other user %s: %v", data["otherUser"], err2)
+				// delete room under other user if it curr matches the room ID
+				otherUser := ownData["otherUser"]
+				othRoomId, err := persistMappings.Conn.HGet(context.Background(), otherUser, "roomId").Result()
+				if err != nil {
+					log.Printf("Error retrieving data for otherUser %s: %v", otherUser, err)
+				} else {
+					if othRoomId == client.roomID {
+						_, err := persistMappings.Conn.Del(context.Background(), otherUser).Result()
+						if err != nil {
+							log.Printf("Error deleting data for other user %s: %v", otherUser, err)
+						}
+					}
 				}
 			}
 			hub.broadcast <- closeMessage
@@ -349,29 +362,28 @@ func handleMessages(
 		} else if msgData.Type == PING {
 			// Broadcast the message to other clients
 			hub.broadcast <- Message{
-				RoomID:  client.roomID,
-				Type:    msgData.Type,
-				UserID:  msgData.UserID,
+				RoomID: client.roomID,
+				Type:   msgData.Type,
+				UserID: msgData.UserID,
 			}
 
 			extendExpiryTime(msgData.UserID, persistMappings)
 		} else {
 			log.Printf("Unknown message type: %s", msgData.Type)
-	}
+		}
 	}
 }
 
 func extendExpiryTime(userId string, persistMappings *verify.PersistMappings) {
-		
+
 	ctx := context.Background()
-	if err := persistMappings.Conn.Expire(ctx, userId, time.Minute * 10).Err(); err != nil {
+	if err := persistMappings.Conn.Expire(ctx, userId, time.Minute*10).Err(); err != nil {
 		log.Println("Error extending room time on ping: ", err.Error())
 	} else {
-		
+
 		log.Printf("expiration reset for 10 minutes for user %s: ", userId)
 	}
-	
-	
+
 }
 
 type ClientWorkspace struct {

peerprep/components/questionpage/CollabEditor.tsx

@@ -19,7 +19,6 @@ import CommsPanel from "./CommsPanel";
 // import { diff_match_patch } from "diff-match-patch";
 import { callFormatter } from "@/app/api/internal/formatter/helper";
 import { Ace } from "ace-builds";
-import { connect } from "http2";
 
 const PING_INTERVAL_MILLISECONDS = 5000;
 const languages: Language[] = ["javascript", "python", "c_cpp"];
@@ -114,6 +113,7 @@ export default function CollabEditor({
       }
     } catch (e: unknown) {
       if (e instanceof Error) {
+        alert(e.message);
         console.error(e.message);
       } else {
         console.error("An unknown error occurred");
@@ -265,7 +265,7 @@ export default function CollabEditor({
     const disconnectCheckInterval = setInterval(() => {
       if (
         lastPingReceived &&
-        Date.now() - lastPingReceived > 2 * PING_INTERVAL_MILLISECONDS
+        Date.now() - lastPingReceived > 3 * PING_INTERVAL_MILLISECONDS
       ) {
         setOtherUserConnected(false);
         clearInterval(disconnectCheckInterval);
@@ -276,9 +276,7 @@ export default function CollabEditor({
       clearInterval(interval);
       clearInterval(disconnectCheckInterval);
     };
-  }, [
-    notifyRoomOfConnection, PING_INTERVAL_MILLISECONDS, connected, socket
-    ]);
+  }, [notifyRoomOfConnection, connected, socket]);
 
   const handleCloseConnection = () => {
     const confirmClose = confirm(

peerprep/components/questionpage/CommsPanel.tsx

@@ -13,6 +13,7 @@ const socket = io(`/`, {
 
 function CommsPanel({ className, roomId }: Props) {
   const [stream, setStream] = useState<MediaStream>();
+  const [callStarts, setCallStarts] = useState<boolean>(false);
 
   const myVideo = useRef<HTMLVideoElement>(null);
   const userVideo = useRef<HTMLVideoElement>(null);
@@ -81,10 +82,10 @@ function CommsPanel({ className, roomId }: Props) {
 
     // when we receive the first peer connection, we immediately send out
     // a peer connection request.
-    attachSocketInitiator(stream, roomId, userVideo, connectionRef);
+    attachSocketInitiator(stream, roomId, userVideo, setCallStarts, connectionRef);
 
     // as the receiver, I will propagate my data outwards now.
-    attachSocketReceiver(stream, roomId, userVideo, connectionRef);
+    attachSocketReceiver(stream, roomId, userVideo, setCallStarts, connectionRef);
 
     socket.on("endCall", () => {
       // immediately destroy the socket listeners
@@ -96,13 +97,14 @@ function CommsPanel({ className, roomId }: Props) {
             tracks.stop();
           });
         userVideo.current.srcObject = null;
+        setCallStarts(false);
       }
       if (connectionRef.current && !connectionRef.current.destroyed) {
         connectionRef.current.destroy();
       }
       // reattach the sockets
-      attachSocketInitiator(stream, roomId, userVideo, connectionRef);
-      attachSocketReceiver(stream, roomId, userVideo, connectionRef);
+      attachSocketInitiator(stream, roomId, userVideo, setCallStarts, connectionRef);
+      attachSocketReceiver(stream, roomId, userVideo, setCallStarts, connectionRef);
       // rejoin the room
       socket.emit("joinRoom", {
         target: roomId,
@@ -127,6 +129,11 @@ function CommsPanel({ className, roomId }: Props) {
         />
       </div>
       <div className="video">
+        {!callStarts &&
+        <p>
+          No signal from other user.
+          (Don't worry - the call doesn't start until we get a signal from both users!)
+        </p>}
         <video
           playsInline
           ref={userVideo}
@@ -148,6 +155,7 @@ function attachSocketReceiver(
   stream: MediaStream,
   roomId: string,
   userVideo: React.RefObject<HTMLVideoElement>,
+  setCallStarts: React.Dispatch<React.SetStateAction<boolean>>,
   connectionRef: React.MutableRefObject<Peer.Instance | undefined>,
 ) {
   socket.on("startCall", (data) => {
@@ -168,6 +176,7 @@ function attachSocketReceiver(
       if (userVideo.current) {
         console.log("user video exists");
         userVideo.current.srcObject = stream;
+        setCallStarts(true);
       }
     });
 
@@ -181,6 +190,7 @@ function attachSocketInitiator(
   stream: MediaStream,
   roomId: string,
   userVideo: React.RefObject<HTMLVideoElement>,
+  setCallStarts: React.Dispatch<React.SetStateAction<boolean>>,
   connectionRef: React.MutableRefObject<Peer.Instance | undefined>,
 ) {
   socket.on("peerConnected", () => {
@@ -200,6 +210,7 @@ function attachSocketInitiator(
       if (userVideo.current) {
         console.log("setting stream for handshake");
         userVideo.current.srcObject = stream;
+        setCallStarts(true);
       }
     });