omserv 0.0.0.dev395__tar.gz → 0.0.0.dev497__tar.gz

{omserv-0.0.0.dev395/omserv.egg-info → omserv-0.0.0.dev497}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev395
+Version: 0.0.0.dev497
 Summary: omserv
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,18 +14,18 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev395
+Requires-Dist: omlish==0.0.0.dev497
 Provides-Extra: all
 Requires-Dist: h11~=0.16; extra == "all"
-Requires-Dist: h2~=4.2; extra == "all"
+Requires-Dist: h2~=4.3; extra == "all"
 Requires-Dist: priority~=2.0; extra == "all"
-Requires-Dist: wsproto~=1.2; extra == "all"
+Requires-Dist: wsproto~=1.3; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
 Provides-Extra: server
 Requires-Dist: h11~=0.16; extra == "server"
-Requires-Dist: h2~=4.2; extra == "server"
+Requires-Dist: h2~=4.3; extra == "server"
 Requires-Dist: priority~=2.0; extra == "server"
-Requires-Dist: wsproto~=1.2; extra == "server"
+Requires-Dist: wsproto~=1.3; extra == "server"
 Provides-Extra: templates
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Dynamic: license-file

omserv-0.0.0.dev395/omserv/.manifests.json → omserv-0.0.0.dev497/omserv/.omlish-manifests.json

@@ -5,9 +5,9 @@
     "file": "omserv/nginx/logs.py",
     "line": 68,
     "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "nginxlogs",
-        "mod_name": "omserv.nginx.logs"
+      "!omdev.cli.types.CliModule": {
+        "name": "nginxlogs",
+        "module": "omserv.nginx.logs"
       }
     }
   }

omserv-0.0.0.dev497/omserv/README.md

