Merge branch 'dev'

# Conflicts:
#	LavalinkServer/docker/Dockerfile

Author: freyacodes

IMPLEMENTATION.md

@@ -199,9 +199,10 @@ Server emitted an event. See the client implementation below.
 /**
  * Implementation details:
  * The only events extending {@link lavalink.client.player.event.PlayerEvent} produced by the remote server are these:
- * 1. TrackEndEvent
- * 2. TrackExceptionEvent
- * 3. TrackStuckEvent
+ * 1. TrackStartEvent
+ * 2. TrackEndEvent
+ * 3. TrackExceptionEvent
+ * 4. TrackStuckEvent
  * <p>
  * The remaining lavaplayer events are caused by client actions, and are therefore not forwarded via WS.
  */
@@ -210,6 +211,11 @@ private void handleEvent(JSONObject json) throws IOException {
     PlayerEvent event = null;
 
     switch (json.getString("type")) {
+        case "TrackStartEvent":
+                event = new TrackStartEvent(player,
+                        LavalinkUtil.toAudioTrack(json.getString("track"))
+                );
+                break;
         case "TrackEndEvent":
             event = new TrackEndEvent(player,
                     LavalinkUtil.toAudioTrack(json.getString("track")),

LavalinkServer/application.yml.example

@@ -23,6 +23,7 @@ lavalink:
       #excludedIps: ["...", "..."] # ips which should be explicit excluded from usage by lavalink
       #strategy: "RotateOnBan" # RotateOnBan | LoadBalance | NanoSwitch | RotatingNanoSwitch
       #searchTriggersFail: true # Whether a search 429 should trigger marking the ip as failing
+      #retryLimit: -1 # -1 = use default lavaplayer value | 0 = infinity | >0 = retry will happen this numbers times
 
 metrics:
   prometheus:

LavalinkServer/build.gradle

@@ -34,7 +34,7 @@ bootRun {
 }
 
 dependencies {
-    compile group: 'space.npstr', name: 'Magma', version: magmaVersion
+    compile group: 'space.npstr.Magma', name: 'magma', version: magmaVersion
     compile group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
     compile group: 'com.sedmelluq', name: 'lavaplayer-ext-youtube-rotator', version: lavaplayerIpRotatorVersion
     compile group: 'com.sedmelluq', name: 'jda-nas', version: jdaNasVersion 

LavalinkServer/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:13-jre-slim
+FROM azul/zulu-openjdk:13
 
 # Run as non-root user
 RUN groupadd -g 322 lavalink && \

LavalinkServer/src/main/java/lavalink/server/config/AudioPlayerConfiguration.kt

@@ -38,7 +38,7 @@ class AudioPlayerConfiguration {
     private val log = LoggerFactory.getLogger(AudioPlayerConfiguration::class.java)
 
     @Bean
-    fun audioPlayerManagerSupplier(sources: AudioSourcesConfig, serverConfig: ServerConfig, routePlanner: AbstractRoutePlanner?) = Supplier<AudioPlayerManager> {
+    fun audioPlayerManagerSupplier(sources: AudioSourcesConfig, serverConfig: ServerConfig, routePlanner: AbstractRoutePlanner?): AudioPlayerManager {
         val audioPlayerManager = DefaultAudioPlayerManager()
 
         if (serverConfig.isGcWarnings) {
@@ -48,7 +48,13 @@ class AudioPlayerConfiguration {
         if (sources.isYoutube) {
             val youtube = YoutubeAudioSourceManager(serverConfig.isYoutubeSearchEnabled)
             if (routePlanner != null) {
-                YoutubeIpRotator.setup(youtube, routePlanner)
+                val retryLimit = serverConfig.ratelimit?.retryLimit ?: -1
+                when {
+                    retryLimit < 0 -> YoutubeIpRotator.setup(youtube, routePlanner)
+                    retryLimit == 0 -> YoutubeIpRotator.setup(youtube, routePlanner, Int.MAX_VALUE)
+                    else -> YoutubeIpRotator.setup(youtube, routePlanner, retryLimit)
+
+                }
             }
             val playlistLoadLimit = serverConfig.youtubePlaylistLoadLimit
             if (playlistLoadLimit != null) youtube.setPlaylistPageCount(playlistLoadLimit)
@@ -76,12 +82,7 @@ class AudioPlayerConfiguration {
 
         audioPlayerManager.configuration.isFilterHotSwapEnabled = true
 
-        audioPlayerManager
-    }
-
-    @Bean
-    fun restAudioPlayerManager(supplier: Supplier<AudioPlayerManager>): AudioPlayerManager {
-        return supplier.get()
+        return audioPlayerManager
     }
 
     @Bean

LavalinkServer/src/main/java/lavalink/server/config/RateLimitConfig.kt

@@ -4,5 +4,6 @@ data class RateLimitConfig(
         var ipBlocks: List<String> = emptyList(),
         var excludedIps: List<String> = emptyList(),
         var strategy: String = "RotateOnBan",
+        var retryLimit: Int = -1,
         var searchTriggersFail: Boolean = true
 )

LavalinkServer/src/main/java/lavalink/server/io/SocketContext.kt

@@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit
 import java.util.function.Supplier
 
 class SocketContext internal constructor(
-        audioPlayerManagerSupplier: Supplier<AudioPlayerManager>,
+        val audioPlayerManager: AudioPlayerManager,
         var session: WebSocketSession,
         private val socketServer: SocketServer,
         val userId: String
@@ -56,7 +56,6 @@ class SocketContext internal constructor(
         private val log = LoggerFactory.getLogger(SocketContext::class.java)
     }
 
-    val audioPlayerManager: AudioPlayerManager = audioPlayerManagerSupplier.get()
     internal val magma: MagmaApi = MagmaFactory.of { socketServer.getAudioSendFactory(it) }
     //guildId <-> Player
     val players = ConcurrentHashMap<String, Player>()
@@ -169,7 +168,6 @@ class SocketContext internal constructor(
     internal fun shutdown() {
         log.info("Shutting down " + playingPlayers.size + " playing players.")
         executor.shutdown()
-        audioPlayerManager.shutdown()
         playerUpdateService.shutdown()
         players.keys.forEach { guildId ->
             val member = MagmaMember.builder()

LavalinkServer/src/main/java/lavalink/server/io/SocketServer.kt

@@ -45,7 +45,7 @@ import java.util.function.Supplier
 @Service
 class SocketServer(
         private val serverConfig: ServerConfig,
-        private val audioPlayerManagerSupplier: Supplier<AudioPlayerManager>,
+        private val audioPlayerManager: AudioPlayerManager,
         private val audioSendFactoryConfiguration: AudioSendFactoryConfiguration
 ) : TextWebSocketHandler() {
 
@@ -92,7 +92,7 @@ class SocketServer(
 
         shardCounts[userId] = shardCount
 
-        contextMap[session.id] = SocketContext(audioPlayerManagerSupplier, session, this, userId)
+        contextMap[session.id] = SocketContext(audioPlayerManager, session, this, userId)
         log.info("Connection successfully established from " + session.remoteAddress!!)
     }
 

LavalinkServer/src/main/java/lavalink/server/player/EventEmitter.java

@@ -47,6 +47,22 @@ public class EventEmitter extends AudioEventAdapter {
         this.linkPlayer = linkPlayer;
     }
 
+    @Override
+    public void onTrackStart(AudioPlayer player, AudioTrack track) {
+        JSONObject out = new JSONObject();
+        out.put("op", "event");
+        out.put("type", "TrackStartEvent");
+        out.put("guildId", linkPlayer.getGuildId());
+
+        try {
+            out.put("track", Util.toMessage(audioPlayerManager, track));
+        } catch (IOException e) {
+            out.put("track", JSONObject.NULL);
+        }
+
+        linkPlayer.getSocket().send(out);
+    }
+
     @Override
     public void onTrackEnd(AudioPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
         JSONObject out = new JSONObject();

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         springBootVersion = '2.1.8.RELEASE'
         gradleGitVersion = '1.5.2'
         sonarqubeVersion = '2.6.2'
-        kotlinVersion = '1.3.41'
+        kotlinVersion = '1.3.61'
         testLoggerVersion = '1.6.0'
     }
     repositories {
@@ -52,9 +52,9 @@ subprojects {
 
     ext {
         //@formatter:off
-        lavaplayerVersion               = '1.3.32'
+        lavaplayerVersion               = '1.3.38'
         lavaplayerIpRotatorVersion      = '0.1.7'
-        magmaVersion                    = '0.12.3'
+        magmaVersion                    = '0.12.5'
         jdaNasVersion                   = '1.1.0'
         jappVersion                     = '1.3.2-MINN'