Simplify HTTP/3. Remove chunked encoding and excessive logging.

sanic/app.py

@@ -1369,12 +1369,6 @@ class Sanic(
             protocol = request.transport.get_protocol()
             ws = await protocol.websocket_handshake(request, subprotocols)
 
-        await self.dispatch(
-            "websocket.handler.before",
-            inline=True,
-            context={"request": request, "websocket": ws},
-            fail_not_found=False,
-        )
         # schedule the application handler
         # its future is kept in self.websocket_tasks in case it
         # needs to be cancelled due to the server being stopped
@@ -1383,24 +1377,10 @@ class Sanic(
         cancelled = False
         try:
             await fut
-            await self.dispatch(
-                "websocket.handler.after",
-                inline=True,
-                context={"request": request, "websocket": ws},
-                reverse=True,
-                fail_not_found=False,
-            )
         except (CancelledError, ConnectionClosed):  # type: ignore
             cancelled = True
         except Exception as e:
             self.error_handler.log(request, e)
-            await self.dispatch(
-                "websocket.handler.exception",
-                inline=True,
-                context={"request": request, "websocket": ws, "exception": e},
-                reverse=True,
-                fail_not_found=False,
-            )
         finally:
             self.websocket_tasks.remove(fut)
             if cancelled:

sanic/http/http3.py

@@ -152,24 +152,20 @@ class HTTPReceiver(Receiver, Stream):
         size = len(response.body) if response.body else 0
         headers = response.headers
         status = response.status
-
-        if not has_message_body(status) and (
+        want_body = (
             size
             or "content-length" in headers
             or "transfer-encoding" in headers
-        ):
+        )
+        headers.pop("transfer-encoding", None)  # Not used with HTTP/3
+        if want_body and not has_message_body(status):
             headers.pop("content-length", None)
-            headers.pop("transfer-encoding", None)
             logger.warning(  # no cov
                 f"Message body set in response on {self.request.path}. "
                 f"A {status} response may only have headers, no body."
             )
-        elif "content-length" not in headers:
-            if size:
-                headers["content-length"] = size
-            else:
-                headers["transfer-encoding"] = "chunked"
-
+        elif size and "content-length" not in headers:
+            headers["content-length"] = size
         headers = [
             (b":status", str(response.status).encode()),
             *response.processed_headers,
@@ -195,18 +191,8 @@ class HTTPReceiver(Receiver, Stream):
         self.headers_sent = True
         self.stage = Stage.RESPONSE
 
-        if self.response.body and not self.head_only:
-            self._send(self.response.body, False)
-        elif self.head_only:
-            self.future.cancel()
-
     def respond(self, response: BaseHTTPResponse) -> BaseHTTPResponse:
         """Prepare response to client"""
-        logger.debug(  # no cov
-            f"{Colors.BLUE}[respond]:{Colors.END} {response}",
-            extra={"verbosity": 2},
-        )
-
         if self.stage is not Stage.HANDLER:
             self.stage = Stage.FAILED
             raise RuntimeError("Response already started")
@@ -229,38 +215,14 @@ class HTTPReceiver(Receiver, Stream):
 
     async def send(self, data: bytes, end_stream: bool) -> None:
         """Send data to client"""
-        logger.debug(  # no cov
-            f"{Colors.BLUE}[send]: {Colors.GREEN}data={data.decode()} "
-            f"end_stream={end_stream}{Colors.END}",
-            extra={"verbosity": 2},
-        )
-        self._send(data, end_stream)
-
-    def _send(self, data: bytes, end_stream: bool) -> None:
         if not self.headers_sent:
             self.send_headers()
         if self.stage is not Stage.RESPONSE:
             raise ServerError(f"not ready to send: {self.stage}")
 
-        # Chunked
-        if (
-            self.response
-            and self.response.headers.get("transfer-encoding") == "chunked"
-        ):
-            size = len(data)
-            if end_stream:
-                data = (
-                    b"%x\r\n%b\r\n0\r\n\r\n" % (size, data)
-                    if size
-                    else b"0\r\n\r\n"
-                )
-            elif size:
-                data = b"%x\r\n%b\r\n" % (size, data)
+        if data and self.head_only:
+            data = b""
 
-        logger.debug(  # no cov
-            f"{Colors.BLUE}[transmitting]{Colors.END}",
-            extra={"verbosity": 2},
-        )
         self.protocol.connection.send_data(
             stream_id=self.request.stream_id,
             data=data,

sanic/signals.py

@@ -38,9 +38,6 @@ class Event(Enum):
     HTTP_LIFECYCLE_SEND = "http.lifecycle.send"
     HTTP_MIDDLEWARE_AFTER = "http.middleware.after"
     HTTP_MIDDLEWARE_BEFORE = "http.middleware.before"
-    WEBSOCKET_HANDLER_AFTER = "websocket.handler.after"
-    WEBSOCKET_HANDLER_BEFORE = "websocket.handler.before"
-    WEBSOCKET_HANDLER_EXCEPTION = "websocket.handler.exception"
 
 
 RESERVED_NAMESPACES = {
@@ -68,11 +65,6 @@ RESERVED_NAMESPACES = {
         Event.HTTP_MIDDLEWARE_AFTER.value,
         Event.HTTP_MIDDLEWARE_BEFORE.value,
     ),
-    "websocket": {
-        Event.WEBSOCKET_HANDLER_AFTER.value,
-        Event.WEBSOCKET_HANDLER_BEFORE.value,
-        Event.WEBSOCKET_HANDLER_EXCEPTION.value,
-    },
 }
 
 

tests/test_ws_handlers.py

@@ -54,65 +54,3 @@ def test_ws_handler_async_for(
     )
     assert ws_proxy.client_sent == ["test 1", "test 2", ""]
     assert ws_proxy.client_received == ["test 1", "test 2"]
-
-
-def signalapp(app):
-    @app.signal("websocket.handler.before")
-    async def ws_before(request: Request, websocket: Websocket):
-        app.ctx.seq.append("before")
-        print("before")
-        await websocket.send("before: " + await websocket.recv())
-        print("before2")
-
-    @app.signal("websocket.handler.after")
-    async def ws_after(request: Request, websocket: Websocket):
-        app.ctx.seq.append("after")
-        await websocket.send("after: " + await websocket.recv())
-        await websocket.recv()
-
-    @app.signal("websocket.handler.exception")
-    async def ws_exception(
-        request: Request, websocket: Websocket, exception: Exception
-    ):
-        app.ctx.seq.append("exception")
-        await websocket.send(f"exception: {exception}")
-        await websocket.recv()
-
-    @app.websocket("/ws")
-    async def ws_handler(request: Request, ws: Websocket):
-        app.ctx.seq.append("ws")
-
-    @app.websocket("/wserror")
-    async def ws_error(request: Request, ws: Websocket):
-        print("wserr")
-        app.ctx.seq.append("wserror")
-        raise Exception(await ws.recv())
-        print("wserr2")
-
-
-def test_ws_signals(
-    app: Sanic,
-    simple_ws_mimic_client: MimicClientType,
-):
-    signalapp(app)
-
-    app.ctx.seq = []
-    _, ws_proxy = app.test_client.websocket(
-        "/ws", mimic=simple_ws_mimic_client
-    )
-    assert ws_proxy.client_received == ["before: test 1", "after: test 2"]
-    assert app.ctx.seq == ["before", "ws", "after"]
-
-
-def test_ws_signals_exception(
-    app: Sanic,
-    simple_ws_mimic_client: MimicClientType,
-):
-    signalapp(app)
-
-    app.ctx.seq = []
-    _, ws_proxy = app.test_client.websocket(
-        "/wserror", mimic=simple_ws_mimic_client
-    )
-    assert ws_proxy.client_received == ["before: test 1", "exception: test 2"]
-    assert app.ctx.seq == ["before", "wserror", "exception"]