Remote 3 Updates

Author: JackJPowell

.devcontainer/devcontainer.json

@@ -1,8 +1,8 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
   "name": "Home Assistant integration development",
-  "image": "mcr.microsoft.com/devcontainers/python:dev-3.13",
-  "postCreateCommand": "sudo apt-get update && sudo apt-get install libturbojpeg0",
+  "image": "mcr.microsoft.com/devcontainers/python:3.13-bookworm",
+  "postCreateCommand": ".devcontainer/setup",
   "postAttachCommand": ".devcontainer/setup",
   "forwardPorts": [8123],
   "runArgs": ["-e", "GIT_EDITOR=code --wait", "--network=host"],

.devcontainer/setup

@@ -1,9 +1,13 @@
 #!/usr/bin/env bash
 
+sudo apt-get update && sudo apt-get install libturbojpeg0
+
 set -e
 
 cd "$(dirname "$0")/.."
 
-python3 -m pip install --requirement requirements.txt
+python3 -m pip install --requirement requirements.txt --upgrade
+
+pre-commit install
 
 mkdir -p config

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.9.10
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

custom_components/unfoldedcircle/config_flow.py

@@ -3,8 +3,9 @@
 import asyncio
 import logging
 from typing import Any, Awaitable, Callable, Type
+
 from aiohttp import ClientConnectionError
-from pyUnfoldedCircleRemote.const import AUTH_APIKEY_NAME, SIMULATOR_MAC_ADDRESS
+from pyUnfoldedCircleRemote.const import AUTH_APIKEY_NAME
 from pyUnfoldedCircleRemote.remote import (
     ApiKeyCreateError,
     ApiKeyRevokeError,
@@ -19,13 +20,13 @@
 from voluptuous import Optional, Required
 
 from homeassistant import config_entries
-from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.config_entries import ConfigEntry, ConfigFlow
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME, CONF_PORT
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.selector import EntitySelector, EntitySelectorConfig
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import (
     CONF_ACTIVITIES_AS_SWITCHES,
@@ -40,17 +41,15 @@
 )
 from .helpers import (
     IntegrationNotFound,
-    UnableToExtractMacAddress,
-    UnableToDetermineUser,
     InvalidWebsocketAddress,
+    UnableToDetermineUser,
     connect_integration,
     device_info_from_discovery_info,
     get_ha_websocket_url,
     get_registered_websocket_url,
-    mac_address_from_discovery_info,
+    register_system_and_driver,
     synchronize_dock_password,
     validate_and_register_system_and_driver,
-    register_system_and_driver,
     validate_dock_password,
     validate_websocket_address,
 )
@@ -169,17 +168,12 @@ async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo):
         host = discovery_info.ip_address.compressed
         port = discovery_info.port
         model = discovery_info.properties.get("model")
-        try:
-            mac_address = mac_address_from_discovery_info(discovery_info)
-        except UnableToExtractMacAddress:
-            if (
-                discovery_info.properties.get("model") != "UCR2-simulator"
-                and discovery_info.properties.get("model") != "UCR3-simulator"
-            ):
-                return self.async_abort(reason="no_mac")
-            _LOGGER.debug("Zeroconf from the Simulator %s", discovery_info)
-            mac_address = SIMULATOR_MAC_ADDRESS.replace(":", "").lower()
 
