.

Dockerfile

@@ -1,7 +1,7 @@
 # Use the official Python 3.9 image
 FROM tiangolo/uvicorn-gunicorn-fastapi:python3.9
 
-RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 curl -y
+RUN apt-get update && apt-get install ffmpeg libsm6 libxext6 curl nginx -y
 
 # Set the working directory to /code
 WORKDIR /code
@@ -15,6 +15,11 @@ RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
 # Set up a new user named "user" with user ID 1000
 RUN useradd -m -u 1000 user
+
+# Create directories for nginx that user can write to
+RUN mkdir -p /home/user/nginx/logs /home/user/nginx/cache /home/user/nginx/tmp && \
+    chown -R user:user /home/user/nginx
+
 # Switch to the "user" user
 USER user
 # Set home to the user's home directory
@@ -27,16 +32,72 @@ WORKDIR $HOME/app
 # Copy the current directory contents into the container at $HOME/app setting the owner to the user
 COPY --chown=user . $HOME/app
 
-# Create startup script using uvicorn like the working version
+# Create custom nginx.conf for non-root operation
+RUN echo 'pid /home/user/nginx/nginx.pid;' > /home/user/nginx.conf && \
+    echo 'error_log /home/user/nginx/logs/error.log;' >> /home/user/nginx.conf && \
+    echo 'worker_processes 1;' >> /home/user/nginx.conf && \
+    echo '' >> /home/user/nginx.conf && \
+    echo 'events {' >> /home/user/nginx.conf && \
+    echo '    worker_connections 1024;' >> /home/user/nginx.conf && \
+    echo '}' >> /home/user/nginx.conf && \
+    echo '' >> /home/user/nginx.conf && \
+    echo 'http {' >> /home/user/nginx.conf && \
+    echo '    access_log /home/user/nginx/logs/access.log;' >> /home/user/nginx.conf && \
+    echo '    client_body_temp_path /home/user/nginx/tmp/client_body;' >> /home/user/nginx.conf && \
+    echo '    proxy_temp_path /home/user/nginx/tmp/proxy;' >> /home/user/nginx.conf && \
+    echo '    fastcgi_temp_path /home/user/nginx/tmp/fastcgi;' >> /home/user/nginx.conf && \
+    echo '    uwsgi_temp_path /home/user/nginx/tmp/uwsgi;' >> /home/user/nginx.conf && \
+    echo '    scgi_temp_path /home/user/nginx/tmp/scgi;' >> /home/user/nginx.conf && \
+    echo '' >> /home/user/nginx.conf && \
+    echo '    server {' >> /home/user/nginx.conf && \
+    echo '        listen 7860;' >> /home/user/nginx.conf && \
+    echo '        server_name localhost;' >> /home/user/nginx.conf && \
+    echo '' >> /home/user/nginx.conf && \
+    echo '        # WebSocket support' >> /home/user/nginx.conf && \
+    echo '        location /ws {' >> /home/user/nginx.conf && \
+    echo '            proxy_pass http://localhost:8080/ws;' >> /home/user/nginx.conf && \
+    echo '            proxy_http_version 1.1;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header Upgrade $http_upgrade;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header Connection "upgrade";' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header Host $host;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Real-IP $remote_addr;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-Proto $scheme;' >> /home/user/nginx.conf && \
+    echo '            proxy_read_timeout 86400;' >> /home/user/nginx.conf && \
+    echo '            proxy_send_timeout 86400;' >> /home/user/nginx.conf && \
+    echo '        }' >> /home/user/nginx.conf && \
+    echo '' >> /home/user/nginx.conf && \
+    echo '        # Regular HTTP requests' >> /home/user/nginx.conf && \
+    echo '        location / {' >> /home/user/nginx.conf && \
+    echo '            proxy_pass http://localhost:8080;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header Host $host;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Real-IP $remote_addr;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> /home/user/nginx.conf && \
+    echo '            proxy_set_header X-Forwarded-Proto $scheme;' >> /home/user/nginx.conf && \
+    echo '        }' >> /home/user/nginx.conf && \
+    echo '    }' >> /home/user/nginx.conf && \
+    echo '}' >> /home/user/nginx.conf
+
+# Create necessary temp directories
+RUN mkdir -p /home/user/nginx/tmp/{client_body,proxy,fastcgi,uwsgi,scgi}
+
+# Create startup script
 RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'set -e' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo 'echo "🚀 Starting Neural OS for HF Spaces with uvicorn"' >> start_hf_spaces.sh && \
