Tidal & Jiosaavn , Advanced mirroring #247

WeeeeeeeeeeS · 2025-01-04T13:30:42Z

Added Two New Platforms

Tidal (mirrored) used Nansess implementation
Jiosvaan (playback):
Proxied Jiosvaan api is implemented by @WeeeeeeeeeeS

Proxy support

Added a ProxyManager to handle multiple proxies. (A method to avoid using specific failing proxies is not yet implemented)
Proxy Manager is implemented by @topi314 & @WeeeeeeeeeeS
Added proxy support to Deezer & JioSaavn (ProxyManager is easy to set up for every source, but each source has a unique implementation)

Advanced mirroring

Added advanced string mirroring, which is useful for platforms that don't support isrc. This method compares the title, author name, and duration for better search results.
(By using this there's no need for YouTube in mirroring. You can use Deezer or other platforms, and fallback to YouTube only if no matches are found)_

(Yes, the branch's name is spelled incorrectly)

…ioTrackResolver & issue fixed in Deezer/Savaan when not using proxies removed newer java syntax to make compiler happy made StringCompareMirroringAudioTrackResolver easier to change/maintain rewrote StringCompareMirroringAudioTrackResolver Refactored SaavnAudioSourceManager & used proxymanager added proxy manager & applied it to deezer tidal, savaan, proxy support,

Fixed DefaultMirroringAudioTrackResolver and made it more readable

…dio manager

fixed a typo

topi314 · 2025-01-15T16:15:54Z

Jiosvaan (playback):
For external api: used appujet apiurl implementation
Proxied Jiosvaan api is implemented by @WeeeeeeeeeeS (inspired by appujet's external api) & web debugging tools;)

I am not a fan of having to run a very specific service just to get Jiosvaan to work
it should just be lavalink and at most a generic http proxy

topi314 · 2025-01-18T15:20:32Z

plugin/build.gradle.kts

@@ -22,8 +22,10 @@ dependencies {
 	compileOnly("com.github.topi314.lavasearch:lavasearch:1.0.0")
 	implementation("com.github.topi314.lavasearch:lavasearch-plugin-api:1.0.0")
 	implementation("com.github.topi314.lavalyrics:lavalyrics-plugin-api:1.0.0")
+    implementation("me.xdrop:fuzzywuzzy:1.4.0")


indentation, a .editorconfig exists for a reason

I didn't understand this. How can it be adjusted?

I have no idea what editor you use, but ideally it would respect this file
https://github.com/topi314/LavaSrc/blob/master/.editorconfig

i use intellij ultimate, and it looks like it didn't respect it

README.md

topi314 · 2025-01-18T15:24:41Z

README.md

+      enabled: false # Whether to enable the advanced mirroring feature
+      titleThreshold: 50 # The threshold for the title match (50 is the most optimal)
+      authorThreshold: 70 # The threshold for the author match (70 is the most optimal)
+      totalMatchThreshold: 196 # The threshold for the total match (196 is the most optimal)
+      skipSoundCloudGo: true # Whether to skip the SoundCloud Go tracks (preview tracks)
+      levelOnePenalty: 1 # The penalty for the first level
+      levelTwoPenalty: 2 # The penalty for the second level
+      levelThreePenalty: 0.8 # The penalty for the third level
+      sources: # The sources to use for the advanced mirroring
+        - jssearch


this config is a mess tbh. this should be restructured

Changed to be optional; advanced users can still add these if they want

providers: # Custom providers for track loading. This is the default # - "dzisrc:%ISRC%" # Deezer ISRC provider # - "dzsearch:%QUERY%" # Deezer search provider # - 'jssearch:%QUERY%' # JioSaavn search provider (recommended to use with advanced mirroring & search proxies) - "ytsearch:\"%ISRC%\"" # Will be ignored if track does not have an ISRC. See https://en.wikipedia.org/wiki/International_Standard_Recording_Code - "ytsearch:%QUERY%" # Will be used if track has no ISRC or no track could be found for the ISRC # you can add multiple other fallback sources here #advancedmirroring: # A custom resolver that will be used for regular QUERY searches, and get you the best results from the sources you provide (Recommended for use with bad search platforms) #sources: # The sources to use for the advanced mirroring # - jssearch # JioSaavn search source # skipSoundCloudGo: true # Whether to skip the SoundCloud Go tracks (preview tracks) (optional) # You can also set the threshold for the title, author & total match (titleThreshold, authorThreshold (1 - 100), totalMatchThreshold (1 - 300)) (optional) # levelOnePenalty: 1, levelTwoPenalty: 2, levelThreePenalty: 0.8 # Penalties for the first, second, and third levels (optional)

README.md

topi314 · 2025-01-18T15:32:34Z

main/src/main/java/com/github/topi314/lavasrc/mirror/DefaultMirroringAudioTrackResolver.java

@@ -10,6 +10,8 @@

 public class DefaultMirroringAudioTrackResolver implements MirroringAudioTrackResolver {

+	private StringCompareMirroringAudioTrackResolver advancedResolver;


don't touch the DefaultMirroringAudioTrackResolver.java
just create a new class with the new resolver

Updated, now StringCompareMirroringAudioTrackResolver got the functionality of DefaultMirroringAudioTrackResolver with the string calculation

main/src/main/java/com/github/topi314/lavasrc/proxy/ProxyConfig.java

topi314 · 2025-01-18T15:34:26Z

main/src/main/java/com/github/topi314/lavasrc/proxy/ProxyManager.java

+import java.util.function.Function;
+
+
+public class ProxyManager {


can't this be an implementation of the HttpInterfaceManager interface?

main/src/main/java/com/github/topi314/lavasrc/saavn/SaavnAudioSourceManager.java

topi314 · 2025-01-18T15:39:39Z

main/src/main/java/com/github/topi314/lavasrc/saavn/SaavnAudioTrack.java

+	private final SaavnAudioSourceManager sourceManager;
+	private static final String ALGORITHM = "DES";
+	private static final String TRANSFORMATION = "DES/ECB/PKCS5Padding";
+	private static final String SECRET_KEY = "38346591";


I don't think I want this secret in my repo

You can use this api endpoint to do the same stuff without keeping the secret.

import httpx from typing import Final, Dict, Any from rich import print url: Final[str] = "https://www.jiosaavn.com/api.php" params: Dict[str, Any] = { "__call": "song.generateAuthToken", "url": "iPPGVzyogeiPwpro65A0eUaQggN+8+J4iDtmEk3uit8d0jqF5NCeUjs9dz6L27C23x77SeY9M6473Jd7+DUPjoPzFaL/aK97", # encrypted_media_url "bitrate": 320, "api_version": 4, "_format": "json", "ctx": "web6dot0", "_marker": 0, } client = httpx.Client() resp = client.get(url, params=params) print(resp.json())

Response

{ 'auth_url': 'https://ac.cf.saavncdn.com/241/d8045f2d787adacdb17533acacd8b298_320.mp4?Expires=1738152371&Signature=PVjJu~qnCey3A~WQw~-l~-GFmuIUZVu65iXZaJW1DBtzGWabkUDS6Daj7MyFnW1THOF8oBanQ4~3-8c81kLFLj41Hpj36GcetR6nzk1EyplYaRLg89bO5-ID5vb8yuo76WFdKZ7oSxD18K8XZ4qPXGRd9cYn7v2JRurw7MWOdg6HNSGFFRBppNpkNT8lp11IZNZ35~TaaTUJA4PWd7um4gEIWykH8o0BDGpkdhY6miMKhvNDKRMx7xlmzxVbvX-~tbwVWsYMWVhNxPXT2Jxqa1km7HuA4prhan-2q7mJmtJiT268uR7YvWYzUzdQmeIODNYEtO-MgySeUwiJNicTCg__&Key-Pair-Id=APKAJB334VX63D3WJ5ZQ', 'type': 'mp4', 'status': 'success' }

I'll give this a look, after i finish rewriting the Proxy system & config stuff
https://discord.com/channels/1082302532421943407/1114604784880734359/1332011810802630778

...rc/main/java/com/github/topi314/lavasrc/mirror/StringCompareMirroringAudioTrackResolver.java

…nnecessary configurations for regular users, and kept the functionality for more advanced users

…more sense

…ager change

WeeeeeeeeeeS and others added 16 commits January 2, 2025 15:35

Used Nansess tidal implementation

b05dfd8

Used Nansess tidal implementation

a811daa

Added "useLocalNetwork" as a proxy option.

bd58425

Fixed DefaultMirroringAudioTrackResolver and made it more readable

Made saavn use localnetwork for playback

800f308

Used fuzzywuzzy:1.4.0

f49e5ff

added TidalToken option & changed application.example.yml

ba952cc

updated application.example.yml

f51e2f2

Updated ReadMe.md & added more constructors to ProxyConfig & Saavn au…

4ef9c2b

…dio manager

Updated Readme.md

2c83c1b

Updated Readme.md

38bb861

if it works don't touch it? Fixed Saavn

5a7cfd1

Added tidal recommendations

37c14c3

Fixed deezer null exception when not using proxies

be58db1

Update application.example.yml

2bc7ee6

fixed a typo

updated apiurl search endpoint in jiosaavn

9b97a9c

topi314 requested changes Jan 18, 2025

View reviewed changes

rewrote StringCompareMirroringAudioTrackResolver

6f65617

topi314 reviewed Jan 18, 2025

View reviewed changes

...rc/main/java/com/github/topi314/lavasrc/mirror/StringCompareMirroringAudioTrackResolver.java Outdated Show resolved Hide resolved

WeeeeeeeeeeS added 10 commits January 19, 2025 12:08

changed the configurations to make them more logical, commented out u…

8b6bc51

…nnecessary configurations for regular users, and kept the functionality for more advanced users

changed Saavn to JioSaavn

e22175d

ProxyManager now implements HttpInterfaceManager, now debugging make …

1ad32e1

…more sense

changed Deezer & jiosaavn to take ProxyManager instead of configs

2c783cc

changed Deezer & jiosaavn to take ProxyManager instead of configs

ac3e29d

updated README.md & application.example.yml to match the new Proxyman…

da80949

…ager change

added an example of how to use ProxyConfig

78561ed

Updated JioSaavn jsrec README.md

87bf40e

updated tidal http link to https

e057b03

removed secret key

5909ed0

WeeeeeeeeeeS added 2 commits January 23, 2025 13:23

replaced apiUrl with a generic proxy (even easier to self host)

e0c2f08

Removed old apiUrl in README.md

00909a4

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tidal & Jiosaavn , Advanced mirroring #247

Tidal & Jiosaavn , Advanced mirroring #247

WeeeeeeeeeeS commented Jan 4, 2025 •

edited

Loading

topi314 commented Jan 15, 2025 •

edited

Loading

topi314 Jan 18, 2025

WeeeeeeeeeeS Jan 19, 2025

topi314 Jan 20, 2025

WeeeeeeeeeeS Jan 21, 2025

topi314 Jan 18, 2025

WeeeeeeeeeeS Jan 19, 2025

topi314 Jan 18, 2025

WeeeeeeeeeeS Jan 19, 2025

topi314 Jan 18, 2025

WeeeeeeeeeeS Jan 19, 2025

topi314 Jan 18, 2025

WeeeeeeeeeeS Jan 21, 2025

munishkhatri720 Jan 29, 2025

WeeeeeeeeeeS Jan 30, 2025

		@@ -10,6 +10,8 @@

		public class DefaultMirroringAudioTrackResolver implements MirroringAudioTrackResolver {

		private StringCompareMirroringAudioTrackResolver advancedResolver;

		import java.util.function.Function;


		public class ProxyManager {

Tidal & Jiosaavn , Advanced mirroring #247

Are you sure you want to change the base?

Tidal & Jiosaavn , Advanced mirroring #247

Conversation

WeeeeeeeeeeS commented Jan 4, 2025 • edited Loading

Added Two New Platforms

Proxy support

Advanced mirroring

topi314 commented Jan 15, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Response

Choose a reason for hiding this comment

WeeeeeeeeeeS commented Jan 4, 2025 •

edited

Loading

topi314 commented Jan 15, 2025 •

edited

Loading