dry

esphome/helpers.py

@@ -177,6 +177,21 @@ def addr_preference_(res: AddrInfo) -> int:
     return 1
 
 
+def _add_ip_addresses_to_addrinfo(
+    addresses: list[str], port: int, res: list[AddrInfo]
+) -> None:
+    """Helper to add IP addresses to addrinfo results with error handling."""
+    import socket
+
+    for addr in addresses:
+        try:
+            res += socket.getaddrinfo(
+                addr, port, proto=socket.IPPROTO_TCP, flags=socket.AI_NUMERICHOST
+            )
+        except OSError:
+            _LOGGER.debug("Failed to parse IP address '%s'", addr)
+
+
 def resolve_ip_address(
     host: str | list[str], port: int, address_cache: AddressCache | None = None
 ) -> list[AddrInfo]:
@@ -203,13 +218,7 @@ def resolve_ip_address(
 
     # Fast path: if all hosts are already IP addresses
     if all(is_ip_address(h) for h in hosts):
-        for addr in hosts:
-            try:
-                res += socket.getaddrinfo(
-                    addr, port, proto=socket.IPPROTO_TCP, flags=socket.AI_NUMERICHOST
-                )
-            except OSError:
-                _LOGGER.debug("Failed to parse IP address '%s'", addr)
+        _add_ip_addresses_to_addrinfo(hosts, port, res)
         # Sort by preference
         res.sort(key=addr_preference_)
         return res
@@ -237,13 +246,7 @@ def resolve_ip_address(
             uncached_hosts.append(h)
 
     # Process cached addresses (includes direct IPs and cached lookups)
-    for addr in cached_addresses:
-        try:
-            res += socket.getaddrinfo(
-                addr, port, proto=socket.IPPROTO_TCP, flags=socket.AI_NUMERICHOST
-            )
-        except OSError:
-            _LOGGER.debug("Failed to parse IP address '%s'", addr)
+    _add_ip_addresses_to_addrinfo(cached_addresses, port, res)
 
     # If we have uncached hosts (only non-IP hostnames), resolve them
     if uncached_hosts:
@@ -296,14 +299,7 @@ def sort_ip_addresses(address_list: list[str]) -> list[str]:
     # First "resolve" all the IP addresses to getaddrinfo() tuples of the form
     # (family, type, proto, canonname, sockaddr)
     res: list[AddrInfo] = []
-    for addr in address_list:
-        # This should always work as these are supposed to be IP addresses
-        try:
-            res += socket.getaddrinfo(
-                addr, 0, proto=socket.IPPROTO_TCP, flags=socket.AI_NUMERICHOST
-            )
-        except OSError:
-            _LOGGER.info("Failed to parse IP address '%s'", addr)
+    _add_ip_addresses_to_addrinfo(address_list, 0, res)
 
     # Now use that information to sort them.
     res.sort(key=addr_preference_)