Migrating some APIs to their HTTP equivalent

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/handlers/MetadataHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 devgianlu
+ * Copyright 2022 devgianlu
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.dealer.ApiClient;
 import xyz.gianlu.librespot.mercury.MercuryClient;
-import xyz.gianlu.librespot.mercury.MercuryRequests;
 import xyz.gianlu.librespot.metadata.*;
 
 import java.io.IOException;
@@ -122,15 +121,7 @@ private JsonObject handle(@NotNull Session session, @NotNull MetadataType type,
 
     @NotNull
     private JsonObject handlePlaylist(@NotNull Session session, @NotNull String uri) throws IOException, MercuryClient.MercuryException {
-        JsonObject obj = new JsonObject();
-        obj.add("tracks", session.mercury().sendSync(MercuryRequests.getPlaylist(PlaylistId.fromUri(uri))).json());
-
-        try {
-            obj.add("annotations", session.mercury().sendSync(MercuryRequests.getPlaylistAnnotation(PlaylistId.fromUri(uri))).json());
-        } catch (MercuryClient.MercuryException ignored) {
-        }
-
-        return obj;
+        return ProtobufToJson.convert(session.api().getPlaylist(PlaylistId.fromUri(uri)));
     }
 
     private enum MetadataType {

api/src/main/java/xyz/gianlu/librespot/api/handlers/ProfileHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 devgianlu
+ * Copyright 2022 devgianlu
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package xyz.gianlu.librespot.api.handlers;
 
+import com.google.gson.JsonObject;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
 import org.apache.logging.log4j.LogManager;
@@ -24,10 +25,7 @@
 import xyz.gianlu.librespot.api.SessionWrapper;
 import xyz.gianlu.librespot.api.Utils;
 import xyz.gianlu.librespot.core.Session;
-import xyz.gianlu.librespot.mercury.MercuryClient;
-import xyz.gianlu.librespot.mercury.MercuryRequests;
 
-import java.io.IOException;
 import java.util.Deque;
 import java.util.Map;
 
@@ -38,19 +36,6 @@ public ProfileHandler(@NotNull SessionWrapper wrapper) {
         super(wrapper);
     }
 
-    private static void profileAction(@NotNull HttpServerExchange exchange, @NotNull Session session, @NotNull String userId, @NotNull String action) throws IOException {
-        String uri = String.format("hm://user-profile-view/v2/desktop/profile/%s/%s", userId, action);
-
-        try {
-            MercuryRequests.GenericJson resp = session.mercury().sendSync(MercuryRequests.getGenericJson(uri));
-            exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json");
-            exchange.getResponseSender().send(resp.toString());
-        } catch (MercuryClient.MercuryException ex) {
-            Utils.internalError(exchange, ex);
-            LOGGER.error("Failed handling api request. {uri: {}}", uri, ex);
-        }
-    }
-
     @Override
     protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Session session) throws Exception {
         exchange.startBlocking();
@@ -72,10 +57,20 @@ protected void handleRequest(@NotNull HttpServerExchange exchange, @NotNull Sess
             return;
         }
 
+        exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json");
+
         switch (action) {
             case "followers":
+                JsonObject followers = session.api().getUserFollowers(userId);
+                exchange.getResponseSender().send(followers.toString());
+                break;
             case "following":
-                profileAction(exchange, session, userId, action);
+                JsonObject following = session.api().getUserFollowing(userId);
+                exchange.getResponseSender().send(following.toString());
+                break;
+            case "profile":
+                JsonObject profile = session.api().getUserProfile(userId, null, null);
+                exchange.getResponseSender().send(profile.toString());
                 break;
             default:
                 Utils.invalidParameter(exchange, "action");

lib/src/main/java/xyz/gianlu/librespot/core/TokenProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 devgianlu
+ * Copyright 2022 devgianlu
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import xyz.gianlu.librespot.common.Utils;
+import xyz.gianlu.librespot.json.GenericJson;
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.MercuryRequests;
 
@@ -65,7 +66,7 @@ public synchronized StoredToken getToken(@NotNull String... scopes) throws IOExc
         }
 
         LOGGER.debug("Token expired or not suitable, requesting again. {scopes: {}, oldToken: {}}", Arrays.asList(scopes), token);
-        MercuryRequests.GenericJson resp = session.mercury().sendSync(MercuryRequests.requestToken(session.deviceId(), String.join(",", scopes)));
+        GenericJson resp = session.mercury().sendSync(MercuryRequests.requestToken(session.deviceId(), String.join(",", scopes)));
         token = new StoredToken(resp.obj);
 
         LOGGER.debug("Updated token successfully! {scopes: {}, newToken: {}}", Arrays.asList(scopes), token);

lib/src/main/java/xyz/gianlu/librespot/dealer/ApiClient.java

@@ -16,12 +16,15 @@
 
 package xyz.gianlu.librespot.dealer;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.protobuf.Message;
 import com.spotify.clienttoken.data.v0.Connectivity;
 import com.spotify.clienttoken.http.v0.ClientToken;
 import com.spotify.connectstate.Connect;
 import com.spotify.extendedmetadata.ExtendedMetadata;
 import com.spotify.metadata.Metadata;
+import com.spotify.playlist4.Playlist4ApiProto;
 import okhttp3.*;
 import okio.BufferedSink;
 import org.jetbrains.annotations.NotNull;
@@ -30,11 +33,13 @@
 import org.slf4j.LoggerFactory;
 import xyz.gianlu.librespot.Version;
 import xyz.gianlu.librespot.core.Session;
+import xyz.gianlu.librespot.json.StationsWrapper;
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.MercuryRequests;
 import xyz.gianlu.librespot.metadata.*;
 
 import java.io.IOException;
+import java.util.List;
 
 import static com.spotify.canvaz.CanvazOuterClass.EntityCanvazRequest;
 import static com.spotify.canvaz.CanvazOuterClass.EntityCanvazResponse;
@@ -202,6 +207,7 @@ public EntityCanvazResponse getCanvases(@NotNull EntityCanvazRequest req) throws
         }
     }
 
