Spaces:

1hitonline
/

flaskdockernew

Sleeping

App Files Files Community

MySafeCode commited on Jan 30

Commit

dcc2634

verified ·

1 Parent(s): 7b55add

Update app.py

Browse files

Files changed (1) hide show

app.py +108 -51

app.py CHANGED Viewed

@@ -1,4 +1,3 @@
-# app.py - SIMPLE VERSION THAT WORKS
 import pygame
 import time
 import threading
@@ -9,12 +8,18 @@ from flask_socketio import SocketIO, emit
 from io import BytesIO
 os.environ['SDL_VIDEODRIVER'] = 'dummy'
-pygame.init()
 app = Flask(__name__)
-app.config['SECRET_KEY'] = 'secret!'
-# Use threading mode instead of eventlet
 socketio = SocketIO(app, async_mode='threading', cors_allowed_origins="*")
 WIDTH, HEIGHT = 400, 300
@@ -26,20 +31,35 @@ shared = {
 }
 def game_loop():
-    """Background thread generating frames"""
-    print("🎮 PyGame loop started")
     screen = pygame.Surface((WIDTH, HEIGHT))
     x, speed = 200, 5
     while shared["streaming"]:
         start_time = time.time()
-        # Update position
         x += speed
         if x < 30 or x > WIDTH-30:
             speed *= -1
-        # Draw frame
         screen.fill((25, 25, 45))
         pygame.draw.circle(screen, (255, 80, 80), (int(x), 150), 20)
@@ -48,21 +68,27 @@ def game_loop():
         pygame.image.save(screen, buf, format='JPEG', quality=85)
         frame_b64 = base64.b64encode(buf.getvalue()).decode('utf-8')
-        # Broadcast to all connected clients
         socketio.emit('new_frame', {
             'frame': frame_b64,
             'count': shared['frame_count'],
-            'x': x
-        }, namespace='/')
         shared['x'] = x
         shared['frame_count'] += 1
-        # Log every 30 frames
-        if shared['frame_count'] % 30 == 0:
-            print(f"Frame {shared['frame_count']}: X={x}, Clients={shared['clients']}")
-        # Control FPS
         elapsed = time.time() - start_time
         if elapsed < 1.0/30:
             time.sleep(1.0/30 - elapsed)
@@ -73,63 +99,94 @@ def game_loop():
 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; }
-        </style>
-    </head>
-    <body>
-        <h1>🔄 Flask-SocketIO (Threading)</h1>
-        <img id="streamImg">
-        <p>Frame: <span id="counter">0</span> | X: <span id="pos">200</span></p>
-        <p>Status: <span id="status">Connecting...</span></p>
-        <script>
-            const socket = io();
-            socket.on('connect', () => {
-                console.log('✅ Connected');
-                document.getElementById('status').textContent = 'Connected';
-                document.body.style.background = '#1a5c1a';
-            });
-            socket.on('new_frame', (data) => {
-                document.getElementById('streamImg').src =
-                    'data:image/jpeg;base64,' + data.frame;
-                document.getElementById('counter').textContent = data.count;
-                document.getElementById('pos').textContent = data.x;
-            });
-            socket.on('disconnect', () => {
-                console.log('❌ Disconnected');
-                document.getElementById('status').textContent = 'Disconnected';
-                document.body.style.background = '#5c1a1a';
-            });
-        </script>
-    </body>
-    </html>
     ''')
 @socketio.on('connect')
 def handle_connect():
     shared['clients'] += 1
     print(f"Client connected. Total: {shared['clients']}")
 @socketio.on('disconnect')
 def handle_disconnect():
     shared['clients'] -= 1
     print(f"Client disconnected. Total: {shared['clients']}")
 if __name__ == '__main__':
-    print("🚀 Starting Flask-SocketIO server...")
     # Start PyGame thread
     game_thread = threading.Thread(target=game_loop, daemon=True)
     game_thread.start()
     # Start server
     socketio.run(
         app,

 import pygame
 import time
 import threading
 from io import BytesIO
 os.environ['SDL_VIDEODRIVER'] = 'dummy'
+try:
+    pygame.init()
+    print("✅ PyGame initialized successfully")
+except Exception as e:
+    print(f"❌ PyGame init failed: {e}")
+    # Create a fallback mode
 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="*")
 WIDTH, HEIGHT = 400, 300
 }
 def game_loop():
+    """Simple PyGame loop"""
+    print("🎬 Starting PyGame loop")
+    # 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}")
+    if test_pixel != (0, 255, 0, 255):
+        print("⚠️  WARNING: PyGame drawing might not work correctly")
+    # Main game surface
     screen = pygame.Surface((WIDTH, HEIGHT))
     x, speed = 200, 5
+    frame_counter = 0
+    last_log_time = time.time()
     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)
         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)
 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();
+        socket.on('connect', () => {
+            console.log('✅ Connected to server');
+            document.getElementById('status').textContent = 'Connected';
+            document.body.style.background = '#1a5c1a';
+        });
+        socket.on('new_frame', (data) => {
+            // Update image
+            document.getElementById('streamImg').src =
+                'data:image/jpeg;base64,' + data.frame;
+            // Update stats
+            document.getElementById('counter').textContent = data.count;
+            document.getElementById('pos').textContent = data.x;
+            // Calculate stream FPS
+            streamFrames++;
+            const now = Date.now();
+            if (now - lastFpsUpdate >= 1000) {
+                document.title = `Stream FPS: ${streamFrames}`;
+                streamFrames = 0;
+                lastFpsUpdate = now;
+            }
+        });
+        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>
     ''')
 @socketio.on('connect')
 def handle_connect():
     shared['clients'] += 1
     print(f"Client connected. Total: {shared['clients']}")
+    socketio.emit('client_count', shared['clients'])
 @socketio.on('disconnect')
 def handle_disconnect():
     shared['clients'] -= 1
     print(f"Client disconnected. Total: {shared['clients']}")
+    socketio.emit('client_count', shared['clients'])
 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
     socketio.run(
         app,