Add support for MQTT

This is currently untested.

Author: wbyoung

README.md

@@ -26,7 +26,7 @@ What it can do:
 - **Even more**  
   There are some more goodies in to docs below. Enjoy!
 
-_Note: currently this is limited to Blue switches using ZHA, but ideally Z2M and other Inovelli switches will be added in the future._
+_Note: currently this is limited to Blue switches using ZHA or Zigbee2MQTT, but other Inovelli switches will be added in the future._
 
 **Configure notifications** for multiple switches easily:
 
@@ -272,6 +272,12 @@ Restore state functionality is provided via a subset of entities:
 
 If you disable these entities, it is possible that various other entities may not be restored after restarting Home Assistant.
 
+##### Zigbee2MQTT
+
+While supported by the Blue switch firmware, Zigbee2MQTT does not yet provide events with an `action` for when a notification expires (it only supports, for instance, [`config_double`](https://www.zigbee2mqtt.io/devices/VZM35-SN.html#action-enum)).
+
+This integration therefore handles notification expiration itself for switches configured with Zigbee2MQTT. This may change unexpectedly in the future—if and when it is possible, Lampie will change to sending durations to the firmware.
+
 ## More Screenshots
 
 Once configured, the integration links the various entities to logical devices:

custom_components/lampie/__init__.py

@@ -45,11 +45,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: LampieConfigEntry) -> bo
     _LOGGER.debug("setup %s with config:%s", entry.title, entry.data)
 
     if DOMAIN not in hass.data:
-        hass.data[DOMAIN] = LampieOrchestrator(hass)
+        orchestrator = LampieOrchestrator(hass)
+        hass.data[DOMAIN] = orchestrator
+
+        await orchestrator.setup()
 
     coordinator = LampieUpdateCoordinator(hass, entry)
-    orchestrator: LampieOrchestrator = hass.data[DOMAIN]
-    orchestrator.add_coordinator(coordinator)
+    orchestrator = hass.data[DOMAIN]
+    await orchestrator.add_coordinator(coordinator)
     entry.runtime_data = LampieConfigEntryRuntimeData(
         orchestrator=orchestrator,
         coordinator=coordinator,
@@ -79,7 +82,7 @@ async def async_unload_entry(hass: HomeAssistant, entry: LampieConfigEntry) -> b
     unload_ok: bool = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
     if orchestrator := entry.runtime_data.orchestrator:
-        orchestrator.remove_coordinator(coordinator)
+        await orchestrator.remove_coordinator(coordinator)
 
         if orchestrator.teardown() and orchestrator == hass.data.get(DOMAIN):
             hass.data.pop(DOMAIN)

custom_components/lampie/config_flow.py

@@ -651,20 +651,20 @@ def _is_inovelli_switch(
     entity_registry: er.EntityRegistry,
     entity_id: str,
 ) -> bool:
-    """Check if entity_id should be included for dependent entities.
+    """Check if entity_id should be included for the list of switches.
 
-    Determine if an entity_id represents an entity with a `state_class` of
-    `total_increasing` and a `unit_of_measurement` of `km`.
+    Determine if an entity_id represents an Inovelli switch.
 
     Returns:
         A flag indicating if the entity should be included.
     """
-    return bool(
-        (entity := entity_registry.async_get(entity_id))
-        and (device := device_registry.async_get(entity.device_id))
-        and (model := device.model)
-        and (model in INOVELLI_MODELS)
-    )
+    if (entity := entity_registry.async_get(entity_id)) and (
+        device := device_registry.async_get(entity.device_id)
+    ):
+        model = device.model
+        model_id = device.model_id
+        return model in INOVELLI_MODELS or model_id in INOVELLI_MODELS
+    return False
 
 
 def _is_listlike[T](value: T) -> bool:

custom_components/lampie/manifest.json

@@ -5,7 +5,7 @@
     "@wbyoung"
   ],
   "config_flow": true,
-  "dependencies": [],
+  "dependencies": ["mqtt"],
   "documentation": "https://github.com/wbyoung/lampie",
   "homekit": {},
   "iot_class": "calculated",