more compat fixes

Author: bdraco

onvif/client.py

@@ -248,12 +248,12 @@ def __init__(
         self.dt_diff = dt_diff
         self.binding_name = binding_name
         # Create soap client
-        connector = TCPConnector(
+        self._connector = TCPConnector(
             ssl=_NO_VERIFY_SSL_CONTEXT,
             keepalive_timeout=KEEPALIVE_EXPIRY,
         )
-        session = ClientSession(
-            connector=connector,
+        self._session = ClientSession(
+            connector=self._connector,
             timeout=aiohttp.ClientTimeout(
                 total=_DEFAULT_TIMEOUT,
                 connect=_CONNECT_TIMEOUT,
@@ -262,12 +262,12 @@ def __init__(
         )
         self.transport = (
             AsyncTransportProtocolErrorHandler(
-                session=session,
+                session=self._session,
                 verify_ssl=False,
             )
             if no_cache
             else AIOHTTPTransport(
-                session=session,
+                session=self._session,
                 verify_ssl=False,
                 cache=SqliteCache(),
             )
@@ -316,6 +316,8 @@ async def setup(self):
     async def close(self):
         """Close the transport."""
         await self.transport.aclose()
+        await self._session.close()
+        await self._connector.close()
 
     @staticmethod
     @safe_func

onvif/managers.py

@@ -62,7 +62,7 @@ def __init__(
     @property
     def closed(self) -> bool:
         """Return True if the manager is closed."""
-        return not self._subscription or self._subscription.transport.client.is_closed
+        return not self._subscription or self._subscription.transport.session.closed
 
     async def start(self) -> None:
         """Setup the manager."""

onvif/zeep_aiohttp.py

@@ -159,17 +159,18 @@ async def _post(
                 proxy=self.proxy,
                 timeout=self._client_timeout,
             )
-            response.raise_for_status()
 
-            # Read the content to log it
+            # Read the content to log it before checking status
             content = await response.read()
             _LOGGER.debug(
                 "HTTP Response from %s (status: %d):\n%s",
                 address,
                 response.status,
-                content.decode("utf-8", errors="replace"),
+                content,
             )
 
+            response.raise_for_status()
+
             # Convert to httpx Response
             return self._aiohttp_to_httpx_response(response, content)
 
@@ -236,17 +237,19 @@ async def _get(
                 proxy=self.proxy,
                 timeout=self._client_timeout,
             )
-            response.raise_for_status()
 
-            # Read content
+            # Read content and log before checking status
             content = await response.read()
 
             _LOGGER.debug(
-                "HTTP Response from %s (status: %d)",
+                "HTTP Response from %s (status: %d):\n%s",
                 address,
                 response.status,
+                content,
             )
 
+            response.raise_for_status()
+
             # Convert directly to requests.Response
             return self._aiohttp_to_requests_response(response, content)