From dfed10420caf4c3ba1823553196b5a0a601ac5c5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 29 Nov 2023 10:24:34 -0700
Subject: [PATCH] Remove aiohttp enable_compression helper (#104174)

---
 homeassistant/components/api/__init__.py   |  7 ++++---
 homeassistant/components/hassio/ingress.py |  4 ++--
 homeassistant/components/http/view.py      |  4 ++--
 homeassistant/helpers/aiohttp_compat.py    | 18 +-----------------
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/homeassistant/components/api/__init__.py b/homeassistant/components/api/__init__.py
index 7e4966e2b0d..057e85613fd 100644
--- a/homeassistant/components/api/__init__.py
+++ b/homeassistant/components/api/__init__.py
@@ -41,7 +41,6 @@ from homeassistant.exceptions import (
     Unauthorized,
 )
 from homeassistant.helpers import config_validation as cv, template
-from homeassistant.helpers.aiohttp_compat import enable_compression
 from homeassistant.helpers.event import EventStateChangedData
 from homeassistant.helpers.json import json_dumps
 from homeassistant.helpers.service import async_get_all_descriptions
@@ -218,9 +217,11 @@ class APIStatesView(HomeAssistantView):
                 if entity_perm(state.entity_id, "read")
             )
         response = web.Response(
-            body=f'[{",".join(states)}]', content_type=CONTENT_TYPE_JSON
+            body=f'[{",".join(states)}]',
+            content_type=CONTENT_TYPE_JSON,
+            zlib_executor_size=32768,
         )
-        enable_compression(response)
+        response.enable_compression()
         return response
 
 
diff --git a/homeassistant/components/hassio/ingress.py b/homeassistant/components/hassio/ingress.py
index 7da6f044db0..751e9005809 100644
--- a/homeassistant/components/hassio/ingress.py
+++ b/homeassistant/components/hassio/ingress.py
@@ -17,7 +17,6 @@ from yarl import URL
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.aiohttp_compat import enable_compression
 from homeassistant.helpers.typing import UNDEFINED
 
 from .const import X_HASS_SOURCE, X_INGRESS_PATH
@@ -188,11 +187,12 @@ class HassIOIngress(HomeAssistantView):
                     status=result.status,
                     content_type=content_type,
                     body=body,
+                    zlib_executor_size=32768,
                 )
                 if content_length_int > MIN_COMPRESSED_SIZE and should_compress(
                     content_type or simple_response.content_type
                 ):
-                    enable_compression(simple_response)
+                    simple_response.enable_compression()
                 await simple_response.prepare(request)
                 return simple_response
 
diff --git a/homeassistant/components/http/view.py b/homeassistant/components/http/view.py
index 7481381bbc8..1be3d761a3b 100644
--- a/homeassistant/components/http/view.py
+++ b/homeassistant/components/http/view.py
@@ -20,7 +20,6 @@ import voluptuous as vol
 from homeassistant import exceptions
 from homeassistant.const import CONTENT_TYPE_JSON
 from homeassistant.core import Context, HomeAssistant, is_callback
-from homeassistant.helpers.aiohttp_compat import enable_compression
 from homeassistant.helpers.json import (
     find_paths_unserializable_data,
     json_bytes,
@@ -72,8 +71,9 @@ class HomeAssistantView:
             content_type=CONTENT_TYPE_JSON,
             status=int(status_code),
             headers=headers,
+            zlib_executor_size=32768,
         )
-        enable_compression(response)
+        response.enable_compression()
         return response
 
     def json_message(
diff --git a/homeassistant/helpers/aiohttp_compat.py b/homeassistant/helpers/aiohttp_compat.py
index 6e281b659fe..78aad44fa66 100644
--- a/homeassistant/helpers/aiohttp_compat.py
+++ b/homeassistant/helpers/aiohttp_compat.py
@@ -1,7 +1,7 @@
 """Helper to restore old aiohttp behavior."""
 from __future__ import annotations
 
-from aiohttp import web, web_protocol, web_server
+from aiohttp import web_protocol, web_server
 
 
 class CancelOnDisconnectRequestHandler(web_protocol.RequestHandler):
@@ -23,19 +23,3 @@ def restore_original_aiohttp_cancel_behavior() -> None:
     """
     web_protocol.RequestHandler = CancelOnDisconnectRequestHandler  # type: ignore[misc]
     web_server.RequestHandler = CancelOnDisconnectRequestHandler  # type: ignore[misc]
-
-
-def enable_compression(response: web.Response) -> None:
-    """Enable compression on the response."""
-    #
-    # Set _zlib_executor_size in the constructor once support for
-    # aiohttp < 3.9.0 is dropped
-    #
-    # We want large zlib payloads to be compressed in the executor
-    # to avoid blocking the event loop.
-    #
-    # 32KiB was chosen based on testing in production.
-    # aiohttp will generate a warning for payloads larger than 1MiB
-    #
-    response._zlib_executor_size = 32768  # pylint: disable=protected-access
-    response.enable_compression()