Updated MercuryClient to throw exceptions for timed out requests

Author: devgianlu

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

@@ -34,10 +34,12 @@ public String get(@NotNull String scope) throws IOException, MercuryClient.Mercu
             else return token.accessToken;
         }
 
-        LOGGER.debug(String.format("Token expired or not suitable, requesting again. {scope: %s, token: %s}", scope, token));
+        LOGGER.debug(String.format("Token expired or not suitable, requesting again. {scope: %s, oldToken: %s}", scope, token));
         MercuryRequests.KeymasterToken resp = session.mercury().sendSync(MercuryRequests.requestToken(session.deviceId(), scope));
         token = new StoredToken(resp);
 
+        LOGGER.debug(String.format("Updated token successfully! {scope: %s, newToken: %s}", scope, token));
+
         tokens.put(scope, token);
         return token.accessToken;
     }

core/src/main/java/xyz/gianlu/librespot/dealer/DealerClient.java

@@ -36,7 +36,7 @@ public class DealerClient implements Closeable {
     private final Map<MessageListener, List<String>> msgListeners = new HashMap<>();
     private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new NameThreadFactory((r) -> "dealer-scheduler-" + r.hashCode()));
     private final AtomicReference<ConnectionHolder> conn = new AtomicReference<>();
-    private ScheduledFuture lastScheduledReconnection;
+    private ScheduledFuture<?> lastScheduledReconnection;
 
     public DealerClient(@NotNull Session session) {
         this.session = session;
@@ -249,7 +249,7 @@ private class ConnectionHolder implements Closeable {
         private final WebSocket ws;
         private boolean closed = false;
         private boolean receivedPong = false;
-        private ScheduledFuture lastScheduledPing;
+        private ScheduledFuture<?> lastScheduledPing;
 
         ConnectionHolder(@NotNull Session session, @NotNull Request request) {
             ws = session.client().newWebSocket(request, new WebSocketListenerImpl());

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

@@ -5,6 +5,7 @@
 import com.google.protobuf.Message;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.BytesArrayList;
 import xyz.gianlu.librespot.common.ProtobufToJson;
 import xyz.gianlu.librespot.common.Utils;
@@ -64,8 +65,13 @@ public void unsubscribe(@NotNull String uri) throws IOException, PubSubException
     @NotNull
     public Response sendSync(@NotNull RawMercuryRequest request) throws IOException {
         SyncCallback callback = new SyncCallback();
-        send(request, callback);
-        return callback.waitResponse();
+        int seq = send(request, callback);
+
+        Response resp = callback.waitResponse();
+        if (resp == null)
+            throw new IOException(String.format("Request timeout out, %d passed, yet no response. {seq: %d}", MERCURY_REQUEST_TIMEOUT, seq));
+
+        return resp;
     }
 
     @NotNull
@@ -113,7 +119,7 @@ public <P extends Message> void send(@NotNull ProtobufMercuryRequest<P> request,
         }
     }
 
-    public void send(@NotNull RawMercuryRequest request, @NotNull Callback callback) throws IOException {
+    public int send(@NotNull RawMercuryRequest request, @NotNull Callback callback) throws IOException {
         ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(bytesOut);
 
@@ -143,6 +149,7 @@ public void send(@NotNull RawMercuryRequest request, @NotNull Callback callback)
         session.send(cmd, bytesOut.toByteArray());
 
         callbacks.put((long) seq, callback);
+        return seq;
     }
 
     @Override
@@ -225,10 +232,7 @@ public void interestedIn(@NotNull String uri, @NotNull SubListener listener) {
 
     public void notInterested(@NotNull SubListener listener) {
         synchronized (subscriptions) {
-            Iterator<InternalSubListener> iter = subscriptions.iterator();
-            while (iter.hasNext())
-                if (iter.next().listener == listener)
-                    iter.remove();
+            subscriptions.removeIf(internalSubListener -> internalSubListener.listener == listener);
         }
     }
 
@@ -288,7 +292,7 @@ public void response(@NotNull Response response) {
             }
         }
 
-        @NotNull
+        @Nullable
         Response waitResponse() {
             synchronized (reference) {
                 try {