Merge pull request #4 from martian56/fix-con-issues

Fixes Connection issues

Author: martian56

backend/main.py

@@ -60,6 +60,7 @@ async def root():
 
 
 @app.get("/health")
+@app.head("/health")
 async def health():
     return {"status": "healthy", "timestamp": datetime.now(UTC).isoformat()}
 
@@ -173,6 +174,7 @@ async def websocket_endpoint(
     user_agent = websocket.headers.get("user-agent", "Unknown")
 
     # Get or create meeting in database
+    meeting = None
     async with AsyncSessionLocal() as db:
         try:
             # Find meeting by code
@@ -185,6 +187,16 @@ async def websocket_endpoint(
                 await websocket.close(code=1008, reason="Meeting not found")
                 return
 
+            # Check if this is the first active participant (make them host)
+            # Use a transaction-safe approach to avoid race conditions
+            existing_participants = await db.execute(
+                select(func.count(Participant.id))
+                .where(Participant.meeting_id == meeting.id)
+                .where(Participant.is_active == True)
+            )
+            count = existing_participants.scalar() or 0
+            is_host = count == 0
+            
             # Create participant record
             participant = Participant(
                 meeting_id=meeting.id,
@@ -193,19 +205,9 @@ async def websocket_endpoint(
                 ip_address=client_ip,
                 user_agent=user_agent,
                 is_active=True,
-                is_host=False,  # First participant becomes host
+                is_host=is_host,
             )
 
-            # Check if this is the first participant (make them host)
-            existing_participants = await db.execute(
-                select(func.count(Participant.id))
-                .where(Participant.meeting_id == meeting.id)
-                .where(Participant.is_active == True)
-            )
-            count = existing_participants.scalar() or 0
-            if count == 0:
-                participant.is_host = True
-            
             db.add(participant)
 
             # Log join event
@@ -221,10 +223,16 @@ async def websocket_endpoint(
             await db.commit()
             await db.refresh(participant)
 
-            logger.info(f"Participant {client_id} created in database for meeting {meeting_code}")
+            logger.info(f"Participant {client_id} created in database for meeting {meeting_code} (host: {is_host})")
         except Exception as e:
             logger.error(f"Error creating participant: {e}")
             await db.rollback()
+            await websocket.close(code=1011, reason="Internal server error")
+            return
+    
+    # Ensure meeting was found before proceeding
+    if not meeting:
+        return
 
     # Initialize meeting connections if not exists
     if meeting_code not in active_connections:
@@ -459,14 +467,20 @@ async def broadcast_to_meeting(meeting_code: str, message: dict, exclude_client:
     if meeting_code not in active_connections:
         return
 
-    for client_id, ws in active_connections[meeting_code].items():
+    # Create a list of connections to avoid modification during iteration
+    connections = list(active_connections[meeting_code].items())
+    
+    for client_id, ws in connections:
         if exclude_client and client_id == exclude_client:
             continue
 
         try:
             await ws.send_json(message)
         except Exception as e:
             logger.error(f"Error broadcasting to {client_id}: {e}")
+            # Remove dead connection
+            if meeting_code in active_connections:
+                active_connections[meeting_code].pop(client_id, None)
 
 
 async def handle_disconnect(meeting_code: str, client_id: str, client_ip: str = None):

frontend/src/config.ts

@@ -1,6 +1,6 @@
 // Backend API configuration
-export const API_BASE_URL = import.meta.env.VITE_API_URL 
-export const WS_BASE_URL = import.meta.env.VITE_WS_URL
+export const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:8000';
+export const WS_BASE_URL = import.meta.env.VITE_WS_URL || 'ws://localhost:8000';
 
 // WebRTC Configuration with Google STUN servers
 export const RTC_CONFIG: RTCConfiguration = {

frontend/src/hooks/useWebSocket.ts

@@ -73,9 +73,11 @@ export const useWebSocket = (
         console.log('WebSocket closed');
         setIsConnected(false);
 
-        // Attempt to reconnect after 3 seconds
+        // Only reconnect if this wasn't an intentional close
+        // Check if component is still mounted before reconnecting
         reconnectTimeoutRef.current = setTimeout(() => {
-          if (wsRef.current?.readyState === WebSocket.CLOSED) {
+          // Only reconnect if WebSocket is still closed and we don't have a new connection
+          if (wsRef.current?.readyState === WebSocket.CLOSED || !wsRef.current) {
             connect();
           }
         }, 3000);
@@ -88,13 +90,17 @@ export const useWebSocket = (
 
   useEffect(() => {
     connect();
+    let isMounted = true;
 
     return () => {
+      isMounted = false;
       if (reconnectTimeoutRef.current) {
         clearTimeout(reconnectTimeoutRef.current);
+        reconnectTimeoutRef.current = undefined;
       }
       if (wsRef.current) {
         wsRef.current.close();
+        wsRef.current = null;
       }
     };
   }, [connect]);

frontend/src/pages/MeetingRoom.tsx

@@ -229,7 +229,7 @@ export default function MeetingRoom() {
         console.warn('Unhandled WebSocket message type:', message.type, message);
         break;
     }
-  }, [clientId, createOffer, handleOffer, handleAnswer, handleRemoteIceCandidate, removePeer, hasPeerConnection, isInitialized]);
+  }, [clientId, createOffer, handleOffer, handleAnswer, handleRemoteIceCandidate, removePeer, hasPeerConnection, isInitialized, localStream, chatOpen]);
 
   // Normalize meeting code to lowercase for backend consistency
   const normalizedMeetingCode = meetingCode?.toLowerCase() || '';