Update app.py

app.py

@@ -1,54 +1,90 @@
-from flask import Flask, render_template
-from flask_socketio import SocketIO, emit, join_room, leave_room
-from collections import defaultdict
 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="*")
 
-waiting = []
-rooms = {}
-sockets = {}
+# In-memory matchmaking state
+PROFILES = {}   # sid -> profile dict
+WAITING  = []   # list of sids waiting
+ROOMS    = {}   # room_id -> (sid1, sid2)
 
-@app.route('/')
+@app.route("/", methods=["GET"])
 def index():
-    return render_template('index.html')
+    return render_template("index.html")
 
-@socketio.on('find')
-def handle_find():
+@app.route("/chat", methods=["GET"])
+def chat():
+    return render_template("chat.html")
+
+@socketio.on("find")
+def handle_find(profile):
     sid = request.sid
-    if waiting:
-        partner_sid = waiting.pop(0)
-        room_id = str(uuid.uuid4())
-        rooms[sid] = room_id
-        rooms[partner_sid] = room_id
-        sockets[room_id] = [sid, partner_sid]
-        join_room(room_id, sid)
-        join_room(room_id, partner_sid)
-        emit('found', {'room': room_id}, to=sid)
-        emit('found', {'room': room_id}, to=partner_sid)
-    else:
-        waiting.append(sid)
+    PROFILES[sid] = profile
+    WAITING.append(sid)
+    emit("status", {"msg": "Finding partner..."}, room=sid)
+    try_match()
 
-@socketio.on('message')
-def handle_message(data):
+@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
-    room_id = data.get('room')
-    msg = data.get('msg')
-    if room_id in sockets and sid in sockets[room_id]:
-        emit('message', {'msg': msg}, room=room_id, include_self=False)
+    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('disconnect')
-def handle_disconnect():
+@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
-    if sid in waiting:
-        waiting.remove(sid)
-    room_id = rooms.pop(sid, None)
-    if room_id and room_id in sockets:
-        partner_sid = [s for s in sockets[room_id] if s != sid]
-        if partner_sid:
-            emit('partner_left', {}, to=partner_sid[0])
-        sockets.pop(room_id, None)
-
-if __name__ == '__main__':
-    socketio.run(app, host='0.0.0.0', port=7860)
+    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)