+    echo 'echo "🚀 Starting Neural OS for HF Spaces with nginx proxy"' >> start_hf_spaces.sh && \
     echo 'echo "===================================="' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo '# Start dispatcher directly with uvicorn' >> start_hf_spaces.sh && \
-    echo 'echo "🎯 Starting dispatcher with uvicorn..."' >> start_hf_spaces.sh && \
-    echo 'uvicorn dispatcher:app --host 0.0.0.0 --port 7860 > dispatcher.log 2>&1 &' >> start_hf_spaces.sh && \
+    echo '# Start nginx as user' >> start_hf_spaces.sh && \
+    echo 'echo "🌐 Starting nginx proxy..."' >> start_hf_spaces.sh && \
+    echo 'nginx -c /home/user/nginx.conf -t' >> start_hf_spaces.sh && \
+    echo 'nginx -c /home/user/nginx.conf &' >> start_hf_spaces.sh && \
+    echo 'NGINX_PID=$!' >> start_hf_spaces.sh && \
+    echo 'echo "📊 Nginx PID: $NGINX_PID"' >> start_hf_spaces.sh && \
+    echo '' >> start_hf_spaces.sh && \
+    echo '# Start dispatcher' >> start_hf_spaces.sh && \
+    echo 'echo "🎯 Starting dispatcher..."' >> start_hf_spaces.sh && \
+    echo 'python dispatcher.py --port 8080 > dispatcher.log 2>&1 &' >> start_hf_spaces.sh && \
     echo 'DISPATCHER_PID=$!' >> start_hf_spaces.sh && \
     echo 'echo "📊 Dispatcher PID: $DISPATCHER_PID"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
@@ -44,9 +105,19 @@ RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'echo "⏳ Waiting for dispatcher to initialize..."' >> start_hf_spaces.sh && \
     echo 'sleep 5' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
+    echo '# Test if everything is working' >> start_hf_spaces.sh && \
+    echo 'echo "🔍 Testing system health..."' >> start_hf_spaces.sh && \
+    echo 'curl -f http://localhost:7860/ > /dev/null 2>&1' >> start_hf_spaces.sh && \
+    echo 'if [ $? -eq 0 ]; then' >> start_hf_spaces.sh && \
+    echo '    echo "✅ System is responding"' >> start_hf_spaces.sh && \
+    echo 'else' >> start_hf_spaces.sh && \
+    echo '    echo "❌ System health check failed"' >> start_hf_spaces.sh && \
+    echo '    exit 1' >> start_hf_spaces.sh && \
+    echo 'fi' >> start_hf_spaces.sh && \
+    echo '' >> start_hf_spaces.sh && \
     echo '# Start worker' >> start_hf_spaces.sh && \
     echo 'echo "🔧 Starting worker..."' >> start_hf_spaces.sh && \
-    echo 'python worker.py --worker-address localhost:8001 --dispatcher-url http://localhost:7860 > worker.log 2>&1 &' >> start_hf_spaces.sh && \
+    echo 'python worker.py --worker-address localhost:8001 --dispatcher-url http://localhost:8080 > worker.log 2>&1 &' >> start_hf_spaces.sh && \
     echo 'WORKER_PID=$!' >> start_hf_spaces.sh && \
     echo 'echo "📊 Worker PID: $WORKER_PID"' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
@@ -54,11 +125,32 @@ RUN echo '#!/bin/bash' > start_hf_spaces.sh && \
     echo 'echo "⏳ Waiting for worker to initialize..."' >> start_hf_spaces.sh && \
     echo 'sleep 30' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
