Fix/doorbell initialization

custom_components/hikvision_next/__init__.py

@@ -5,6 +5,7 @@
 import asyncio
 from contextlib import suppress
 import logging
+import traceback
 
 from httpx import TimeoutException
 
@@ -59,12 +60,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         device_info = isapi.hass_device_info()
         device_registry = dr.async_get(hass)
         device_registry.async_get_or_create(config_entry_id=entry.entry_id, **device_info)
-    except (asyncio.TimeoutError, TimeoutException) as ex:
+    except (TimeoutError, TimeoutException) as ex:
         raise ConfigEntryNotReady(f"Timeout while connecting to {host}. Cannot initialize {DOMAIN}") from ex
     except Exception as ex:  # pylint: disable=broad-except
-        raise ConfigEntryNotReady(
-            f"Unknown error connecting to {host}. Cannot initialize {DOMAIN}. Error is {ex}"
-        ) from ex
+        msg = f"Cannot initialize {DOMAIN} {host}. Error: {ex}\n"
+        _LOGGER.error(msg + traceback.format_exc())
+        raise ConfigEntryNotReady(msg) from ex
 
     coordinators = {}
 

custom_components/hikvision_next/config_flow.py

@@ -14,6 +14,7 @@
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import DATA_ALARM_SERVER_HOST, DATA_SET_ALARM_SERVER, DOMAIN
 from .isapi import ISAPI
@@ -62,7 +63,8 @@ async def async_step_user(self, user_input: dict[str, Any] | None = None) -> Flo
                     CONF_HOST: host,
                 }
 
-                isapi = ISAPI(host, username, password)
+                session = get_async_client(self.hass)
+                isapi = ISAPI(host, username, password, session)
                 await isapi.get_device_info()
 
                 if self._reauth_entry:

custom_components/hikvision_next/isapi.py

@@ -440,6 +440,8 @@ def get_event(event_trigger: dict):
             supported_events = deep_get(event_notification, "EventTriggerList.EventTrigger", [])
         else:
             supported_events = deep_get(event_triggers, "EventTriggerList.EventTrigger", [])
+        if not isinstance(supported_events, list):
+            supported_events = [supported_events]
 
         for event_trigger in supported_events:
             if event := get_event(event_trigger):

custom_components/hikvision_next/isapi_client.py

@@ -1,10 +1,13 @@
 import httpx
+import logging
 from typing import Any, AsyncIterator, List, Union
 from urllib.parse import urljoin
 import json
 import xmltodict
 from dataclasses import dataclass
 
+_LOGGER = logging.getLogger(__name__)
+
 
 def response_parser(response, present="dict"):
     """Parse Hikvision results."""
@@ -42,16 +45,21 @@ async def _detect_auth_method(self):
         if not self.session:
             self.session = httpx.AsyncClient(timeout=self.timeout)
 
-        url = urljoin(self.host, self.isapi_prefix + "/System/status")
-        for method in [
-            httpx.BasicAuth(self.username, self.password),
-            httpx.DigestAuth(self.username, self.password),
-        ]:
-            response = await self.session.get(url, auth=method)
-            if response.status_code == 200:
-                self._auth_method = method
+        url = urljoin(self.host, self.isapi_prefix + "/System/deviceInfo")
+        _LOGGER.debug("--- [WWW-Authenticate detection] %s", self.host)
+        response = await self.session.get(url)
+        if response.status_code == 401:
+            www_authenticate = response.headers.get("WWW-Authenticate", "")
+            _LOGGER.debug("WWW-Authenticate header: %s", www_authenticate)
+            if "Basic" in www_authenticate:
+                self._auth_method = httpx.BasicAuth(self.username, self.password)
+            elif "Digest" in www_authenticate:
+                self._auth_method = httpx.DigestAuth(self.username, self.password)
 
         if not self._auth_method:
+            _LOGGER.error("Authentication method not detected, %s", response.status_code)
+            if response.headers:
+                _LOGGER.error("response.headers %s", response.headers)
             response.raise_for_status()
 
     def get_url(self, relative_url: str) -> str:

tests/conftest.py

@@ -76,7 +76,7 @@ def mock_device_endpoints(model):
 def mock_isapi():
     """Mock ISAPI instance."""
 
-    respx.get(f"{TEST_HOST}/ISAPI/System/status").respond(status_code=200)
+    respx.get(f"{TEST_HOST}/ISAPI/System/deviceInfo").respond(status_code=200)
     isapi = ISAPI(**TEST_CLIENT)
     return isapi