projects / music-assistant-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5307b3a)
Fix Alexa player provider bugs during experimental testing (#2251)
authorSameer Alam <31905246+alams154@users.noreply.github.com>
Wed, 2 Jul 2025 21:16:57 +0000 (16:16 -0500)
committerGitHub <noreply@github.com>
Wed, 2 Jul 2025 21:16:57 +0000 (23:16 +0200)
music_assistant/helpers/webserver.py patch | blob | history
music_assistant/providers/alexa/__init__.py patch | blob | history

diff --git a/music_assistant/helpers/webserver.py b/music_assistant/helpers/webserver.py
index 4dac602af9255aa4a55e4a43b96fa96856392fb3..9b62d5be760801f1fcf9c5d67f354ff220ba06ad 100644 (file)
--- a/music_assistant/helpers/webserver.py
+++ b/music_assistant/helpers/webserver.py
@@ -143,10 +143,19 @@ class Webserver:
     async def _handle_catch_all(self, request: web.Request) -> web.Response:
         """Redirect request to correct destination."""
         # find handler for the request
+        # Try exact match first
         for key in (f"{request.method}.{request.path}", f"*.{request.path}"):
             assert self._dynamic_routes is not None  # for type checking
             if handler := self._dynamic_routes.get(key):
                 return await handler(request)
+        # Try prefix match (for routes registered with /*)
+        if self._dynamic_routes is not None:
+            for route_key, handler in self._dynamic_routes.items():
+                method, path = route_key.split(".", 1)
+                if method in (request.method, "*") and path.endswith("/*"):
+                    prefix = path[:-2]
+                    if request.path.startswith(prefix):
+                        return await handler(request)
         # deny all other requests
         self.logger.warning(
             "Received unhandled %s request to %s from %s\nheaders: %s\n",
diff --git a/music_assistant/providers/alexa/__init__.py b/music_assistant/providers/alexa/__init__.py
index 1fe0ae27808fc835461435d1be0f86cb6c240384..74cc17ebadbdd27269b1339c0a85d625edb2a1aa 100644 (file)
--- a/music_assistant/providers/alexa/__init__.py
+++ b/music_assistant/providers/alexa/__init__.py
@@ -9,7 +9,7 @@ import time
 from typing import TYPE_CHECKING, Any
 
 import aiohttp
-from aiohttp import web
+from aiohttp import BasicAuth, web
 from alexapy import AlexaAPI, AlexaLogin, AlexaProxy
 from music_assistant_models.config_entries import ConfigEntry
 from music_assistant_models.enums import (
@@ -47,7 +47,10 @@ if TYPE_CHECKING:
 
 CONF_URL = "url"
 CONF_ACTION_AUTH = "auth"
-CONF_AUTH_TOKEN = "token"
+CONF_AUTH_SECRET = "secret"
+CONF_API_BASIC_AUTH_USERNAME = "api_username"
+CONF_API_BASIC_AUTH_PASSWORD = "api_password"
+CONF_API_URL = "api_url"
 
 SUPPORTED_FEATURES: set[ProviderFeature] = set()
 
@@ -80,13 +83,14 @@ async def get_config_entries(
                 url=str(values[CONF_URL]),
                 email=str(values[CONF_USERNAME]),
                 password=str(values[CONF_PASSWORD]),
+                otp_secret=str(values.get(CONF_AUTH_SECRET, "")),
                 outputpath=lambda x: x,
             )
 
             # --- Proxy authentication logic using AlexaProxy ---
             # Build the proxy path and URL
             proxy_path = "/alexa/auth/proxy/"
-            post_path = "/alexa/auth/proxy/ap/signin"
+            post_path = "/alexa/auth/proxy/ap/signin/*"
             base_url = mass.webserver.base_url.rstrip("/")
             proxy_url = f"{base_url}{proxy_path}"
 
@@ -100,6 +104,7 @@ async def get_config_entries(
                     # Notify the callback URL
                     async with aiohttp.ClientSession() as session:
                         await session.get(auth_helper.callback_url)
+                        _LOGGER.info("Alexa Callback URL: %s", auth_helper.callback_url)
                     return web.Response(
                         text="""
                         <html>
@@ -119,16 +124,21 @@ async def get_config_entries(
             mass.webserver.register_dynamic_route(post_path, proxy_handler, "POST")
 
             try:
-                await auth_helper.authenticate(proxy_url, timeout=300)
-                await save_cookie(login, str(values[CONF_USERNAME]), mass)
+                await auth_helper.authenticate(proxy_url)
+                if await login.test_loggedin():
+                    await save_cookie(login, str(values[CONF_USERNAME]), mass)
+                else:
+                    raise LoginFailed(
+                        "Authentication login failed, please provide logs to the discussion #431."
+                    )
             except KeyError:
                 # no URL param was found so user probably cancelled the auth
                 pass
             except Exception as error:
                 raise LoginFailed(f"Failed to authenticate with Amazon '{error}'.")
             finally:
-                mass.webserver.unregister_dynamic_route(proxy_path)
-                mass.webserver.unregister_dynamic_route(post_path)
+                mass.webserver.unregister_dynamic_route(proxy_path, "GET")
+                mass.webserver.unregister_dynamic_route(post_path, "POST")
 
     return (
         ConfigEntry(
@@ -143,12 +153,21 @@ async def get_config_entries(
             type=ConfigEntryType.STRING,
             label="E-Mail",
             required=True,
+            value=values.get(CONF_USERNAME) if values else None,
         ),
         ConfigEntry(
             key=CONF_PASSWORD,
             type=ConfigEntryType.SECURE_STRING,
             label="Password",
             required=True,
+            value=values.get(CONF_PASSWORD) if values else None,
+        ),
+        ConfigEntry(
+            key=CONF_AUTH_SECRET,
+            type=ConfigEntryType.SECURE_STRING,
+            label="OTP Secret",
+            required=False,
+            value=values.get(CONF_AUTH_SECRET) if values else None,
         ),
         ConfigEntry(
             key=CONF_ACTION_AUTH,
@@ -158,6 +177,28 @@ async def get_config_entries(
             action=CONF_ACTION_AUTH,
             depends_on=CONF_URL,
         ),
+        ConfigEntry(
+            key=CONF_API_URL,
+            type=ConfigEntryType.STRING,
+            label="API Url",
+            default_value="http://localhost:3000",
+            required=True,
+            value=values.get(CONF_API_URL) if values else None,
+        ),
+        ConfigEntry(
+            key=CONF_API_BASIC_AUTH_USERNAME,
+            type=ConfigEntryType.STRING,
+            label="API Basic Auth Username",
+            required=False,
+            value=values.get(CONF_API_BASIC_AUTH_USERNAME) if values else None,
+        ),
+        ConfigEntry(
+            key=CONF_API_BASIC_AUTH_PASSWORD,
+            type=ConfigEntryType.SECURE_STRING,
+            label="API Basic Auth Password",
+            required=False,
+            value=values.get(CONF_API_BASIC_AUTH_PASSWORD) if values else None,
+        ),
     )
 
 
@@ -356,12 +397,20 @@ class AlexaProvider(PlayerProvider):
         if not (player := self.mass.players.get(player_id)):
             return
 
+        username = self.config.get_value(CONF_API_BASIC_AUTH_USERNAME)
+        password = self.config.get_value(CONF_API_BASIC_AUTH_PASSWORD)
+
+        auth = None
+        if username is not None and password is not None:
+            auth = BasicAuth(str(username), str(password))
+
         async with aiohttp.ClientSession() as session:
             try:
                 async with session.post(
-                    "http://localhost:3000/ma/push-url",
+                    f"{self.config.get_value(CONF_API_URL)}/ma/push-url",
                     json={"streamUrl": media.uri},
                     timeout=aiohttp.ClientTimeout(total=10),
+                    auth=auth,
                 ) as resp:
                     await resp.text()
             except Exception as exc:
@@ -371,8 +420,18 @@ class AlexaProvider(PlayerProvider):
         api = AlexaAPI(device_object, self.login)
         await api.run_custom("Ask music assistant to play audio")
 
-        player.current_media = media
-        player.elapsed_time = 0
-        player.elapsed_time_last_updated = time.time()
-        player.state = PlayerState.PLAYING
+        state = await api.get_state()
+        if state:
+            state = state.get("playerInfo", None)
+
+        if state:
+            device_media = state.get("infoText")
+            if device_media:
+                media.title = device_media.get("title")
+                media.artist = device_media.get("subText1")
+                player.current_media = media
+            player.elapsed_time = 0
+            player.elapsed_time_last_updated = time.time()
+            if state.get("playbackState") == "PLAYING":
+                player.state = PlayerState.PLAYING
         self.mass.players.update(player_id)
Unnamed repository; edit this file 'description' to name the repository.