From a4f849918bd285b90f67065e94bfad60fe018c58 Mon Sep 17 00:00:00 2001 From: Axel Larsson Date: Fri, 29 Sep 2023 21:05:35 -0400 Subject: [PATCH 1/3] fix: Restore NOTIFICATION_CHANGE command (#2044) * Restore NOTIFICATION_CHANGE Partial revert of 8f0dfa2 to restore NOTIFICATION_CHANGE functionality for timers and alarms. * style: auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- custom_components/alexa_media/sensor.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/custom_components/alexa_media/sensor.py b/custom_components/alexa_media/sensor.py index a28db89a..4f128ba0 100644 --- a/custom_components/alexa_media/sensor.py +++ b/custom_components/alexa_media/sensor.py @@ -557,14 +557,21 @@ async def async_will_remove_from_hass(self): def _handle_event(self, event): """Handle events. - This will update PUSH_ACTIVITY events to see if the sensor - should be updated. + This will update PUSH_ACTIVITY or NOTIFICATION_UPDATE events to see if + the sensor should be updated. """ try: if not self.enabled: return except AttributeError: pass + if "notification_update" in event: + if ( + event["notification_update"]["dopplerId"]["deviceSerialNumber"] + == self._client.device_serial_number + ): + _LOGGER.debug("Updating sensor %s", self) + self.schedule_update_ha_state(True) if "push_activity" in event: if ( event["push_activity"]["key"]["serialNumber"] From d8f270eb5ae9195d22b19237c4a06d7e743f13e5 Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 30 Sep 2023 00:28:42 -0700 Subject: [PATCH 2/3] fix: fix unload error when entity_id None --- custom_components/alexa_media/notify.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/custom_components/alexa_media/notify.py b/custom_components/alexa_media/notify.py index d220b9a5..218dd680 100644 --- a/custom_components/alexa_media/notify.py +++ b/custom_components/alexa_media/notify.py @@ -64,8 +64,11 @@ async def async_unload_entry(hass, entry) -> bool: if "entities" not in account_dict: continue for device in account_dict["entities"]["media_player"].values(): - entity_id = device.entity_id.split(".") - hass.services.async_remove(SERVICE_NOTIFY, f"{DOMAIN}_{entity_id[1]}") + if device.entity_id: + entity_id = device.entity_id.split(".") + hass.services.async_remove( + SERVICE_NOTIFY, f"{DOMAIN}_{entity_id[1]}" + ) else: other_accounts = True if not other_accounts: From b83bfffc108edea24a88ca45d30c17d9751102ec Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Sat, 30 Sep 2023 00:34:36 -0700 Subject: [PATCH 3/3] fix: fix http2 push for non-NA domains closes #1982 closes #1953 --- custom_components/alexa_media/__init__.py | 10 ++++--- custom_components/alexa_media/manifest.json | 2 +- poetry.lock | 29 +++++++++++++++++---- pyproject.toml | 2 +- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/custom_components/alexa_media/__init__.py b/custom_components/alexa_media/__init__.py index cb9642ae..73b9a5e5 100644 --- a/custom_components/alexa_media/__init__.py +++ b/custom_components/alexa_media/__init__.py @@ -838,12 +838,12 @@ async def http2_connect() -> HTTP2EchoClient: ) return http2 = HTTP2EchoClient( - hass, login_obj, msg_callback=http2_handler, open_callback=http2_open_handler, close_callback=http2_close_handler, error_callback=http2_error_handler, + loop=hass.loop, ) _LOGGER.debug("%s: HTTP2 created: %s", hide_email(email), http2) await http2.async_run() @@ -1191,10 +1191,14 @@ async def http2_error_handler(message): ) hass.data[DATA_ALEXAMEDIA]["accounts"][email]["http2"] = None if not login_obj.close_requested and ( - login_obj.session.closed or message == "" + login_obj.session.closed or isinstance(message, AlexapyLoginError) ): hass.data[DATA_ALEXAMEDIA]["accounts"][email]["http2error"] = 5 - _LOGGER.debug("%s: Immediate abort on EoFstream", hide_email(email)) + _LOGGER.debug("%s: Login error detected.", hide_email(email)) + hass.bus.async_fire( + "alexa_media_relogin_required", + event_data={"email": hide_email(email), "url": login_obj.url}, + ) return hass.data[DATA_ALEXAMEDIA]["accounts"][email]["http2error"] = errors + 1 diff --git a/custom_components/alexa_media/manifest.json b/custom_components/alexa_media/manifest.json index f887736a..c4f5721d 100644 --- a/custom_components/alexa_media/manifest.json +++ b/custom_components/alexa_media/manifest.json @@ -8,6 +8,6 @@ "iot_class": "cloud_polling", "issue_tracker": "https://github.com/custom-components/alexa_media_player/issues", "loggers": ["alexapy", "authcaptureproxy"], - "requirements": ["alexapy==1.27.0", "packaging>=20.3", "wrapt>=1.12.1"], + "requirements": ["alexapy==1.27.2", "packaging>=20.3", "wrapt>=1.12.1"], "version": "4.6.5" } diff --git a/poetry.lock b/poetry.lock index 5b024e78..8d759389 100644 --- a/poetry.lock +++ b/poetry.lock @@ -135,13 +135,13 @@ frozenlist = ">=1.1.0" [[package]] name = "alexapy" -version = "1.27.0" +version = "1.27.2" description = "Python API to control Amazon Echo Devices Programmatically." optional = false python-versions = ">=3.11,<4" files = [ - {file = "alexapy-1.27.0-py3-none-any.whl", hash = "sha256:a6dc55daac51d0f8f423b85cec346fd012b2f58a5b05493524a93156585c5110"}, - {file = "alexapy-1.27.0.tar.gz", hash = "sha256:4d22da25f315ed77f51604bb7fc8fca1ec8aba73e3da049cce798924855db462"}, + {file = "alexapy-1.27.2-py3-none-any.whl", hash = "sha256:2ace1d7413b7b20c824934afa2c386f596531b10a5029ef7914014a01dcc092b"}, + {file = "alexapy-1.27.2.tar.gz", hash = "sha256:39eac16e8ebb5c92d17608dc59d7dbda98970f291a4a842e0041172660487445"}, ] [package.dependencies] @@ -152,7 +152,6 @@ backoff = ">=1.10" beautifulsoup4 = "*" certifi = "*" cryptography = ">=35.0" -homeassistant = ">=2022.11.0b0" httpx = {version = ">=0.24.0", extras = ["http2"]} pyotp = ">=2.4" requests = "*" @@ -1488,6 +1487,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2459,6 +2468,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -2466,8 +2476,15 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -2484,6 +2501,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -2491,6 +2509,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -3351,4 +3370,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.11,<4.0" -content-hash = "6ad2890201ba73ae8542b357f142a53b0d6ddc550989e4bae76a89ee75c478a5" +content-hash = "3cead14854277c912ff1f88b1ed167106644d998c81bc9673bfae532eb46721a" diff --git a/pyproject.toml b/pyproject.toml index fbbce716..14090063 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ license = "Apache-2.0" [tool.poetry.dependencies] python = ">=3.11,<4.0" -alexapy = "1.27.0" +alexapy = "1.27.2" aiohttp = ">=3.8.1" packaging = ">=20.3" wrapt = ">=1.12.1"