up

Dockerfile

@@ -48,5 +48,5 @@ EXPOSE 8080
 
 ENV PORT 8080
 
-# Run the server.py instead of api.py
-CMD ["python3", "server.py", "--host", "0.0.0.0", "--port", "8080"]
+# Run the HF space launcher script which sets up the correct paths
+CMD ["python3", "run_hf_space.py"]

client/client.js

@@ -57,7 +57,21 @@ const mouseState = {
 
 // Connect to WebSocket server
 function connectWebSocket() {
-    const serverUrl = `ws://${window.location.hostname}:${window.location.port}/ws`;
+    // Use secure WebSocket (wss://) if the page is loaded over HTTPS
+    const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+    
+    // Get base path by extracting path from the script tag's src attribute
+    let basePath = '';
+    const scriptTags = document.getElementsByTagName('script');
+    for (const script of scriptTags) {
+        if (script.src.includes('client.js')) {
+            const url = new URL(script.src);
+            basePath = url.pathname.replace('/assets/client.js', '');
+            break;
+        }
+    }
+    
+    const serverUrl = `${protocol}//${window.location.hostname}${window.location.port ? ':' + window.location.port : ''}${basePath}/ws`;
     logMessage(`Connecting to ${serverUrl}...`);
     
     socket = new WebSocket(serverUrl);

client/index.html

@@ -233,6 +233,6 @@
         </div>
     </div>
     
-    <script src="/assets/client.js"></script>
+    <script src="./assets/client.js"></script>
 </body>
 </html>

run_hf_space.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Hugging Face Space launcher for MatrixGame WebSocket Server
+This script launches the server with the appropriate configuration for Hugging Face Spaces.
+"""
+
+import os
+import sys
+import subprocess
+
+def main():
+    # Get the port from environment variable in Hugging Face Space
+    port = int(os.environ.get("PORT", 7860))
+    
+    # Determine if this is running in a Hugging Face Space
+    is_hf_space = os.environ.get("SPACE_ID") is not None
+    
+    # Pass the appropriate path if in a space
+    path_arg = ""
+    if is_hf_space:
+        # In a space, we're usually behind a proxy, so we need to handle base path
+        path_arg = f"--path /{os.environ.get('SPACE_ID', '')}"
+    
+    # Construct and run the command
+    cmd = f"{sys.executable} server.py --host 0.0.0.0 --port {port} {path_arg}"
+    print(f"Running command: {cmd}")
+    subprocess.run(cmd, shell=True)
+
+if __name__ == "__main__":
+    main()

server.py

@@ -562,7 +562,7 @@ async def websocket_handler(request: web.Request) -> web.WebSocketResponse:
     
     return ws
 
-async def init_app() -> web.Application:
+async def init_app(base_path="") -> web.Application:
     app = web.Application(
         client_max_size=1024**2*10  # 10MB max size
     )
@@ -574,15 +574,34 @@ async def init_app() -> web.Application:
     
     app.on_shutdown.append(cleanup)
     
-    # Add routes
-    app.router.add_get('/ws', websocket_handler)
-    app.router.add_get('/api/status', status_handler)
+    # Add routes with CORS headers for WebSockets
+    # Configure CORS for all routes
+    async def cors_middleware(request, handler):
+        response = await handler(request)
+        response.headers['Access-Control-Allow-Origin'] = '*'
+        response.headers['Access-Control-Allow-Methods'] = 'GET, POST, OPTIONS'
+        response.headers['Access-Control-Allow-Headers'] = 'Content-Type, X-Requested-With'
+        return response
     
-    # Serve the client at root path
-    app.router.add_get('/', root_handler)
+    app.middlewares.append(cors_middleware)
+    
+    # Set up routes with the base_path
+    app.router.add_get(f'{base_path}/ws', websocket_handler)
+    app.router.add_get(f'{base_path}/api/status', status_handler)
+    
+    # Serve the client at both the base path and root path for compatibility
+    app.router.add_get(f'{base_path}/', root_handler)
+    
+    # Always serve at the root path for Hugging Face Spaces compatibility
+    if base_path:
+        app.router.add_get('/', root_handler)
     
     # Set up static file serving for the client assets
-    app.router.add_static('/assets', path=pathlib.Path(__file__).parent / 'client')
+    app.router.add_static(f'{base_path}/assets', path=pathlib.Path(__file__).parent / 'client')
+    
+    # Add static file serving at root for compatibility
+    if base_path:
+        app.router.add_static('/assets', path=pathlib.Path(__file__).parent / 'client')
     
     return app
 
@@ -590,9 +609,10 @@ def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="MatrixGame WebSocket Server")
     parser.add_argument("--host", type=str, default="0.0.0.0", help="Host IP to bind to")
     parser.add_argument("--port", type=int, default=8080, help="Port to listen on")
+    parser.add_argument("--path", type=str, default="", help="Base path for the server (for proxy setups)")
     return parser.parse_args()
 
 if __name__ == '__main__':
     args = parse_args()
-    app = asyncio.run(init_app())
+    app = asyncio.run(init_app(base_path=args.path))
     web.run_app(app, host=args.host, port=args.port)