latch-asgi 1.0.5__tar.gz → 1.0.6.dev1__tar.gz

{latch_asgi-1.0.5 → latch_asgi-1.0.6.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: latch-asgi
-Version: 1.0.5
+Version: 1.0.6.dev1
 Summary: ASGI python server
 Author-Email: Max Smolin <max@latch.bio>
 License: CC0-1.0

{latch_asgi-1.0.5 → latch_asgi-1.0.6.dev1}/latch_asgi/context/websocket.py

@@ -27,9 +27,42 @@ class Context(
 
     @trace_app_function
     async def accept_connection(
-        self: Self, *, subprotocol: str | None = None, headers: Headers | None = None
+        self: Self,
+        *,
+        subprotocol: str | None = None,
+        headers: Headers | None = None,
+        negotiate_permessage_deflate: bool = False,
     ) -> None:
-        await accept_connection(self.send, subprotocol=subprotocol, headers=headers)
+        if not negotiate_permessage_deflate:
+            await accept_connection(self.send, subprotocol=subprotocol, headers=headers)
+            return
+
+        offer = self.header_str("sec-websocket-extensions")
+
+        headers_out: Headers = {}
+        if headers is not None:
+            headers_out = dict(headers)
+
+        def _has_extensions_header(h: Headers) -> bool:
+            for k in h.keys():
+                if isinstance(k, bytes):
+                    if k.decode("latin-1").lower() == "sec-websocket-extensions":
+                        return True
+                else:
+                    if k.lower() == "sec-websocket-extensions":
+                        return True
+            return False
+
+        if (
+            offer is not None
+            and "permessage-deflate" in offer.replace(" ", "").lower()
+            and not _has_extensions_header(headers_out)
+        ):
+            headers_out["Sec-WebSocket-Extensions"] = "permessage-deflate"
+
+        await accept_connection(
+            self.send, subprotocol=subprotocol, headers=headers_out or headers
+        )
 
     @trace_app_function
     async def receive_message(self: Self, cls: type[T]) -> T:

{latch_asgi-1.0.5 → latch_asgi-1.0.6.dev1}/latch_asgi/framework/common.py

@@ -22,6 +22,7 @@ otel_header_whitelist = {
     "sec-gpc",
     "te",
     "upgrade-insecure-requests",
+    "sec-websocket-extensions",
     "device-memory",
     "downlink",
     "dpr",

{latch_asgi-1.0.5 → latch_asgi-1.0.6.dev1}/latch_asgi/server.py

@@ -222,6 +222,13 @@ class LatchASGIServer:
         s.set_attribute("http.route", scope["path"])
 
         close_reason: str | None = None
+        close_already_sent: bool = False
+
+        async def send_tracking(e):
+            nonlocal close_already_sent
+            if isinstance(e, dict) and e.get("type") == "websocket.close":
+                close_already_sent = True
+            await send(e)
         try:
             try:
                 msg = await receive()
@@ -230,7 +237,7 @@ class LatchASGIServer:
                         "ASGI protocol violation: missing websocket.connect event"
                     )
 
-                ctx = websocket.Context(scope, receive, send)
+                ctx = websocket.Context(scope, receive, send_tracking)
                 close_reason = await handler(ctx)
             except WebsocketErrorResponse:
                 raise
@@ -241,7 +248,7 @@ class LatchASGIServer:
                 raise WebsocketInternalServerError("Internal Error") from e
         except WebsocketErrorResponse as e:
             await close_connection(
-                send, status=e.status, reason=orjson.dumps({"error": e.data}).decode()
+                send_tracking, status=e.status, reason=orjson.dumps({"error": e.data}).decode()
             )
 
             if e.status != WebsocketStatus.server_error:
@@ -249,12 +256,13 @@ class LatchASGIServer:
 
             raise
         else:
-            if close_reason is None:
-                close_reason = "Session complete"
+            if not close_already_sent:
+                if close_reason is None:
+                    close_reason = "Session complete"
 
-            await close_connection(
-                send, status=WebsocketStatus.normal, reason=close_reason
-            )
+                await close_connection(
+                    send_tracking, status=WebsocketStatus.normal, reason=close_reason
+                )
 
     async def scope_http(
         self: Self,

{latch_asgi-1.0.5 → latch_asgi-1.0.6.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "latch-asgi"
-version = "1.0.5"
+version = "1.0.6.dev1"
 description = "ASGI python server"
 authors = [
     { name = "Max Smolin", email = "max@latch.bio" },