misc fixes

Author: rmorshea

src/idom/server/any.py

@@ -27,7 +27,7 @@ def run(
     host: str = "127.0.0.1",
     port: int | None = None,
     open_browser: bool = True,
-    implementation: ServerImplementation = sys.modules[__name__],
+    implementation: ServerImplementation[Any] = sys.modules[__name__],
 ) -> None:
     """Run a component with a development server"""
 
@@ -40,7 +40,7 @@ def run(
     app = implementation.create_development_app()
     implementation.configure(app, component)
 
-    coros: list[Awaitable] = []
+    coros: list[Awaitable[Any]] = []
 
     host = host
     port = port or find_available_port(host)
@@ -56,7 +56,7 @@ async def _open_browser_after_server() -> None:
 
         coros.append(_open_browser_after_server())
 
-    asyncio.get_event_loop().run_forever(asyncio.gather(*coros))
+    asyncio.get_event_loop().run_until_complete(asyncio.gather(*coros))
 
 
 def configure(app: Any, component: RootComponentConstructor) -> None:
@@ -78,7 +78,7 @@ async def serve_development_app(
     )
 
 
-def _get_any_implementation() -> ServerImplementation:
+def _get_any_implementation() -> ServerImplementation[Any]:
     """Get the first available server implementation"""
     global _DEFAULT_IMPLEMENTATION
 
@@ -94,10 +94,10 @@ def _get_any_implementation() -> ServerImplementation:
         return implementation
 
 
-_DEFAULT_IMPLEMENTATION: ServerImplementation | None = None
+_DEFAULT_IMPLEMENTATION: ServerImplementation[Any] | None = None
 
 
-def all_implementations() -> Iterator[ServerImplementation]:
+def all_implementations() -> Iterator[ServerImplementation[Any]]:
     """Yield all available server implementations"""
     for name in SUPPORTED_PACKAGES:
         try:

src/idom/server/tornado.py

@@ -9,6 +9,7 @@
 from typing import Any, List, Optional, Tuple, Type, Union
 from urllib.parse import urljoin
 
+from tornado.httpserver import HTTPServer
 from tornado.platform.asyncio import AsyncIOMainLoop
 from tornado.web import Application, RedirectHandler, RequestHandler, StaticFileHandler
 from tornado.websocket import WebSocketHandler
@@ -19,7 +20,7 @@
 from idom.core.serve import VdomJsonPatch, serve_json_patch
 from idom.core.types import ComponentConstructor
 
-from .utils import CLIENT_BUILD_DIR, threaded, wait_on_event
+from .utils import CLIENT_BUILD_DIR
 
 
 def configure(
@@ -52,11 +53,23 @@ def create_development_app() -> Application:
 async def serve_development_app(
     app: Application, host: str, port: int, started: asyncio.Event
 ) -> None:
-    loop = AsyncIOMainLoop()
-    loop.install()
-    app.listen(port, host)
-    loop.add_callback(lambda: loop.asyncio_loop.call_soon_threadsafe(started.set))
-    await loop.run_in_executor(ThreadPoolExecutor())
+    # setup up tornado to use asyncio
+    AsyncIOMainLoop().install()
+
+    server = HTTPServer(app)
+    server.listen(port, host)
+
+    # at this point the server is accepting connection
+    started.set()
+
+    try:
+        # block forever - tornado has already set up its own background tasks
+        await asyncio.get_event_loop().create_future()
+    finally:
+        # stop accepting new connections
+        server.stop()
+        # wait for existing connections to complete
+        await server.close_all_connections()
 
 
 class Options(TypedDict, total=False):

src/idom/server/types.py

@@ -10,7 +10,7 @@
 
 
 @runtime_checkable
-class ServerImplementation(Protocol):
+class ServerImplementation(Protocol[_App]):
     """Common interface for IDOM's builti-in server implementations"""
 
     def configure(self, app: _App, component: RootComponentConstructor) -> None:

src/idom/testing.py

@@ -72,11 +72,11 @@ class ServerMountPoint:
     """A context manager for imperatively mounting views to a render server when testing"""
 
     _log_handler: "_LogRecordCaptor"
-    _server_future: asyncio.Task
+    _server_future: asyncio.Task[Any]
 
     def __init__(
         self,
-        server_implementation: ServerImplementation = any_server,
+        server_implementation: ServerImplementation[Any] = any_server,
         host: str = "127.0.0.1",
         port: Optional[int] = None,
     ) -> None:

src/idom/widgets.py

@@ -107,7 +107,7 @@ def __call__(self, value: str) -> _CastTo:
         ...
 
 
-MountFunc = Callable[[ComponentConstructor], None]
+MountFunc = Callable[["ComponentConstructor | None"], None]
 
 
 def hotswap(update_on_change: bool = False) -> Tuple[MountFunc, ComponentConstructor]:
@@ -162,8 +162,8 @@ def add_callback() -> Callable[[], None]:
 
             return constructor()
 
-        def swap(constructor: Callable[[], Any]) -> None:
-            constructor_ref.current = constructor
+        def swap(constructor: Callable[[], Any] | None) -> None:
+            constructor = constructor_ref.current = constructor or (lambda: None)
 
             for set_constructor in set_constructor_callbacks:
                 set_constructor(constructor)