@@ -0,0 +1,9 @@
+# Overview
+
+Request serving code.
+
+# Notable packages
+
+- **[server](https://github.com/wrmsr/omlish/blob/master/omserv/server)** - Production web server based on
+  [hypercorn](https://github.com/pgjones/hypercorn). Converted to anyio, but still being refined and integrated with the
+  codebase.

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/__about__.py

@@ -14,9 +14,9 @@ class Project(ProjectBase):
     optional_dependencies = {
         'server': [
             'h11 ~= 0.16',
-            'h2 ~= 4.2',
+            'h2 ~= 4.3',
             'priority ~= 2.0',
-            'wsproto ~= 1.2',
+            'wsproto ~= 1.3',
         ],
 
         'templates': [

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/apps/markers.py

@@ -27,7 +27,7 @@ def append_app_marker(obj: T, *markers: AppMarker) -> T:
 
 
 def get_app_markers(obj: ta.Any) -> ta.Sequence[AppMarker]:
-    return [md for md in get_object_metadata(obj) if isinstance(md, AppMarker)]
+    return get_object_metadata(obj, type=AppMarker)
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/apps/routes.py

@@ -5,13 +5,13 @@ TODO:
 """
 import contextlib
 import dataclasses as dc
-import logging
 import re
 import typing as ta
 
 from omlish import check
 from omlish import lang
 from omlish.http import asgi
+from omlish.logs import all as logs
 
 from .base import BASE_SERVER_URL
 from .base import SCOPE
@@ -49,7 +49,7 @@ KNOWN_METHODS: tuple[str, ...] = (
 PatOrStr: ta.TypeAlias = re.Pattern | str
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -143,7 +143,7 @@ HANDLES_APP_MARKER_PROCESSORS: AppMarkerProcessorMap = {
 ##
 
 
-class RouteHandlerHolder(lang.Abstract):  # noqa
+class RouteHandlerHolder(lang.Abstract):
     def get_route_handlers(self) -> ta.Iterable[RouteHandler]:
         return get_marked_route_handlers(self)
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/apps/sessions.py

@@ -1,17 +1,17 @@
 import contextvars
 import dataclasses as dc
-import logging
 
 from omlish import lang
 from omlish.http import asgi
 from omlish.http import sessions
+from omlish.logs import all as logs
 
 from .markers import AppMarker
 from .markers import AppMarkerProcessor
 from .markers import append_app_marker
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/apps/templates.py

@@ -1,14 +1,15 @@
 import dataclasses as dc
 import importlib.resources
-import logging
 import typing as ta
 
 import jinja2
 
+from omlish.logs import all as logs
+
 from .base import url_for
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -53,6 +54,7 @@ class JinjaTemplates:
     class _Loader(jinja2.BaseLoader):
         def __init__(self, owner: 'JinjaTemplates') -> None:
             super().__init__()
+
             self._owner = owner
 
         def get_source(self, environment, template):

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/nginx/build.py

@@ -20,7 +20,7 @@ from omlish import lang
 NGINX_VERSION = '1.28.0'
 NGINX_SRC_URL = f'https://nginx.org/download/nginx-{NGINX_VERSION}.tar.gz'
 
-NGINX_VTS_VERSION = '0.2.2'
+NGINX_VTS_VERSION = '0.2.4'
 NGINX_VTS_SRC_URL = f'https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v{NGINX_VTS_VERSION}.tar.gz'
 
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/nginx/logs.py

@@ -66,9 +66,9 @@ def parse_nginx_log_line(
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'nginxlogs',
-    'mod_name': __name__,
+_CLI_MODULE = {'!omdev.cli.types.CliModule': {
+    'name': 'nginxlogs',
+    'module': __name__,
 }}
 
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/nodes/registry.py

@@ -1,6 +1,5 @@
 import contextlib
 import dataclasses as dc
-import logging
 import socket
 import typing as ta
 import uuid
@@ -12,6 +11,7 @@ from omlish import check
 from omlish import lang
 from omlish.asyncs import all as au
 from omlish.asyncs import anyio as anu
+from omlish.logs import all as logs
 from omlish.sql import alchemy as sau
 
 from .models import Nodes
@@ -19,7 +19,7 @@ from .models import setup_db
 from .sql import utcnow
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/nodes/sql.py

@@ -85,6 +85,7 @@ class CreateUpdateAtTrigger(sa.schema.DDLElement):
 
     def __init__(self, table_name: str) -> None:
         super().__init__()
+
         self.table_name = table_name
 
 
@@ -111,6 +112,7 @@ class DropUpdateAtTrigger(sa.schema.DDLElement):
 
     def __init__(self, table_name: str) -> None:
         super().__init__()
+
         self.table_name = table_name
 
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/debug.py

@@ -1,10 +1,10 @@
-import logging
 import sys
 
 from omlish.diag import pydevd as pdu
+from omlish.logs import all as logs
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/events.py

@@ -57,6 +57,11 @@ class Data(ProtocolEvent):
     data: bytes
 
 
+@dc.dataclass(frozen=True)
+class Trailers(ProtocolEvent):
+    headers: list[tuple[bytes, bytes]]
+
+
 @dc.dataclass(frozen=True)
 class EndData(ProtocolEvent):
     pass

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/lifespans.py

@@ -1,4 +1,3 @@
-import logging
 import typing as ta
 
 import anyio
@@ -6,6 +5,8 @@ import anyio.abc
 import anyio.from_thread
 import anyio.to_thread
 
+from omlish.logs import all as logs
+
 from .config import Config
 from .debug import handle_error_debug
 from .types import AppWrapper
@@ -15,7 +16,7 @@ from .types import LifespanScope
 from .types import UnexpectedMessageError
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -37,6 +38,7 @@ class LifespanFailureError(Exception):
 class Lifespan:
     def __init__(self, app: AppWrapper, config: Config) -> None:
         super().__init__()
+
         self.app = app
         self.config = config
         self.startup = anyio.Event()

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/listener.py

@@ -1,6 +1,5 @@
 import errno
 import functools
-import logging
 import os
 import random
 import signal  # noqa
@@ -9,6 +8,8 @@ import typing as ta
 import anyio
 import anyio.abc
 
+from omlish.logs import all as logs
+
 from .config import Config
 from .lifespans import Lifespan
 from .server import ServerFactory
@@ -22,7 +23,7 @@ from .workercontext import ShutdownError
 from .workercontext import WorkerContext
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -173,7 +174,7 @@ class Listener:
                 binds = []
 
                 for sock in sockets.insecure_sockets:
-                    listeners.append(anyio._core._eventloop.get_async_backend().create_tcp_listener(sock))  # noqa
+                    listeners.append(anyio._core._eventloop.get_async_backend().create_tcp_listener(sock))  # type: ignore[attr-defined]  # 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)

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/protocols/h11.py

@@ -43,6 +43,7 @@ STREAM_ID = 1
 class H2CProtocolRequiredError(Exception):
     def __init__(self, data: bytes, request: h11.Request) -> None:
         super().__init__()
+
         settings = ''
         headers = [(b':method', request.method), (b':path', request.target)]
         for name, value in request.headers:
@@ -60,6 +61,7 @@ class H2CProtocolRequiredError(Exception):
 class H2ProtocolAssumedError(Exception):
     def __init__(self, data: bytes) -> None:
         super().__init__()
+
         self.data = data
 
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/protocols/h2.py

@@ -24,6 +24,7 @@ from ..events import Request
 from ..events import Response
 from ..events import ServerEvent
 from ..events import StreamClosed
+from ..events import Trailers
 from ..events import Updated
 from ..headers import filter_pseudo_headers
 from ..headers import response_headers
@@ -50,6 +51,7 @@ class BufferCompleteError(Exception):
 class StreamBuffer:
     def __init__(self, event_class: type[WaitableEvent]) -> None:
         super().__init__()
+
         self.buffer = bytearray()
         self._complete = False
         self._is_empty = event_class()
@@ -152,8 +154,7 @@ class H2Protocol(Protocol):
         await self._flush()
 
         if headers is not None:
-            event = h2.events.RequestReceived()
-            event.stream_id = 1
+            event = h2.events.RequestReceived(stream_id=1)
             event.headers = [hpack.HeaderTuple(*t) for t in headers]
             await self._create_stream(event)
             await self.streams[event.stream_id].handle(EndBody(stream_id=event.stream_id))
@@ -239,6 +240,10 @@ class H2Protocol(Protocol):
                 await self.has_data.set()
                 await self.stream_buffers[event.stream_id].drain()
 
+            elif isinstance(event, Trailers):
+                self.connection.send_headers(event.stream_id, event.headers)
+                await self._flush()
+
             elif isinstance(event, StreamClosed):
                 await self._close_stream(event.stream_id)
                 idle = len(self.streams) == 0 or all(
@@ -288,9 +293,13 @@ class H2Protocol(Protocol):
                 )
 
             elif isinstance(event, h2.events.StreamEnded):
-                await self.streams[check.not_none(event.stream_id)].handle(
-                    EndBody(stream_id=check.not_none(event.stream_id)),
-                )
+                try:
+                    stream = self.streams[check.not_none(event.stream_id)]
+                except KeyError:
+                    # Response sent before full request received, nothing to do already closed.
+                    pass
+                else:
+                    await stream.handle(EndBody(stream_id=check.not_none(event.stream_id)))
 
             elif isinstance(event, h2.events.StreamReset):
                 await self._close_stream(check.not_none(event.stream_id))
@@ -395,7 +404,7 @@ class H2Protocol(Protocol):
 
         await self.streams[stream_id].handle(Request(
             stream_id=stream_id,
-            headers=filter_pseudo_headers(check.not_none(request.headers)),  # type: ignore[arg-type]
+            headers=filter_pseudo_headers(check.not_none(request.headers)),
             http_version='2',
             method=method,
             raw_path=raw_path,
@@ -428,8 +437,7 @@ class H2Protocol(Protocol):
             pass
 
         else:
-            event = h2.events.RequestReceived()
-            event.stream_id = push_stream_id
+            event = h2.events.RequestReceived(stream_id=push_stream_id)
             event.headers = [hpack.HeaderTuple(*t) for t in request_headers]
             await self._create_stream(event)
             await self.streams[event.stream_id].handle(EndBody(stream_id=event.stream_id))

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/protocols/protocols.py

@@ -29,6 +29,7 @@ class ProtocolWrapper:
             alpn_protocol: str | None = None,
     ) -> None:
         super().__init__()
+
         self.app = app
         self.config = config
         self.context = context

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/protocols/types.py

@@ -1,5 +1,7 @@
 import abc
 
+from omlish import lang
+
 from ..events import ProtocolEvent
 from ..events import ServerEvent
 
@@ -7,7 +9,7 @@ from ..events import ServerEvent
 ##
 
 
-class Protocol(abc.ABC):
+class Protocol(lang.Abstract):
     @abc.abstractmethod
     async def initiate(self) -> None:
         raise NotImplementedError

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/server.py

@@ -1,5 +1,4 @@
 import errno
-import logging
 import math
 import typing as ta
 
@@ -7,6 +6,7 @@ import anyio.abc
 
 from omlish import check
 from omlish import lang
+from omlish.logs import all as logs
 
 from .config import Config
 from .events import Closed
@@ -20,7 +20,7 @@ from .types import AppWrapper
 from .workercontext import WorkerContext
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/streams/httpstream.py

@@ -1,9 +1,10 @@
 import enum
-import logging
 import time
 import typing as ta
 import urllib.parse
 
+from omlish.logs import all as logs
+
 from ..config import Config
 from ..events import Body
 from ..events import EndBody
@@ -12,6 +13,7 @@ from ..events import ProtocolEvent
 from ..events import Request
 from ..events import Response
 from ..events import StreamClosed
+from ..events import Trailers
 from ..taskspawner import TaskSpawner
 from ..types import AppWrapper
 from ..types import AsgiSendEvent
@@ -25,12 +27,13 @@ from .utils import suppress_body
 from .utils import valid_server_name
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
 
 
+TRAILERS_VERSIONS = {'2', '3'}
 PUSH_VERSIONS = {'2', '3'}
 EARLY_HINTS_VERSIONS = {'2', '3'}
 
@@ -40,6 +43,7 @@ class AsgiHttpState(enum.Enum):
     # hence why this state tracking is required.
     REQUEST = enum.auto()
     RESPONSE = enum.auto()
+    TRAILERS = enum.auto()
     CLOSED = enum.auto()
 
 
@@ -56,6 +60,7 @@ class HttpStream:
             stream_id: int,
     ) -> None:
         super().__init__()
+
         self.app = app
         self.client = client
         self.closed = False
@@ -99,6 +104,9 @@ class HttpStream:
                 'extensions': {},
             }
 
+            if event.http_version in TRAILERS_VERSIONS:
+                self.scope['extensions']['http.response.trailers'] = {}
+
             if event.http_version in PUSH_VERSIONS:
                 self.scope['extensions']['http.response.push'] = {}
 
@@ -198,7 +206,12 @@ class HttpStream:
                 await self.send(Body(stream_id=self.stream_id, data=bytes(message.get('body', b''))))
 
             if not message.get('more_body', False):
-                if self.state != AsgiHttpState.CLOSED:
+                await self.send(EndBody(stream_id=self.stream_id))
+
+                if self.response.get('trailers', False):
+                    self.state = AsgiHttpState.TRAILERS
+
+                else:
                     self.state = AsgiHttpState.CLOSED
 
                     log_access(
@@ -208,7 +221,30 @@ class HttpStream:
                         time.time() - self.start_time,
                     )
 
-                    await self.send(EndBody(stream_id=self.stream_id))
+                    await self.send(StreamClosed(stream_id=self.stream_id))
+
+            elif (
+                    message['type'] == 'http.response.trailers' and
+                    self.scope['http_version'] in TRAILERS_VERSIONS and
+                    self.state == AsgiHttpState.TRAILERS
+            ):
+                for name, value in self.scope['headers']:
+                    if name == b'te' and value == b'trailers':
+                        headers = build_and_validate_headers(message['headers'])
+
+                        await self.send(Trailers(stream_id=self.stream_id, headers=headers))
+
+                        break
+
+                if not message.get('more_trailers', False):
+                    self.state = AsgiHttpState.CLOSED
+
+                    log_access(
+                        self.config,
+                        self.scope,
+                        self.response,  # type: ignore  # noqa
+                        time.time() - self.start_time,
+                    )
 
                     await self.send(StreamClosed(stream_id=self.stream_id))
 

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/streams/utils.py

@@ -1,12 +1,13 @@
-import logging
 import typing as ta
 
+from omlish.logs import all as logs
+
 from ..config import Config
 from ..events import Request
 from ..types import Scope
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/streams/wsstream.py

@@ -1,18 +1,19 @@
 import encodings.idna  # prevents `LookupError: unknown encoding: idna`  # noqa
 import enum
 import io
-import logging
 import time
 import typing as ta
 import urllib.parse
 
-from omlish import check
 import wsproto as wsp
 import wsproto.events as wse
 import wsproto.extensions
 import wsproto.frame_protocol
 import wsproto.utilities
 
+from omlish import check
+from omlish.logs import all as logs
+
 from ..config import Config
 from ..events import Body
 from ..events import Data
@@ -37,7 +38,7 @@ from .utils import suppress_body
 from .utils import valid_server_name
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -64,6 +65,7 @@ class Handshake:
     ) -> None:
         super().__init__()
 
+        self.accepted = False
         self.http_version = http_version
         self.connection_tokens: list[str] | None = None
         self.extensions: list[str] | None = None
@@ -148,6 +150,7 @@ class Handshake:
 
             headers.append((name, value))
 
+        self.accepted = True
         return status_code, headers, wsp.Connection(wsp.ConnectionType.SERVER, extensions)
 
 
@@ -260,6 +263,10 @@ class WsStream:
             self.connection.receive_data(event.data)
             await self._handle_events()
 
+        elif isinstance(event, (Body, Data)) and not self.handshake.accepted:
+            await self._send_error_response(400)
+            self.closed = True
+
         elif isinstance(event, StreamClosed):
             self.closed = True
 
@@ -311,7 +318,7 @@ class WsStream:
         elif message['type'] == 'websocket.send' and self.state == AsgiWebsocketState.CONNECTED:
             event: wse.Event
             if message.get('bytes') is not None:
-                event = wse.BytesMessage(data=bytes(message['bytes']))
+                event = wse.BytesMessage(data=bytearray(message['bytes']))
 
             elif not isinstance(message['text'], str):
                 raise TypeError(f'{message["text"]} should be a str')

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/taskspawner.py

@@ -1,4 +1,3 @@
-import logging
 import types
 import typing as ta
 
@@ -8,6 +7,7 @@ import anyio.from_thread
 import anyio.to_thread
 
 from omlish import check
+from omlish.logs import all as logs
 
 from .config import Config
 from .debug import handle_error_debug
@@ -18,7 +18,7 @@ from .types import AsgiSendEvent
 from .types import Scope
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -67,6 +67,7 @@ async def _handle(
 class TaskSpawner:
     def __init__(self) -> None:
         super().__init__()
+
         self._task_group: anyio.abc.TaskGroup | None = None
 
     async def start(

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/types.py

@@ -41,6 +41,7 @@ class UnexpectedMessageError(Exception):
 class AsgiWrapper:
     def __init__(self, app: AsgiFramework) -> None:
         super().__init__()
+
         self.app = app
 
     async def __call__(

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv/server/workercontext.py

@@ -9,6 +9,7 @@ from .types import WaitableEvent
 class WaitableEventWrapper:
     def __init__(self) -> None:
         super().__init__()
+
         self._event = anyio.Event()
 
     async def clear(self) -> None:
@@ -29,6 +30,7 @@ class WorkerContext:
 
     def __init__(self, max_requests: int | None) -> None:
         super().__init__()
+
         self.max_requests = max_requests
         self.requests = 0
         self.terminate = self.event_class()

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev395
+Version: 0.0.0.dev497
 Summary: omserv
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,18 +14,18 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev395
+Requires-Dist: omlish==0.0.0.dev497
 Provides-Extra: all
 Requires-Dist: h11~=0.16; extra == "all"
-Requires-Dist: h2~=4.2; extra == "all"
+Requires-Dist: h2~=4.3; extra == "all"
 Requires-Dist: priority~=2.0; extra == "all"
-Requires-Dist: wsproto~=1.2; extra == "all"
+Requires-Dist: wsproto~=1.3; extra == "all"
 Requires-Dist: jinja2~=3.1; extra == "all"
 Provides-Extra: server
 Requires-Dist: h11~=0.16; extra == "server"
-Requires-Dist: h2~=4.2; extra == "server"
+Requires-Dist: h2~=4.3; extra == "server"
 Requires-Dist: priority~=2.0; extra == "server"
-Requires-Dist: wsproto~=1.2; extra == "server"
+Requires-Dist: wsproto~=1.3; extra == "server"
 Provides-Extra: templates
 Requires-Dist: jinja2~=3.1; extra == "templates"
 Dynamic: license-file

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv.egg-info/SOURCES.txt

@@ -2,7 +2,8 @@ LICENSE
 MANIFEST.in
 README.md
 pyproject.toml
-omserv/.manifests.json
+omserv/.omlish-manifests.json
+omserv/README.md
 omserv/__about__.py
 omserv/__init__.py
 omserv.egg-info/PKG-INFO

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/omserv.egg-info/requires.txt

@@ -1,17 +1,17 @@
-omlish==0.0.0.dev395
+omlish==0.0.0.dev497
 
 [all]
 h11~=0.16
-h2~=4.2
+h2~=4.3
 priority~=2.0
-wsproto~=1.2
+wsproto~=1.3
 jinja2~=3.1
 
 [server]
 h11~=0.16
-h2~=4.2
+h2~=4.3
 priority~=2.0
-wsproto~=1.2
+wsproto~=1.3
 
 [templates]
 jinja2~=3.1

{omserv-0.0.0.dev395 → omserv-0.0.0.dev497}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev395'
+version = '0.0.0.dev497'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,22 +24,22 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev395',
+    'omlish == 0.0.0.dev497',
 ]
 
 [project.optional-dependencies]
 all = [
     'h11 ~= 0.16',
-    'h2 ~= 4.2',
+    'h2 ~= 4.3',
     'priority ~= 2.0',
-    'wsproto ~= 1.2',
+    'wsproto ~= 1.3',
     'jinja2 ~= 3.1',
 ]
 server = [
     'h11 ~= 0.16',
-    'h2 ~= 4.2',
+    'h2 ~= 4.3',
     'priority ~= 2.0',
-    'wsproto ~= 1.2',
+    'wsproto ~= 1.3',
 ]
 templates = [
     'jinja2 ~= 3.1',
@@ -67,9 +67,13 @@ exclude = [
     '*.cu',
     '*.g4',
     '*.h',
-    '.manifests.json',
+    '*.hh',
+    '.omlish-manifests.json',
+    'README',
+    'README.md',
     'LICENSE',
     'LICENSE.txt',
+    'AUTHORS',
     'nginx/patches/*.patch',
     'server/resources/*.ico',
 ]