Update app.py

app.py

@@ -1,71 +1,89 @@
-from flask import Flask, request, jsonify, render_template
 import random
 import string
+from flask import Flask, request, jsonify, render_template
+from threading import Timer
 import time
 
 app = Flask(__name__)
 
-# In-memory storage for game sessions
+# In-memory storage for game sessions and player data
 sessions = {}
+waiting_session = None
 
 def generate_session_id():
     return ''.join(random.choices(string.digits, k=4))
 
-@app.route('/')
-def index():
-    return render_template('index.html')
+def generate_player_id():
+    return ''.join(random.choices(string.ascii_uppercase + string.digits, k=6))
 
-@app.route('/play', methods=['POST'])
-def play():
-    session_id = generate_session_id()
-    while session_id in sessions:
+def create_game_session():
+    global waiting_session
+    if waiting_session:
+        session_id = waiting_session
+        waiting_session = None
+    else:
         session_id = generate_session_id()
-    sessions[session_id] = {
-        'players': 1,
-        'words': {},
-        'guesses': set(),
-        'incorrect_guesses': 0,
-        'current_player': None,
-        'last_activity': time.time()
-    }
-    return jsonify({'session_id': session_id})
+        while session_id in sessions:
+            session_id = generate_session_id()
+        waiting_session = session_id
+    
+    if session_id not in sessions:
+        sessions[session_id] = {
+            'players': [],
+            'words': {},
+            'current_player': None,
+            'guesses': set(),
+            'incorrect_guesses': 0,
+            'last_activity': time.time()
+        }
+    return session_id
 
-@app.route('/join/<session_id>', methods=['POST'])
-def join(session_id):
+def join_game_session(session_id):
     if session_id not in sessions:
-        return jsonify({'error': 'Session not found'}), 404
-    if sessions[session_id]['players'] == 2:
-        return jsonify({'error': 'Session is full'}), 400
-    sessions[session_id]['players'] += 1
+        return None
+    player_id = generate_player_id()
+    sessions[session_id]['players'].append(player_id)
     sessions[session_id]['last_activity'] = time.time()
-    return jsonify({'status': 'joined', 'players': sessions[session_id]['players']})
+    return player_id
 
-@app.route('/status/<session_id>', methods=['GET'])
-def status(session_id):
-    if session_id not in sessions:
-        return jsonify({'error': 'Session not found'}), 404
+@app.route('/')
+def index():
+    return render_template('index.html')
+
+@app.route('/play', methods=['POST'])
+def play():
+    session_id = create_game_session()
+    player_id = join_game_session(session_id)
     return jsonify({
-        'players': sessions[session_id]['players'],
-        'status': 'ready' if sessions[session_id]['players'] == 2 else 'waiting'
+        'session_id': session_id, 
+        'player_id': player_id,
+        'waiting': len(sessions[session_id]['players']) == 1
     })
 
+@app.route('/check_status/<session_id>', methods=['GET'])
+def check_status(session_id):
+    if session_id in sessions:
+        return jsonify({
+            'players': len(sessions[session_id]['players']),
+            'waiting': len(sessions[session_id]['players']) == 1
+        })
+    return jsonify({'error': 'Session not found'}), 404
+
 @app.route('/submit_word', methods=['POST'])
 def submit_word():
     data = request.json
     session_id = data['session_id']
-    player = data['player']
+    player_id = data['player_id']
     word = data['word'].lower()
     
-    if session_id not in sessions:
-        return jsonify({'error': 'Session not found'}), 404
     if len(word) != 7:
         return jsonify({'error': 'Word must be 7 letters long'}), 400
     
-    sessions[session_id]['words'][player] = word
+    sessions[session_id]['words'][player_id] = word
     sessions[session_id]['last_activity'] = time.time()
     
     if len(sessions[session_id]['words']) == 2:
-        sessions[session_id]['current_player'] = 'player1'
+        sessions[session_id]['current_player'] = sessions[session_id]['players'][0]
         return jsonify({'status': 'game_started'})
     return jsonify({'status': 'waiting_for_opponent'})
 
@@ -73,19 +91,16 @@ def submit_word():
 def guess():
     data = request.json
     session_id = data['session_id']
-    player = data['player']
+    player_id = data['player_id']
     guess = data['guess'].lower()
     
-    if session_id not in sessions:
-        return jsonify({'error': 'Session not found'}), 404
-    if player != sessions[session_id]['current_player']:
+    if player_id != sessions[session_id]['current_player']:
         return jsonify({'error': 'Not your turn'}), 400
     
     session = sessions[session_id]
-    opponent = 'player2' if player == 'player1' else 'player1'
-    
     session['guesses'].add(guess)
     
+    opponent = [p for p in session['players'] if p != player_id][0]
     if guess not in session['words'][opponent]:
         session['incorrect_guesses'] += 1
     
@@ -93,10 +108,11 @@ def guess():
         return jsonify({'status': 'game_over', 'winner': opponent})
     
     if all(letter in session['guesses'] for letter in session['words'][opponent]):
-        return jsonify({'status': 'game_over', 'winner': player})
+        return jsonify({'status': 'game_over', 'winner': player_id})
     
     session['current_player'] = opponent
     session['last_activity'] = time.time()
+    
     return jsonify({'status': 'continue'})
 
 @app.route('/game_state/<session_id>')
@@ -106,6 +122,7 @@ def game_state(session_id):
     
     session = sessions[session_id]
     return jsonify({
+        'players': session['players'],
         'current_player': session['current_player'],
         'guesses': list(session['guesses']),
         'incorrect_guesses': session['incorrect_guesses'],
@@ -113,5 +130,16 @@ def game_state(session_id):
                   for player, word in session['words'].items()}
     })
 
+def cleanup_inactive_sessions():
+    current_time = time.time()
+    global waiting_session
+    for session_id in list(sessions.keys()):
+        if current_time - sessions[session_id]['last_activity'] > 60:
+            if session_id == waiting_session:
+                waiting_session = None
+            del sessions[session_id]
+    Timer(60, cleanup_inactive_sessions).start()
+
 if __name__ == '__main__':
+    cleanup_inactive_sessions()
     app.run(host='0.0.0.0', port=7860)