Skip to content

Only listen for zeroconf when the esphome device cannot connect #48645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 3 commits into from
Apr 4, 2021
Merged

Only listen for zeroconf when the esphome device cannot connect #48645

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d095a3
Only listen for zeroconf when the esphome device cannot connect
bdraco Apr 3, 2021
c011ff1
check for existing listen
bdraco Apr 3, 2021
07a6abb
speed up reconnect
bdraco Apr 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions homeassistant/components/esphome/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ def __init__(
# Flag to check if the device is connected
self._connected = True
self._connected_lock = asyncio.Lock()
self._zc_lock = asyncio.Lock()
self._zc_listening = False
# Event the different strategies use for issuing a reconnect attempt.
self._reconnect_event = asyncio.Event()
# The task containing the infinite reconnect loop while running
Expand Down Expand Up @@ -270,6 +272,7 @@ async def _on_disconnect(self):
self._entry_data.disconnect_callbacks = []
self._entry_data.available = False
self._entry_data.async_update_device_state(self._hass)
await self._start_zc_listen()

# Reset tries
async with self._tries_lock:
Expand Down Expand Up @@ -315,6 +318,7 @@ async def _try_connect(self):
self._host,
error,
)
await self._start_zc_listen()
# Schedule re-connect in event loop in order not to delay HA
# startup. First connect is scheduled in tracked tasks.
async with self._wait_task_lock:
Expand All @@ -332,6 +336,7 @@ async def _try_connect(self):
self._tries = 0
async with self._connected_lock:
self._connected = True
await self._stop_zc_listen()
self._hass.async_create_task(self._on_login())

async def _reconnect_once(self):
Expand Down Expand Up @@ -375,9 +380,6 @@ async def start(self):
# Create reconnection loop outside of HA's tracked tasks in order
# not to delay startup.
self._loop_task = self._hass.loop.create_task(self._reconnect_loop())
# Listen for mDNS records so we can reconnect directly if a received mDNS record
# indicates the node is up again
await self._hass.async_add_executor_job(self._zc.add_listener, self, None)

async with self._connected_lock:
self._connected = False
Expand All @@ -388,11 +390,31 @@ async def stop(self):
if self._loop_task is not None:
self._loop_task.cancel()
self._loop_task = None
await self._hass.async_add_executor_job(self._zc.remove_listener, self)
async with self._wait_task_lock:
if self._wait_task is not None:
self._wait_task.cancel()
self._wait_task = None
await self._stop_zc_listen()

async def _start_zc_listen(self):
"""Listen for mDNS records.

This listener allows us to schedule a reconnect as soon as a
received mDNS record indicates the node is up again.
"""
async with self._zc_lock:
if not self._zc_listening:
await self._hass.async_add_executor_job(
self._zc.add_listener, self, None
)
self._zc_listening = True

async def _stop_zc_listen(self):
"""Stop listening for zeroconf updates."""
async with self._zc_lock:
if self._zc_listening:
await self._hass.async_add_executor_job(self._zc.remove_listener, self)
self._zc_listening = False

@callback
def stop_callback(self):
Expand Down