Add 60s timeout

Author: jq1836

frontend/components/matching/find-match.tsx

@@ -15,6 +15,7 @@ export default function FindMatch() {
   const [isSearching, setIsSearching] = useState<boolean>(false);
   const [waitTime, setWaitTime] = useState<number>(0);
   const [websocket, setWebsocket] = useState<WebSocket>();
+  const [queueTimeout, setQueueTimeout] = useState<NodeJS.Timeout>();
   const { toast } = useToast();
   const auth = useAuth();
 
@@ -26,17 +27,14 @@ export default function FindMatch() {
       }, 1000);
     } else {
       setWaitTime(0);
+      clearTimeout(queueTimeout);
+      setQueueTimeout(undefined);
     }
-    return () => clearInterval(interval);
-  }, [isSearching]);
 
-  useEffect(() => {
     return () => {
-      if (websocket) {
-        websocket.close();
-      }
+      clearInterval(interval);
     };
-  }, [websocket]);
+  }, [isSearching]);
 
   const handleSearch = async () => {
     if (!selectedDifficulty || !selectedTopic) {
@@ -105,6 +103,11 @@ export default function FindMatch() {
             variant: "destructive",
           });
         };
+        setQueueTimeout(
+          setTimeout(() => {
+            handleCancel();
+          }, 60000)
+        );
         setWebsocket(ws);
         return;
       default:

matching-service/app/routers/match.py

@@ -39,4 +39,4 @@ async def subscribe(
         while True:
             await websocket.receive_text()
     except WebSocketDisconnect:
-        manager.disconnect(user_id, topic, difficulty, websocket)
+        await manager.disconnect(user_id, topic, difficulty, websocket)

matching-service/app/utils/socketmanager.py

@@ -48,9 +48,9 @@ async def disconnect_all(
             return
 
         await asyncio.gather(
-            *[websocket.close() for websocket in self.connection_map[key]]
+            *[self._close_and_ignore(websocket) for websocket in self.connection_map[key]]
         )
-        del self.connection_map[key]
+        self.connection_map.pop(key, None)
 
     '''
     Disconnects the single connection.
@@ -68,8 +68,14 @@ async def disconnect(
 
         self.connection_map[key].remove(websocket)
         if len(self.connection_map[key]) == 0:
-            del self.connections_map[key]
-        websocket.close()
+            self.connection_map.pop(key, None)
+        self._close_and_ignore(websocket)
+    
+    async def _close_and_ignore(self, websocket: WebSocket):
+        try:
+            await websocket.close()
+        except Exception:
+            pass
 
     '''
     Data is sent to through all connections associated with