Improved handling of missing events and appliances

Reduce SSE stream timeout to 15min to (hopefully) avoid missing events

Author: ekutner

home_connect_async/appliance.py

@@ -429,20 +429,21 @@ async def async_update_data(self, data:dict) -> None:
                 self.active_program.options[key].name = data.get('name')
                 self.active_program.options[key].displayvalue = data.get('displayvalue')
                 #self.active_program = await self._async_fetch_programs('active')
-            if '/status/' in data['uri']:
-                if key in self.status:
-                    self.status[key].value = value
-                    self.status[key].name = data.get('name')
-                    self.status[key].displayvalue = data.get('displayvalue')
-                else:
-                    self.status = await self._async_fetch_status()
-            if '/settings/' in data['uri']:
-                if key in self.settings:
-                    self.settings[key].value = value
-                    self.settings[key].name = data.get('name')
-                    self.settings[key].displayvalue = data.get('displayvalue')
-                else:
-                    self.settings = await self._async_fetch_settings()
+
+            if key in self.status:
+                self.status[key].value = value
+                self.status[key].name = data.get('name')
+                self.status[key].displayvalue = data.get('displayvalue')
+            elif 'uri' in data and '/status/' in data['uri']:
+                self.status = await self._async_fetch_status()
+
+            if key in self.settings:
+                self.settings[key].value = value
+                self.settings[key].name = data.get('name')
+                self.settings[key].displayvalue = data.get('displayvalue')
+            elif 'uri' in data and '/settings/' in data['uri']:
+                self.settings = await self._async_fetch_settings()
+
 
         # Handle cases were the appliance data was loaded without getting all the programs
         if  (

home_connect_async/auth.py

@@ -57,7 +57,7 @@ async def stream(self, endpoint:str, lang:str=None, **kwargs) -> sse_client.Even
         if lang:
             headers['Accept-Language'] = lang
         #timeout = aiohttp.ClientTimeout(total = ( self._auth.access_token_expirs_at - datetime.now() ).total_seconds() )
-        timeout = aiohttp.ClientTimeout(total = 3600 )
+        timeout = aiohttp.ClientTimeout(total = 900 )
         return sse_client.EventSource(f"{self.host}{endpoint}", session=self.websession, headers=headers, timeout=timeout, **kwargs)
 
 

home_connect_async/homeconnect.py

@@ -306,7 +306,12 @@ async def _async_process_updates(self, event:MessageEvent):
         haid = event.last_event_id
         if event.type == 'KEEP-ALIVE':
             self._last_update = datetime.now()
-        elif event.type == 'PAIRED':
+            return
+        if haid not in self.appliances:
+            # handle cases where the appliance wasn't loaded before
+            _LOGGER.debug("Unknown haId '%s' reloading HomeConnected from the API", haid)
+            await self.async_load_data()
+        if event.type == 'PAIRED':
             self.appliances[haid] = await Appliance.async_create(self, haId=haid)
             await self._callbacks.async_broadcast_event(self.appliances[haid],  Events.PAIRED)
         elif event.type == 'DEPAIRED':
@@ -328,6 +333,9 @@ async def _async_process_updates(self, event:MessageEvent):
             # Type is NOTIFY or EVENT
             data = json.loads(event.data)
             haid = data['haId']
+            if haid not in self.appliances:
+                _LOGGER.debug("Unknown haId '%s' reloading HomeConnected from the API", haid)
+                await self.async_load_data()
             if 'items' in data:
                 for item in data['items']:
                     # haid = self._get_haId_from_event(item) if 'uri' in item else haid

setup.py

@@ -3,7 +3,7 @@
 setup(
     name = 'home-connect-async',
     packages = ['home_connect_async'],
-    version = '0.6.1',
+    version = '0.6.2',
     license='MIT',
     description = 'Async SDK for BSH Home Connect API',
     author = 'Eran Kutner',