get basic tests working

Author: rmorshea

.github/workflows/test.yml

@@ -28,7 +28,7 @@ jobs:
         run: pip install -r requirements/nox-deps.txt
       - name: Run Tests
         env: { "CI": "true" }
-        run: nox -s test_python_suite -- --headless --maxfail=3
+        run: nox -s test_python_suite -- --maxfail=3
   test-python-environments:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -50,7 +50,7 @@ jobs:
         run: pip install -r requirements/nox-deps.txt
       - name: Run Tests
         env: { "CI": "true" }
-        run: nox -s test_python --stop-on-first-error -- --headless --maxfail=3 --no-cov
+        run: nox -s test_python --stop-on-first-error -- --maxfail=3 --no-cov
   test-docs:
     runs-on: ubuntu-latest
     steps:

requirements/pkg-extras.txt

@@ -15,12 +15,13 @@ flask<2.0
 markupsafe<2.1
 flask-cors
 flask-sockets
+a2wsgi
 
 # tornado
 tornado
 
 # extra=testing
-selenium
+playwright
 
 # extra=matplotlib
 matplotlib

src/idom/__init__.py

@@ -16,7 +16,7 @@
 from .core.serve import Stop
 from .core.vdom import vdom
 from .sample import run_sample_app
-from .server.any import run
+from .server.utils import run
 from .utils import Ref, html_to_vdom
 from .widgets import hotswap, multiview
 

src/idom/sample.py

@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-import webbrowser
-from typing import Any
-
 from . import html
 from .core.component import component
 from .core.types import VdomDict
-from .server.any import run
+from .server.utils import run
 
 
 @component

src/idom/server/__init__.py

@@ -1 +0,0 @@
-from .any import all_implementations

src/idom/server/_asgi.py

@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+import asyncio
+from asyncio import FIRST_EXCEPTION, CancelledError
+
+from asgiref.typing import ASGIApplication
+from uvicorn.config import Config as UvicornConfig
+from uvicorn.server import Server as UvicornServer
+
+
+async def serve_development_asgi(
+    app: ASGIApplication,
+    host: str,
+    port: int,
+    started: asyncio.Event,
+) -> None:
+    """Run a development server for starlette"""
+    server = UvicornServer(UvicornConfig(app, host=host, port=port, loop="asyncio"))
+
+    async def check_if_started():
+        while not server.started:
+            await asyncio.sleep(0.2)
+        started.set()
+
+    coros = [server.serve(), check_if_started()]
+    _, pending = await asyncio.wait(
+        list(map(asyncio.create_task, coros)), return_when=FIRST_EXCEPTION
+    )
+
+    for task in pending:
+        task.cancel()
+
+    try:
+        await asyncio.gather(*list(pending))
+    except CancelledError:
+        pass

src/idom/server/any.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+
+from idom.types import RootComponentConstructor
+
+from .utils import default_implementation
+
+
+def configure(app: Any, component: RootComponentConstructor) -> None:
+    """Configure the given app instance to display the given component"""
+    return default_implementation().configure(app, component)
+
+
+def create_development_app() -> Any:
+    """Create an application instance for development purposes"""
+    return default_implementation().create_development_app()
+
+
+async def serve_development_app(
+    app: Any, host: str, port: int, started: asyncio.Event
+) -> None:
+    """Run an application using a development server"""
+    return await default_implementation().serve_development_app(
+        app, host, port, started
+    )

src/idom/server/default.py

@@ -13,12 +13,13 @@
 from flask import Blueprint, Flask, redirect, request, send_from_directory, url_for
 from flask_cors import CORS
 from flask_sockets import Sockets
+from gevent import pywsgi
+from geventwebsocket.handler import WebSocketHandler
 from geventwebsocket.websocket import WebSocket
 from typing_extensions import TypedDict
-from werkzeug.serving import ThreadedWSGIServer
 
 import idom
-from idom.config import IDOM_DEBUG_MODE, IDOM_WEB_MODULES_DIR
+from idom.config import IDOM_WEB_MODULES_DIR
 from idom.core.layout import LayoutEvent, LayoutUpdate
 from idom.core.serve import serve_json_patch
 from idom.core.types import ComponentType, RootComponentConstructor
@@ -58,28 +59,34 @@ async def serve_development_app(
 ) -> None:
     """Run an application using a development server"""
     loop = asyncio.get_event_loop()
-
-    @app.before_first_request
-    def set_started():
-        loop.call_soon_threadsafe(started.set)
-
-    server = ThreadedWSGIServer(host, port, app)
-
     stopped = asyncio.Event()
 
+    server: pywsgi.WSGIServer
+
     def run_server():
+        nonlocal server
+        server = pywsgi.WSGIServer(
+            (host, port),
+            app,
+            handler_class=WebSocketHandler,
+        )
+        server.start()
+        loop.call_soon_threadsafe(started.set)
         try:
             server.serve_forever()
         finally:
             loop.call_soon_threadsafe(stopped.set)
 
     thread = Thread(target=run_server, daemon=True)
+    thread.start()
+
+    await started.wait()
 
     try:
         await stopped.wait()
     finally:
         # we may have exitted because this task was cancelled
-        server.shutdown()
+        server.stop(3)
         # the thread should eventually join
         thread.join(timeout=3)
         # just double check it happened

src/idom/server/flask.py

@@ -3,12 +3,14 @@
 import asyncio
 import json
 import logging
+import os
+import socket
 from typing import Any, Dict, Tuple, Union
 
 from mypy_extensions import TypedDict
 from sanic import Blueprint, Sanic, request, response
 from sanic_cors import CORS
-from websockets import WebSocketCommonProtocol
+from websockets.legacy.protocol import WebSocketCommonProtocol
 
 from idom.config import IDOM_WEB_MODULES_DIR
 from idom.core.layout import Layout, LayoutEvent
@@ -48,12 +50,17 @@ async def serve_development_app(
     app: Sanic, host: str, port: int, started: asyncio.Event
 ) -> None:
     """Run a development server for :mod:`sanic`"""
-
-    @app.listener("after_server_start")
-    async def after_started():
+    try:
+        server = await app.create_server(
+            host, port, return_asyncio_server=True, debug=True
+        )
+        await server.startup()
+        await server.start_serving()
         started.set()
-
-    await app.create_server(host, port, debug=True)
+        await server.serve_forever()
+    except KeyboardInterrupt:
+        app.shutdown_tasks(3)
+        app.stop()
 
 
 class Options(TypedDict, total=False):

src/idom/server/sanic.py

@@ -26,6 +26,7 @@
 )
 from idom.core.types import RootComponentConstructor
 
+from ._asgi import serve_development_asgi
 from .utils import CLIENT_BUILD_DIR
 
 
@@ -63,25 +64,7 @@ async def serve_development_app(
     started: asyncio.Event,
 ) -> None:
     """Run a development server for starlette"""
-    server = UvicornServer(UvicornConfig(app, host=host, port=port, loop="asyncio"))
-
-    async def check_if_started():
-        while not server.started:
-            await asyncio.sleep(0.2)
-        started.set()
-
-    _, pending = await asyncio.wait(
-        [server.serve(), check_if_started()],
-        return_when=FIRST_EXCEPTION,
-    )
-
-    for task in pending:
-        task.cancel()
-
-    try:
-        await asyncio.gather(*list(pending))
-    except CancelledError:
-        pass
+    await serve_development_asgi(app, host, port, started)
 
 
 class Options(TypedDict, total=False):