Revert "Fix event stream timeout at session level (#508)"

This reverts commit 696e662.

Author: rroller

custom_components/dahua/__init__.py

@@ -12,7 +12,7 @@
 from homeassistant.components.tag import async_scan_tag
 import hashlib
 
-from aiohttp import ClientError, ClientResponseError, ClientSession, ClientTimeout, TCPConnector
+from aiohttp import ClientError, ClientResponseError, ClientSession, TCPConnector
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady, PlatformNotReady
@@ -98,8 +98,7 @@ def __init__(self, hass: HomeAssistant, events: list, address: str, port: int, r
         """Initialize the coordinator."""
         # Self signed certs are used over HTTPS so we'll disable SSL verification
         connector = TCPConnector(enable_cleanup_closed=True, ssl=SSL_CONTEXT)
-        # Disable total timeout for infinite event stream (default 5-minute timeout causes disconnects)
-        self._session = ClientSession(connector=connector, timeout=ClientTimeout(total=None))
+        self._session = ClientSession(connector=connector)
 
         # The client used to communicate with Dahua devices
         self.client: DahuaClient = DahuaClient(username, password, address, port, rtsp_port, self._session)

custom_components/dahua/client.py

@@ -759,13 +759,18 @@ async def stream_events(self, on_receive, events: list, channel: int):
         """
         # Use codes=[All] for all codes
         codes = ",".join(events)
-        url = "{0}/cgi-bin/eventManager.cgi?action=attach&codes=[{1}]&heartbeat=5".format(self._base, codes)
+        heartbeat_interval = 5
+        url = "{0}/cgi-bin/eventManager.cgi?action=attach&codes=[{1}]&heartbeat={2}".format(
+            self._base, codes, heartbeat_interval
+        )
         if self._username is not None and self._password is not None:
             response = None
 
             try:
                 auth = DigestAuth(self._username, self._password, self._session)
-                response = await auth.request("GET", url)
+                # Disable timeout for infinite event stream (fixes 5-minute disconnection)
+                timeout = aiohttp.ClientTimeout(total=None)
+                response = await auth.request("GET", url, timeout=timeout)
                 response.raise_for_status()
 
                 # https://docs.aiohttp.org/en/stable/streams.html