-    echo 'echo "✅ System ready!"' >> start_hf_spaces.sh && \
-    echo 'echo "🌍 Web interface: http://localhost:7860"' >> start_hf_spaces.sh && \
+    echo '# Final health check' >> start_hf_spaces.sh && \
+    echo 'if kill -0 $DISPATCHER_PID 2>/dev/null && kill -0 $WORKER_PID 2>/dev/null; then' >> start_hf_spaces.sh && \
+    echo '    echo "✅ System ready!"' >> start_hf_spaces.sh && \
+    echo '    echo "🌍 Web interface: http://localhost:7860"' >> start_hf_spaces.sh && \
+    echo '    echo "📊 Dispatcher: http://localhost:8080"' >> start_hf_spaces.sh && \
+    echo 'else' >> start_hf_spaces.sh && \
+    echo '    echo "❌ System failed to start properly"' >> start_hf_spaces.sh && \
+    echo '    echo "📋 Dispatcher log:"' >> start_hf_spaces.sh && \
+    echo '    tail -n 20 dispatcher.log' >> start_hf_spaces.sh && \
+    echo '    echo "📋 Worker log:"' >> start_hf_spaces.sh && \
+    echo '    tail -n 20 worker.log' >> start_hf_spaces.sh && \
+    echo '    exit 1' >> start_hf_spaces.sh && \
+    echo 'fi' >> start_hf_spaces.sh && \
+    echo '' >> start_hf_spaces.sh && \
+    echo '# Function to cleanup' >> start_hf_spaces.sh && \
+    echo 'cleanup() {' >> start_hf_spaces.sh && \
+    echo '    echo "🛑 Shutting down..."' >> start_hf_spaces.sh && \
+    echo '    kill $NGINX_PID $DISPATCHER_PID $WORKER_PID 2>/dev/null || true' >> start_hf_spaces.sh && \
+    echo '    exit 0' >> start_hf_spaces.sh && \
+    echo '}' >> start_hf_spaces.sh && \
+    echo '' >> start_hf_spaces.sh && \
+    echo 'trap cleanup SIGINT SIGTERM' >> start_hf_spaces.sh && \
     echo '' >> start_hf_spaces.sh && \
     echo '# Keep running' >> start_hf_spaces.sh && \
-    echo 'tail -f dispatcher.log worker.log &' >> start_hf_spaces.sh && \
+    echo 'echo "📋 Following logs (Ctrl+C to stop):"' >> start_hf_spaces.sh && \
+    echo 'tail -f dispatcher.log worker.log /home/user/nginx/logs/error.log &' >> start_hf_spaces.sh && \
     echo 'wait $DISPATCHER_PID' >> start_hf_spaces.sh && \
     chmod +x start_hf_spaces.sh
 

static/index.html

