mirror of
https://github.com/sudoxnym/roomba_rest980.git
synced 2026-04-14 11:37:46 +00:00
## Problem Roomba i3 models were frequently showing "unknown" status in Home Assistant instead of proper vacuum states (cleaning, docked, returning, etc.). This was caused by incomplete status mapping for the i3 model's specific status reporting format. ## Root Cause Analysis 1. **Incomplete phase mapping**: i3 models rely more heavily on phase data than cycle data for status reporting 2. **Missing model-specific logic**: i3 models (SKU starting with R3) report status differently than i7/s9 models 3. **Insufficient fallback handling**: No proper fallback when status combinations weren't recognized 4. **Null pointer exceptions**: Missing runtime stats causing crashes in LegacyCompatibility and sensor calculations ## Solution Implemented ### Enhanced Status Detection (vacuum.py) - **Comprehensive phase-to-activity mapping**: Added PHASE_MAPPING dict for reliable i3 status detection - **Model detection**: Automatically detects i3 models and applies model-specific handling - **Improved error handling**: Better error state detection for various error codes and not_ready states - **Battery state logic**: Special handling for low battery and charging states on i3 models - **Debug logging**: Enhanced logging to identify and debug unknown status combinations ### Null Safety Fixes (LegacyCompatibility.py & sensor.py) - **Safe attribute access**: Added null checks for runtimeStats, signal, bbmssn, and bbrun objects - **Graceful calculation handling**: Proper fallback values for missing time/area data - **Sensor error prevention**: Default values (0) for missing runtime statistics ### Configuration Entry Stability (__init__.py) - **State validation**: Added ConfigEntryState.LOADED check before forwarding platform setups - **Improved error isolation**: Cloud coordinator failures no longer prevent main integration functionality - **Better logging**: Enhanced error messages for debugging setup issues ## Testing - Tested with Roomba i3 model showing previous "unknown" status - Verified proper status reporting for all vacuum states - Confirmed backward compatibility with i7/s9 models - No more TypeError exceptions from null runtime stats ## Benefits - ✅ Eliminates "unknown" status for Roomba i3 models - ✅ More accurate and responsive status reporting - ✅ Better user experience with proper vacuum state visibility - ✅ Enhanced debugging capabilities for future status mapping issues - ✅ Improved integration stability and error resilience - ✅ Prevents crashes from missing data fields Fixes: Roomba i3 status unknown issue
227 lines
No EOL
8.2 KiB
Python
227 lines
No EOL
8.2 KiB
Python
"""Roomba integration using an external Rest980 server."""
|
|
|
|
import logging
|
|
|
|
import voluptuous as vol
|
|
|
|
from homeassistant.config_entries import ConfigEntry, ConfigEntryState
|
|
from homeassistant.core import HomeAssistant, ServiceCall
|
|
from homeassistant.helpers import config_validation as cv
|
|
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
|
|
|
from .const import DOMAIN
|
|
from .coordinator import RoombaCloudCoordinator, RoombaDataCoordinator
|
|
from .switch import RoomSwitch
|
|
|
|
CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
|
|
|
|
_LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
class RoombaRuntimeData:
|
|
"""Setup the runtime data structure."""
|
|
|
|
local_coordinator: RoombaDataCoordinator = None
|
|
robot_blid: str = None
|
|
cloud_enabled: bool = False
|
|
cloud_coordinator: RoombaCloudCoordinator = None
|
|
|
|
switched_rooms: dict[str, RoomSwitch] = {}
|
|
|
|
def __init__(
|
|
self,
|
|
local_coordinator: RoombaDataCoordinator,
|
|
robot_blid: str,
|
|
cloud_enabled: bool,
|
|
cloud_coordinator: RoombaCloudCoordinator,
|
|
) -> None:
|
|
"""Initialize the class with given data."""
|
|
self.local_coordinator = local_coordinator
|
|
self.robot_blid = robot_blid
|
|
self.cloud_enabled = cloud_enabled
|
|
self.cloud_coordinator = cloud_coordinator
|
|
|
|
|
|
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|
"""Setup Roombas with the Rest980 base url."""
|
|
coordinator = RoombaDataCoordinator(hass, entry)
|
|
cloud_coordinator: RoombaCloudCoordinator = None
|
|
|
|
await coordinator.async_config_entry_first_refresh()
|
|
|
|
entry.runtime_data = RoombaRuntimeData(
|
|
local_coordinator=coordinator,
|
|
robot_blid=None,
|
|
cloud_enabled=entry.data["cloud_api"],
|
|
cloud_coordinator=cloud_coordinator,
|
|
)
|
|
|
|
# Set up cloud coordinator if enabled
|
|
if entry.data["cloud_api"]:
|
|
cloud_coordinator = RoombaCloudCoordinator(hass, entry)
|
|
|
|
await cloud_coordinator.async_config_entry_first_refresh()
|
|
|
|
# Start background task for cloud setup and BLID matching
|
|
hass.async_create_task(
|
|
_async_setup_cloud(hass, entry, coordinator, cloud_coordinator)
|
|
)
|
|
|
|
# Update runtime data with cloud coordinator
|
|
entry.runtime_data.cloud_coordinator = cloud_coordinator
|
|
else:
|
|
cloud_coordinator = None
|
|
|
|
# Register services
|
|
await _async_register_services(hass)
|
|
|
|
# Forward platforms; create tasks but await to ensure no failure?
|
|
await hass.config_entries.async_forward_entry_setups(entry, ["vacuum", "sensor"])
|
|
|
|
return True
|
|
|
|
|
|
async def _async_register_services(hass: HomeAssistant) -> None:
|
|
"""Register integration services."""
|
|
|
|
async def handle_vacuum_clean(call: ServiceCall) -> None:
|
|
"""Handle vacuum clean service call."""
|
|
try:
|
|
payload = call.data["payload"]
|
|
base_url = call.data["base_url"]
|
|
|
|
session = async_get_clientsession(hass)
|
|
async with session.post(
|
|
f"{base_url}/api/local/action/cleanRoom",
|
|
headers={"content-type": "application/json"},
|
|
json=payload,
|
|
) as response:
|
|
if response.status != 200:
|
|
_LOGGER.error("Failed to send clean command: %s", response.status)
|
|
else:
|
|
_LOGGER.debug("Clean command sent successfully")
|
|
except Exception as e: # pylint: disable=broad-except
|
|
_LOGGER.error("Error sending clean command: %s", e)
|
|
|
|
async def handle_action(call: ServiceCall) -> None:
|
|
"""Handle action service call."""
|
|
try:
|
|
action = call.data["action"]
|
|
base_url = call.data["base_url"]
|
|
|
|
session = async_get_clientsession(hass)
|
|
async with session.get(
|
|
f"{base_url}/api/local/action/{action}",
|
|
) as response:
|
|
if response.status != 200:
|
|
_LOGGER.error("Failed to send clean command: %s", response.status)
|
|
else:
|
|
_LOGGER.debug("Action sent successfully")
|
|
except Exception as e: # pylint: disable=broad-except
|
|
_LOGGER.error("Error sending clean command: %s", e)
|
|
|
|
# Register services if not already registered
|
|
if not hass.services.has_service(DOMAIN, "rest980_clean"):
|
|
hass.services.async_register(
|
|
DOMAIN,
|
|
"rest980_clean",
|
|
handle_vacuum_clean,
|
|
vol.Schema({vol.Required("payload"): dict, vol.Required("base_url"): str}),
|
|
)
|
|
|
|
if not hass.services.has_service(DOMAIN, "rest980_action"):
|
|
hass.services.async_register(
|
|
DOMAIN,
|
|
"rest980_action",
|
|
handle_action,
|
|
vol.Schema({vol.Required("action"): str, vol.Required("base_url"): str}),
|
|
)
|
|
|
|
|
|
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
|
"""Safely remove Roombas."""
|
|
await hass.config_entries.async_unload_platforms(
|
|
entry, ["vacuum", "sensor", "switch", "button", "camera"]
|
|
)
|
|
return True
|
|
|
|
|
|
async def _async_setup_cloud(
|
|
hass: HomeAssistant,
|
|
entry: ConfigEntry,
|
|
coordinator: RoombaDataCoordinator,
|
|
cloud_coordinator: RoombaCloudCoordinator,
|
|
) -> None:
|
|
"""Set up cloud coordinator and perform BLID matching in background."""
|
|
try:
|
|
# Refresh cloud data
|
|
await cloud_coordinator.async_config_entry_first_refresh()
|
|
|
|
# Perform BLID matching only if not already stored in config entry
|
|
if "robot_blid" not in entry.data:
|
|
matched_blid = await _async_match_blid(
|
|
hass, entry, coordinator, cloud_coordinator
|
|
)
|
|
if matched_blid:
|
|
# Store the matched BLID permanently in config entry data
|
|
hass.config_entries.async_update_entry(
|
|
entry, data={**entry.data, "robot_blid": matched_blid}
|
|
)
|
|
entry.runtime_data.robot_blid = matched_blid
|
|
else:
|
|
# Use stored BLID from config entry
|
|
entry.runtime_data.robot_blid = entry.data["robot_blid"]
|
|
|
|
# Only forward setups if the entry is in LOADED state
|
|
if entry.state == ConfigEntryState.LOADED:
|
|
await hass.config_entries.async_forward_entry_setups(
|
|
entry, ["switch", "button", "camera"]
|
|
)
|
|
else:
|
|
_LOGGER.warning("Config entry not in LOADED state, skipping cloud platform setup")
|
|
|
|
except Exception as e: # pylint: disable=broad-except
|
|
_LOGGER.error("Failed to set up cloud coordinator: %s", e)
|
|
# Don't let cloud coordinator failure prevent main integration from working
|
|
entry.runtime_data.cloud_coordinator = None
|
|
|
|
|
|
async def _async_match_blid(
|
|
hass: HomeAssistant,
|
|
entry: ConfigEntry,
|
|
coordinator: RoombaDataCoordinator,
|
|
cloud_coordinator: RoombaCloudCoordinator,
|
|
) -> None:
|
|
"""Match local Roomba with cloud robot by comparing device info."""
|
|
try:
|
|
for blid, robo in cloud_coordinator.data.items():
|
|
try:
|
|
# Get cloud robot info
|
|
robot_info = robo.get("robot_info") or {}
|
|
cloud_sku = robot_info.get("sku")
|
|
cloud_sw_ver = robot_info.get("softwareVer")
|
|
cloud_name = robot_info.get("name")
|
|
|
|
# Get local robot info
|
|
local_data = coordinator.data or {}
|
|
local_name = local_data.get("name", "Roomba")
|
|
local_sw_ver = local_data.get("softwareVer")
|
|
local_sku = local_data.get("sku")
|
|
|
|
# Match robots by SKU, software version, and name
|
|
if (
|
|
cloud_sku == local_sku
|
|
and cloud_sw_ver == local_sw_ver
|
|
and cloud_name == local_name
|
|
):
|
|
entry.runtime_data.robot_blid = blid
|
|
_LOGGER.info("Matched local Roomba with cloud robot %s", blid)
|
|
break
|
|
|
|
except (KeyError, TypeError) as e:
|
|
_LOGGER.debug("Error matching robot %s: %s", blid, e)
|
|
else:
|
|
_LOGGER.warning("Could not match local Roomba with any cloud robot")
|
|
|
|
except Exception as e: # pylint: disable=broad-except
|
|
_LOGGER.error("Error during BLID matching: %s", e) |