omserv 0.0.0.dev177__tar.gz → 0.0.0.dev179__tar.gz

{omserv-0.0.0.dev177/omserv.egg-info → omserv-0.0.0.dev179}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev177
+Version: 0.0.0.dev179
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev177
+Requires-Dist: omlish==0.0.0.dev179
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179}/omserv/server/__init__.py

@@ -15,4 +15,4 @@ See:
  - https://github.com/tiangolo/fastapi
 """
 from .config import Config  # noqa
-from .workers import serve  # noqa
+from .default import serve  # noqa

omserv-0.0.0.dev179/omserv/server/default.py

@@ -0,0 +1,34 @@
+import typing as ta
+
+import anyio.abc
+
+from omlish import inject as inj
+
+from .config import Config
+from .inject import bind_server
+from .listener import Listener
+from .sockets import Sockets
+from .types import AppWrapper
+from .types import AsgiFramework
+from .types import wrap_app
+
+
+async def serve(
+        app: AsgiFramework | AppWrapper,
+        config: Config,
+        *,
+        sockets: Sockets | None = None,
+        shutdown_trigger: ta.Callable[..., ta.Awaitable[None]] | None = None,
+        handle_shutdown_signals: bool = False,
+        task_status: anyio.abc.TaskStatus[ta.Sequence[str]] = anyio.TASK_STATUS_IGNORED,
+) -> None:
+    injector = inj.create_injector(bind_server(config))
+    listener = injector.inject(Listener)
+    await listener.listen(
+        wrap_app(app),
+        config,
+        sockets=sockets,
+        shutdown_trigger=shutdown_trigger,
+        handle_shutdown_signals=handle_shutdown_signals,
+        task_status=task_status,
+    )

omserv-0.0.0.dev179/omserv/server/inject.py

@@ -0,0 +1,21 @@
+import functools
+
+from omlish import inject as inj
+
+from .config import Config
+from .server import Server
+from .server import ServerFactory
+
+
+def _provide_server_factory(config: Config) -> ServerFactory:
+    return ServerFactory(functools.partial(Server, config=config))
+
+
+def bind_server(
+        config: Config,
+) -> inj.Elemental:
+    return inj.as_elements(
+        inj.bind(config),
+
+        inj.bind(_provide_server_factory, singleton=True),
+    )

omserv-0.0.0.dev177/omserv/server/workers.py → omserv-0.0.0.dev179/omserv/server/listener.py

@@ -11,10 +11,10 @@ import anyio.abc
 
 from .config import Config
 from .lifespans import Lifespan
+from .server import ServerFactory
 from .sockets import Sockets
 from .sockets import create_sockets
 from .sockets import repr_socket_addr
-from .tcpserver import TcpServer
 from .types import AppWrapper
 from .types import AsgiFramework
 from .types import wrap_app
@@ -125,69 +125,80 @@ async def _install_signal_handler(
     return signal_event.wait
 
 
-async def serve(
-        app: AsgiFramework | AppWrapper,
-        config: Config,
-        *,
-        sockets: Sockets | None = None,
-        shutdown_trigger: ta.Callable[..., ta.Awaitable[None]] | None = None,
-        handle_shutdown_signals: bool = False,
-        task_status: anyio.abc.TaskStatus[ta.Sequence[str]] = anyio.TASK_STATUS_IGNORED,
-) -> None:
-    app = wrap_app(app)
-
-    lifespan = Lifespan(app, config)
-    max_requests = None
-    if config.max_requests is not None:
-        max_requests = config.max_requests + random.randint(0, config.max_requests_jitter)
-    context = WorkerContext(max_requests)
+class Listener:
+    def __init__(
+            self,
+            *,
+            server_factory: ServerFactory,
+    ) -> None:
+        super().__init__()
+
+        self._server_factory = server_factory
+
+    async def listen(
+            self,
+            app: AsgiFramework | AppWrapper,
+            config: Config,
+            *,
+            sockets: Sockets | None = None,
+            shutdown_trigger: ta.Callable[..., ta.Awaitable[None]] | None = None,
+            handle_shutdown_signals: bool = False,
+            task_status: anyio.abc.TaskStatus[ta.Sequence[str]] = anyio.TASK_STATUS_IGNORED,
+    ) -> None:
+        app = wrap_app(app)
+
+        lifespan = Lifespan(app, config)
+        max_requests = None
+        if config.max_requests is not None:
+            max_requests = config.max_requests + random.randint(0, config.max_requests_jitter)
+        context = WorkerContext(max_requests)
+
+        async with anyio.create_task_group() as lifespan_task_group:
+            if shutdown_trigger is None and handle_shutdown_signals:
+                shutdown_trigger = await _install_signal_handler(lifespan_task_group)
+
+            await lifespan_task_group.start(lifespan.handle_lifespan)
+            await lifespan.wait_for_startup()
+
+            async with anyio.create_task_group() as server_task_group:
+                if sockets is None:
+                    sockets = create_sockets(config)
+                    for sock in sockets.insecure_sockets:
+                        sock.listen(config.backlog)
+
+                listeners = []
+                binds = []
 
-    async with anyio.create_task_group() as lifespan_task_group:
-        if shutdown_trigger is None and handle_shutdown_signals:
-            shutdown_trigger = await _install_signal_handler(lifespan_task_group)
-
-        await lifespan_task_group.start(lifespan.handle_lifespan)
-        await lifespan.wait_for_startup()
-
-        async with anyio.create_task_group() as server_task_group:
-            if sockets is None:
-                sockets = create_sockets(config)
                 for sock in sockets.insecure_sockets:
-                    sock.listen(config.backlog)
-
-            listeners = []
-            binds = []
-
-            for sock in sockets.insecure_sockets:
-                listeners.append(anyio._core._eventloop.get_async_backend().create_tcp_listener(sock))  # noqa
-                bind = repr_socket_addr(sock.family, sock.getsockname())
-                binds.append(f'http://{bind}')
-                log.info('Running on http://%s (CTRL + C to quit)', bind)
-
-            task_status.started(binds)
-            try:
-                async with anyio.create_task_group() as task_group:
-                    if shutdown_trigger is not None:
-                        task_group.start_soon(raise_shutdown, shutdown_trigger)
-                    task_group.start_soon(raise_shutdown, context.terminate.wait)
-
-                    task_group.start_soon(
-                        functools.partial(
-                            serve_listeners,
-                            functools.partial(TcpServer, app, config, context),
-                            listeners,
-                            handler_task_group=server_task_group,
-                        ),
-                    )
-
-                    await anyio.sleep_forever()
-            except BaseExceptionGroup as error:
-                _, other_errors = error.split((ShutdownError, KeyboardInterrupt))  # noqa
-                if other_errors is not None:
-                    raise other_errors  # noqa
-            finally:
-                await context.terminated.set()
-                server_task_group.cancel_scope.deadline = anyio.current_time() + config.graceful_timeout
-
-        await lifespan.wait_for_shutdown()
-        lifespan_task_group.cancel_scope.cancel()
+                    listeners.append(anyio._core._eventloop.get_async_backend().create_tcp_listener(sock))  # noqa
+                    bind = repr_socket_addr(sock.family, sock.getsockname())
+                    binds.append(f'http://{bind}')
+                    log.info('Running on http://%s (CTRL + C to quit)', bind)
+
+                task_status.started(binds)
+                try:
+                    async with anyio.create_task_group() as task_group:
+                        if shutdown_trigger is not None:
+                            task_group.start_soon(raise_shutdown, shutdown_trigger)
+                        task_group.start_soon(raise_shutdown, context.terminate.wait)
+
+                        task_group.start_soon(
+                            functools.partial(
+                                serve_listeners,
+                                functools.partial(self._server_factory, app, context),
+                                listeners,
+                                handler_task_group=server_task_group,
+                            ),
+                        )
+
+                        await anyio.sleep_forever()
+                except BaseExceptionGroup as error:
+                    _, other_errors = error.split((ShutdownError, KeyboardInterrupt))  # noqa
+                    if other_errors is not None:
+                        raise other_errors  # noqa
+                finally:
+                    await context.terminated.set()
+                    server_task_group.cancel_scope.deadline = anyio.current_time() + config.graceful_timeout
+
+            await lifespan.wait_for_shutdown()
+            lifespan_task_group.cancel_scope.cancel()

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179}/omserv/server/multiprocess.py

@@ -12,11 +12,11 @@ import typing as ta
 import anyio
 
 from .config import Config
+from .default import serve
 from .sockets import Sockets
 from .sockets import create_sockets
 from .types import AsgiFramework
 from .types import wrap_app
-from .workers import serve
 
 
 async def check_multiprocess_shutdown_event(

omserv-0.0.0.dev177/omserv/server/tcpserver.py → omserv-0.0.0.dev179/omserv/server/server.py

@@ -6,6 +6,7 @@ import typing as ta
 import anyio.abc
 
 from omlish import check
+from omlish import lang
 
 from .config import Config
 from .events import Closed
@@ -25,13 +26,18 @@ log = logging.getLogger(__name__)
 MAX_RECV = 2 ** 16
 
 
-class TcpServer:
+class ServerFactory(lang.Func3[AppWrapper, WorkerContext, anyio.abc.SocketStream, 'Server']):
+    pass
+
+
+class Server:
     def __init__(
             self,
             app: AppWrapper,
-            config: Config,
             context: WorkerContext,
             stream: anyio.abc.SocketStream,
+            *,
+            config: Config,
     ) -> None:
         super().__init__()
 

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev177
+Version: 0.0.0.dev179
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev177
+Requires-Dist: omlish==0.0.0.dev179
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179}/omserv.egg-info/SOURCES.txt

@@ -34,17 +34,19 @@ omserv/server/LICENSE
 omserv/server/__init__.py
 omserv/server/config.py
 omserv/server/debug.py
+omserv/server/default.py
 omserv/server/events.py
 omserv/server/headers.py
+omserv/server/inject.py
 omserv/server/lifespans.py
+omserv/server/listener.py
 omserv/server/multiprocess.py
+omserv/server/server.py
 omserv/server/sockets.py
 omserv/server/ssl.py
 omserv/server/taskspawner.py
-omserv/server/tcpserver.py
 omserv/server/types.py
 omserv/server/workercontext.py
-omserv/server/workers.py
 omserv/server/protocols/__init__.py
 omserv/server/protocols/h11.py
 omserv/server/protocols/h2.py

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179}/omserv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev177
+omlish==0.0.0.dev179
 
 [all]
 h11~=0.14

{omserv-0.0.0.dev177 → omserv-0.0.0.dev179}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev177'
+version = '0.0.0.dev179'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev177',
+    'omlish == 0.0.0.dev179',
 ]
 
 [project.optional-dependencies]