jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-08-04 11:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure existing SimpliSafe websocket tasks are cancelled appropriately (#62347)

Browse Source
This commit is contained in:
Aaron Bach 2021-12-19 15:05:13 -07:00 committed by Paulus Schoutsen
parent 7c925778eb
commit beb5a992e6
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
homeassistant/components/simplisafe/__init__.py
View File

@ -519,14 +519,14 @@ class SimpliSafe:
self._system_notifications[system.system_id] = latest_notifications
async def _async_start_websocket_loop(self) -> None:
"""Define a callback for connecting to the websocket."""
"""Start a websocket reconnection loop."""
if TYPE_CHECKING:
assert self._api.websocket
should_reconnect = True
try:
await self._api.websocket.async_reconnect()
await self._api.websocket.async_connect()
await self._api.websocket.async_listen()
except asyncio.CancelledError:
LOGGER.debug("Request to cancel websocket loop received")
@ -538,10 +538,25 @@ class SimpliSafe:
if should_reconnect:
LOGGER.info("Disconnected from websocket; reconnecting")
await self._async_cancel_websocket_loop()
self._websocket_reconnect_task = self._hass.async_create_task(
self._async_start_websocket_loop()
)
async def _async_cancel_websocket_loop(self) -> None:
"""Stop any existing websocket reconnection loop."""
if self._websocket_reconnect_task:
self._websocket_reconnect_task.cancel()
try:
await self._websocket_reconnect_task
except asyncio.CancelledError:
LOGGER.debug("Websocket reconnection task successfully canceled")
self._websocket_reconnect_task = None
if TYPE_CHECKING:
assert self._api.websocket
await self._api.websocket.async_disconnect()
@callback
def _async_websocket_on_event(self, event: WebsocketEvent) -> None:
"""Define a callback for receiving a websocket event."""
@ -590,15 +605,7 @@ class SimpliSafe:
if TYPE_CHECKING:
assert self._api.websocket
if self._websocket_reconnect_task:
self._websocket_reconnect_task.cancel()
try:
await self._websocket_reconnect_task
except asyncio.CancelledError:
LOGGER.debug("Websocket reconnection task successfully canceled")
self._websocket_reconnect_task = None
await self._api.websocket.async_disconnect()
await self._async_cancel_websocket_loop()
self.entry.async_on_unload(
self._hass.bus.async_listen_once(
@ -640,8 +647,7 @@ class SimpliSafe:
data={**self.entry.data, CONF_TOKEN: token},
)
@callback
def async_handle_refresh_token(token: str) -> None:
async def async_handle_refresh_token(token: str) -> None:
"""Handle a new refresh token."""
async_save_refresh_token(token)
@ -649,6 +655,7 @@ class SimpliSafe:
assert self._api.websocket
# Open a new websocket connection with the fresh token:
await self._async_cancel_websocket_loop()
self._websocket_reconnect_task = self._hass.async_create_task(
self._async_start_websocket_loop()
)

2
homeassistant/components/simplisafe/manifest.json
View File

@ -3,7 +3,7 @@
"name": "SimpliSafe",
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/simplisafe",
"requirements": ["simplisafe-python==2021.12.1"],
"requirements": ["simplisafe-python==2021.12.2"],
"codeowners": ["@bachya"],
"iot_class": "cloud_polling",
"dhcp": [

2
requirements_all.txt
View File

@ -2146,7 +2146,7 @@ simplehound==0.3
simplepush==1.1.4
# homeassistant.components.simplisafe
simplisafe-python==2021.12.1
simplisafe-python==2021.12.2
# homeassistant.components.sisyphus
sisyphus-control==3.0

2
requirements_test_all.txt
View File

@ -1273,7 +1273,7 @@ sharkiqpy==0.1.8
simplehound==0.3
# homeassistant.components.simplisafe
simplisafe-python==2021.12.1
simplisafe-python==2021.12.2
# homeassistant.components.slack
slackclient==2.5.0