Update app.py

app.py

@@ -874,6 +874,7 @@ def handle_join_chat(data):
         "role": role,
         "receiver_number": data.get('receiver_number'),
         "public_key": public_key,
+        "socket_id": request.sid,  # NEW: Store socket ID
         "joined_at": time.time(),
         "last_seen": time.time()
     }
@@ -986,21 +987,22 @@ def handle_leave_chat(data):
     
     if room_id in CHAT_ROOMS and session_id in CHAT_ROOMS[room_id]["active_sessions"]:
         session = CHAT_ROOMS[room_id]["active_sessions"][session_id]
-        del CHAT_ROOMS[room_id]["active_sessions"][session_id]
         
         # If admin left and burn_on_admin_exit is true
         if session["role"] == "admin" and CHAT_ROOMS[room_id]["settings"]["burn_on_admin_exit"]:
             emit('room_closing', {'reason': 'Admin left the room'}, room=room_id)
             del CHAT_ROOMS[room_id]
         else:
-            # Notify everyone in the room (including self, so they see the message before leaving)
+            # CRITICAL: Emit BEFORE deleting and leaving
             emit('user_left', {
                 'session_id': session_id,  # NEW: Include session_id
                 'role': session["role"],
                 'receiver_number': session.get("receiver_number"),
-                'active_count': len(CHAT_ROOMS[room_id]["active_sessions"])
-            }, room=room_id)  # Send to everyone including sender
+                'active_count': len(CHAT_ROOMS[room_id]["active_sessions"]) - 1  # Count after this person leaves
+            }, room=room_id)  # Send to ENTIRE room (including sender)
         
+        # Delete AFTER emitting
+        del CHAT_ROOMS[room_id]["active_sessions"][session_id]
         leave_room(room_id)
 
 @app.route("/api/auth/signup", methods=["POST"])
@@ -1505,26 +1507,30 @@ def handle_disconnect():
         print(f"👤 User disconnected: {username_hash[:8]}...")
         
         # Remove from chat rooms
+        # Remove from chat rooms and notify others
         for room_id, room in list(CHAT_ROOMS.items()):
-            if username_hash in [s for s_id, s in room['active_sessions'].items()]:
-                # Find and remove session
-                for session_id, session in list(room['active_sessions'].items()):
-                    if session.get('username_hash') == username_hash or \
-                       (session['role'] == 'admin' and room['admin_session'] == session_id):
-                        
-                        # If admin left, close room
-                        if session['role'] == 'admin' and room['settings'].get('burn_on_admin_exit', True):
-                            socketio.emit('room_closing', {'reason': 'Admin disconnected'}, room=room_id)
-                            if room_id in CHAT_MESSAGES:
-                                del CHAT_MESSAGES[room_id]
-                            del CHAT_ROOMS[room_id]
-                        else:
-                            del room['active_sessions'][session_id]
-                            socketio.emit('user_left', {
-                                'role': session['role'],
-                                'receiver_number': session.get('receiver_number'),
-                                'active_count': len(room['active_sessions'])
-                            }, room=room_id)
+            for session_id, session in list(room['active_sessions'].items()):
+                # Check if this session matches the disconnected socket
+                if session.get('socket_id') == request.sid:
+                    print(f"[Disconnect] User {session_id} disconnected from room {room_id}")
+                    
+                    # CRITICAL: Notify BEFORE deleting
+                    socketio.emit('user_left', {
+                        'session_id': session_id,
+                        'role': session['role'],
+                        'receiver_number': session.get('receiver_number'),
+                        'active_count': len(room['active_sessions']) - 1
+                    }, room=room_id)
+                    
+                    # If admin disconnected, close room
+                    if session['role'] == 'admin' and room['settings'].get('burn_on_admin_exit', True):
+                        print(f"[Disconnect] Admin disconnected, closing room {room_id}")
+                        socketio.emit('room_closing', {'reason': 'Admin disconnected'}, room=room_id)
+                        del CHAT_ROOMS[room_id]
+                    else:
+                        del room['active_sessions'][session_id]
+                    
+                    break
         
         # Remove from screen share rooms
         for room_id, room in list(SCREEN_SHARE_ROOMS.items()):