Some minor changes.

lavalink-devs · Aug 15, 2024 · 3358633 · 3358633
1 parent b9b2dac
commit 3358633
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 15 deletions.
diff --git a/common/src/main/java/dev/lavalink/youtube/YoutubeAudioSourceManager.java b/common/src/main/java/dev/lavalink/youtube/YoutubeAudioSourceManager.java
@@ -137,7 +137,6 @@ public YoutubeAudioSourceManager(YoutubeSourceOptions options,
         this.allowDirectPlaylistIds = options.isAllowDirectPlaylistIds();
         this.clients = clients;
         this.cipherManager = new SignatureCipherManager();
-
         this.oauth2Handler = new YoutubeOauth2Handler(httpInterfaceManager);
 
         contextFilter = new YoutubeHttpContextFilter();
@@ -379,6 +378,11 @@ public YoutubeHttpContextFilter getContextFilter() {
         return contextFilter;
     }
 
+    @NotNull
+    public YoutubeOauth2Handler getOauth2Handler() {
+        return oauth2Handler;
+    }
+
     @NotNull
     public HttpInterfaceManager getHttpInterfaceManager() {
         return httpInterfaceManager;

diff --git a/common/src/main/java/dev/lavalink/youtube/http/YoutubeOauth2Handler.java b/common/src/main/java/dev/lavalink/youtube/http/YoutubeOauth2Handler.java
@@ -59,10 +59,11 @@ public void setRefreshToken(@Nullable String refreshToken, boolean skipInitializ
 
             // if refreshAccessToken() fails, enabled will never be flipped, so we don't use
             // oauth tokens erroneously.
-            // TODO?: This should fall back to access token initialization if refresh isn't valid,
-            //        provided "skipInitialization" is not true.
             enabled = true;
-        } else if (!skipInitialization) {
+            return;
+        }
+
+        if (!skipInitialization) {
             initializeAccessToken();
         }
     }
@@ -189,24 +190,28 @@ private void pollForToken(String deviceCode, long interval) {
      * @param force Whether to forcefully renew the access token, even if it doesn't necessarily
      *              need to be refreshed yet.
      */
-    private void refreshAccessToken(boolean force) {
-        if (!shouldRefreshAccessToken() && !force) {
-            return;
-        }
+    public void refreshAccessToken(boolean force) {
+        log.debug("Refreshing access token (force: {})", force);
 
         if (DataFormatTools.isNullOrEmpty(refreshToken)) {
             throw new IllegalStateException("Cannot fetch access token without a refresh token!");
         }
 
-        synchronized (this) {
-            if (!shouldRefreshAccessToken() && !force) {
-                return;
-            }
+        if (!shouldRefreshAccessToken() && !force) {
+            log.debug("Access token does not need to be refreshed yet.");
+            return;
+        }
 
+        synchronized (this) {
             if (DataFormatTools.isNullOrEmpty(refreshToken)) {
                 throw new IllegalStateException("Cannot fetch access token without a refresh token!");
             }
 
+            if (!shouldRefreshAccessToken() && !force) {
+                log.debug("Access token does not need to be refreshed yet.");
+                return;
+            }
+
             // @formatter:off
             String requestJson = JsonWriter.string()
                 .object()
@@ -260,8 +265,8 @@ public void applyToken(HttpUriRequest request) {
             try {
                 refreshAccessToken(false);
             } catch (Throwable t) {
-                if (fetchErrorLogCount++ <= 3) {
-                    // log fetch errors up to 3 times to avoid spamming logs. in theory requests can still be made
+                if (++fetchErrorLogCount <= 3) {
+                    // log fetch errors up to 3 consecutive times to avoid spamming logs. in theory requests can still be made
                     // without an access token, but they are less likely to succeed. regardless, we shouldn't bloat a
                     // user's logs just in case YT changed something and broke oauth integration.
                     log.error("Refreshing YouTube access token failed", t);
@@ -273,6 +278,8 @@ public void applyToken(HttpUriRequest request) {
                 tokenExpires = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(15);
                 return;
             }
+
+            fetchErrorLogCount = 0;
         }
 
         // check again to ensure updating worked as expected.

diff --git a/plugin/src/main/java/dev/lavalink/youtube/plugin/YoutubeRestHandler.java b/plugin/src/main/java/dev/lavalink/youtube/plugin/YoutubeRestHandler.java
@@ -38,7 +38,7 @@ public Map<String, String> getYoutubeConfig() {
 
     @PostMapping("/v4/youtube")
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void updateRefreshToken(@RequestBody YoutubeOauthConfig config) {
+    public void updateOauth(@RequestBody YoutubeOauthConfig config) {
         YoutubeAudioSourceManager source = playerManager.source(YoutubeAudioSourceManager.class);
 
         if (source == null) {
@@ -48,4 +48,6 @@ public void updateRefreshToken(@RequestBody YoutubeOauthConfig config) {
         source.useOauth2(config.getRefreshToken(), config.getSkipInitialization());
         log.debug("Updated YouTube OAuth2 refresh token to {}", config.getRefreshToken());
     }
+
+
 }