Merge remote-tracking branch 'origin/dev' into dev

devgianlu · devgianlu · commit 26c1ebb40045 · 2020-01-11T21:59:34.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,37 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.2.0] - 12-01-2020
+### Added
+- Add CORS headers to API responses (#161)
+- Added timeout to Mercury requests to avoid deadlocks (1e8255bfac4c360f61712eca3da76fe90a49be84)
+- Added `trackTime` to API events (9a8a515bbebce17a68142c35242f0a9d38c13254)
+- Added `metadataAvailable`, `playbackHaltStateChanged`, `sessionCleared`, `sessionChanged`, `inactiveSession` events (5cfae00dfdd3fade92934c4504de6ac5268be1d4, b933939e165f4a76cc9c9cd65fb4f6d9f283d3a6)
+- API server is available immediately even for Zeroconf instances (#166, b933939e165f4a76cc9c9cd65fb4f6d9f283d3a6)
+
+### Changed
+- Updated client version and type (b4d6476f49c81dc7db8f6d2c22bd7ead0a2a0095)
+- Improved download retry strategy (#163, fcd47e2ee0f8774a6adc8da4149339714d498e51)
+- Moved API configuration (`api.port` and `api.host`) to file (1c9a221221df0549d45003f96d4ca31297d7746f)
+- Modified `player/current` endpoint to include `trackTime` parameter (9a8a515bbebce17a68142c35242f0a9d38c13254)
+
+### Fixed
+- Do not shuffle mixed playlists if not allowed (2e35d9bf74f12a417302a9b1ea43ab72c7cd7b1d)
+- Fixed NTP UDP socket timeout (4e5c5749039f98346f2f7fa0c4cded84b98d064d)
+- Fixed official client not working after disconnecting (#165)
+- Update time (`pcm_offset` in Vorbis codec) when seeking (553fa315663279754e0f5d19d1012073dc6d8bd3)
+- Fixed pausing state being overridden in some cases (651d6d78e10773103867131660a746669def74ea)
+
+
+## [1.1.0] - 13-12-2019
+### Added
+- Websocket API to listen to player events
+- Ability to change the API port via `api.port`
+- Retry request when Spotify sends 503
+
+### Changed
+- Fixed deadlocks
+- Fixed synchronization issue
diff --git a/README.md b/README.md
@@ -56,7 +56,8 @@ To run the newly build jar run `java -jar ./core/target/librespot-core-jar-with-
 
 ## Related Projects
 - [librespot](https://github.com/librespot-org/librespot)
-- [ansible-role-librespot](https://github.com/xMordax/ansible-role-librespot/tree/master) - Ansible role that will build, install and configure Librespot-Java.
+- [ansible-role-librespot](https://github.com/xMordax/ansible-role-librespot/tree/master) - Ansible role that will build, install and configure librespot-java.
+- [spocon](https://github.com/spocon/spocon) - Install librespot-java from APT
 
 # Special thanks
 
diff --git a/api/pom.xml b/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>io.undertow</groupId>
             <artifactId>undertow-core</artifactId>
-            <version>2.0.27.Final</version>
+            <version>2.0.29.Final</version>
         </dependency>
         <dependency>
             <groupId>com.stijndewitt.undertow.cors</groupId>
diff --git a/api/src/main/java/xyz/gianlu/librespot/api/handlers/PlayerHandler.java b/api/src/main/java/xyz/gianlu/librespot/api/handlers/PlayerHandler.java
@@ -147,7 +147,7 @@ private enum Command {
         NEXT("next"), PREV("prev"), SET_VOLUME("set-volume"),
         VOLUME_UP("volume-up"), VOLUME_DOWN("volume-down"), CURRENT("current");
 
-        private String name;
+        private final String name;
 
         Command(String name) {
             this.name = name;
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../</relativePath>
     </parent>
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>xyz.gianlu.librespot</groupId>
         <artifactId>librespot-java</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -75,21 +75,21 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.199</version>
+            <version>1.4.200</version>
         </dependency>
 
         <!-- HTTP -->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.0.1</version>
+            <version>4.3.1</version>
         </dependency>
 
         <!-- TOML configuration -->
         <dependency>
             <groupId>com.electronwill.night-config</groupId>
             <artifactId>toml</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.2</version>
         </dependency>
 
         <!-- Commons Net (NTP) -->
diff --git a/core/src/main/java/xyz/gianlu/librespot/BytesArrayList.java b/core/src/main/java/xyz/gianlu/librespot/BytesArrayList.java
@@ -118,9 +118,6 @@ public int read(@NotNull byte[] b, int off, int len) {
 
             int i = 0;
             while (true) {
-                if (sub >= elementData.length)
-                    return i;
-
                 int copy = Math.min(len - i, elementData[sub].length - offset);
                 System.arraycopy(elementData[sub], offset, b, off + i, copy);
                 i += copy;
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/ApResolver.java b/core/src/main/java/xyz/gianlu/librespot/core/ApResolver.java
@@ -22,7 +22,6 @@
  * @author Gianlu
  */
 public class ApResolver {
-    private static final JsonParser PARSER = new JsonParser();
     private static final String BASE_URL = "http://apresolve.spotify.com/";
     private static final Map<String, List<String>> pool = new HashMap<>(3);
     private static final Logger LOGGER = Logger.getLogger(ApResolver.class);
@@ -54,7 +53,7 @@ private static Map<String, List<String>> request(@NotNull String... types) throw
         conn.connect();
 
         try {
-            JsonObject obj = PARSER.parse(new InputStreamReader(conn.getInputStream())).getAsJsonObject();
+            JsonObject obj = JsonParser.parseReader(new InputStreamReader(conn.getInputStream())).getAsJsonObject();
             HashMap<String, List<String>> map = new HashMap<>();
             for (String type : types)
                 map.put(type, getUrls(obj, type));
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/FacebookAuthenticator.java b/core/src/main/java/xyz/gianlu/librespot/core/FacebookAuthenticator.java
@@ -23,7 +23,6 @@
  */
 public class FacebookAuthenticator implements Closeable {
     private static final URL LOGIN_SPOTIFY;
-    private static final JsonParser PARSER = new JsonParser();
     private static final Logger LOGGER = Logger.getLogger(FacebookAuthenticator.class);
     private static final byte[] EOL = new byte[]{'\r', '\n'};
 
@@ -44,7 +43,7 @@ public class FacebookAuthenticator implements Closeable {
         HttpURLConnection conn = (HttpURLConnection) LOGIN_SPOTIFY.openConnection();
         try {
             conn.connect();
-            JsonObject obj = PARSER.parse(new InputStreamReader(conn.getInputStream())).getAsJsonObject();
+            JsonObject obj = JsonParser.parseReader(new InputStreamReader(conn.getInputStream())).getAsJsonObject();
             credentialsUrl = obj.get("credentials_url").getAsString();
             String loginUrl = obj.get("login_url").getAsString();
             LOGGER.info(String.format("Visit %s in your browser.", loginUrl));
@@ -73,7 +72,7 @@ public void close() throws IOException {
     }
 
     private void authData(@NotNull String json) {
-        JsonObject obj = PARSER.parse(json).getAsJsonObject();
+        JsonObject obj = JsonParser.parseString(json).getAsJsonObject();
         if (!obj.get("error").isJsonNull()) {
             LOGGER.fatal("Error during authentication: " + obj.get("error"));
             return;
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/SearchManager.java b/core/src/main/java/xyz/gianlu/librespot/core/SearchManager.java
@@ -16,7 +16,6 @@
  */
 public class SearchManager {
     private static final String BASE_URL = "hm://searchview/km/v4/search/";
-    private static final JsonParser PARSER = new JsonParser();
     private final Session session;
 
     public SearchManager(@NotNull Session session) {
@@ -34,7 +33,7 @@ public JsonObject request(@NotNull SearchRequest req) throws IOException {
 
         if (resp.statusCode != 200) throw new SearchException(resp.statusCode);
 
-        return (JsonObject) PARSER.parse(new InputStreamReader(resp.payload.stream()));
+        return JsonParser.parseReader(new InputStreamReader(resp.payload.stream())).getAsJsonObject();
     }
 
     public static class SearchException extends IOException {
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/Session.java b/core/src/main/java/xyz/gianlu/librespot/core/Session.java
@@ -643,8 +643,8 @@ static Inner from(@NotNull AbsConfiguration configuration) {
      */
     public static class Builder {
         private final Inner inner;
+        private final AuthConfiguration authConf;
         private Authentication.LoginCredentials loginCredentials = null;
-        private AuthConfiguration authConf;
 
         public Builder(@NotNull Connect.DeviceType deviceType, @NotNull String deviceName, @NotNull AbsConfiguration configuration) {
             this.inner = new Inner(deviceType, deviceName, configuration);
diff --git a/core/src/main/java/xyz/gianlu/librespot/core/TimeProvider.java b/core/src/main/java/xyz/gianlu/librespot/core/TimeProvider.java
@@ -23,7 +23,6 @@
 public final class TimeProvider {
     private static final AtomicLong offset = new AtomicLong(0);
     private static final Logger LOGGER = Logger.getLogger(TimeProvider.class);
-    private static final JsonParser PARSER = new JsonParser();
     private static Method method = Method.NTP;
 
     private TimeProvider() {
@@ -99,7 +98,7 @@ private static void updateMelody(@NotNull Session session) {
             ResponseBody body = resp.body();
             if (body == null) throw new IllegalStateException();
 
-            JsonObject obj = PARSER.parse(body.string()).getAsJsonObject();
+            JsonObject obj = JsonParser.parseString(body.string()).getAsJsonObject();
             long diff = obj.get("timestamp").getAsLong() - System.currentTimeMillis();
             synchronized (offset) {
                 offset.set(diff);
diff --git a/core/src/main/java/xyz/gianlu/librespot/crypto/DiffieHellman.java b/core/src/main/java/xyz/gianlu/librespot/crypto/DiffieHellman.java
@@ -11,7 +11,7 @@
  */
 public class DiffieHellman {
     private static final BigInteger GENERATOR = BigInteger.valueOf(2);
-    private static final byte PRIME_BYTES[] = {
+    private static final byte[] PRIME_BYTES = {
             (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xc9, (byte)
             (byte) 0x0f, (byte) 0xda, (byte) 0xa2, (byte) 0x21, (byte) 0x68, (byte) 0xc2, (byte) 0x34, (byte) 0xc4, (byte) 0xc6, (byte)
             (byte) 0x62, (byte) 0x8b, (byte) 0x80, (byte) 0xdc, (byte) 0x1c, (byte) 0xd1, (byte) 0x29, (byte) 0x02, (byte) 0x4e, (byte)
diff --git a/core/src/main/java/xyz/gianlu/librespot/dealer/DealerClient.java b/core/src/main/java/xyz/gianlu/librespot/dealer/DealerClient.java
@@ -28,7 +28,6 @@
  * @author Gianlu
  */
 public class DealerClient implements Closeable {
-    private static final JsonParser PARSER = new JsonParser();
     private static final Logger LOGGER = Logger.getLogger(DealerClient.class);
     private final Looper looper = new Looper();
     private final Session session;
@@ -314,7 +313,7 @@ public void onOpen(@NotNull WebSocket ws, @NotNull Response response) {
 
             @Override
             public void onMessage(@NotNull WebSocket ws, @NotNull String text) {
-                JsonObject obj = PARSER.parse(text).getAsJsonObject();
+                JsonObject obj = JsonParser.parseString(text).getAsJsonObject();
 
                 waitForListeners();
 
diff --git a/core/src/main/java/xyz/gianlu/librespot/mercury/JsonMercuryRequest.java b/core/src/main/java/xyz/gianlu/librespot/mercury/JsonMercuryRequest.java
@@ -12,7 +12,6 @@
  * @author Gianlu
  */
 public class JsonMercuryRequest<W extends JsonWrapper> {
-    private static final JsonParser PARSER = new JsonParser();
     final RawMercuryRequest request;
     private final Class<W> wrapperClass;
 
@@ -24,7 +23,7 @@ public class JsonMercuryRequest<W extends JsonWrapper> {
     @NotNull
     public W instantiate(@NotNull MercuryClient.Response resp) {
         try {
-            JsonElement elm = PARSER.parse(new InputStreamReader(resp.payload.stream()));
+            JsonElement elm = JsonParser.parseReader(new InputStreamReader(resp.payload.stream()));
             return wrapperClass.getConstructor(JsonObject.class).newInstance(elm.getAsJsonObject());
         } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException ex) {
             throw new IllegalArgumentException(ex);
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/PagesLoader.java b/core/src/main/java/xyz/gianlu/librespot/player/PagesLoader.java
@@ -22,7 +22,6 @@
  * @author Gianlu
  */
 public final class PagesLoader {
-    private static final JsonParser PARSER = new JsonParser();
     private final List<ContextPage> pages;
     private final Session session;
     private String resolveUrl = null;
@@ -55,7 +54,7 @@ private List<ContextTrack> fetchTracks(@NotNull String url) throws IOException {
         MercuryClient.Response resp = session.mercury().sendSync(RawMercuryRequest.newBuilder()
                 .setUri(url).setMethod("GET").build());
 
-        JsonObject obj = PARSER.parse(new InputStreamReader(resp.payload.stream())).getAsJsonObject();
+        JsonObject obj = JsonParser.parseReader(new InputStreamReader(resp.payload.stream())).getAsJsonObject();
         return ProtoUtils.jsonToContextTracks(obj.getAsJsonArray("tracks"));
     }
 
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java b/core/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java
@@ -48,7 +48,6 @@
  */
 public class StateWrapper implements DeviceStateHandler.Listener, DealerClient.MessageListener {
     private static final Logger LOGGER = Logger.getLogger(StateWrapper.class);
-    private static final JsonParser PARSER = new JsonParser();
 
     static {
         try {
@@ -175,7 +174,7 @@ private void loadTransforming() {
                 return;
             }
 
-            if (body != null) updateContext(PARSER.parse(body.string()).getAsJsonObject());
+            if (body != null) updateContext(JsonParser.parseString(body.string()).getAsJsonObject());
             else throw new IllegalArgumentException();
 
             LOGGER.debug("Updated context with transforming information!");
@@ -631,7 +630,7 @@ else if (op.getKind() == Playlist4ApiProto.Op.Kind.REM)
             List<String> added = null;
             List<String> removed = null;
 
-            JsonArray items = PARSER.parse(payloads[0]).getAsJsonObject().getAsJsonArray("items");
+            JsonArray items = JsonParser.parseString(payloads[0]).getAsJsonObject().getAsJsonArray("items");
             for (JsonElement elm : items) {
                 JsonObject obj = elm.getAsJsonObject();
                 String itemUri = "spotify:" + obj.get("type").getAsString() + ":" + obj.get("identifier").getAsString();
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/contexts/AbsSpotifyContext.java b/core/src/main/java/xyz/gianlu/librespot/player/contexts/AbsSpotifyContext.java
@@ -34,7 +34,7 @@ else if (context.startsWith("spotify:search:"))
 
     @Override
     public String toString() {
-        return "AbsSpotifyContext{context='" + context + "\'}";
+        return "AbsSpotifyContext{context='" + context + "'}";
     }
 
     public abstract boolean isFinite();
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/crossfade/CrossfadeController.java b/core/src/main/java/xyz/gianlu/librespot/player/crossfade/CrossfadeController.java
@@ -11,7 +11,6 @@
 import java.util.Map;
 
 public class CrossfadeController {
-    private final static JsonParser PARSER = new JsonParser();
     private static final Logger LOGGER = Logger.getLogger(CrossfadeController.class);
     private final int trackDuration;
     private final int defaultFadeDuration;
@@ -55,13 +54,13 @@ public CrossfadeController(int duration, @NotNull Map<String, String> metadata,
 
         fadeInDuration = Integer.parseInt(metadata.getOrDefault("audio.fade_in_duration", "-1"));
         fadeInStartTime = Integer.parseInt(metadata.getOrDefault("audio.fade_in_start_time", "-1"));
-        JsonArray fadeInCurves = PARSER.parse(metadata.getOrDefault("audio.fade_in_curves", "[]")).getAsJsonArray();
+        JsonArray fadeInCurves = JsonParser.parseString(metadata.getOrDefault("audio.fade_in_curves", "[]")).getAsJsonArray();
         if (fadeInCurves.size() > 1) throw new UnsupportedOperationException(fadeInCurves.toString());
 
         fadeOutUri = metadata.get("audio.fade_out_uri");
         fadeOutDuration = Integer.parseInt(metadata.getOrDefault("audio.fade_out_duration", "-1"));
         fadeOutStartTime = Integer.parseInt(metadata.getOrDefault("audio.fade_out_start_time", "-1"));
-        JsonArray fadeOutCurves = PARSER.parse(metadata.getOrDefault("audio.fade_out_curves", "[]")).getAsJsonArray();
+        JsonArray fadeOutCurves = JsonParser.parseString(metadata.getOrDefault("audio.fade_out_curves", "[]")).getAsJsonArray();
         if (fadeOutCurves.size() > 1) throw new UnsupportedOperationException(fadeOutCurves.toString());
 
 
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/decrypt/AesAudioDecrypt.java b/core/src/main/java/xyz/gianlu/librespot/player/decrypt/AesAudioDecrypt.java
@@ -26,8 +26,6 @@ public AesAudioDecrypt(byte[] key) {
     public synchronized void decryptChunk(int chunkIndex, byte[] in, byte[] out) throws IOException {
         int pos = CHUNK_SIZE * chunkIndex;
 
-        if (pos % 16 != 0) throw new IllegalArgumentException("Position not multiple of 16: " + pos);
-
         try {
             Cipher cipher = Cipher.getInstance("AES/CTR/NoPadding");
             cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, new IvParameterSpec(Utils.toByteArray(IV_INT.add(BigInteger.valueOf(pos / 16)))));
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>xyz.gianlu.librespot</groupId>
     <artifactId>librespot-java</artifactId>
     <packaging>pom</packaging>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 
     <name>librespot-java</name>
     <description>Java port of librespot, the Open Source Spotify client library</description>
@@ -37,8 +37,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <gson.version>2.8.5</gson.version>
-        <protobuf.version>3.9.0</protobuf.version>
+        <gson.version>2.8.6</gson.version>
+        <protobuf.version>3.11.1</protobuf.version>
     </properties>
 
     <modules>