+        (
+            device_name,
+            configuration_url,
+            mac_address,
+        ) = await device_info_from_discovery_info(discovery_info)
         remote_name = Remote.name_from_model_id(model)
         self.discovery_info.update(
             {
@@ -195,10 +189,6 @@ async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo):
         if mac_address:
             await self._async_set_unique_id_and_abort_if_already_configured(mac_address)
 
-        device_name, configuration_url = await device_info_from_discovery_info(
-            discovery_info
-        )
-
         self.context.update(
             {
                 "title_placeholders": {"name": device_name},

custom_components/unfoldedcircle/helpers.py

@@ -7,6 +7,7 @@
 from typing import Any
 from urllib.parse import urljoin, urlparse
 
+from pyUnfoldedCircleRemote.const import SIMULATOR_MAC_ADDRESS
 from pyUnfoldedCircleRemote.dock_websocket import DockWebsocket
 from pyUnfoldedCircleRemote.remote import (
     HTTPError,
@@ -16,9 +17,9 @@
 )
 
 from homeassistant.auth.models import TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN, RefreshToken
-from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.network import NoURLAvailableError, get_url
+from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
 
 from .const import (
     DEFAULT_HASS_URL,
@@ -221,27 +222,15 @@ async def get_registered_websocket_url(remote: Remote) -> str:
     return None
 
 
-@staticmethod
-def mac_address_from_discovery_info(discovery_info: ZeroconfServiceInfo) -> str:
-    """Returns the mac address embedded in the hostname. This is typically used with zeroconf broadcasts"""
-    hostname = discovery_info.hostname
-    name = discovery_info.name
-    try:
-        return re.match(r"(?:RemoteTwo|RemoteThree)-(.*?)\.", hostname).group(1).lower()
-    except Exception:
-        try:
-            return re.match(r"(?:RemoteTwo|RemoteThree)-(.*?)\.", name).group(1).lower()
-        except Exception:
-            raise UnableToExtractMacAddress
-
-
 async def device_info_from_discovery_info(discovery_info: ZeroconfServiceInfo) -> tuple:
+    """Returns device information from discovery info"""
     host = discovery_info.ip_address.compressed
     port = discovery_info.port
     model = discovery_info.properties.get("model")
     endpoint = f"http://{host}:{port}/api/"
     configuration_url = ""
     device_name = ""
+    mac_address = ""
     match model:
         case "UCR2":
             device_name = "Remote Two"
@@ -253,13 +242,15 @@ async def device_info_from_discovery_info(discovery_info: ZeroconfServiceInfo) -
                 device_name = response.get("device_name", None)
                 if not device_name:
                     device_name = "Remote Two"
+                mac_address = response.get("address", "").replace(":", "").lower()
             except Exception:
                 pass
         case "UCR2-simulator":
             device_name = "Remote Two Simulator"
             configuration_url = (
                 f"http://{discovery_info.host}:{discovery_info.port}/configurator/"
             )
+            mac_address = SIMULATOR_MAC_ADDRESS.replace(":", "").lower()
         case "UCR3":
             device_name = "Remote 3"
             configuration_url = (
@@ -269,15 +260,17 @@ async def device_info_from_discovery_info(discovery_info: ZeroconfServiceInfo) -
                 response = await Remote.get_version_information(endpoint)
                 device_name = response.get("device_name", None)
                 if not device_name:
-                    device_name = "Remote Two"
+                    device_name = "Remote Three"
+                mac_address = response.get("address", "").replace(":", "").lower()
             except Exception:
                 pass
         case "UCR3-simulator":
             device_name = "Remote 3 Simulator"
             configuration_url = (
                 f"http://{discovery_info.host}:{discovery_info.port}/configurator/"
             )
-    return device_name, configuration_url
+            mac_address = SIMULATOR_MAC_ADDRESS.replace(":", "").lower()
+    return device_name, configuration_url, mac_address
 
 
 async def validate_tokens(hass: HomeAssistant, remote: Remote) -> bool:

custom_components/unfoldedcircle/manifest.json

@@ -10,9 +10,9 @@
   "issue_tracker": "https://github.com/JackJPowell/hass-unfoldedcircle/issues",
   "requirements": [
     "websockets>=12.0,<14",
-    "pyUnfoldedCircleRemote==0.13.4",
+    "pyUnfoldedCircleRemote==0.14.0",
     "wakeonlan==3.1.0"
   ],
-  "version": "0.14.6",
+  "version": "0.15.0",
   "zeroconf": ["_uc-remote._tcp.local."]
 }

custom_components/unfoldedcircle/media_player.py

@@ -16,7 +16,6 @@
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import utcnow
 from pyUnfoldedCircleRemote.const import RemoteUpdateType
 from pyUnfoldedCircleRemote.remote import (
     Activity,

custom_components/unfoldedcircle/pyUnfoldedCircleRemote/remote.py

@@ -933,7 +933,7 @@ async def get_version(self) -> dict[str]:
                 await self.get_remote_information()
 
             if self._is_simulator is True:
-                core = information.get("core", "")
+                # core = information.get("core", "")
                 # We only care about the beginning of the version for this compare
                 self._external_entity_configuration_available = True
                 self._new_web_configurator = False
@@ -1511,8 +1511,12 @@ async def get_remote_network_settings(self) -> str:
             self._wifi_enabled = settings.get("wifi_enabled")
 
             try:
-                self._wake_on_lan = settings.get("wake_on_wlan").get("enabled")
-                self._wake_on_lan_available = True
+                if self._model_number.upper() == "UCR3":
+                    self._wake_on_lan = False
+                    self._wake_on_lan_available = False
+                else:
+                    self._wake_on_lan = settings.get("wake_on_wlan").get("enabled")
+                    self._wake_on_lan_available = True
             except AttributeError:
                 self._wake_on_lan = False
             return settings

custom_components/unfoldedcircle/remote.py

@@ -482,11 +482,11 @@ async def async_send_command(self, **kwargs: Any) -> None:
                         port=port,
                     )
                 except (AuthenticationError, OSError) as err:
-                    _LOGGER.error("Failed to learn '%s': %s", command, err)
+                    _LOGGER.error("Failed to send '%s': %s", command, err)
                     break
 
                 except Exception as err:
-                    _LOGGER.error("Failed to learn '%s': %s", command, err)
+                    _LOGGER.error("Failed to send '%s': %s", command, err)
                     continue
 
     def translate_port(self, port_name) -> str:

requirements.txt

@@ -1,5 +1,5 @@
 # Home Assistant
-homeassistant>=2025.2
+homeassistant>=2025.5
 PyTurboJPEG
 
 # Development
@@ -8,4 +8,5 @@ pip>=24.2
 ruff>=0.5.3
 aiohttp_fast_zlib
 zlib_ng
-isal
+isal
+pre-commit