retry forever

Author: thematrixdev

custom_components/clphk/__init__.py

@@ -53,3 +53,15 @@ async def async_setup_entry(hass: HomeAssistant, entry):
         }
     await hass.config_entries.async_forward_entry_setups(entry, ["sensor"])
     return True
+
+async def async_unload_entry(hass: HomeAssistant, entry):
+    """Unload a config entry."""
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, ["sensor"])
+    if unload_ok and CONF_DOMAIN in hass.data:
+        hass.data.pop(CONF_DOMAIN)
+    return unload_ok
+
+async def async_reload_entry(hass: HomeAssistant, entry):
+    """Reload config entry when options or data change."""
+    await async_unload_entry(hass, entry)
+    await async_setup_entry(hass, entry)

custom_components/clphk/config_flow.py

@@ -14,6 +14,7 @@
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_flow
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
@@ -64,11 +65,17 @@ async def async_step_init(self, user_input=None):
                 user_input["access_token"] = token_data["access_token"]
                 user_input["refresh_token"] = token_data["refresh_token"]
                 user_input["access_token_expiry_time"] = token_data.get("expires_in")
-                self._user_input.update(user_input)
-                return self.async_create_entry(title="", data=self._user_input)
+                # Update config entry data
+                self.hass.config_entries.async_update_entry(
+                    self.config_entry,
+                    data={**self.config_entry.data, **user_input},
+                )
+                # Trigger reload
+                await self.hass.config_entries.async_reload(self.config_entry.entry_id)
+                return self.async_create_entry(title=self.config_entry.title, data=user_input)
             except Exception as ex:
                 _LOGGER.exception(ex)
-                errors["base"] = "invalid_auth"
+                errors["base"] = "auth_failed"
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema({

custom_components/clphk/sensor.py

@@ -392,17 +392,17 @@ async def api_request(
                 _LOGGER.error(error_message)
 
                 # Handle all HTTP 4xx errors (client errors)
-                if 400 <= e.status < 500:
-                    self._4xx_error_retry = self._4xx_error_retry + 1
-
-                    if self._4xx_error_retry > HTTP_4xx_ERROR_RETRY_LIMIT:
-                        self._account_number = None
-                        self._access_token = None
-                        self._refresh_token = None
-                        self._access_token_expiry_time = None
-
-                        _LOGGER.error('HTTP 4xx error retry limit reached')
-                        raise Exception('HTTP 4xx error retry limit reached')
+                # if 400 <= e.status < 500:
+                #     self._4xx_error_retry = self._4xx_error_retry + 1
+                #
+                #     if self._4xx_error_retry > HTTP_4xx_ERROR_RETRY_LIMIT:
+                #         self._account_number = None
+                #         self._access_token = None
+                #         self._refresh_token = None
+                #         self._access_token_expiry_time = None
+                #
+                #         _LOGGER.error('HTTP 4xx error retry limit reached')
+                #         raise Exception('HTTP 4xx error retry limit reached')
 
                 raise e
 
@@ -426,7 +426,7 @@ async def api_request(
     async def auth(self):
         token_lock = self._token_state["token_lock"]
         async with token_lock:
-            if self._access_token_expiry_time and datetime.datetime.now(datetime.timezone.utc) > (datetime.datetime.strptime(self._access_token_expiry_time, '%Y-%m-%dT%H:%M:%S.%fZ') + datetime.timedelta(minutes=-1)).replace(tzinfo=datetime.timezone.utc):
+            if self._access_token_expiry_time and datetime.datetime.now(datetime.timezone.utc) > datetime.datetime.strptime(self._access_token_expiry_time, '%Y-%m-%dT%H:%M:%S.%fZ').replace(tzinfo=datetime.timezone.utc):
                 _LOGGER.debug(f"Refreshing access_token and refresh_token")
                 response = await self.api_request(
                     method="POST",