Update app.py

app.py

@@ -3,191 +3,270 @@ import time
 import threading
 import base64
 import os
+import sys
 from flask import Flask, render_template_string
 from flask_socketio import SocketIO, emit
 from io import BytesIO
 
+print("🔍 [START] Script loading", file=sys.stderr)
+
+# ===== 1. PYGAME INIT =====
+print("🔍 [1/5] Setting up PyGame", file=sys.stderr)
 os.environ['SDL_VIDEODRIVER'] = 'dummy'
 
 try:
     pygame.init()
-    print("✅ PyGame initialized successfully")
+    print("✅ [1/5] PyGame initialized", file=sys.stderr)
 except Exception as e:
-    print(f"❌ PyGame init failed: {e}")
-    # Create a fallback mode
+    print(f"❌ [1/5] PyGame failed: {e}", file=sys.stderr)
+    sys.exit(1)
 
+# ===== 2. FLASK/SOCKETIO INIT =====
+print("🔍 [2/5] Creating Flask app", file=sys.stderr)
 app = Flask(__name__)
-app.config['SECRET_KEY'] = 'simple_stream_key'
-
-# Use threading mode - avoids eventlet issues
-socketio = SocketIO(app, async_mode='threading', cors_allowed_origins="*")
+app.config['SECRET_KEY'] = 'debug_key'
+socketio = SocketIO(app, async_mode='threading', cors_allowed_origins="*", logger=True, engineio_logger=True)
 
+# ===== 3. SHARED STATE =====
+print("🔍 [3/5] Setting up shared state", file=sys.stderr)
 WIDTH, HEIGHT = 400, 300
 shared = {
     "streaming": True,
     "x": 200,
     "frame_count": 0,
-    "clients": 0
+    "clients": 0,
+    "thread_alive": False
 }
 
+# ===== 4. PYGAME THREAD =====
 def game_loop():
-    """Simple PyGame loop"""
-    print("🎬 Starting PyGame loop")
+    print("🎬 [THREAD START] PyGame thread entered", file=sys.stderr)
+    shared["thread_alive"] = True
+    
+    # TEST 1: Can we create a surface?
+    try:
+        test_screen = pygame.Surface((100, 100))
+        test_screen.fill((255, 0, 0))
+        print("✅ [TEST 1] Surface created", file=sys.stderr)
+    except Exception as e:
+        print(f"❌ [TEST 1] Surface failed: {e}", file=sys.stderr)
+        shared["thread_alive"] = False
+        return
     
-    # Test PyGame drawing
-    test_screen = pygame.Surface((100, 100))
-    test_screen.fill((255, 0, 0))
-    pygame.draw.circle(test_screen, (0, 255, 0), (50, 50), 30)
-    test_pixel = test_screen.get_at((50, 50))
-    print(f"🧪 PyGame test - Pixel at (50,50): {test_pixel}")
+    # TEST 2: Can we draw?
+    try:
+        pygame.draw.circle(test_screen, (0, 255, 0), (50, 50), 30)
+        pixel = test_screen.get_at((50, 50))
+        print(f"✅ [TEST 2] Drawing test - Pixel: {pixel}", file=sys.stderr)
+        
+        if pixel == (0, 255, 0, 255):
+            print("🎯 [TEST 2] PyGame drawing WORKS!", file=sys.stderr)
+        else:
+            print(f"⚠️  [TEST 2] Unexpected pixel color: {pixel}", file=sys.stderr)
+    except Exception as e:
+        print(f"❌ [TEST 2] Drawing failed: {e}", file=sys.stderr)
+        shared["thread_alive"] = False
+        return
+    
+    # TEST 3: Can we save to JPEG?
+    try:
+        buf = BytesIO()
+        pygame.image.save(test_screen, buf, format='JPEG')
+        test_frame = base64.b64encode(buf.getvalue()).decode('utf-8')
+        print(f"✅ [TEST 3] JPEG save works - Frame size: {len(test_frame)}", file=sys.stderr)
+    except Exception as e:
+        print(f"❌ [TEST 3] JPEG save failed: {e}", file=sys.stderr)
+        shared["thread_alive"] = False
+        return
     
-    if test_pixel != (0, 255, 0, 255):
-        print("⚠️  WARNING: PyGame drawing might not work correctly")
+    # If all tests pass, start main loop
+    print("🚀 [THREAD READY] Starting main game loop", file=sys.stderr)
     
-    # Main game surface
     screen = pygame.Surface((WIDTH, HEIGHT))
     x, speed = 200, 5
-    
-    frame_counter = 0
-    last_log_time = time.time()
+    frame_log_counter = 0
     
     while shared["streaming"]:
