Add option to load components present on remote (#83)

Author: postlund

README.md

@@ -129,6 +129,8 @@ remote_homeassistant:
     - service_registered
     - zwave.network_ready
     - zwave.node_event
+    load_components:
+    - zwave
 ```
 
 ```
@@ -206,19 +208,27 @@ subscribe_events:
   default: 
   - state_changed
   - service_registered
+load_components:
+  description: Load components of specified domains only present on the remote instance, e.g. to register services that would otherwise not be available.
+  required: false
+  type: list
 ```
 
 ## Special notes 
 
-If you have remote domains (e.g. `switch`), that are not loaded on the master instance you need to add a dummy entry on the master, otherwise you'll get a `Call service failed` error.
+If you have remote domains (e.g. `switch`), that are not loaded on the master instance you need to list them under `load_components`, otherwise you'll get a `Call service failed` error.
 
 E.g. on the master:
 
 ```
-switch:
+remote_homeassistant:
+  instances:
+  - host: 10.0.0.2
+    load_components:
+    - zwave
 ```
 
-to enable all `switch` services.
+to enable all `zwave` services. This can also be configured via options under Configuration->Integrations.
 
 ---
 

custom_components/remote_homeassistant/__init__.py

@@ -46,6 +46,7 @@
 from homeassistant.helpers.reload import async_integration_yaml_config
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.setup import async_setup_component
 
 from .const import (
     CONF_REMOTE_CONNECTION,
@@ -56,6 +57,7 @@
     CONF_EXCLUDE_ENTITIES,
     CONF_OPTIONS,
     CONF_REMOTE_INFO,
+    CONF_LOAD_COMPONENTS,
     DOMAIN,
 )
 from .rest_api import UnsupportedVersion, async_get_discovery_info
@@ -121,6 +123,7 @@
             CONF_SUBSCRIBE_EVENTS, default=DEFAULT_SUBSCRIBED_EVENTS
         ): cv.ensure_list,
         vol.Optional(CONF_ENTITY_PREFIX, default=DEFAULT_ENTITY_PREFIX): cv.string,
+        vol.Optional(CONF_LOAD_COMPONENTS): cv.ensure_list,
     }
 )
 
@@ -160,14 +163,14 @@ def async_yaml_to_config_entry(instance_conf):
         if CONF_DOMAINS in exclude:
             options[CONF_EXCLUDE_DOMAINS] = exclude[CONF_DOMAINS]
 
-    if CONF_FILTER in conf:
-        options[CONF_FILTER] = conf.pop(CONF_FILTER)
-
-    if CONF_SUBSCRIBE_EVENTS in conf:
-        options[CONF_SUBSCRIBE_EVENTS] = conf.pop(CONF_SUBSCRIBE_EVENTS)
-
-    if CONF_ENTITY_PREFIX in conf:
-        options[CONF_ENTITY_PREFIX] = conf.pop(CONF_ENTITY_PREFIX)
+    for option in [
+        CONF_FILTER,
+        CONF_SUBSCRIBE_EVENTS,
+        CONF_ENTITY_PREFIX,
+        CONF_LOAD_COMPONENTS,
+    ]:
+        if option in conf:
+            options[option] = conf.pop(option)
 
     return conf, options
 
@@ -240,15 +243,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
         CONF_UNSUB_LISTENER: entry.add_update_listener(_update_listener),
     }
 
-    async def setup_platforms():
+    async def setup_components_and_platforms():
         """Set up platforms and initiate connection."""
+        for domain in entry.options.get(CONF_LOAD_COMPONENTS, []):
+            hass.async_create_task(async_setup_component(hass, domain, {}))
         for component in PLATFORMS:
             hass.async_create_task(
                 hass.config_entries.async_forward_entry_setup(entry, component)
             )
         await remote.async_connect()
 
-    hass.async_create_task(setup_platforms())
+    hass.async_create_task(setup_components_and_platforms())
 
     return True
 

custom_components/remote_homeassistant/config_flow.py

@@ -35,6 +35,7 @@
 from .const import (
     CONF_REMOTE_CONNECTION,
     CONF_SECURE,
+    CONF_LOAD_COMPONENTS,
     CONF_FILTER,
     CONF_SUBSCRIBE_EVENTS,
     CONF_ENTITY_PREFIX,
@@ -196,6 +197,8 @@ async def async_step_init(self, user_input=None):
             self.options = user_input.copy()
             return await self.async_step_domain_entity_filters()
 
+        domains, _ = self._domains_and_entities()
+        domains = set(domains + self.config_entry.options.get(CONF_LOAD_COMPONENTS, []))
         return self.async_show_form(
             step_id="init",
             data_schema=vol.Schema(
@@ -207,7 +210,11 @@ async def async_step_init(self, user_input=None):
                                 CONF_ENTITY_PREFIX
                             )
                         },
-                    ): str
+                    ): str,
+                    vol.Optional(
+                        CONF_LOAD_COMPONENTS,
+                        default=self._default(CONF_LOAD_COMPONENTS),
+                    ): cv.multi_select(sorted(domains)),
                 }
             ),
         )

custom_components/remote_homeassistant/const.py

@@ -4,6 +4,7 @@
 CONF_UNSUB_LISTENER = "unsub_listener"
 CONF_OPTIONS = "options"
 CONF_REMOTE_INFO = "remote_info"
+CONF_LOAD_COMPONENTS = "load_components"
 
 CONF_FILTER = "filter"
 CONF_SECURE = "secure"

custom_components/remote_homeassistant/translations/en.json

@@ -39,7 +39,8 @@
       "init": {
         "title": "Basic Options (step 1/4)",
         "data": {
-            "entity_prefix": "Entity prefix (optional)"
+            "entity_prefix": "Entity prefix (optional)",
+            "load_components": "Load component (if not loaded)"
         }
       },
       "domain_entity_filters": {