Added a couple of tweaks from the latest Spotify build

Author: devgianlu

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

@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.AbsConfiguration;
 import xyz.gianlu.librespot.Version;
+import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.common.proto.Authentication;
 import xyz.gianlu.librespot.common.proto.Keyexchange;
 import xyz.gianlu.librespot.crypto.CipherPair;
@@ -221,6 +222,10 @@ private void authenticate(@NotNull Authentication.LoginCredentials credentials)
             player = new Player(inner.configuration, inner.configuration, this);
 
             LOGGER.info(String.format("Authenticated as %s!", apWelcome.getCanonicalUsername()));
+
+            byte[] bytes0x0f = new byte[20];
+            random().nextBytes(bytes0x0f);
+            send(Packet.Type.Unknown_0x0f, bytes0x0f);
         } else if (packet.is(Packet.Type.AuthFailure)) {
             throw new SpotifyAuthenticationException(Keyexchange.APLoginFailed.parseFrom(packet.payload));
         } else {
@@ -563,6 +568,9 @@ public void run() {
                         licenseVersion.get(buffer);
                         LOGGER.info(String.format("Received LicenseVersion: %d, %s", id, new String(buffer)));
                         break;
+                    case Unknown_0x10:
+                        LOGGER.debug("Received 0x10: " + Utils.bytesToHex(packet.payload));
+                        break;
                     case MercurySub:
                     case MercuryUnsub:
                     case MercurySubEvent:

core/src/main/java/xyz/gianlu/librespot/crypto/Packet.java

@@ -51,7 +51,10 @@ public enum Type {
         MercurySub(0xb3),
         MercuryUnsub(0xb4),
         MercurySubEvent(0xb5),
-        UnknownData_AllZeros(0x1f);
+        UnknownData_AllZeros(0x1f),
+        Unknown_0x4f(0x4f),
+        Unknown_0x0f(0x0f),
+        Unknown_0x10(0x10);
 
         public final byte val;
 

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

@@ -45,12 +45,10 @@ void requestChunk(@NotNull ByteString fileId, int index, @NotNull AudioFile file
         DataOutputStream out = new DataOutputStream(bytes);
 
         out.writeShort(channel.id);
-        out.writeByte(0);
-        out.writeByte(1);
-        out.writeShort(0);
-        out.writeInt(0);
-        out.writeInt(0x00009C40);
-        out.writeInt(0x00020000);
+        out.writeInt(0x00000000);
+        out.writeInt(0x00000000);
+        out.writeInt(0x00004e20);
+        out.writeInt(0x00030d40);
         fileId.writeTo(out);
         out.writeInt(start);
         out.writeInt(end);

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

@@ -4,12 +4,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.gianlu.librespot.common.Utils;
+import xyz.gianlu.librespot.common.proto.Metadata;
+import xyz.gianlu.librespot.common.proto.Spirc;
 import xyz.gianlu.librespot.core.Session;
+import xyz.gianlu.librespot.crypto.Packet;
 import xyz.gianlu.librespot.mercury.MercuryClient;
 import xyz.gianlu.librespot.mercury.MercuryRequests;
 import xyz.gianlu.librespot.mercury.model.TrackId;
-import xyz.gianlu.librespot.common.proto.Metadata;
-import xyz.gianlu.librespot.common.proto.Spirc;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -79,6 +80,8 @@ private void load(@NotNull Spirc.TrackRef ref, boolean play, int pos) throws IOE
             }
         }
 
+        session.send(Packet.Type.Unknown_0x4f, new byte[0]);
+
         byte[] key = session.audioKey().getAudioKey(track, file);
         AudioFileStreaming audioStreaming = new AudioFileStreaming(session, cacheManager, file, key);
         audioStreaming.open();