Fix #12

When the new_state is None, this state was removed from the remote instance.
So make sure it also gets removed from here.

This happens e.g. when a persistent notifications is cleared.

Author: lukas-hetzenecker

README.md

@@ -74,6 +74,8 @@ remote_homeassistant:
       - zwave.controller
       - zwave.desk_light
     exclude:
+      domains:
+      - persistent_notification
       entities:
       - group.all_switches
     filter:
@@ -86,6 +88,8 @@ remote_homeassistant:
       unit_of_measurement: W
       below: 500
     subscribe_events:
+    - state_changed
+    - service_registered
     - zwave.network_ready
     - zwave.node_event
 ```

custom_components/remote_homeassistant/__init__.py

@@ -8,12 +8,14 @@
 import logging
 import copy
 import asyncio
+from contextlib import suppress
+
 import aiohttp
 import re
 
 import voluptuous as vol
 
-from homeassistant.core import callback
+from homeassistant.core import callback, Context
 import homeassistant.components.websocket_api.auth as api
 from homeassistant.core import EventOrigin, split_entity_id
 from homeassistant.helpers.typing import HomeAssistantType, ConfigType
@@ -377,15 +379,26 @@ def fire_event(message):
                 return
 
             if message['event']['event_type'] == 'state_changed':
-                entity_id = message['event']['data']['entity_id']
-                state = message['event']['data']['new_state']['state']
-                attr = message['event']['data']['new_state']['attributes']
+                data = message['event']['data']
+                entity_id = data['entity_id']
+                if not data['new_state']:
+                    # entity was removed in the remote instance
+                    with suppress(ValueError, AttributeError):
+                        self._entities.remove(entity_id)
+                    self._hass.states.async_remove(entity_id)
+                    return
+
+                state = data['new_state']['state']
+                attr = data['new_state']['attributes']
                 state_changed(entity_id, state, attr)
             else:
                 event = message['event']
                 self._hass.bus.async_fire(
                     event_type=event['event_type'],
                     event_data=event['data'],
+                    context=Context(id=event['context'].get('id'),
+                                    user_id=event['context'].get('user_id'),
+                                    parent_id=event['context'].get('parent_id')),
                     origin=EventOrigin.remote
                 )