Merge pull request #69 from CS3219-AY2425S1/collab-post-ms6-risky

WZWren · web-flow · commit c4893cad9a57 · 2024-11-13T22:06:11.000+08:00
Unify expiry handling with main collab-post-ms6 branch
diff --git a/collab/main.go b/collab/main.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"strconv"
 	"sync"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
@@ -22,7 +23,7 @@ const (
 	AUTH_FAIL      = "auth_fail"
 	CLOSE_SESSION  = "close_session"
 	CONTENT_CHANGE = "content_change"
-	PING = "ping"
+	PING           = "ping"
 )
 
 var upgrader = websocket.Upgrader{
@@ -139,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 {
 
@@ -162,8 +165,6 @@ func (h *Hub) Run() {
 			h.mutex.Unlock()
 		}
 
-
-
 	}
 }
 
@@ -305,34 +306,48 @@ 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
 		// }
 
 		if msgData.Type == CLOSE_SESSION {
 			closeMessage := Message{
+				Type: CLOSE_SESSION,
 				RoomID:  client.roomID,
 				Content: "The session has been closed by a user.",
 			}
 			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
@@ -347,16 +362,30 @@ 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 {
+		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 {
 	Clients   int    `json:"clients"`
 	Workspace string `json:"workspace"`
diff --git a/collab/verify/persistMappings.go b/collab/verify/persistMappings.go
@@ -30,5 +30,7 @@ func VerifyPersist(persistMappings *PersistMappings, roomID string, userID strin
 		return false
 	}
 
+	log.Printf("current roomID: %s, expected roomID: %s", data["roomId"], roomID)
+
 	return data["roomId"] == roomID
 }
diff --git a/collab/verify/roomMappings.go b/collab/verify/roomMappings.go
@@ -3,6 +3,7 @@ package verify
 import (
 	"context"
 	"log"
+	//"time"
 
 	redis "github.com/go-redis/redis/v8"
 )
@@ -54,5 +55,13 @@ func VerifyRoomAndMoveToPersist(
 		log.Printf("error sending room to persistent storage: %s", err.Error())
 	}
 
+	/*	
+	if err := persistMappings.Conn.Expire(ctx, userId, 20 * time.Second).Err(); err != nil {
+		log.Printf("error setting expiration for persisting room storage: %s", err.Error())
+	} else {
+		log.Printf("expiration set for 10 minutes for user %s: ", userId)
+	
+	}
+	*/
 	return true
 }
diff --git a/comms/server.js b/comms/server.js
@@ -15,9 +15,30 @@ const io = require("socket.io")(server, {
 io.on("connection", (socket) => {
   // emit endCall to the room it was in.
   socket.on("disconnecting", () => {
-    socket.to(Array.from(socket.rooms))
-      .except(socket.id)
-      .emit("endCall");
+    // for each room in the disconnecting socket...
+    socket.rooms.forEach((target) => {
+      // ignoring the room matching its own id...
+      if (target === socket.id) {
+        return;
+      }
+      // get the user ids within the room...
+      io.sockets.adapter.rooms
+          .get(target)
+          .forEach(
+            (id) => {
+              // and for each user id in the room not matching
+              // its own id...
+              if (id === socket.id) {
+                return;
+              }
+              // leave the target room...
+              io.sockets.sockets.get(id).leave(target);
+              console.log(id + " leaves " + target);
+              // then tell the user id to endCall.
+              io.to(id).emit("endCall");
+            }
+          );
+    });
   });
 
   // join a room and inform the peer that the other person has joined
diff --git a/peerprep/app/actions/server_actions.ts b/peerprep/app/actions/server_actions.ts
@@ -95,7 +95,7 @@ export async function hydrateUid(): Promise<null | UserData> {
   if (isError(json)) {
     console.log("Failed to fetch user ID.");
     console.log(`Error ${json.status}: ${json.error}`);
-    redirect("/auth/logout");
+    // redirect("/auth/logout");
   }
   // TODO: handle error handling
   const response = json as UserServiceResponse;
diff --git a/peerprep/app/questions/page.tsx b/peerprep/app/questions/page.tsx
@@ -6,10 +6,15 @@ import { hydrateUid } from "../actions/server_actions";
 import { isError, Question, StatusBody, UserData } from "@/api/structs";
 import { UserInfoProvider } from "@/contexts/UserInfoContext";
 import { fetchAllQuestions } from "@/app/questions/helper";
+import { redirect } from "next/navigation";
 
 async function QuestionsPage() {
   const userData = (await hydrateUid()) as UserData;
 
+  if (!userData) {
+    redirect("/auth/login");
+  }
+
   const questions: Question[] | StatusBody = await fetchAllQuestions();
 
   if (isError(questions)) {
diff --git a/peerprep/components/navbar/ProfileDropdown.tsx b/peerprep/components/navbar/ProfileDropdown.tsx
@@ -1,11 +1,19 @@
-"use client";
-
 import { Menu, MenuButton, MenuItem, MenuItems } from "@headlessui/react";
 import Image from "next/image";
 import React from "react";
 import Link from "next/link";
+import { UserData } from "@/api/structs";
+import { hydrateUid } from "@/app/actions/server_actions";
+
+export const ProfileDropdown = async () => {
+  let userData;
+  try {
+    userData = (await hydrateUid()) as UserData;
+  } catch {
+    userData = null;
+    console.error("Error hydrating user data.");
+  }
 
-export const ProfileDropdown = () => {
   return (
     <div className="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0">
       {/* Profile dropdown */}
@@ -27,30 +35,34 @@ export const ProfileDropdown = () => {
           transition
           className="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-gray-1 py-1 shadow-lg ring-1 ring-black ring-opacity-5 transition focus:outline-none data-[closed]:scale-95 data-[closed]:transform data-[closed]:opacity-0 data-[enter]:duration-100 data-[leave]:duration-75 data-[enter]:ease-out data-[leave]:ease-in"
         >
-          <MenuItem>
-            <Link
-              href="#"
-              className="block px-4 py-2 text-sm data-[focus]:bg-gray-2"
-            >
-              Your Profile (Coming Soon)
-            </Link>
-          </MenuItem>
-          <MenuItem>
-            <Link
-              href="#"
-              className="block px-4 py-2 text-sm data-[focus]:bg-gray-2"
-            >
-              Settings (Coming Soon)
-            </Link>
-          </MenuItem>
-          <MenuItem>
-            <Link
-              href="/auth/logout"
-              className="block px-4 py-2 text-sm data-[focus]:bg-gray-2"
-            >
-              Sign out
-            </Link>
-          </MenuItem>
+          {userData ? (
+            <>
+              <MenuItem>
+                <div className="block px-4 py-2 text-sm text-white data-[focus]:bg-gray-2">
+                  Hello, {userData.username}!
+                </div>
+              </MenuItem>
+              <MenuItem>
+                <Link
+                  href="/auth/logout"
+                  className="block px-4 py-2 text-sm data-[focus]:bg-gray-2"
+                >
+                  Sign out
+                </Link>
+              </MenuItem>
+            </>
+          ) : (
+            <>
+              <MenuItem>
+                <Link
+                  href="/auth/login"
+                  className="block px-4 py-2 text-sm data-[focus]:bg-gray-2"
+                >
+                  Login
+                </Link>
+              </MenuItem>
+            </>
+          )}
         </MenuItems>
       </Menu>
     </div>
diff --git a/peerprep/components/questionpage/CollabEditor.tsx b/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,7 +276,7 @@ export default function CollabEditor({
       clearInterval(interval);
       clearInterval(disconnectCheckInterval);
     };
-  }, [notifyRoomOfConnection, PING_INTERVAL_MILLISECONDS, connected, socket]);
+  }, [notifyRoomOfConnection, connected, socket]);
 
   const handleCloseConnection = () => {
     const confirmClose = confirm(
diff --git a/peerprep/components/questionpage/CommsPanel.tsx b/peerprep/components/questionpage/CommsPanel.tsx
diff --git a/peerprep/components/shared/TitleBar.tsx b/peerprep/components/shared/TitleBar.tsx
diff --git a/peerprep/middleware.ts b/peerprep/middleware.ts

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,7 @@ func VerifyPersist(persistMappings *PersistMappings, roomID string, userID strin`
`30`	`30`	`return false`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ log.Printf("current roomID: %s, expected roomID: %s", data["roomId"], roomID)`
	`34`	`+`
`33`	`35`	`return data["roomId"] == roomID`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package verify`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"log"`
	`6`	`+ //"time"`
`6`	`7`
`7`	`8`	`redis "github.com/go-redis/redis/v8"`
`8`	`9`	`)`
`@@ -54,5 +55,13 @@ func VerifyRoomAndMoveToPersist(`
`54`	`55`	`log.Printf("error sending room to persistent storage: %s", err.Error())`
`55`	`56`	`}`
`56`	`57`
	`58`	`+ /*`
	`59`	`+ if err := persistMappings.Conn.Expire(ctx, userId, 20 * time.Second).Err(); err != nil {`
	`60`	`+ log.Printf("error setting expiration for persisting room storage: %s", err.Error())`
	`61`	`+ } else {`
	`62`	`+ log.Printf("expiration set for 10 minutes for user %s: ", userId)`
	`63`	`+`
	`64`	`+ }`
	`65`	`+ */`
`57`	`66`	`return true`
`58`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ export async function hydrateUid(): Promise<null \| UserData> {`
`95`	`95`	`if (isError(json)) {`
`96`	`96`	`console.log("Failed to fetch user ID.");`
`97`	`97`	console.log(`Error ${json.status}: ${json.error}`);
`98`		`- redirect("/auth/logout");`
	`98`	`+ // redirect("/auth/logout");`
`99`	`99`	`}`
`100`	`100`	`// TODO: handle error handling`
`101`	`101`	`const response = json as UserServiceResponse;`