From 2e22b232fb61cf56ea6e036576ec056e84aa28fe Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 17 Sep 2021 05:44:30 -1000
Subject: [PATCH] Avoid executor jump to resolve ip addresses (#103)

---
 aioesphomeapi/host_resolver.py | 35 ++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/aioesphomeapi/host_resolver.py b/aioesphomeapi/host_resolver.py
index e2ea2f2..c05d851 100644
--- a/aioesphomeapi/host_resolver.py
+++ b/aioesphomeapi/host_resolver.py
@@ -1,7 +1,9 @@
 import asyncio
+import contextlib
 import functools
 import socket
 from dataclasses import dataclass
+from ipaddress import IPv4Address, IPv6Address
 from typing import List, Optional, Tuple, Union, cast
 
 import zeroconf
@@ -213,6 +215,36 @@ async def _async_resolve_host_getaddrinfo(
     return addrs
 
 
+def _async_ip_address_to_addrs(host: str, port: int) -> List[AddrInfo]:
+    """Convert an ipaddress to AddrInfo."""
+    with contextlib.suppress(ValueError):
+        return [
+            AddrInfo(
+                family=socket.AF_INET6,
+                type=socket.SOCK_STREAM,
+                proto=socket.IPPROTO_TCP,
+                sockaddr=IPv6Sockaddr(
+                    address=str(IPv6Address(host)), port=port, flowinfo=0, scope_id=0
+                ),
+            )
+        ]
+
+    with contextlib.suppress(ValueError):
+        return [
+            AddrInfo(
+                family=socket.AF_INET,
+                type=socket.SOCK_STREAM,
+                proto=socket.IPPROTO_TCP,
+                sockaddr=IPv4Sockaddr(
+                    address=str(IPv4Address(host)),
+                    port=port,
+                ),
+            )
+        ]
+
+    return []
+
+
 async def async_resolve_host(
     eventloop: asyncio.events.AbstractEventLoop,
     host: str,
@@ -233,6 +265,9 @@ async def async_resolve_host(
         except APIConnectionError as err:
             zc_error = err
 
+    if not addrs:
+        addrs.extend(_async_ip_address_to_addrs(host, port))
+
     if not addrs:
         addrs.extend(await _async_resolve_host_getaddrinfo(eventloop, host, port))