hopefully fixing race condition. Downsides...30s feels like a long time. Some excessive code added to possibly handle that?

Author: bookman-dius

custom_components/powersensor/PowersensorMessageDispatacher.py

@@ -14,6 +14,7 @@ def __init__(self, hass: HomeAssistant, vhh: VirtualHousehold):
         self._vhh = vhh
         self.plugs = dict()
         self.sensors = dict()
+        self.on_start_sensor_queue = dict()
         self._unsubscribe_from_sensor_added_signal = (
             async_dispatcher_connect(self._hass,
                                      f"{DOMAIN}_sensor_added_to_homeassistant",
@@ -49,6 +50,7 @@ async def handle_message(self, event: str, message: dict):
             if mac not in self.sensors:
                 role = None
                 if 'role' in message:
+                    self.on_start_sensor_queue[mac] = role
                     role = message['role']
                 async_dispatcher_send(self._hass, f"{DOMAIN}_create_sensor", mac, role)
 

custom_components/powersensor/sensor.py

@@ -36,8 +36,8 @@ async def async_setup_entry(
 
     async_add_entities(plug_sensors, True)
 
-    async def handle_discovered_sensor(sensor_mac, role):
-        if role == 'solar':
+    async def handle_discovered_sensor(sensor_mac, sensor_role):
+        if sensor_role == 'solar':
             my_data["with_solar"] = True  # Remember for next time we start
 
         new_sensors = [
@@ -46,14 +46,20 @@ async def handle_discovered_sensor(sensor_mac, role):
             PowersensorSensorEntity(hass, sensor_mac, SensorMeasurements.SUMMATION_ENERGY),
         ]
         async_add_entities(new_sensors, True)
-        async_dispatcher_send(hass, f"{DOMAIN}_sensor_added_to_homeassistant", sensor_mac, role)
+        async_dispatcher_send(hass, f"{DOMAIN}_sensor_added_to_homeassistant", sensor_mac, sensor_role)
 
     entry.async_on_unload(
         async_dispatcher_connect(
             hass, f"{DOMAIN}_create_sensor", handle_discovered_sensor
         )
     )
 
+
+    # Possibly unnecessary but will add sensors where the messages came in early.
+    # Hopefully keeps wait time less than 30s
+    for mac, role in my_data['dispatcher'].on_start_sensor_queue.items():
+        await handle_discovered_sensor(mac, role)
+
     # Register the virtual household entities
     household_entities = []
     for measurement_type in HouseholdMeasurements: