.

Author: MateoGreil

custom_components/comwatt/__init__.py

@@ -6,7 +6,7 @@
 from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
-from .client import comwatt_client
+from comwatt_client import ComwattClient
 
 import asyncio
 
@@ -18,7 +18,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Set default DOMAIN
     hass.data.setdefault(DOMAIN, {})
 
-    await asyncio.to_thread(lambda: comwatt_client.authenticate(entry.data["username"], entry.data["password"]))
+    client = ComwattClient()
+    await asyncio.to_thread(lambda: client.authenticate(entry.data["username"], entry.data["password"]))
+
+    hass.data[DOMAIN]["cookies"] = client.session.cookies.get_dict()
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 

custom_components/comwatt/client.py

@@ -17,12 +17,15 @@
 
 import asyncio
 from .const import DOMAIN
-from .client import comwatt_client
+from comwatt_client import ComwattClient
 from datetime import timedelta
 
 SCAN_INTERVAL = timedelta(minutes=2)
 
 async def async_setup_entry(hass, entry, async_add_entities):
+    comwatt_client = ComwattClient()
+    comwatt_client.session.cookies.update(hass.data[DOMAIN]["cookies"])
+
     new_devices = []
     sites = await asyncio.to_thread(lambda: comwatt_client.get_sites())
     for site in sites:
@@ -79,11 +82,14 @@ def __init__(self, entry, device):
     # TODO: Update it ~ only 1 per hour
     def update(self) -> None:
         """Fetch new state data for the sensor."""
+        comwatt_client = ComwattClient()
+        comwatt_client.session.cookies.update(self.hass.data[DOMAIN]["cookies"])
 
         try:
             time_series_data = comwatt_client.get_device_ts_time_ago(self._device["id"], "VIRTUAL_QUANTITY", "HOUR", "NONE")
         except Exception:
             comwatt_client.authenticate(self._username, self._password)
+            self.hass.data[DOMAIN]["cookies"] = comwatt_client.session.cookies.get_dict()
             time_series_data = comwatt_client.get_device_ts_time_ago(self._device["id"], "VIRTUAL_QUANTITY", "HOUR", "NONE")
 
         if self._attr_native_value == None:
@@ -111,11 +117,14 @@ def __init__(self, entry, device):
 
     def update(self) -> None:
         """Fetch new state data for the sensor."""
+        comwatt_client = ComwattClient()
+        comwatt_client.session.cookies.update(self.hass.data[DOMAIN]["cookies"])
 
         try:
             time_series_data = comwatt_client.get_device_ts_time_ago(self._device["id"], "FLOW", "NONE", "NONE", "HOUR", 1)
         except Exception:
             comwatt_client.authenticate(self._username, self._password)
+            self.hass.data[DOMAIN]["cookies"] = comwatt_client.session.cookies.get_dict()
             time_series_data = comwatt_client.get_device_ts_time_ago(self._device["id"], "FLOW", "NONE", "NONE", "HOUR", 1)
 
         # TODO: Update to the time of comwatt and not the current time

custom_components/comwatt/sensor.py

@@ -2,13 +2,16 @@
 from homeassistant.helpers.device_registry import DeviceInfo
 
 import asyncio
-from .client import comwatt_client
+from comwatt_client import ComwattClient
 from datetime import timedelta
 
 SCAN_INTERVAL = timedelta(minutes=2)
 SWITCH_NATURE = ['POWER_SWITCH', 'RELAY']
 
 async def async_setup_entry(hass, entry, async_add_entities):
+    comwatt_client = ComwattClient()
+    comwatt_client.session.cookies.update(hass.data[DOMAIN]["cookies"])
+
     new_devices = []
     sites = await asyncio.to_thread(lambda: comwatt_client.get_sites())
     for site in sites:
@@ -70,6 +73,9 @@ def is_on(self):
 
     def turn_on(self, **kwargs) -> None:
         """Turn the entity on."""
+        comwatt_client = ComwattClient()
+        comwatt_client.session.cookies.update(self.hass.data[DOMAIN]["cookies"])
+
         try:
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
@@ -80,6 +86,7 @@ def turn_on(self, **kwargs) -> None:
 
         except Exception:
             comwatt_client.authenticate(self._username, self._password)
+            self.hass.data[DOMAIN]["cookies"] = comwatt_client.session.cookies.get_dict()
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
                 for capacity in feature['capacities']:
@@ -91,6 +98,9 @@ def turn_on(self, **kwargs) -> None:
 
     def turn_off(self, **kwargs) -> None:
         """Turn the entity off."""
+        comwatt_client = ComwattClient()
+        comwatt_client.session.cookies.update(self.hass.data[DOMAIN]["cookies"])
+
         try:
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
@@ -101,6 +111,7 @@ def turn_off(self, **kwargs) -> None:
 
         except Exception:
             comwatt_client.authenticate(self._username, self._password)
+            self.hass.data[DOMAIN]["cookies"] = comwatt_client.session.cookies.get_dict()
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
                 for capacity in feature['capacities']:
@@ -112,6 +123,9 @@ def turn_off(self, **kwargs) -> None:
 
     def update(self) -> None:
         """Fetch new state data for the sensor."""
+        comwatt_client = ComwattClient()
+        comwatt_client.session.cookies.update(self.hass.data[DOMAIN]["cookies"])
+
         try:
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
@@ -121,6 +135,7 @@ def update(self) -> None:
 
         except Exception:
             comwatt_client.authenticate(self._username, self._password)
+            self.hass.data[DOMAIN]["cookies"] = comwatt_client.session.cookies.get_dict()
             device = comwatt_client.get_device(self._ref)
             for feature in device['features']:
                 for capacity in feature['capacities']: