Initialise sts with script.

Author: devoxin

common/src/main/java/dev/lavalink/youtube/cipher/CipherManager.java

@@ -48,7 +48,7 @@ default CachedPlayerScript getPlayerScript(@NotNull HttpInterface httpInterface)
                     throw new ExceptionWithResponseBody("no jsUrl found", responseText);
                 }
 
-                return new CachedPlayerScript(scriptUrl);
+                return new CachedPlayerScript(scriptUrl, getTimestamp(httpInterface, scriptUrl));
             } catch (IOException e) {
                 throw ExceptionTools.toRuntimeException(e);
             }
@@ -57,10 +57,12 @@ default CachedPlayerScript getPlayerScript(@NotNull HttpInterface httpInterface)
 
     class CachedPlayerScript {
         public final String url;
+        public final String signatureTimestamp;
         public final long expireTimestampMs;
 
-        protected CachedPlayerScript(@NotNull String url) {
+        protected CachedPlayerScript(@NotNull String url, @NotNull String signatureTimestamp) {
             this.url = url;
+            this.signatureTimestamp = signatureTimestamp;
             this.expireTimestampMs = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);
         }
     }

common/src/main/java/dev/lavalink/youtube/cipher/LocalSignatureCipherManager.java

@@ -265,6 +265,7 @@ public String getTimestamp(HttpInterface httpInterface, String sourceUrl) throws
                     throw new IOException("Received non-success response code " + statusCode + " from script url " +
                         sourceUrl + " ( " + CipherUtils.parseTokenScriptUrl(sourceUrl) + " )");
                 }
+
                 return getScriptTimestamp(httpInterface, EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8), sourceUrl);
             }
         }

common/src/main/java/dev/lavalink/youtube/cipher/RemoteCipherManager.java

@@ -95,37 +95,32 @@ public CachedPlayerScript getCachedPlayerScript(@NotNull HttpInterface httpInter
 
     public String getTimestamp(HttpInterface httpInterface, String sourceUrl) throws IOException {
         synchronized (this) {
-            log.debug("Timestamp from script {}", sourceUrl);
-            return getTimestampFromScript(httpInterface, sourceUrl);
-        }
-    }
+            HttpPost request = new HttpPost(getRemoteEndpoint("get_sts"));
 
-    private String getRemoteEndpoint(String path) {
-        return remoteUrl.endsWith("/") ? remoteUrl + path : remoteUrl + "/" + path;
-    }
+            log.debug("Getting timestamp for script: {}", sourceUrl);
 
-    private String getTimestampFromScript(HttpInterface httpInterface, String playerScript) throws IOException {
-        HttpPost request = new HttpPost(getRemoteEndpoint("get_sts"));
+            String requestBody = JsonWriter.string()
+                .object()
+                .value("player_url", sourceUrl)
+                .end()
+                .done();
+            request.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON));
 
-        log.debug("Getting timestamp for script: {}", playerScript);
+            try (CloseableHttpResponse response = configureHttpInterface(httpInterface).execute(request)) {
+                String responseBody = validateAndGetResponseBody(response);
 
-        String requestBody = JsonWriter.string()
-            .object()
-            .value("player_url", playerScript)
-            .end()
-            .done();
-        request.setEntity(new StringEntity(requestBody, ContentType.APPLICATION_JSON));
+                log.debug("Received response from remote cipher service: {}", responseBody);
 
-        try (CloseableHttpResponse response = configureHttpInterface(httpInterface).execute(request)) {
-            String responseBody = validateAndGetResponseBody(response);
-
-            log.debug("Received response from remote cipher service: {}", responseBody);
-
-            JsonBrowser json = JsonBrowser.parse(responseBody);
-            return json.get("sts").text();
+                JsonBrowser json = JsonBrowser.parse(responseBody);
+                return json.get("sts").text();
+            }
         }
     }
 
+    private String getRemoteEndpoint(String path) {
+        return remoteUrl.endsWith("/") ? remoteUrl + path : remoteUrl + "/" + path;
+    }
+
     public HttpInterface configureHttpInterface(HttpInterface httpInterface) {
         httpInterface.getContext().setAttribute(YoutubeHttpContextFilter.ATTRIBUTE_CIPHER_REQUEST_SPECIFIED, true);
         return httpInterface;

common/src/main/java/dev/lavalink/youtube/clients/skeleton/NonMusicClient.java

@@ -125,10 +125,11 @@ protected JsonBrowser loadTrackInfoFromInnertube(@NotNull YoutubeAudioSourceMana
         }
 
         String payload = config.setAttributes(httpInterface).toJsonString();
+
         if (requirePlayerScript()) {
             CachedPlayerScript playerScript = cipherManager.getCachedPlayerScript(httpInterface);
-            String timestamp = cipherManager.getTimestamp(httpInterface, playerScript.url);
-            payload = config.withPlaybackSignatureTimestamp(timestamp)
+
+            payload = config.withPlaybackSignatureTimestamp(playerScript.signatureTimestamp)
                     .setAttributes(httpInterface)
                     .toJsonString();
         }