@@ -188,8 +188,22 @@
         function connect() {
             console.log("connect() function called - creating new WebSocket connection");
             //const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-            const protocol = 'ws:';
-            socket = new WebSocket(`${protocol}//${window.location.host}/ws`);
+            //socket = new WebSocket(`${protocol}//${window.location.host}/ws`);
+            const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+
+        // Fix for HF Spaces - construct correct domain from path
+        let host = window.location.host;
+        if (host === 'huggingface.co' && window.location.pathname.startsWith('/spaces/')) {
+            // Extract username and spacename from path like /spaces/username/spacename
+            const pathParts = window.location.pathname.split('/');
+            if (pathParts.length >= 4) {
+                const username = pathParts[2];
+                const spacename = pathParts[3];
+                host = `${username}-${spacename}.hf.space`;
+            }
+        }
+
+        socket = new WebSocket(`${protocol}//${host}/ws`);
 
             socket.onopen = function(event) {
                 console.log("WebSocket connection established");
@@ -291,9 +305,6 @@
                     console.log(`Queue update: Position ${data.position}/${data.total_waiting}, wait: ${data.maximum_wait_seconds.toFixed(1)} seconds`);
                     const waitSeconds = Math.ceil(data.maximum_wait_seconds);
                     
-                    // Disable canvas interaction while in queue
-                    disableCanvasInteraction();
-                    
                     if (waitSeconds === 0) {
                         showConnectionStatus("Starting soon...");
                         stopQueueCountdown();
@@ -317,8 +328,6 @@
                     console.log("Session started, clearing queue display");
                     // Stop queue countdown and clear the display
                     stopQueueCountdown();
-                    // Enable canvas interaction when session starts
-                    enableCanvasInteraction();
                     //ctx.clearRect(0, 0, canvas.width, canvas.height);
                 } else if (data.type === "session_warning") {
                     console.log(`Session time warning: ${data.time_remaining} seconds remaining`);
@@ -397,10 +406,6 @@
         let autoInputEnabled = true; // Default to enabled
         let userHasInteracted = false; // Track if user has moved mouse inside canvas
         
-        // Session state tracking
-        let sessionState = 'queued'; // 'queued', 'active', 'disconnected'
-        let canvasInteractionEnabled = false;
-        
         // Timeout countdown mechanism - support concurrent timeouts
         let timeoutCountdownInterval = null;
         let timeoutCountdown = 10;
@@ -720,44 +725,6 @@
             queueCountdownActive = false;
             queueWaitTime = 0;
         }
-        
-        function enableCanvasInteraction() {
-            canvasInteractionEnabled = true;
-            sessionState = 'active';
-            
-            // Remove visual queue indicator
-            if (canvas) {
-                canvas.style.opacity = '1';
-                canvas.style.cursor = 'crosshair';
-                canvas.style.pointerEvents = 'auto';
-            }
-            
-            // Update status
-            const statusElement = document.getElementById('connectionStatus');
-            if (statusElement) {
-                statusElement.textContent = 'Active';
-                statusElement.className = 'connected';
-            }
-        }
-        
-        function disableCanvasInteraction() {
-            canvasInteractionEnabled = false;
-            sessionState = 'queued';
-            
-            // Add visual queue indicator
-            if (canvas) {
-                canvas.style.opacity = '0.5';
-                canvas.style.cursor = 'not-allowed';
-                canvas.style.pointerEvents = 'none';
-            }
-            
-            // Update status
-            const statusElement = document.getElementById('connectionStatus');
-            if (statusElement) {
-                statusElement.textContent = 'Queued';
-                statusElement.className = 'connecting';
-            }
-        }
 
         function updateQueueCountdownDisplay() {
             if (queueWaitTime <= 0) {
@@ -863,13 +830,6 @@
             }
             
             if (!isConnected || isProcessing) return;
-            
-            // Check if canvas interaction is enabled (not queued)
-            if (!canvasInteractionEnabled) {
-                console.log("Canvas interaction disabled - user is queued");
-                return;
-            }
-            
             let rect = canvas.getBoundingClientRect();
             let x = event.clientX - rect.left;
             let y = event.clientY - rect.top;
@@ -887,13 +847,6 @@
 
         canvas.addEventListener("click", function (event) {
             if (!isConnected || isProcessing) return;
-            
-            // Check if canvas interaction is enabled (not queued)
-            if (!canvasInteractionEnabled) {
-                console.log("Canvas interaction disabled - user is queued");
-                return;
-            }
-            
             let rect = canvas.getBoundingClientRect();
             let x = event.clientX - rect.left;
             let y = event.clientY - rect.top;
@@ -906,12 +859,6 @@
             event.preventDefault(); // Prevent default context menu
             if (!isConnected || isProcessing) return;
             
-            // Check if canvas interaction is enabled (not queued)
-            if (!canvasInteractionEnabled) {
-                console.log("Canvas interaction disabled - user is queued");
-                return;
-            }
-            
             let rect = canvas.getBoundingClientRect();
             let x = event.clientX - rect.left;
             let y = event.clientY - rect.top;
@@ -975,12 +922,6 @@
             }
             if (!isConnected || isProcessing || !userHasInteracted) return;
             
-            // Check if canvas interaction is enabled (not queued)
-            if (!canvasInteractionEnabled) {
-                console.log("Canvas interaction disabled - user is queued");
-                return;
-            }
-            
             // Get the current mouse position
             let rect = canvas.getBoundingClientRect();
             let x = lastSentPosition ? lastSentPosition.x : canvas.width / 2;
@@ -997,12 +938,6 @@
             }
             if (!isConnected || socket.readyState !== WebSocket.OPEN || !userHasInteracted) return;
             
-            // Check if canvas interaction is enabled (not queued)
-            if (!canvasInteractionEnabled) {
-                console.log("Canvas interaction disabled - user is queued");
-                return;
-            }
-            
             // Get the current mouse position
             let rect = canvas.getBoundingClientRect();
             let x = lastSentPosition ? lastSentPosition.x : canvas.width / 2;
@@ -1110,9 +1045,6 @@
                 }
             }
         });
-        
-        // Initialize canvas in disabled state (user starts queued)
-        disableCanvasInteraction();
     </script>
     
     <!-- Bootstrap JS (optional) -->