Update app.py

app.py

@@ -1,129 +1,90 @@
-import uuid
-import time
-from flask import Flask, render_template, request
-from flask_socketio import SocketIO, join_room, leave_room, emit
-
-app = Flask(__name__)
-socketio = SocketIO(app, cors_allowed_origins="*")
-
-# In-memory matchmaking state
-PROFILES = {}   # sid -> profile dict
-WAITING  = []   # list of sids waiting
-ROOMS    = {}   # room_id -> {'users': (sid1, sid2), 'last_active': timestamp}
-
-STALE_TIMEOUT = 300  # 5 minutes
-SWEEP_INTERVAL = 300  # every 5 minutes
-
-@app.route("/", methods=["GET"])
-def index():
-    return render_template("index.html")
-
-@app.route("/chat", methods=["GET"])
-def chat():
-    return render_template("chat.html")
-
-@socketio.on("find")
-def handle_find(profile):
-    sid = request.sid
-    PROFILES[sid] = profile
-    WAITING.append(sid)
-    emit("status", {"msg": "Finding partner..."}, room=sid)
-    try_match()
-
-@socketio.on("disconnect")
-def handle_disconnect():
-    sid = request.sid
-    if sid in WAITING:
-        WAITING.remove(sid)
-    PROFILES.pop(sid, None)
-
-    # Remove from any room
-    for room, info in list(ROOMS.items()):
-        if sid in info['users']:
-            other = info['users'][1] if info['users'][0] == sid else info['users'][0]
-            emit("status", {"msg": "Partner left."}, room=other)
-            leave_room(room, sid=other)
-            ROOMS.pop(room)
-
-@socketio.on("subscribe")
-def handle_subscribe(data):
-    room = data.get("room")
-    sid = request.sid
-    if room in ROOMS and sid in ROOMS[room]['users']:
-        join_room(room)
-        ROOMS[room]['last_active'] = time.time()
-        emit("status", {"msg": f"Joined room {room}!"}, room=sid)
-    else:
-        emit("status", {"msg": "Invalid room or not in this room."}, room=sid)
-
-@socketio.on("chat")
-def handle_chat(data):
-    room = data.get("room")
-    msg  = data.get("msg")
-    if room in ROOMS:
-        ROOMS[room]['last_active'] = time.time()
-        emit("chat", {"msg": msg}, room=room)
-
-@socketio.on("leave")
-def handle_leave(data):
-    room = data.get("room")
-    sid = request.sid
-    emit("left", {}, room=sid)
-    if room in ROOMS:
-        other = next(s for s in ROOMS[room]['users'] if s != sid)
-        emit("status", {"msg": "Partner left."}, room=other)
-        leave_room(room, sid=other)
-        ROOMS.pop(room)
-
-def try_match():
-    while len(WAITING) >= 2:
-        s1 = WAITING.pop(0)
-        prefs1 = set(PROFILES[s1]["interests"])
-        s2 = None
-        for i, sid in enumerate(WAITING):
-            if prefs1 & set(PROFILES[sid]["interests"]):
-                s2 = WAITING.pop(i)
-                break
-        if not s2:
-            s2 = WAITING.pop(0)
-        room = str(uuid.uuid4())
-        ROOMS[room] = {
-            'users': (s1, s2),
-            'last_active': time.time()
-        }
-        join_room(room, sid=s1)
-        join_room(room, sid=s2)
-        emit("matched", {"room": room}, room=s1)
-        emit("matched", {"room": room}, room=s2)
-
-def sweeper():
-    while True:
-        now = time.time()
-        # Clean stale rooms
-        for room, info in list(ROOMS.items()):
-            if now - info['last_active'] > STALE_TIMEOUT:
-                for sid in info['users']:
-                    try:
-                        emit("status", {"msg": "Room expired due to inactivity."}, room=sid)
-                        leave_room(room, sid=sid)
-                        PROFILES.pop(sid, None)
-                        if sid in WAITING:
-                            WAITING.remove(sid)
-                    except:
-                        pass
-                ROOMS.pop(room)
-
-        # Clean stale profiles
-        active_sids = set()
-        for room in ROOMS.values():
-            active_sids.update(room['users'])
-        for sid in list(PROFILES.keys()):
-            if sid not in active_sids and sid not in WAITING:
-                PROFILES.pop(sid, None)
-        time.sleep(SWEEP_INTERVAL)
-
-# Start sweeper on app boot
-socketio.start_background_task(sweeper)
-
-if __name__ == "__main__":
+import uuid  
+from flask import Flask, render_template, request  
+from flask_socketio import SocketIO, join_room, leave_room, emit  
+  
+app = Flask(__name__)  
+socketio = SocketIO(app, cors_allowed_origins="*")  
+  
+# In-memory matchmaking state  
+PROFILES = {}   # sid -> profile dict  
+WAITING  = []   # list of sids waiting  
+ROOMS    = {}   # room_id -> (sid1, sid2)  
+  
+@app.route("/", methods=["GET"])  
+def index():  
+    return render_template("index.html")  
+  
+@app.route("/chat", methods=["GET"])  
+def chat():  
+    return render_template("chat.html")  
+  
+@socketio.on("find")  
+def handle_find(profile):  
+    sid = request.sid  
+    PROFILES[sid] = profile  
+    WAITING.append(sid)  
+    emit("status", {"msg": "Finding partner..."}, room=sid)  
+    try_match()  
+  
+@socketio.on("disconnect")  
+def handle_disconnect(sid):  
+    # `sid` is passed in by Socket.IO on disconnect  
+    if sid in WAITING:  
+        WAITING.remove(sid)  
+    PROFILES.pop(sid, None)  
+    # Remove from any room  
+    for room, pair in list(ROOMS.items()):  
+        if sid in pair:  
+            other = pair[1] if pair[0] == sid else pair[0]  
+            emit("status", {"msg": "Partner left."}, room=other)  
+            leave_room(room, sid=other)  
+            ROOMS.pop(room)  
+  
+@socketio.on("subscribe")  
+def handle_subscribe(data):  
+    room = data.get("room")  
+    sid = request.sid  
+    if room in ROOMS and sid in ROOMS[room]:  
+        join_room(room)  
+        emit("status", {"msg": f"Joined room {room}!"}, room=sid)  
+    else:  
+        emit("status", {"msg": "Invalid room or not in this room."}, room=sid)  
+  
+@socketio.on("chat")  
+def handle_chat(data):  
+    room = data.get("room")  
+    msg  = data.get("msg")  
+    if room in ROOMS:  
+        emit("chat", {"msg": msg}, room=room)  
+  
+@socketio.on("leave")  
+def handle_leave(data):  
+    room = data.get("room")  
+    sid = request.sid  
+    emit("left", {}, room=sid)  
+    if room in ROOMS:  
+        other = next(s for s in ROOMS[room] if s != sid)  
+        emit("status", {"msg": "Partner left."}, room=other)  
+        leave_room(room, sid=other)  
+        ROOMS.pop(room)  
+  
+def try_match():  
+    while len(WAITING) >= 2:  
+        s1 = WAITING.pop(0)  
+        prefs1 = set(PROFILES[s1]["interests"])  
+        s2 = None  
+        for i, sid in enumerate(WAITING):  
+            if prefs1 & set(PROFILES[sid]["interests"]):  
+                s2 = WAITING.pop(i)  
+                break  
+        if not s2:  
+            s2 = WAITING.pop(0)  
+        room = str(uuid.uuid4())  
+        ROOMS[room] = (s1, s2)  
+        join_room(room, sid=s1)  
+        join_room(room, sid=s2)  
+        emit("matched", {"room": room}, room=s1)  
+        emit("matched", {"room": room}, room=s2)  
+  
+if __name__ == "__main__":  
     socketio.run(app, host="0.0.0.0", port=7860)