PR comments

Author: kikkia

common/src/main/java/dev/lavalink/youtube/AllClientsFailedException.java

@@ -1,18 +1,43 @@
 package dev.lavalink.youtube;
 
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import org.jetbrains.annotations.NotNull;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.List;
 
 /**
  * Thrown when all clients failed to load a track.
  */
 public class AllClientsFailedException extends FriendlyException {
+    private final List<ClientException> clientExceptions;
+
     /**
      * @param suppressed The exceptions that were caused client failures.
      */
-    public AllClientsFailedException(List<Throwable> suppressed) {
-        super("All clients failed to load the item. See suppressed exceptions for details.", Severity.SUSPICIOUS, null);
-        suppressed.forEach(this::addSuppressed);
+    public AllClientsFailedException(@NotNull List<ClientException> suppressed) {
+        super(createMessage(suppressed), Severity.SUSPICIOUS, null);
+        this.clientExceptions = suppressed;
+    }
+
+    @NotNull
+    public List<ClientException> getClientExceptions() {
+        return clientExceptions;
+    }
+
+    private static String createMessage(@NotNull List<ClientException> exceptions) {
+        StringWriter writer = new StringWriter();
+        PrintWriter printer = new PrintWriter(writer);
+
+        printer.format("(yts.version: %s) All clients failed to load the item.", YoutubeSource.VERSION);
+
+        for (ClientException exception : exceptions) {
+            printer.println();
+            printer.println();
+            printer.print(exception.getFormattedMessage());
+        }
+
+        return writer.toString();
     }
 }

common/src/main/java/dev/lavalink/youtube/ClientException.java

@@ -3,12 +3,41 @@
 import dev.lavalink.youtube.clients.skeleton.Client;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
 /**
  * Wraps an exception with client context
  */
-public class ClientException extends Exception {
+public class ClientException extends RuntimeException {
+    private final Client client;
+
     public ClientException(@NotNull String message, @NotNull Client client, @NotNull Throwable cause) {
         super(String.format("Client [%s] failed: %s", client.getIdentifier(), message), cause);
-        addSuppressed(ClientInformation.create(client));
+        this.client = client;
+    }
+
+    @NotNull
+    public Client getClient() {
+        return client;
+    }
+
+    @NotNull
+    public String getFormattedMessage() {
+        StringWriter writer = new StringWriter();
+        try (PrintWriter printer = new PrintWriter(writer)) {
+            printer.print(getMessage());
+
+            Throwable cause = getCause();
+            if (cause != null) {
+                StackTraceElement[] stackTrace = cause.getStackTrace();
+                int limit = Math.min(4, stackTrace.length);
+                for (int i = 0; i < limit; i++) {
+                    printer.println();
+                    printer.format("\tat %s", stackTrace[i]);
+                }
+            }
+        }
+        return writer.toString();
     }
 }

common/src/main/java/dev/lavalink/youtube/ClientInformation.java

@@ -10,7 +10,6 @@ private ClientInformation(String message) {
 
     public static ClientInformation create(Client client) {
         DetailMessageBuilder builder = new DetailMessageBuilder();
-        builder.appendField("yts.version", YoutubeSource.VERSION);
         builder.appendField("client.identifier", client.getIdentifier());
         builder.appendField("client.options", client.getOptions());
         return new ClientInformation(builder.toString());

common/src/main/java/dev/lavalink/youtube/YoutubeAudioSourceManager.java

@@ -39,6 +39,7 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import static com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity.SUSPICIOUS;
 
@@ -215,7 +216,7 @@ public AudioItem loadItem(@NotNull AudioPlayerManager manager, @NotNull AudioRef
     @Nullable
     protected AudioItem loadItemOnce(@NotNull AudioReference reference) {
         AudioItem item = null;
-        List<Throwable> exceptions = new ArrayList<>();
+        List<ClientException> exceptions = new ArrayList<>();
 
         try (HttpInterface httpInterface = httpInterfaceManager.getInterface()) {
             Router router = getRouter(httpInterface, reference.identifier);
@@ -261,8 +262,14 @@ protected AudioItem loadItemOnce(@NotNull AudioReference reference) {
             throw ExceptionTools.toRuntimeException(e);
         }
 
-        if (item == null && !exceptions.isEmpty()) {
-            throw new AllClientsFailedException(exceptions);
+        if (!exceptions.isEmpty()) {
+            if (item == null) {
+                throw new AllClientsFailedException(exceptions);
+            }
+
+            String exceptionSummary = exceptions.stream().map(ClientException::getFormattedMessage).collect(Collectors.toList()).toString();
+
+            log.debug("Exceptions suppressed whilst loading {}: {}", reference.identifier, exceptionSummary);
         }
 
         return item;

common/src/main/java/dev/lavalink/youtube/track/YoutubeAudioTrack.java

@@ -86,7 +86,7 @@ public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
         log.debug("Failed to parse token from userData", e);
       }
 
-      List<Throwable> exceptions = new ArrayList<>();
+      List<ClientException> exceptions = new ArrayList<>();
 
       for (Client client : clients) {
         if (!client.supportsFormatLoading()) {
@@ -101,12 +101,26 @@ public void process(LocalAudioTrackExecutor localExecutor) throws Exception {
         } catch (CannotBeLoaded e) {
           throw e;
         } catch (Exception e) {
+          if (e instanceof ScriptExtractionException) {
+            // If we're still early in playback, we can try another client
+            if (localExecutor.getPosition() >= BAD_STREAM_POSITION_THRESHOLD_MS) {
+              throw e;
+            }
+          } else if ("Not success status code: 403".equals(e.getMessage()) ||
+                  "Invalid status code for player api response: 400".equals(e.getMessage())) {
+            // As long as the executor position has not surpassed the threshold for which
+            // a stream is considered unrecoverable, we can try to renew the playback URL with
+            // another client.
+            if (localExecutor.getPosition() >= BAD_STREAM_POSITION_THRESHOLD_MS) {
+              throw e;
+            }
+          }
           exceptions.add(new ClientException(e.getMessage(), client, e));
         }
       }
 
       if (!exceptions.isEmpty()) {
-        throw ExceptionTools.wrapUnfriendlyExceptions("All clients failed to load the track.", Severity.SUSPICIOUS, new AllClientsFailedException(exceptions));
+        throw new AllClientsFailedException(exceptions);
       }
     } catch (CannotBeLoaded e) {
       throw ExceptionTools.wrapUnfriendlyExceptions("This video is unavailable", Severity.SUSPICIOUS, e.getCause());