Using correct endpoint to load autoplay

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/BytesArrayList.java

@@ -85,6 +85,12 @@ public InputStream stream() {
         return new InternalStream();
     }
 
+    @NotNull
+    public String readIntoString(int index) {
+        byte[] b = get(index);
+        return new String(b);
+    }
+
     private class InternalStream extends InputStream {
         private int offset = 0;
         private int sub = 0;

core/src/main/java/xyz/gianlu/librespot/mercury/MercuryRequests.java

@@ -83,6 +83,11 @@ public static JsonMercuryRequest<StationsWrapper> getStationFor(@NotNull String
         return new JsonMercuryRequest<>(RawMercuryRequest.get("hm://radio-apollo/v3/stations/" + context), StationsWrapper.class);
     }
 
+    @NotNull
+    public static RawMercuryRequest autoplayQuery(@NotNull String context) {
+        return RawMercuryRequest.get("hm://autoplay-enabled/query?uri=" + context);
+    }
+
     @NotNull
     public static JsonMercuryRequest<ResolvedContextWrapper> resolveContext(@NotNull String uri) {
         return new JsonMercuryRequest<>(RawMercuryRequest.get(String.format("hm://context-resolve/v1/%s", uri)), ResolvedContextWrapper.class);

core/src/main/java/xyz/gianlu/librespot/player/Player.java

@@ -285,17 +285,19 @@ private void updateTracks(@NotNull Remote3Frame frame) {
         stateUpdated();
     }
 
+    private void loadTracksProvider(@NotNull String context) {
+        if (context.startsWith("spotify:station:") || context.startsWith("spotify:dailymix:"))
+            tracksProvider = new StationProvider(session, state.state);
+        else if (context.startsWith("spotify:show:") || context.startsWith("spotify:episode:"))
+            tracksProvider = new ShowProvider(state.state);
+        else
+            tracksProvider = new PlaylistProvider(session, state.state, conf);
+    }
+
     private void updateContext(@NotNull Remote3Frame frame) {
         if (frame.context.uri != null) {
             state.updateContext(frame);
-
-            String context = frame.context.uri;
-            if (context.startsWith("spotify:station:") || context.startsWith("spotify:dailymix:"))
-                tracksProvider = new StationProvider(session, state.state);
-            else if (context.startsWith("spotify:show:") || context.startsWith("spotify:episode:"))
-                tracksProvider = new ShowProvider(state.state);
-            else
-                tracksProvider = new PlaylistProvider(session, state.state, conf);
+            loadTracksProvider(frame.context.uri);
         }
 
         if (frame.options != null && frame.options.playerOptionsOverride != null) {
@@ -525,17 +527,24 @@ private void loadAutoplay() {
         }
 
         try {
-            MercuryRequests.StationsWrapper json = session.mercury().sendSync(MercuryRequests.getStationFor(context));
-            state.updateContext(json);
+            MercuryClient.Response resp = session.mercury().sendSync(MercuryRequests.autoplayQuery(context));
+            if (resp.statusCode == 200) {
+                String newContext = resp.payload.readIntoString(0);
+                state.loadStationContext(newContext);
 
-            state.setPositionMs(0);
-            state.setPositionMeasuredAt(TimeProvider.currentTimeMillis());
+                state.setPositionMs(0);
+                state.setPositionMeasuredAt(TimeProvider.currentTimeMillis());
 
-            tracksProvider = new StationProvider(session, state.state);
-            loadTrack(true);
+                tracksProvider = new StationProvider(session, state.state);
+                loadTrack(true);
 
-            LOGGER.debug(String.format("Loading context for autoplay, uri: %s", json.uri()));
-        } catch (IOException | MercuryClient.MercuryException ex) {
+                LOGGER.debug(String.format("Loading context for autoplay, uri: %s", newContext));
+            } else {
+                LOGGER.fatal("Failed retrieving autoplay context, code: " + resp.statusCode);
+                state.setStatus(Spirc.PlayStatus.kPlayStatusStop);
+                stateUpdated();
+            }
+        } catch (IOException ex) {
             LOGGER.fatal("Failed loading autoplay station!", ex);
             state.setStatus(Spirc.PlayStatus.kPlayStatusStop);
             stateUpdated();
@@ -789,12 +798,20 @@ void updateContext(@NotNull Remote3Frame frame) {
             }
         }
 
-        void updateContext(@NotNull MercuryRequests.StationsWrapper json) {
-            state.setContextUri(json.uri());
+        void loadStationContext(@NotNull String context) {
+            loadTracksProvider(context);
+            if (!(tracksProvider instanceof StationProvider)) {
+                LOGGER.fatal("Not a station context: " + context);
+                setStatus(Spirc.PlayStatus.kPlayStatusStop);
+                stateUpdated();
+                return;
+            }
+
+            state.setContextUri(context);
 
-            state.setPlayingTrackIndex(0);
             state.clearTrack();
-            state.addAllTrack(json.tracks());
+            state.setPlayingTrackIndex(-1); // A bit hacky but works
+            state.setPlayingTrackIndex(tracksProvider.getNextTrackIndex(false));
         }
 
         long getPositionMeasuredAt() {
@@ -828,7 +845,5 @@ void setPlayingTrackIndex(int i) {
         int getTrackCount() {
             return state.getTrackCount();
         }
-
-
     }
 }