Better handling of Spotify stream error (due to token expires)

music_assistant/server/providers/spotify/__init__.py

@@ -20,6 +20,7 @@
     StreamType,
 )
 from music_assistant.common.models.errors import (
+    AudioError,
     LoginFailed,
     MediaNotFoundError,
     ResourceTemporarilyUnavailable,
@@ -539,7 +540,6 @@ async def get_similar_tracks(self, prov_track_id, limit=25) -> list[Track]:
 
     async def get_stream_details(self, item_id: str) -> StreamDetails:
         """Return the content details for the given track when it will be streamed."""
-        await self.login(force_fresh=True)
         # fetch full track details
         # this will also check if the track is available for streaming
         # and use spotify's track linking feature to serve a substitute track
@@ -558,47 +558,45 @@ async def get_audio_stream(
         self, streamdetails: StreamDetails, seek_position: int = 0
     ) -> AsyncGenerator[bytes, None]:
         """Return the audio stream for the provider item."""
-        auth_info = await self.login(force_fresh=True)
         librespot = await self.get_librespot_binary()
         spotify_uri = f"spotify://track:{streamdetails.item_id}"
-        args = [
-            librespot,
-            "-c",
-            CACHE_DIR,
-            "-M",
-            "256M",
-            "--passthrough",
-            "-b",
-            "320",
-            "--backend",
-            "pipe",
-            "--single-track",
-            spotify_uri,
-            "--token",
-            auth_info["access_token"],
-        ]
-        if seek_position:
-            args += ["--start-position", str(int(seek_position))]
-        chunk_size = get_chunksize(streamdetails.audio_format)
-        stderr = None if self.logger.isEnabledFor(VERBOSE_LOG_LEVEL) else False
         self.logger.log(VERBOSE_LOG_LEVEL, f"Start streaming {spotify_uri} using librespot")
-        for attempt in range(1, 3):
+        for attempt in range(1, 4):
+            auth_info = await self.login(force_refresh=attempt == 2)
+            args = [
+                librespot,
+                "-c",
+                CACHE_DIR,
+                "-M",
+                "256M",
+                "--passthrough",
+                "-b",
+                "320",
+                "--backend",
+                "pipe",
+                "--single-track",
+                spotify_uri,
+                "--token",
+                auth_info["access_token"],
+            ]
+            if seek_position:
+                args += ["--start-position", str(int(seek_position))]
+            chunk_size = get_chunksize(streamdetails.audio_format)
+            stderr = None if self.logger.isEnabledFor(VERBOSE_LOG_LEVEL) else False
             async with AsyncProcess(
                 args,
                 stdout=True,
                 stderr=stderr,
                 name="librespot",
             ) as librespot_proc:
-                chunks_received = 0
                 async for chunk in librespot_proc.iter_any(chunk_size):
                     yield chunk
-                    chunks_received += 1
-            if chunks_received:
-                break
-            self.logger.warning(
+            if librespot_proc.returncode == 0:
+                return
+            self.logger.debug(
                 "librespot failed to stream track, retrying... (attempt %s/3)", attempt
             )
-            await asyncio.sleep(0.1)
+        raise AudioError("Failed to stream track %s after 3 attempts", spotify_uri)
 
     def _parse_artist(self, artist_obj):
         """Parse spotify artist object to generic layout."""
@@ -781,11 +779,13 @@ def _parse_playlist(self, playlist_obj):
         return playlist
 
     @lock
-    async def login(self, force_fresh: bool = False) -> dict:
+    async def login(self, force_refresh: bool = False) -> dict:
         """Log-in Spotify and return Auth/token info."""
         # return existing token if we have one in memory
-        if self._auth_info and (
-            self._auth_info["expires_at"] > (time.time() - 600 if force_fresh else 300)
+        if (
+            not force_refresh
+            and self._auth_info
+            and (self._auth_info["expires_at"] > (time.time() - 600))
         ):
             return self._auth_info
         # request new access token using the refresh token