Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 08:28:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

dashboard: Fix online status when api is disabled (#5792)

Browse source
This commit is contained in:
J. Nick Koston 2023-11-21 01:16:06 +01:00 committed by GitHub
parent d5d97c4558
commit 7d5ebeda52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
esphome/dashboard/status/mdns.py
View file

@ -12,7 +12,7 @@ from esphome.zeroconf import (
from ..const import SENTINEL from ..const import SENTINEL
from ..core import DASHBOARD from ..core import DASHBOARD
from ..entries import bool_to_entry_state from ..entries import DashboardEntry, bool_to_entry_state
class MDNSStatus: class MDNSStatus:
@ -37,15 +37,30 @@ class MDNSStatus:
dashboard = DASHBOARD dashboard = DASHBOARD
host_mdns_state = self.host_mdns_state host_mdns_state = self.host_mdns_state
entries = dashboard.entries entries = dashboard.entries
poll_names: dict[str, set[DashboardEntry]] = {}
for entry in entries.async_all(): for entry in entries.async_all():
if entry.no_mdns: if entry.no_mdns:
continue continue
# If we just adopted/imported this host, we likely # If we just adopted/imported this host, we likely
# already have a state for it, so we should make sure # already have a state for it, so we should make sure
# to set it so the dashboard shows it as online # to set it so the dashboard shows it as online
if (online := host_mdns_state.get(entry.name, SENTINEL)) != SENTINEL: if entry.loaded_integrations and "api" not in entry.loaded_integrations:
# No api available so we have to poll since
# the device won't respond to a request to ._esphomelib._tcp.local.
poll_names.setdefault(entry.name, set()).add(entry)
elif (online := host_mdns_state.get(entry.name, SENTINEL)) != SENTINEL:
entries.async_set_state(entry, bool_to_entry_state(online)) entries.async_set_state(entry, bool_to_entry_state(online))
if poll_names and self.aiozc:
results = await asyncio.gather(
*(self.aiozc.async_resolve_host(name) for name in poll_names)
)
for name, address in zip(poll_names, results):
result = bool(address)
host_mdns_state[name] = result
for entry in poll_names[name]:
entries.async_set_state(entry, bool_to_entry_state(result))
async def async_run(self) -> None: async def async_run(self) -> None:
dashboard = DASHBOARD dashboard = DASHBOARD
entries = dashboard.entries entries = dashboard.entries

4
esphome/zeroconf.py
View file

@ -169,7 +169,9 @@ class DashboardImportDiscovery:
def _make_host_resolver(host: str) -> HostResolver: def _make_host_resolver(host: str) -> HostResolver:
"""Create a new HostResolver for the given host name.""" """Create a new HostResolver for the given host name."""
name = host.partition(".")[0] name = host.partition(".")[0]
info = HostResolver(ESPHOME_SERVICE_TYPE, f"{name}.{ESPHOME_SERVICE_TYPE}") info = HostResolver(
ESPHOME_SERVICE_TYPE, f"{name}.{ESPHOME_SERVICE_TYPE}", server=f"{name}.local."
)
return info return info