Merge pull request #105 from librespot-org/new-spotify-api

Updating to the newest Spotify API

Author: devgianlu

.travis.yml

@@ -1,22 +1,14 @@
 language: java
 
 before_install:
-  - |
-    if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-      echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
-      echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
-    fi
+  - chmod +x .travis/*.sh
+  - .travis/load_gpg.sh
 
 install:
   - mvn clean install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
 
 script:
-  - |
-    if [[ -z "${TRAVIS_TAG}" ]]; then
-      mvn deploy -Dmaven.deploy.skip=true -B -U -Pdebug
-    else
-      mvn deploy --settings .maven.xml -B -U -Prelease
-    fi
+  - .travis/script.sh
 
 before_deploy:
   - mvn help:evaluate -N -Dexpression=project.version|grep -v '\['

.travis/load_gpg.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -ev
+
+if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+  echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
+  echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
+fi

.travis/script.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -ev
+
+if [[ -z "${TRAVIS_TAG}" ]]; then
+  mvn deploy -Dmaven.deploy.skip=true -B -U -Pdebug
+else
+  mvn deploy --settings .maven.xml -B -U -Prelease
+fi

LICENSE

@@ -199,31 +199,3 @@
    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.
-
-
-
-                              ===============
-                                MP3 decoder
-                              ===============
-
-   MIT License
-
-   Copyright (c) 2017 delthas
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all
-   copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.

README.md

@@ -2,6 +2,7 @@
 [![Build Status](https://travis-ci.com/librespot-org/librespot-java.svg?branch=master)](https://travis-ci.com/librespot-org/librespot-java)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/1ec8ca04e5054558a089bc7f640079a6)](https://www.codacy.com/manual/devgianlu/librespot-java?utm_source=github.com&utm_medium=referral&utm_content=librespot-org/librespot-java&utm_campaign=Badge_Grade)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/xyz.gianlu.librespot/librespot-java)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1ec8ca04e5054558a089bc7f640079a6)](https://www.codacy.com/app/devgianlu/librespot-java?utm_source=github.com&utm_medium=referral&utm_content=librespot-org/librespot-java&utm_campaign=Badge_Grade)
 
 `librespot-java` is a port of [librespot](https://github.com/librespot-org/librespot), originally written in Rust, which as evolved into the most up-to-date open-source Spotify client. Additionally, this implementation provides an useful API to request metadata or control the player, more [here](https://github.com/librespot-org/librespot-java/blob/master/api).
 
@@ -18,6 +19,7 @@ Its main features are:
 - Local content caching
 - Zeroconf (Spotify Connect)
 - Gapless playback
+- Mixed playlists (cuepoints and transitions)
 
 ## Get started
 All the configuration you need is inside the `config.toml` file, there you can decide to authenticate with:
@@ -58,5 +60,5 @@ To run the newly build jar run `java -jar ./core/target/librespot-core-jar-with-
 # Special thanks
 
 - All the developers of [librespot](https://github.com/librespot-org/librespot) which started this project in Rust
-- All the contributors of this project for testing and fixing stuff
+- All the contributors of this project for testing and fixing stuff, especially [@loeffelpan](https://github.com/loeffelpan), [@crsmoro](https://github.com/crsmoro) and [@Schluggi](https://github.com/Schluggi) for the feedback provided
 - <a href="https://www.yourkit.com/"><img src="https://www.yourkit.com/images/yklogo.png" height="20"></a> that provided a free license for their [Java Profiler](https://www.yourkit.com/java/profiler/)

api-client/pom.xml

@@ -28,6 +28,8 @@
                         <configuration>
                             <archive>
                                 <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                    <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                                     <mainClass>xyz.gianlu.librespot.api.client.Main</mainClass>
                                 </manifest>
                             </archive>

api/pom.xml

@@ -28,6 +28,8 @@
                         <configuration>
                             <archive>
                                 <manifest>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                    <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                                     <mainClass>xyz.gianlu.librespot.api.Main</mainClass>
                                 </manifest>
                             </archive>

api/src/main/java/xyz/gianlu/librespot/api/Main.java

@@ -7,7 +7,7 @@
 import xyz.gianlu.librespot.core.AuthConfiguration;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.core.ZeroconfServer;
-import xyz.gianlu.librespot.spirc.SpotifyIrc;
+import xyz.gianlu.librespot.mercury.MercuryClient;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -17,7 +17,7 @@
  */
 public class Main {
 
-    public static void main(String[] args) throws IOException, GeneralSecurityException, SpotifyIrc.IrcException, Session.SpotifyAuthenticationException {
+    public static void main(String[] args) throws IOException, GeneralSecurityException, Session.SpotifyAuthenticationException, MercuryClient.MercuryException {
         AbsConfiguration conf = new FileConfiguration(args);
         if (conf.authStrategy() == AuthConfiguration.Strategy.ZEROCONF) {
             ZeroconfServer.create(conf).addSessionListener(new ZeroconfApiServer(24879));

api/src/main/java/xyz/gianlu/librespot/api/MercuryHandler.java

@@ -6,6 +6,7 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.api.server.AbsApiHandler;
 import xyz.gianlu.librespot.api.server.ApiServer;
+import xyz.gianlu.librespot.api.server.ApiServer.PredefinedJsonRpcException;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.RawMercuryRequest;
@@ -17,47 +18,49 @@
  * @author Gianlu
  */
 public class MercuryHandler extends AbsApiHandler {
-    private final MercuryClient client;
+    private final Session session;
 
     public MercuryHandler(@NotNull Session session) {
         super("mercury");
-        this.client = session.mercury();
+        this.session = session;
     }
 
     @Override
-    protected @NotNull JsonElement handleRequest(ApiServer.@NotNull Request request) throws HandlingException, ApiServer.PredefinedJsonRpcException {
-        if (request.getSuffix().equals("request")) {
-            JsonObject params = request.params.getAsJsonObject();
+    protected @NotNull JsonElement handleRequest(ApiServer.@NotNull Request request) throws HandlingException, PredefinedJsonRpcException {
+        if (!request.getSuffix().equals("request"))
+            throw PredefinedJsonRpcException.from(request, ApiServer.PredefinedJsonRpcError.METHOD_NOT_FOUND);
 
-            RawMercuryRequest.Builder builder = RawMercuryRequest.newBuilder()
-                    .setMethod(params.get("method").getAsString())
-                    .setUri(params.get("uri").getAsString());
+        if (request.params == null || !request.params.isJsonArray())
+            throw PredefinedJsonRpcException.from(request, ApiServer.PredefinedJsonRpcError.INVALID_PARAMS);
 
-            if (params.has("headers")) {
-                JsonArray headers = params.getAsJsonArray("headers");
-                for (JsonElement element : headers) {
-                    JsonObject header = element.getAsJsonObject();
-                    builder.addUserField(header.get("key").getAsString(), header.get("value").getAsString());
-                }
+        JsonObject params = request.params.getAsJsonObject();
+
+        RawMercuryRequest.Builder builder = RawMercuryRequest.newBuilder()
+                .setMethod(params.get("method").getAsString())
+                .setUri(params.get("uri").getAsString());
+
+        if (params.has("headers")) {
+            JsonArray headers = params.getAsJsonArray("headers");
+            for (JsonElement element : headers) {
+                JsonObject header = element.getAsJsonObject();
+                builder.addUserField(header.get("key").getAsString(), header.get("value").getAsString());
             }
+        }
 
-            try {
-                MercuryClient.Response response = client.sendSync(builder.build());
+        try {
+            MercuryClient.Response response = session.mercury().sendSync(builder.build());
 
-                JsonArray payloads = new JsonArray(response.payload.size());
-                for (byte[] bytes : response.payload)
-                    payloads.add(Base64.getEncoder().encodeToString(bytes));
+            JsonArray payloads = new JsonArray(response.payload.size());
+            for (byte[] bytes : response.payload)
+                payloads.add(Base64.getEncoder().encodeToString(bytes));
 
-                JsonObject obj = new JsonObject();
-                obj.addProperty("code", response.statusCode);
-                obj.addProperty("uri", response.uri);
-                obj.add("payloads", payloads);
-                return obj;
-            } catch (IOException ex) {
-                throw new HandlingException(ex, ErrorCode.IO_EXCEPTION);
-            }
-        } else {
-            throw ApiServer.PredefinedJsonRpcException.from(request, ApiServer.PredefinedJsonRpcError.METHOD_NOT_FOUND);
+            JsonObject obj = new JsonObject();
+            obj.addProperty("code", response.statusCode);
+            obj.addProperty("uri", response.uri);
+            obj.add("payloads", payloads);
+            return obj;
+        } catch (IOException ex) {
+            throw new HandlingException(ex, ErrorCode.IO_EXCEPTION);
         }
     }
 

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

@@ -5,6 +5,8 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.api.server.AbsApiHandler;
 import xyz.gianlu.librespot.api.server.ApiServer;
+import xyz.gianlu.librespot.api.server.ApiServer.PredefinedJsonRpcError;
+import xyz.gianlu.librespot.api.server.ApiServer.PredefinedJsonRpcException;
 import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.MercuryRequests;
@@ -17,20 +19,18 @@
  * @author Gianlu
  */
 public class MetadataHandler extends AbsApiHandler {
-    private final MercuryClient client;
     private final Session session;
 
     public MetadataHandler(@NotNull Session session) {
         super("metadata");
         this.session = session;
-        this.client = session.mercury();
     }
 
     @Override
-    protected @NotNull JsonElement handleRequest(ApiServer.@NotNull Request request) throws ApiServer.PredefinedJsonRpcException, HandlingException {
+    protected @NotNull JsonElement handleRequest(ApiServer.@NotNull Request request) throws PredefinedJsonRpcException, HandlingException {
         switch (request.getSuffix()) {
             case "rootlists":
-                return handle(MercuryRequests.getRootPlaylists(session.apWelcome().getCanonicalUsername()));
+                return handle(MercuryRequests.getRootPlaylists(session.username()));
             case "playlist":
                 return handle(MercuryRequests.getPlaylist(ApiUtils.extractId(PlaylistId.class, request, request.params)));
             case "track":
@@ -42,14 +42,14 @@ public MetadataHandler(@NotNull Session session) {
             case "episode":
                 return handle(MercuryRequests.getEpisode(ApiUtils.extractId(EpisodeId.class, request, request.params)));
             default:
-                throw ApiServer.PredefinedJsonRpcException.from(request, ApiServer.PredefinedJsonRpcError.METHOD_NOT_FOUND);
+                throw PredefinedJsonRpcException.from(request, PredefinedJsonRpcError.METHOD_NOT_FOUND);
         }
     }
 
     @NotNull
     private <P extends Message> JsonElement handle(@NotNull ProtobufMercuryRequest<P> req) throws HandlingException {
         try {
-            return client.sendSync(req).json();
+            return session.mercury().sendSync(req).json();
         } catch (MercuryClient.MercuryException ex) {
             throw new HandlingException(ex, ErrorCode.MERCURY_EXCEPTION);
         } catch (IOException ex) {