Added proxy settings for VK Music & fixed minor inaccuracies in README.md (#308)

Author: Krispeckt

README.md

@@ -175,6 +175,10 @@ plugins:
       playlistLoadLimit: 1 # The number of pages at 50 tracks each
       artistLoadLimit: 1 # The number of pages at 10 tracks each
       recommendationsLoadLimit: 10 # Number of tracks
+#      proxy: # If the server with the plugin is located outside of Russia, you must configure a proxy located in Russia to bypass regional restrictions.
+#        url: "https://example.org" # The HTTP proxy to use
+#        username: "my-bot" # Optional username to authenticate with the proxy
+#        password: "youshallpass" # Optional password to authenticate with the proxy
     tidal:
       countryCode: "US" # the country code for accessing region-specific content on Tidal (ISO 3166-1 alpha-2).
       searchLimit: 6 # How many search results should be returned
@@ -733,7 +737,9 @@ playerManager.registerSourceManager(new FloweryTTSSourceManager("..."));
 AudioPlayerManager playerManager = new DefaultAudioPlayerManager();
 
 // create a new VkMusicSourceManager with the user token and register it
-playerManager.registerSourceManager(new VkMusicSourceManager("...");
+var vkMusic = new VkMusicSourceManager("...");
+
+playerManager.registerSourceManager(vkMusic);
 ```
 
 #### LavaLyrics
@@ -746,7 +752,7 @@ playerManager.registerSourceManager(new VkMusicSourceManager("...");
 var lyricsManager = new LyricsManager();
 
 // register source
-lyricsManager.registerLyricsManager(vkmusic);
+lyricsManager.registerLyricsManager(vkMusic);
 ```
 
 </details>
@@ -761,7 +767,7 @@ lyricsManager.registerLyricsManager(vkmusic);
 var searchManager = new SearchManager();
 
 // register source
-searchManager.registerSearchManager(vkmusic);
+searchManager.registerSearchManager(vkMusic);
 ```
 
 </details>

application.example.yml

@@ -76,6 +76,10 @@ plugins:
       playlistLoadLimit: 1 # The number of pages at 50 tracks each
       artistLoadLimit: 1 # The number of pages at 10 tracks each
       recommendationsLoadLimit: 10 # Number of tracks
+#      proxy: # If the server with the plugin is located outside of Russia, you must configure a proxy located in Russia to bypass regional restrictions.
+#        url: "https://example.org" # The HTTP proxy to use
+#        username: "my-bot" # Optional username to authenticate with the proxy
+#        password: "youshallpass" # Optional password to authenticate with the proxy
     tidal:
       countryCode: "US" # the country code for accessing region-specific content on Tidal (ISO 3166-1 alpha-2).
       searchLimit: 6 # How many search results should be returned

main/src/main/java/com/github/topi314/lavasrc/vkmusic/VkMusicAudioTrack.java

@@ -35,18 +35,23 @@ public void process(LocalAudioTrackExecutor executor) throws Exception {
 	}
 
 	public URI getMp3TrackUri() throws URISyntaxException, IOException {
-		var id = this.trackInfo.identifier;
-		var json = this.sourceManager.getJson("audio.getById", "&audios=" + id)
+		String id = trackInfo.identifier;
+
+		var response = sourceManager
+			.getJson("audio.getById", "&audios=" + id)
 			.get("response");
-		if (
-			json.isNull()
-				|| json.values().isEmpty()
-				|| json.values().get(0).get("url").isNull()
-		) {
+
+		if (response == null || response.isNull() || response.values().isEmpty()) {
+			throw new IllegalStateException("Empty response for track " + id);
+		}
+
+		var url = response.values().get(0).get("url");
+
+		if (url == null || url.text().isEmpty()) {
 			throw new IllegalStateException("No download url found for track " + id);
 		}
 
-		return new URI(json.values().get(0).get("url").text());
+		return new URI(url.text());
 	}
 
 	@Override

main/src/main/java/com/github/topi314/lavasrc/vkmusic/VkMusicSourceManager.java

@@ -400,11 +400,16 @@ private AudioItem getTrack(String id) throws IOException {
 		if (json.isNull() || json.get("response").isNull()) {
 			return AudioReference.NO_TRACK;
 		}
-		return this.parseTrack(json.get("response").values().get(0));
+
+		var track = this.parseTrack(json.get("response").values().get(0));
+		if (track == null) {
+			return AudioReference.NO_TRACK;
+		}
+		return track;
 	}
 
 	private AudioItem getArtist(String id) throws IOException {
-		var json = this.getJson("audio.getAudiosByArtist", "&artist_id=" + id + "&count" + artistLoadLimit * 20);
+		var json = this.getJson("audio.getAudiosByArtist", "&artist_id=" + id + "&count=" + artistLoadLimit * 20);
 		if (json.isNull() || json.get("response").values().isEmpty()) {
 			return AudioReference.NO_TRACK;
 		}
@@ -453,7 +458,7 @@ private List<AudioTrack> parseTracks(JsonBrowser json) {
 
 	private AudioTrack parseTrack(JsonBrowser json) {
 		try {
-			if (json.get("url").isNull()) {
+			if (json.get("url").isNull() || json.get("url").text().isEmpty()) {
 				return null;
 			}
 			String coverUri = null;
@@ -537,4 +542,4 @@ public void shutdown() {
 	public HttpInterface getHttpInterface() {
 		return this.httpInterfaceManager.getInterface();
 	}
-}
+}

plugin/src/main/java/com/github/topi314/lavasrc/plugin/LavaSrcPlugin.java

@@ -146,6 +146,8 @@ public LavaSrcPlugin(
 		}
 		if (sourcesConfig.isVkMusic() || lyricsSourcesConfig.isVkMusic()) {
 			this.vkMusic = new VkMusicSourceManager(vkMusicConfig.getUserToken());
+			proxyConfigurationService.configure(this.vkMusic, vkMusicConfig.getProxy());
+
 			if (vkMusicConfig.getPlaylistLoadLimit() > 0) {
 				vkMusic.setPlaylistLoadLimit(vkMusicConfig.getPlaylistLoadLimit());
 			}

plugin/src/main/java/com/github/topi314/lavasrc/plugin/config/VkMusicConfig.java

@@ -1,17 +1,31 @@
 package com.github.topi314.lavasrc.plugin.config;
 
+import org.jetbrains.annotations.Nullable;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 @ConfigurationProperties(prefix = "plugins.lavasrc.vkmusic")
 @Component
 public class VkMusicConfig {
 
+	@Nullable
+	private HttpProxyConfig proxy;
+
 	private String userToken;
 	private int playlistLoadLimit = 1;
 	private int artistLoadLimit = 1;
 	private int recommendationLoadLimit = 1;
 
+	@Nullable
+	public HttpProxyConfig getProxy() {
+		return this.proxy;
+	}
+
+	@SuppressWarnings("unused")
+	public void setProxy(@Nullable HttpProxyConfig proxy) {
+		this.proxy = proxy;
+	}
+
 	public String getUserToken() {
 		return this.userToken;
 	}