omserv 0.0.0.dev471__tar.gz → 0.0.0.dev486__tar.gz

{omserv-0.0.0.dev471/omserv.egg-info → omserv-0.0.0.dev486}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev471
+Version: 0.0.0.dev486
 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.dev471
+Requires-Dist: omlish==0.0.0.dev486
 Provides-Extra: all
 Requires-Dist: h11~=0.16; 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.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.dev471 → omserv-0.0.0.dev486}/omserv/__about__.py

@@ -16,7 +16,7 @@ class Project(ProjectBase):
             'h11 ~= 0.16',
             'h2 ~= 4.3',
             'priority ~= 2.0',
-            'wsproto ~= 1.2',
+            'wsproto ~= 1.3',
         ],
 
         'templates': [

{omserv-0.0.0.dev471 → omserv-0.0.0.dev486}/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.dev471 → omserv-0.0.0.dev486}/omserv/server/listener.py

@@ -174,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.dev471 → omserv-0.0.0.dev486}/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
@@ -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))

{omserv-0.0.0.dev471 → omserv-0.0.0.dev486}/omserv/server/streams/httpstream.py

@@ -13,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
@@ -32,6 +33,7 @@ log = logs.get_module_logger(globals())
 ##
 
 
+TRAILERS_VERSIONS = {'2', '3'}
 PUSH_VERSIONS = {'2', '3'}
 EARLY_HINTS_VERSIONS = {'2', '3'}
 
@@ -41,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()
 
 
@@ -101,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'] = {}
 
@@ -200,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(
@@ -210,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.dev471 → omserv-0.0.0.dev486}/omserv/server/streams/wsstream.py

@@ -65,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
@@ -149,6 +150,7 @@ class Handshake:
 
             headers.append((name, value))
 
+        self.accepted = True
         return status_code, headers, wsp.Connection(wsp.ConnectionType.SERVER, extensions)
 
 
@@ -261,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
 
@@ -312,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.dev471 → omserv-0.0.0.dev486/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omserv
-Version: 0.0.0.dev471
+Version: 0.0.0.dev486
 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.dev471
+Requires-Dist: omlish==0.0.0.dev486
 Provides-Extra: all
 Requires-Dist: h11~=0.16; 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.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.dev471 → omserv-0.0.0.dev486}/omserv.egg-info/requires.txt

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

{omserv-0.0.0.dev471 → omserv-0.0.0.dev486}/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.dev471'
+version = '0.0.0.dev486'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev471',
+    'omlish == 0.0.0.dev486',
 ]
 
 [project.optional-dependencies]
@@ -32,14 +32,14 @@ all = [
     'h11 ~= 0.16',
     'h2 ~= 4.3',
     'priority ~= 2.0',
-    'wsproto ~= 1.2',
+    'wsproto ~= 1.3',
     'jinja2 ~= 3.1',
 ]
 server = [
     'h11 ~= 0.16',
     'h2 ~= 4.3',
     'priority ~= 2.0',
-    'wsproto ~= 1.2',
+    'wsproto ~= 1.3',
 ]
 templates = [
     'jinja2 ~= 3.1',