fix: track HA shutdown requests

The component will now distinguish between a HA shutdown where the session
is closed voluntarily versus an error. This will avoid deleting a good
.pickle file forcing a relogin request. This will also prevent attempts
to use the API after a requested close.
closes #819

custom_components/alexa_media/__init__.py

@@ -251,6 +251,7 @@ async def async_update_data():
             email not in hass.data[DATA_ALEXAMEDIA]["accounts"]
             or "login_successful" not in login_obj.status
             or login_obj.session.closed
+            or login_obj.close_requested
         ):
             return
         existing_serials = _existing_serials(hass, login_obj)
@@ -804,6 +805,11 @@ async def ws_close_handler():
         import time
 
         email: Text = login_obj.email
+        if login_obj.close_requested:
+            _LOGGER.debug(
+                "%s: Close requested; will not reconnect websocket", hide_email(email)
+            )
+            return
         errors: int = (hass.data[DATA_ALEXAMEDIA]["accounts"][email]["websocketerror"])
         delay: int = 5 * 2 ** errors
         last_attempt = hass.data[DATA_ALEXAMEDIA]["accounts"][email][
@@ -859,7 +865,9 @@ async def ws_error_handler(message):
             type(message),
         )
         hass.data[DATA_ALEXAMEDIA]["accounts"][email]["websocket"] = None
-        if login_obj.session.closed or message == "<class 'aiohttp.streams.EofStream'>":
+        if not login_obj.close_requested and (
+            login_obj.session.closed or message == "<class 'aiohttp.streams.EofStream'>"
+        ):
             hass.data[DATA_ALEXAMEDIA]["accounts"][email]["websocketerror"] = 5
             _LOGGER.debug("%s: Immediate abort on EoFstream", hide_email(email))
             return

custom_components/alexa_media/helpers.py

@@ -11,7 +11,7 @@
 import logging
 from typing import Any, Callable, List, Optional, Text
 
-from alexapy import AlexapyLoginError, hide_email
+from alexapy import AlexapyLoginCloseRequested, AlexapyLoginError, hide_email
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_component import EntityComponent
 
@@ -151,6 +151,13 @@ async def wrapper(*args, **kwargs) -> Any:
             instance.check_login_changes()
         try:
             result = await func(*args, **kwargs)
+        except AlexapyLoginCloseRequested:
+            _LOGGER.debug(
+                "%s.%s: Ignoring attempt to access Alexa after HA shutdown",
+                func.__module__[func.__module__.find(".") + 1 :],
+                func.__name__,
+            )
+            return None
         except AlexapyLoginError as ex:
             _LOGGER.debug(
                 "%s.%s: detected bad login: %s",

custom_components/alexa_media/manifest.json

@@ -5,5 +5,5 @@
   "documentation": "https://github.com/custom-components/alexa_media_player/wiki",
   "dependencies": ["configurator"],
   "codeowners": ["@keatontaylor", "@alandtse"],
-  "requirements": ["alexapy==1.10.7"]
+  "requirements": ["alexapy==1.10.8"]
 }