-        start_time = time.time()
-        
-        # Update
-        x += speed
-        if x < 30 or x > WIDTH-30:
-            speed *= -1
-        
-        # Draw
-        screen.fill((25, 25, 45))
-        pygame.draw.circle(screen, (255, 80, 80), (int(x), 150), 20)
-        
-        # Convert to JPEG
-        buf = BytesIO()
-        pygame.image.save(screen, buf, format='JPEG', quality=85)
-        frame_b64 = base64.b64encode(buf.getvalue()).decode('utf-8')
-        
-        # Broadcast frame
-        socketio.emit('new_frame', {
-            'frame': frame_b64,
-            'count': shared['frame_count'],
-            'x': x,
-            'timestamp': time.time()
-        })
-        
-        # Update shared state
-        shared['x'] = x
-        shared['frame_count'] += 1
-        frame_counter += 1
-        
-        # Log every second
-        current_time = time.time()
-        if current_time - last_log_time >= 1.0:
-            print(f"📊 FPS: {frame_counter} | Total: {shared['frame_count']} | Clients: {shared['clients']}")
-            frame_counter = 0
-            last_log_time = current_time
-        
-        # Frame rate control
-        elapsed = time.time() - start_time
-        if elapsed < 1.0/30:
-            time.sleep(1.0/30 - elapsed)
+        try:
+            # Update
+            x += speed
+            if x < 30 or x > WIDTH-30:
+                speed *= -1
+            
+            # Draw
+            screen.fill((25, 25, 45))
+            pygame.draw.circle(screen, (255, 80, 80), (int(x), 150), 20)
+            
+            # Save
+            buf = BytesIO()
+            pygame.image.save(screen, buf, format='JPEG', quality=85)
+            frame_b64 = base64.b64encode(buf.getvalue()).decode('utf-8')
+            
+            # Emit
+            socketio.emit('new_frame', {
+                'frame': frame_b64,
+                'count': shared['frame_count'],
+                'x': x,
+                'timestamp': time.time()
+            })
+            
+            # Update state
+            shared['x'] = x
+            shared['frame_count'] += 1
+            frame_log_counter += 1
+            
+            # Log every 10 frames
+            if frame_log_counter >= 10:
+                print(f"📦 [THREAD LOOP] Frame {shared['frame_count']}, X={x}", file=sys.stderr)
+                frame_log_counter = 0
+            
+            # Sleep for FPS
+            time.sleep(1.0/30)
+            
+        except Exception as e:
+            print(f"❌ [THREAD ERROR] {e}", file=sys.stderr)
+            break
     
