Use the shared Zeroconf instance in esphome (#38747)
This commit is contained in:
1 parent
7f7a0003c7
commit
9b23d7c2fd
6 files changed
+30
-7
No files matched your search
@@ -17,6 +17,7 @@ from aioesphomeapi import (
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant import const
|
||||
from homeassistant.components import zeroconf
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.const import (
|
||||
CONF_HOST,
|
||||
@@ -66,12 +67,15 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
|
||||
port = entry.data[CONF_PORT]
|
||||
password = entry.data[CONF_PASSWORD]
|
||||
|
||||
zeroconf_instance = await zeroconf.async_get_instance(hass)
|
||||
|
||||
cli = APIClient(
|
||||
hass.loop,
|
||||
host,
|
||||
port,
|
||||
password,
|
||||
client_info=f"Home Assistant {const.__version__}",
|
||||
zeroconf_instance=zeroconf_instance,
|
||||
)
|
||||
|
||||
# Store client in per-config-entry hass.data
|
||||
|
||||
@@ -5,6 +5,7 @@ from typing import Optional
|
||||
from aioesphomeapi import APIClient, APIConnectionError
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.components import zeroconf
|
||||
from homeassistant.config_entries import CONN_CLASS_LOCAL_PUSH, ConfigFlow
|
||||
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
|
||||
from homeassistant.core import callback
|
||||
@@ -165,7 +166,14 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
|
||||
|
||||
async def fetch_device_info(self):
|
||||
"""Fetch device info from API and return any errors."""
|
||||
cli = APIClient(self.hass.loop, self._host, self._port, "")
|
||||
zeroconf_instance = await zeroconf.async_get_instance(self.hass)
|
||||
cli = APIClient(
|
||||
self.hass.loop,
|
||||
self._host,
|
||||
self._port,
|
||||
"",
|
||||
zeroconf_instance=zeroconf_instance,
|
||||
)
|
||||
|
||||
try:
|
||||
await cli.connect()
|
||||
@@ -181,7 +189,14 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
|
||||
|
||||
async def try_login(self):
|
||||
"""Try logging in to device and return any errors."""
|
||||
cli = APIClient(self.hass.loop, self._host, self._port, self._password)
|
||||
zeroconf_instance = await zeroconf.async_get_instance(self.hass)
|
||||
cli = APIClient(
|
||||
self.hass.loop,
|
||||
self._host,
|
||||
self._port,
|
||||
self._password,
|
||||
zeroconf_instance=zeroconf_instance,
|
||||
)
|
||||
|
||||
try:
|
||||
await cli.connect(login=True)
|
||||
|
||||
@@ -3,7 +3,10 @@
|
||||
"name": "ESPHome",
|
||||
"config_flow": true,
|
||||
"documentation": "https://www.home-assistant.io/integrations/esphome",
|
||||
"requirements": ["aioesphomeapi==2.6.1"],
|
||||
"requirements": ["aioesphomeapi==2.6.3"],
|
||||
"zeroconf": ["_esphomelib._tcp.local."],
|
||||
"codeowners": ["@OttoWinter"]
|
||||
"codeowners": ["@OttoWinter"],
|
||||
"after_dependencies": [
|
||||
"zeroconf"
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user