+    @NotNull
     public ExtendedMetadata.BatchedExtensionResponse getExtendedMetadata(@NotNull ExtendedMetadata.BatchedEntityRequest req) throws IOException, MercuryClient.MercuryException {
         try (Response resp = send("POST", "/extended-metadata/v0/extended-metadata", null, protoBody(req))) {
             StatusCodeException.checkStatus(resp);
@@ -212,6 +218,99 @@ public ExtendedMetadata.BatchedExtensionResponse getExtendedMetadata(@NotNull Ex
         }
     }
 
+    @NotNull
+    public Playlist4ApiProto.SelectedListContent getPlaylist(@NotNull PlaylistId id) throws IOException, MercuryClient.MercuryException {
+        try (Response resp = send("GET", "/playlist/v2/playlist/" + id.id(), null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return Playlist4ApiProto.SelectedListContent.parseFrom(body.byteStream());
+        }
+    }
+
+    @NotNull
+    public JsonObject getUserProfile(@NotNull String id, @Nullable Integer playlistLimit, @Nullable Integer artistLimit) throws IOException, MercuryClient.MercuryException {
+        StringBuilder url = new StringBuilder();
+        url.append("/user-profile-view/v3/profile/");
+        url.append(id);
+
+        if (playlistLimit != null || artistLimit != null) {
+            url.append("?");
+
+            if (playlistLimit != null) {
+                url.append("playlist_limit=");
+                url.append(playlistLimit);
+                if (artistLimit != null)
+                    url.append("&");
+            }
+
+            if (artistLimit != null) {
+                url.append("artist_limit=");
+                url.append(artistLimit);
+            }
+        }
+
+        try (Response resp = send("GET", url.toString(), null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return JsonParser.parseReader(body.charStream()).getAsJsonObject();
+        }
+    }
+
+    @NotNull
+    public JsonObject getUserFollowers(@NotNull String id) throws IOException, MercuryClient.MercuryException {
+        try (Response resp = send("GET", "/user-profile-view/v3/profile/" + id + "/followers", null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return JsonParser.parseReader(body.charStream()).getAsJsonObject();
+        }
+    }
+
+    @NotNull
+    public JsonObject getUserFollowing(@NotNull String id) throws IOException, MercuryClient.MercuryException {
+        try (Response resp = send("GET", "/user-profile-view/v3/profile/" + id + "/following", null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return JsonParser.parseReader(body.charStream()).getAsJsonObject();
+        }
+    }
+
+    @NotNull
+    public JsonObject getRadioForTrack(@NotNull PlayableId id) throws IOException, MercuryClient.MercuryException {
+        try (Response resp = send("GET", "/inspiredby-mix/v2/seed_to_playlist/" + id.toSpotifyUri() + "?response-format=json", null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return JsonParser.parseReader(body.charStream()).getAsJsonObject();
+        }
+    }
+
+    @NotNull
+    public StationsWrapper getApolloStation(@NotNull String context, @NotNull List<String> prevTracks, int count, boolean autoplay) throws IOException, MercuryClient.MercuryException {
+        StringBuilder prevTracksStr = new StringBuilder();
+        for (int i = 0; i < prevTracks.size(); i++) {
+            if (i != 0) prevTracksStr.append(",");
+            prevTracksStr.append(prevTracks.get(i));
+        }
+
+        try (Response resp = send("GET", String.format("/radio-apollo/v3/stations/%s?count=%d&prev_tracks=%s&autoplay=%b", context, count, prevTracksStr, autoplay), null, null)) {
+            StatusCodeException.checkStatus(resp);
+
+            ResponseBody body;
+            if ((body = resp.body()) == null) throw new IOException();
+            return new StationsWrapper(JsonParser.parseReader(body.charStream()).getAsJsonObject());
+        }
+    }
+
     @NotNull
     private ClientToken.ClientTokenResponse clientToken() throws IOException {
         ClientToken.ClientTokenRequest protoReq = ClientToken.ClientTokenRequest.newBuilder()

lib/src/main/java/xyz/gianlu/librespot/json/GenericJson.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 devgianlu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.gianlu.librespot.json;
+
+import com.google.gson.JsonObject;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author devgianlu
+ */
+public final class GenericJson extends JsonWrapper {
+
+    public GenericJson(@NotNull JsonObject obj) {
+        super(obj);
+    }
+}

…ianlu/librespot/mercury/JsonWrapper.java …z/gianlu/librespot/json/JsonWrapper.javalib/src/main/java/xyz/gianlu/librespot/mercury/JsonWrapper.java renamed to lib/src/main/java/xyz/gianlu/librespot/json/JsonWrapper.java lib/src/main/java/xyz/gianlu/librespot/mercury/JsonWrapper.java renamed to lib/src/main/java/xyz/gianlu/librespot/json/JsonWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 devgianlu
+ * Copyright 2022 devgianlu
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package xyz.gianlu.librespot.mercury;
+package xyz.gianlu.librespot.json;
 
 import com.google.gson.JsonObject;
 import org.jetbrains.annotations.NotNull;

lib/src/main/java/xyz/gianlu/librespot/json/ResolvedContextWrapper.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 devgianlu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package xyz.gianlu.librespot.json;
+
+import com.google.gson.JsonObject;
+import com.spotify.context.ContextPageOuterClass;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.common.ProtoUtils;
+
+import java.util.List;
+
+/**
+ * @author devgianlu
+ */
+public final class ResolvedContextWrapper extends JsonWrapper {
+
+    public ResolvedContextWrapper(@NotNull JsonObject obj) {
+        super(obj);
+    }
+
+    @NotNull
+    public List<ContextPageOuterClass.ContextPage> pages() {
+        return ProtoUtils.jsonToContextPages(obj.getAsJsonArray("pages"));
+    }
+
+    @Nullable
+    public JsonObject metadata() {
+        return obj.getAsJsonObject("metadata");
+    }
+
+    @NotNull
+    public String uri() {
+        return obj.get("uri").getAsString();
+    }
+
+    @NotNull
+    public String url() {
+        return obj.get("url").getAsString();
+    }
+}