async changes put back in to push for 1.7.0

custom_components/ecovacs/__init__.py

@@ -1,4 +1,3 @@
-
 """Support for Ecovacs Deebot vacuums."""
 import random
 import string
@@ -45,55 +44,60 @@ ECOVACS_API_DEVICEID = "".join(
     random.choice(string.ascii_uppercase + string.digits) for _ in range(8)
 )
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Ecovacs component."""
     LOGGER.debug("Creating new Ecovacs component")
-    hass.data[ECOVACS_DEVICES] = []
+    def get_devices() -> list[VacBot]:
+        ecovacs_api = EcoVacsAPI(
+            ECOVACS_API_DEVICEID,
+            config[DOMAIN].get(CONF_USERNAME),
+            EcoVacsAPI.md5(config[DOMAIN].get(CONF_PASSWORD)),
+            config[DOMAIN].get(CONF_COUNTRY),
+            config[DOMAIN].get(CONF_CONTINENT),
+        )
+        ecovacs_devices = ecovacs_api.devices()
+        _LOGGER.debug("Ecobot devices: %s", ecovacs_devices)
+
     SERVER_ADDRESS = None
 
-    ecovacs_api = EcoVacsAPI(
+        devices: list[VacBot] = []
-        ECOVACS_API_DEVICEID,
+        for device in ecovacs_devices:
-        config[DOMAIN].get(CONF_USERNAME),
+            _LOGGER.info(
-        EcoVacsAPI.md5(config[DOMAIN].get(CONF_PASSWORD)),
+                "Discovered Ecovacs device on account: %s with nickname %s",
-        config[DOMAIN].get(CONF_COUNTRY),
+                device.get("did"),
-        config[DOMAIN].get(CONF_CONTINENT),
+                device.get("nick"),
-        config[DOMAIN].get(CONF_VERIFY_SSL), # add to class call
+            )
-    )
+            vacbot = VacBot(
+                ecovacs_api.uid,
+                ecovacs_api.REALM,
+                ecovacs_api.resource,
+                ecovacs_api.user_access_token,
+                device,
+                config[DOMAIN].get(CONF_CONTINENT).lower(),
+                config[DOMAIN].get(CONF_VERIFY_SSL), # add to class call
+                monitor=True,
+            )
 
-    devices = ecovacs_api.devices()
+            devices.append(vacbot)
-    LOGGER.debug("Ecobot devices: %s", devices)
+        return devices
 
-    for device in devices:
+    hass.data[ECOVACS_DEVICES] = await hass.async_add_executor_job(get_devices)
-        LOGGER.info(
-            "Discovered Ecovacs device on account: %s with nickname %s",
-            device.get("did"),
-            device.get("nick"),
-        )
-        vacbot = VacBot(
-            ecovacs_api.uid,
-            ecovacs_api.REALM,
-            ecovacs_api.resource,
-            ecovacs_api.user_access_token,
-            device,
-            config[DOMAIN].get(CONF_CONTINENT).lower(),
-            SERVER_ADDRESS, # include server address in class, if it's null should be no effect
-            config[DOMAIN].get(CONF_VERIFY_SSL), # add to class call
-            monitor=True
-        )
-        hass.data[ECOVACS_DEVICES].append(vacbot)
 
-    def stop(event: object) -> None:
+    async def async_stop(event: object) -> None:
         """Shut down open connections to Ecovacs XMPP server."""
-        for device in hass.data[ECOVACS_DEVICES]:
+        devices: list[VacBot] = hass.data[ECOVACS_DEVICES]
+        for device in devices:
             LOGGER.info(
                 "Shutting down connection to Ecovacs device %s",
                 device.vacuum.get("did"),
             )
-            device.disconnect()
+            await hass.async_add_executor_job(device.disconnect)
 
     # Listen for HA stop to disconnect.
-    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop)
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, async_stop)
     if hass.data[ECOVACS_DEVICES]:
         LOGGER.debug("Starting vacuum components")
-        discovery.load_platform(hass, Platform.VACUUM, DOMAIN, {}, config)
+        hass.async_create_task(
+            discovery.async_load_platform(hass, Platform.VACUUM, DOMAIN, {}, config)
+        )
     return True

custom_components/ecovacs/vacuum.py

@@ -21,18 +21,20 @@ ATTR_ERROR = "error"
 ATTR_COMPONENT_PREFIX = "component_"
 
 
-def setup_platform(
+async def async_setup_platform(
     hass: HomeAssistant,
     config: ConfigType,
-    add_entities: AddEntitiesCallback,
+    async_add_entities: AddEntitiesCallback,
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the Ecovacs vacuums."""
     vacuums = []
-    for device in hass.data[ECOVACS_DEVICES]:
+    devices: list[sucks.VacBot] = hass.data[ECOVACS_DEVICES]
+    for device in devices:
+        await hass.async_add_executor_job(device.connect_and_wait_until_ready)
         vacuums.append(EcovacsVacuum(device))
     _LOGGER.debug("Adding Ecovacs Vacuums to Home Assistant: %s", vacuums)
-    add_entities(vacuums, True)
+    async_add_entities(vacuums)
 
 
 class EcovacsVacuum(StateVacuumEntity):
@@ -56,7 +58,7 @@ class EcovacsVacuum(StateVacuumEntity):
     def __init__(self, device: sucks.VacBot) -> None:
         """Initialize the Ecovacs Vacuum."""
         self.device = device
-        self.device.connect_and_wait_until_ready()
+
         if self.device.vacuum.get("nick") is not None:
             self._attr_name = str(self.device.vacuum["nick"])
         else:
@@ -64,7 +66,6 @@ class EcovacsVacuum(StateVacuumEntity):
             self._attr_name = str(format(self.device.vacuum["did"]))
 
         self._error = None
-        _LOGGER.debug("Vacuum initialized: %s", self.name)
 
     async def async_added_to_hass(self) -> None:
         """Set up the event listeners now that hass is ready."""