Fixes

app.py

@@ -8,8 +8,7 @@ from viser_proxy_manager import ViserProxyManager
 
 
 def main() -> None:
-    app = fastapi.FastAPI()
-    viser_manager = ViserProxyManager(app)
+    viser_manager = ViserProxyManager()
 
     # Create a Gradio interface with title, iframe, and buttons
     with gr.Blocks(title="Viser Viewer") as demo:
@@ -28,9 +27,16 @@ def main() -> None:
             # Use the request's base URL if available
             host = request.headers["host"]
 
+            # Determine protocol (use HTTPS for HuggingFace Spaces or other secure environments)
+            protocol = (
+                "https"
+                if request.headers.get("x-forwarded-proto") == "https"
+                else "http"
+            )
+
             return f"""
             <div style="border: 2px solid #ccc; padding: 10px;">
-                <iframe src="http://{host}/viser/{request.session_hash}/" width="100%" height="500px" frameborder="0"></iframe>
+                <iframe src="{protocol}://{host}/viser/{request.session_hash}/" width="100%" height="500px" frameborder="0"></iframe>
             </div>
             """
 
@@ -56,8 +62,9 @@ def main() -> None:
             assert request.session_hash is not None
             viser_manager.stop_server(request.session_hash)
 
-    app = gr.mount_gradio_app(app, demo, path="/")
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    demo.launch(prevent_thread_lock=True)
+    viser_manager.setup(demo.app)
+    demo.block_thread()
 
 
 if __name__ == "__main__":

viser_proxy_manager.py

@@ -14,7 +14,6 @@ class ViserProxyManager:
     as well as proxying HTTP and WebSocket requests to the appropriate Viser server.
 
     Args:
-        app: The FastAPI application to which the proxy routes will be added.
         min_local_port: Minimum local port number to use for Viser servers. Defaults to 8000.
             These ports are used only for internal communication and don't need to be publicly exposed.
         max_local_port: Maximum local port number to use for Viser servers. Defaults to 9000.
@@ -23,14 +22,24 @@ class ViserProxyManager:
 
     def __init__(
         self,
-        app: FastAPI,
         min_local_port: int = 8000,
         max_local_port: int = 9000,
     ) -> None:
         self._min_port = min_local_port
         self._max_port = max_local_port
+
+    def setup(
+        self,
+        app: FastAPI,
+    ) -> None:
+        """Set up the Viser proxy manager with the given FastAPI application.
+        This should be called after `demo.launch(prevent_thread_lock=True)`.
+
+        Args:
+            app: The FastAPI application to which the proxy routes will be added.
+        """
         self._server_from_session_hash: dict[str, viser.ViserServer] = {}
-        self._last_port = min_local_port - 1  # Track last port tried
+        self._last_port = self._min_port - 1  # Track last port tried
 
         @app.get("/viser/{server_id}/{proxy_path:path}")
         async def proxy(request: Request, server_id: str, proxy_path: str):