jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-05-31 03:07:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust time to remove stale connectable devices from the esphome ble to closer match bluez (#81356)

Browse Source
This commit is contained in:
J. Nick Koston 2022-11-01 12:07:42 -05:00 committed by GitHub
parent 5b09ab93dc
commit 972b36b469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/esphome/bluetooth/scanner.py
View File

@ -6,6 +6,7 @@ import datetime
from datetime import timedelta from datetime import timedelta
import re import re
import time import time
from typing import Final
from aioesphomeapi import BluetoothLEAdvertisement from aioesphomeapi import BluetoothLEAdvertisement
from bleak.backends.device import BLEDevice from bleak.backends.device import BLEDevice
@ -23,6 +24,15 @@ from homeassistant.util.dt import monotonic_time_coarse
TWO_CHAR = re.compile("..") TWO_CHAR = re.compile("..")
# The maximum time between advertisements for a device to be considered
# stale when the advertisement tracker can determine the interval for
# connectable devices.
#
# BlueZ uses 180 seconds by default but we give it a bit more time
# to account for the esp32's bluetooth stack being a bit slower
# than BlueZ's.
CONNECTABLE_FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS: Final = 195
class ESPHomeScanner(BaseHaScanner): class ESPHomeScanner(BaseHaScanner):
"""Scanner for esphome.""" """Scanner for esphome."""
@ -45,8 +55,12 @@ class ESPHomeScanner(BaseHaScanner):
self._connector = connector self._connector = connector
self._connectable = connectable self._connectable = connectable
self._details: dict[str, str | HaBluetoothConnector] = {"source": scanner_id} self._details: dict[str, str | HaBluetoothConnector] = {"source": scanner_id}
self._fallback_seconds = FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS
if connectable: if connectable:
self._details["connector"] = connector self._details["connector"] = connector
self._fallback_seconds = (
CONNECTABLE_FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS
)
@callback @callback
def async_setup(self) -> CALLBACK_TYPE: def async_setup(self) -> CALLBACK_TYPE:
@ -61,7 +75,7 @@ class ESPHomeScanner(BaseHaScanner):
expired = [ expired = [
address address
for address, timestamp in self._discovered_device_timestamps.items() for address, timestamp in self._discovered_device_timestamps.items()
if now - timestamp > FALLBACK_MAXIMUM_STALE_ADVERTISEMENT_SECONDS if now - timestamp > self._fallback_seconds
] ]
for address in expired: for address in expired:
del self._discovered_device_advertisement_datas[address] del self._discovered_device_advertisement_datas[address]