fix: preserve cloud identity and guard learning recovery

Author: Maksym Shtembuliak

CHANGELOG.md

@@ -81,6 +81,17 @@ the GitHub release body should be rendered from the matching version section her
 
 ### Fixed
 
+- Device learning keeps the original cloud API when the collector is temporarily
+  redirected to Home Assistant. A local port or AT traffic cannot replace a
+  known ValueCloud, SmartValue or SmartESS server with another provider (#46).
+  Unconfirmed endpoint restoration blocks a new active scan and offers an
+  explicit recovery action instead of reporting the connection as restored.
+
+- Collector metadata polling no longer requests nearby Wi-Fi scans. Connected
+  SSID and signal readings remain local queries; Wi-Fi setup still offers scans
+  on demand. This removes unnecessary background work without assuming it was
+  the cause of reported connection interruptions.
+
 - Newly learned Modbus controls retain the captured FC06 or FC16 write command
   through profile generation and runtime dispatch. Incomplete, conflicting or
   unrepresentable write shapes remain support evidence instead of guessed

custom_components/eybond_local/collector/at_runtime.py

@@ -199,12 +199,6 @@ def _decode_collector_server_endpoint(response: CollectorAtResponse) -> dict[str
         _decode_text_value("collector_link_status"),
         frozenset({"collector_link_status"}),
     ),
-    CollectorAtQueryDefinition(
-        "INTPARA49",
-        "Nearby Wi-Fi scan list reported by the collector.",
-        _decode_text_value("collector_wifi_scan_list"),
-        frozenset({"collector_wifi_scan_list"}),
-    ),
     # Keep optional numbered queries after the established metadata set. An
     # older collector that stays silent for this read still leaves every prior
     # value available as a fresh partial result.
@@ -240,7 +234,7 @@ async def read_runtime_collector_at_values(
       the link is unusable, not the commands unsupported);
     * a timeout/disconnect AFTER some metadata -> ``partial`` (fresh, no strike);
       one timeout ends the sweep so a dead link costs one request timeout, not
-      thirteen;
+      twelve;
     * every command delivered but none carried metadata -> ``empty`` (a strike:
       the collector answered but does not support this channel);
     * an individual unsupported/rejected command is skipped, not fatal.

custom_components/eybond_local/collector/cloud_family.py

@@ -29,7 +29,7 @@
 
 _SOURCE_RANK = {
     "": 0,
-    COLLECTOR_CLOUD_FAMILY_SOURCE_ENDPOINT_HOST: 1,
+    COLLECTOR_CLOUD_FAMILY_SOURCE_ENDPOINT_HOST: 3,
     COLLECTOR_CLOUD_FAMILY_SOURCE_EXPLICIT_ENDPOINT_PORT: 1,
     COLLECTOR_CLOUD_FAMILY_SOURCE_TRANSPORT_SNIFF: 2,
 }
@@ -189,9 +189,12 @@ def select_preferred_collector_cloud_family(
     for observation in observations:
         if not observation.known:
             continue
+        # AT traffic and shared ports identify a wire family, not a particular
+        # cloud account provider. A known cloud host remains authoritative even
+        # when the collector is temporarily redirected to a local listener.
         rank = (
-            _CONFIDENCE_RANK.get(observation.confidence, 0),
             _SOURCE_RANK.get(observation.source, 0),
+            _CONFIDENCE_RANK.get(observation.confidence, 0),
         )
         if rank > selected_rank:
             selected = observation

custom_components/eybond_local/collector/transport_profile.py

@@ -13,7 +13,9 @@
 from ..const import (
     CONF_COLLECTOR_CLOUD_FAMILY,
     CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT,
+    CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_OBSERVED_AT,
     CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_PROFILE_KEY,
+    CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_SOURCE,
     CONF_DRIVER_HINT,
     DRIVER_HINT_AUTO,
 )
@@ -24,7 +26,13 @@
     resolve_collector_cloud_raw_passthrough_min_interval_ms,
     resolve_collector_cloud_session_protocol,
 )
-from .cloud_family import collector_cloud_family_observation_from_endpoint
+from .cloud_family import (
+    COLLECTOR_CLOUD_FAMILY_SOURCE_ENDPOINT_HOST,
+    CollectorCloudFamilyObservation,
+    collector_cloud_family_observation_from_endpoint,
+    collector_cloud_family_observation_from_mapping,
+    select_preferred_collector_cloud_family,
+)
 from .capabilities import (
     COLLECTOR_KIND_ENTRY_KEY,
     COLLECTOR_KIND_ESP_EYBOND_BRIDGE,
@@ -118,34 +126,69 @@ def collector_cloud_family_from_entry_context(
     options: Mapping[str, object],
     *,
     extra_endpoints: tuple[object, ...] = (),
+    extra_observations: tuple[CollectorCloudFamilyObservation, ...] = (),
 ) -> str:
     """Resolve collector cloud family from durable and runtime entry context."""
 
-    for source in (data, options):
-        family = known_collector_cloud_family(source.get(CONF_COLLECTOR_CLOUD_FAMILY, ""))
-        if family:
-            return family
+    return known_collector_cloud_family(
+        collector_cloud_family_observation_from_entry_context(
+            data, options,
+            extra_endpoints=extra_endpoints,
+            extra_observations=extra_observations,
+        ).family
+    )
 
-    for source in (options, data):
-        family = known_collector_cloud_family(
-            source.get(CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_PROFILE_KEY, "")
-        )
-        if family:
-            return family
 
-    for endpoint in extra_endpoints:
-        family = _known_family_from_endpoint(endpoint)
-        if family:
-            return family
+def collector_cloud_family_observation_from_entry_context(
+    data: Mapping[str, object],
+    options: Mapping[str, object],
+    *,
+    extra_endpoints: tuple[object, ...] = (),
+    extra_observations: tuple[CollectorCloudFamilyObservation, ...] = (),
+) -> CollectorCloudFamilyObservation:
+    """Resolve cloud identity without confusing a local route with a provider.
+
+    A current known cloud host wins over the remembered host. Local endpoints,
+    shared ports and wire sniffing cannot replace either. Preserve the original
+    endpoint as one record: data owns it, options is only a legacy fallback.
+    This projection never chooses or confirms a session's wire protocol.
+    """
 
-    for source in (options, data):
-        family = _known_family_from_endpoint(
-            source.get(CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT, "")
+    original_fields = (
+        CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT,
+        CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_PROFILE_KEY,
+        CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_SOURCE,
+        CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_OBSERVED_AT,
+    )
+    original = data if any(key in data for key in original_fields) else options
+    endpoint_observations = tuple(
+        collector_cloud_family_observation_from_endpoint(endpoint)
+        for endpoint in (
+            *extra_endpoints,
+            original.get(CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT, ""),
         )
-        if family:
-            return family
+    )
+    for observation in (*endpoint_observations, *extra_observations):
+        if (
+            observation.source == COLLECTOR_CLOUD_FAMILY_SOURCE_ENDPOINT_HOST
+            and known_collector_cloud_family(observation.family)
+        ):
+            return observation
+
+    original_family = known_collector_cloud_family(
+        original.get(CONF_COLLECTOR_ORIGINAL_SERVER_ENDPOINT_PROFILE_KEY, "")
+    )
+    if original_family:
+        return CollectorCloudFamilyObservation(family=original_family)
 
-    return ""
+    durable_observations = tuple(
+        collector_cloud_family_observation_from_mapping(source)
+        for source in (data, options)
+    )
+    for observation in (*extra_observations, *durable_observations):
+        if known_collector_cloud_family(observation.family):
+            return observation
+    return select_preferred_collector_cloud_family(*endpoint_observations)
 
 
 def resolve_collector_transport_profile(
@@ -300,8 +343,3 @@ def resolve_collector_transport_profile_from_entry_context(
         runtime_owner_key=runtime_owner_key,
         virtual_bridge=entry_context_is_virtual_bridge(data, options),
     )
-
-
-def _known_family_from_endpoint(endpoint: object) -> str:
-    observation = collector_cloud_family_observation_from_endpoint(endpoint)
-    return known_collector_cloud_family(observation.family)

custom_components/eybond_local/flow_translations/en.json

@@ -494,6 +494,9 @@
       "control_discovery_cloud_network": "Home Assistant could not reach the cloud service. Check its internet connection.",
       "control_discovery_cloud_unexpected": "The cloud service returned an unexpected response.",
       "cloud_active_no_safe_controls": "The selected cloud API did not expose any safe controls that could be checked for this device. Nothing was changed.",
+      "shadow_learning_restore_pending": "Home Assistant could not confirm restoration of the previous collector connection. Open Expand device support → Analyze cloud data and device capabilities, then retry restoring the connection before starting another check. Download a Support Archive if restoration keeps failing.",
+      "shadow_learning_restore_action": "Retry restoring the collector connection",
+      "shadow_learning_restore_confirmed": "✓ The previous collector connection was restored. You can start another check.",
       "control_discovery_failure_generic": "Home Assistant stopped safely and restored the collector connection.",
       "control_discovery_result_failed": "The check couldn't finish. {control_discovery_error} Try again, download the support package so the developer can inspect what happened, or return to the menu.",
       "control_discovery_result_action_retry": "Try the scan again",

custom_components/eybond_local/flow_translations/ru.json

@@ -494,6 +494,9 @@
       "control_discovery_cloud_network": "Home Assistant не удалось связаться с облачным сервисом. Проверьте подключение к интернету.",
       "control_discovery_cloud_unexpected": "Облачный сервис вернул неожиданный ответ.",
       "cloud_active_no_safe_controls": "Выбранный облачный API не предоставил безопасных элементов управления, которые можно проверить для этого устройства. Ничего не изменено.",
+      "shadow_learning_restore_pending": "Home Assistant не смог подтвердить восстановление прежнего подключения коллектора. Откройте «Расширить поддержку устройства → Проанализировать облачные данные и возможности устройства» и повторите восстановление подключения перед новой проверкой. Если восстановление снова не удастся, загрузите пакет поддержки.",
+      "shadow_learning_restore_action": "Повторить восстановление подключения коллектора",
+      "shadow_learning_restore_confirmed": "✓ Прежнее подключение коллектора восстановлено. Можно начать новую проверку.",
       "control_discovery_failure_generic": "Home Assistant безопасно остановил процесс и восстановил подключение коллектора.",
       "control_discovery_result_failed": "Проверку не удалось завершить. {control_discovery_error} Повторите попытку, загрузите пакет поддержки, чтобы разработчик мог разобраться, или вернитесь в меню.",
       "control_discovery_result_action_retry": "Повторить попытку",

custom_components/eybond_local/flow_translations/uk.json

@@ -494,6 +494,9 @@
       "control_discovery_cloud_network": "Home Assistant не вдалося зв’язатися з хмарним сервісом. Перевірте підключення до інтернету.",
       "control_discovery_cloud_unexpected": "Хмарний сервіс повернув неочікувану відповідь.",
       "cloud_active_no_safe_controls": "Вибраний хмарний API не надав безпечних елементів керування, які можна перевірити для цього пристрою. Нічого не змінено.",
+      "shadow_learning_restore_pending": "Home Assistant не зміг підтвердити відновлення попереднього підключення колектора. Відкрийте «Розширити підтримку пристрою → Проаналізувати хмарні дані та можливості пристрою» та повторіть відновлення підключення перед новою перевіркою. Якщо відновлення знову не вдасться, завантажте пакет підтримки.",
+      "shadow_learning_restore_action": "Повторити відновлення підключення колектора",
+      "shadow_learning_restore_confirmed": "✓ Попереднє підключення колектора відновлено. Можна почати нову перевірку.",
       "control_discovery_failure_generic": "Home Assistant безпечно зупинив процес і відновив підключення колектора.",
       "control_discovery_result_failed": "Перевірку не вдалося завершити. {control_discovery_error} Повторіть спробу, завантажте пакет підтримки, щоб розробник міг розібратися, або поверніться до меню.",
       "control_discovery_result_action_retry": "Повторити спробу",