Simplified reconnection logic + additional logging

Author: devgianlu

core/src/main/java/xyz/gianlu/librespot/connectstate/DeviceStateHandler.java

@@ -150,11 +150,6 @@ public void onMessage(@NotNull String uri, @NotNull Map<String, String> headers,
         }
     }
 
-    @Override
-    public void onConnectionRestarted() {
-        // Do nothing (already handled by StateWrapper)
-    }
-
     @NotNull
     @Override
     public RequestResult onRequest(@NotNull String mid, int pid, @NotNull String sender, @NotNull JsonObject command) {
@@ -205,7 +200,7 @@ private synchronized void putState(@NotNull Connect.PutStateReason reason, @NotN
                 .getDeviceBuilder().setDeviceInfo(deviceInfo).setPlayerState(state);
 
         session.api().putConnectState(connectionId, putState.build());
-        LOGGER.info(String.format("Put state. {ts: %d, reason: %s, request: %s}", TimeProvider.currentTimeMillis(), reason, TextFormat.shortDebugString(putState)));
+        LOGGER.info(String.format("Put state. {ts: %d, connId: %s[truncated], reason: %s, request: %s}", TimeProvider.currentTimeMillis(), connectionId.substring(0, 6), reason, TextFormat.shortDebugString(putState)));
     }
 
     public synchronized int getVolume() {

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

@@ -196,21 +196,13 @@ private void connectionInvalided() {
 
             try {
                 connect();
-                notifyConnectionRestarted();
             } catch (IOException | MercuryClient.MercuryException ex) {
                 LOGGER.error("Failed reconnecting, retrying...", ex);
                 connectionInvalided();
             }
         }, 10, TimeUnit.SECONDS);
     }
 
-    private void notifyConnectionRestarted() {
-        synchronized (msgListeners) {
-            for (MessageListener listener : msgListeners.keySet())
-                listener.onConnectionRestarted();
-        }
-    }
-
     public enum RequestResult {
         UNKNOWN_SEND_COMMAND_RESULT, SUCCESS,
         DEVICE_NOT_FOUND, CONTEXT_PLAYER_ERROR,
@@ -225,8 +217,6 @@ public interface RequestListener {
 
     public interface MessageListener {
         void onMessage(@NotNull String uri, @NotNull Map<String, String> headers, @NotNull String[] payloads) throws IOException;
-
-        void onConnectionRestarted();
     }
 
     private static class Looper implements Runnable, Closeable {
@@ -289,6 +279,8 @@ public void close() {
 
             if (conn == ConnectionHolder.this)
                 connectionInvalided();
+            else
+                LOGGER.debug(String.format("Did not dispatch connection invalidated: %s != %s", conn, ConnectionHolder.this));
         }
 
         private class WebSocketListenerImpl extends WebSocketListener {
@@ -310,7 +302,7 @@ public void onOpen(@NotNull WebSocket ws, @NotNull Response response) {
 
                         if (!receivedPong) {
                             LOGGER.warn("Did not receive ping in 3 seconds. Reconnecting...");
-                            close();
+                            ConnectionHolder.this.close();
                             return;
                         }
 
@@ -346,7 +338,7 @@ public void onMessage(@NotNull WebSocket ws, @NotNull String text) {
             @Override
             public void onFailure(@NotNull WebSocket ws, @NotNull Throwable t, @Nullable Response response) {
                 LOGGER.warn("An exception occurred. Reconnecting...", t);
-                close();
+                ConnectionHolder.this.close();
             }
         }
     }

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

@@ -658,11 +658,6 @@ else if (op.getKind() == Playlist4ApiProto.Op.Kind.REM)
         }
     }
 
-    @Override
-    public void onConnectionRestarted() {
-        updated();
-    }
-
     private synchronized void performCollectionUpdate(@NotNull List<String> uris, boolean inCollection) {
         for (String uri : uris)
             tracksKeeper.updateMetadataFor(uri, "collection.in_collection", String.valueOf(inCollection));