-    print("🛑 PyGame loop stopped")
+    print("🛑 [THREAD END] PyGame thread exiting", file=sys.stderr)
+    shared["thread_alive"] = False
+
+print("🔍 [4/5] Starting PyGame thread", file=sys.stderr)
+game_thread = threading.Thread(target=game_loop, daemon=True, name="PyGameThread")
+game_thread.start()
+
+# Wait a moment to see if thread starts
+time.sleep(1)
+print(f"📊 [4/5] Thread status - Alive: {game_thread.is_alive()}, Shared alive: {shared['thread_alive']}", file=sys.stderr)
+
+# ===== 5. FLASK ROUTES =====
+print("🔍 [5/5] Setting up Flask routes", file=sys.stderr)
 
 @app.route('/')
 def index():
     return render_template_string('''
     <!DOCTYPE html>
-<html>
-<head>
-    <script src="https://cdn.socket.io/4.5.0/socket.io.min.js"></script>
-    <style>
-        body { background: #0f172a; color: white; text-align: center; padding: 20px; }
-        #streamImg { border: 3px solid #60a5fa; width: 400px; height: 300px; }
-        .stats { background: #1e293b; padding: 15px; border-radius: 10px; margin: 20px auto; width: 400px; }
-    </style>
-</head>
-<body>
-    <h1>🔄 Working PyGame Stream</h1>
-    
-    <img id="streamImg">
-    
-    <div class="stats">
-        <div>Frame: <span id="counter">0</span></div>
-        <div>Position: X=<span id="pos">200</span></div>
-        <div>Status: <span id="status">Connecting...</span></div>
-        <div>Clients: <span id="clients">0</span></div>
-    </div>
-    
-    <script>
-        const socket = io();
-        let streamFrames = 0;
-        let lastFpsUpdate = Date.now();
+    <html>
+    <head>
+        <script src="https://cdn.socket.io/4.5.0/socket.io.min.js"></script>
+        <style>
+            body { background: #0f172a; color: white; text-align: center; padding: 20px; }
+            #streamImg { border: 3px solid #60a5fa; width: 400px; height: 300px; }
+            .debug { background: #1e293b; padding: 15px; border-radius: 10px; margin: 20px auto; width: 400px; text-align: left; }
+        </style>
+    </head>
+    <body>
+        <h1>🐛 Debug Stream</h1>
+        
+        <div class="debug">
+            <div>Server Time: <span id="server_time">--:--:--</span></div>
+            <div>Thread Alive: <span id="thread_status">Checking...</span></div>
+            <div>Frames Sent: <span id="frames_sent">0</span></div>
+            <div>Last Frame: <span id="last_frame">Never</span></div>
+            <div>Connection: <span id="conn_status">Connecting...</span></div>
+        </div>
         
-        socket.on('connect', () => {
-            console.log('✅ Connected to server');
-            document.getElementById('status').textContent = 'Connected';
-            document.body.style.background = '#1a5c1a';
-        });
+        <img id="streamImg">
         
-        socket.on('new_frame', (data) => {
-            // Update image
-            document.getElementById('streamImg').src = 
-                'data:image/jpeg;base64,' + data.frame;
+        <div style="margin-top: 20px;">
+            <button onclick="manualCheck()">🔍 Check Status</button>
+            <button onclick="forceFrame()">🔄 Force Frame</button>
+        </div>
+        
+        <script>
+            const socket = io();
+            let lastFrameTime = 0;
+            
+            socket.on('connect', () => {
+                console.log('✅ Socket connected');
+                document.getElementById('conn_status').textContent = 'Connected';
+                document.getElementById('conn_status').style.color = '#10b981';
+                
+                // Request initial status
+                socket.emit('get_status');
+            });
+            
+            socket.on('new_frame', (data) => {
+                console.log('📥 Frame received:', data.count);
+                document.getElementById('streamImg').src = 
+                    'data:image/jpeg;base64,' + data.frame;
+                document.getElementById('frames_sent').textContent = data.count;
+                document.getElementById('last_frame').textContent = 
+                    new Date().toLocaleTimeString();
+                lastFrameTime = Date.now();
+            });
             
-            // Update stats
-            document.getElementById('counter').textContent = data.count;
-            document.getElementById('pos').textContent = data.x;
+            socket.on('status_update', (data) => {
+                document.getElementById('thread_status').textContent = 
+                    data.thread_alive ? '✅ Alive' : '❌ Dead';
+                document.getElementById('server_time').textContent = 
+                    new Date(data.timestamp * 1000).toLocaleTimeString();
+            });
             
-            // Calculate stream FPS
-            streamFrames++;
-            const now = Date.now();
-            if (now - lastFpsUpdate >= 1000) {
-                document.title = `Stream FPS: ${streamFrames}`;
-                streamFrames = 0;
-                lastFpsUpdate = now;
+            socket.on('disconnect', () => {
+                document.getElementById('conn_status').textContent = 'Disconnected';
+                document.getElementById('conn_status').style.color = '#ef4444';
+            });
+            
+            function manualCheck() {
+                console.log('Manual check');
+                socket.emit('get_status');
             }
-        });
-        
-        socket.on('client_count', (count) => {
-            document.getElementById('clients').textContent = count;
-        });
-        
-        socket.on('disconnect', () => {
-            document.getElementById('status').textContent = 'Disconnected';
-            document.body.style.background = '#5c1a1a';
-        });
-        
-        console.log('SocketIO client started');
-    </script>
-</body>
-</html>
+            
+            function forceFrame() {
+                console.log('Requesting test frame');
+                socket.emit('request_frame');
+            }
+            
+            // Auto-check every 5 seconds
+            setInterval(() => {
+                if (Date.now() - lastFrameTime > 2000) {
+                    console.log('No frames for 2 seconds, checking...');
+                    socket.emit('get_status');
+                }
+            }, 5000);
+            
+            console.log('Debug client ready');
+        </script>
+    </body>
+    </html>
     ''')
 
 @socketio.on('connect')
 def handle_connect():
     shared['clients'] += 1
-    print(f"Client connected. Total: {shared['clients']}")
-    socketio.emit('client_count', shared['clients'])
+    print(f"👤 [CLIENT] Connected - Total: {shared['clients']}", file=sys.stderr)
+    socketio.emit('status_update', {
+        'thread_alive': shared['thread_alive'],
+        'timestamp': time.time()
+    })
 
 @socketio.on('disconnect')
 def handle_disconnect():
     shared['clients'] -= 1
-    print(f"Client disconnected. Total: {shared['clients']}")
-    socketio.emit('client_count', shared['clients'])
+    print(f"👤 [CLIENT] Disconnected - Total: {shared['clients']}", file=sys.stderr)
+
+@socketio.on('get_status')
+def handle_status():
+    print(f"📡 [STATUS REQ] Thread alive: {shared['thread_alive']}, Frames: {shared['frame_count']}", file=sys.stderr)
+    socketio.emit('status_update', {
+        'thread_alive': shared['thread_alive'],
+        'frame_count': shared['frame_count'],
+        'timestamp': time.time()
+    })
 
+@socketio.on('request_frame')
+def handle_frame_request():
+    print(f"📡 [FRAME REQ] Client requested frame", file=sys.stderr)
+    # Send the current frame if we have one
+    if shared['frame_count'] > 0:
+        # We'd need to store the last frame to send it
+        pass
+
+print("✅ [SETUP COMPLETE] Flask app ready", file=sys.stderr)
+
+# ===== START SERVER =====
 if __name__ == '__main__':
-    print("🚀 Starting server...")
-    
-    # Start PyGame thread
-    game_thread = threading.Thread(target=game_loop, daemon=True)
-    game_thread.start()
-    
-    # Give it a moment
-    time.sleep(1)
-    
-    # Start server
+    print("🚀 [MAIN] Starting server on port 7860", file=sys.stderr)
     socketio.run(
         app, 
         host='0.0.0.0',