lavalink-client 2.4.7 → 2.5.1

package/README.md

@@ -819,3 +819,27 @@ if(previousTrack) {
   - remove structuredClone so that it works in bun more stable
   - Player Options Validation also allows single property objects
   - Some typos were fixed
+
+
+
+## **Version 2.5.0**
+- Deps got updated
+- Handling of parsing url got updated to use the URL object
+- Flowerytts requests needs to be changed now:
+
+```js
+const query = "Hello World How are you?";
+const voice = "Ava";
+const speed = "1.0";
+
+const fttsParams = new URLSearchParams();
+if(voice) fttsParams.append("voice", voice);
+if(speed) fttsParams.append("speed", speed);
+
+const response = await player.search({
+    // For flowerytts you need to send a URL
+    // and if you want to add optiojns, this is how you add the params to the query..
+    query: `${encodeURI(query)}${fttsParams.size ? `?${fttsParams.toString()}` : ""}`,
+    source: "ftts"
+}, interaction.user);
+```

package/dist/cjs/structures/CustomSearches/BandCampSearch.js

@@ -8,7 +8,9 @@ const bandCampSearch = async (player, query, requestUser) => {
         console.log(`Lavalink-Client-Debug | SEARCHING | - ${query} on lavalink-client`);
     player.LavalinkManager.utils.validateQueryString(player.node, query);
     try {
-        const data = await fetch(`https://bandcamp.com/api/nusearch/2/autocomplete?q=${encodeURIComponent(query)}`, {
+        const requestUrl = new URL("https://bandcamp.com/api/nusearch/2/autocomplete");
+        requestUrl.searchParams.append("q", query);
+        const data = await fetch(requestUrl.toString(), {
             headers: {
                 'User-Agent': 'android-async-http/1.4.1 (http://loopj.com/android-async-http)',
                 'Cookie': '$Version=1'

package/dist/cjs/structures/LavalinkManager.js

@@ -495,7 +495,7 @@ class LavalinkManager extends events_1.EventEmitter {
                         functionLayer: "LavalinkManager > sendRawData()",
                     });
                     if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Sent updatePlayer for voice token session", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, playerVoice: player.voice, update });
+                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing sessionId", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, update, playerVoice: player.voice });
                 }
                 else {
                     await player.node.updatePlayer({
@@ -505,8 +505,8 @@ class LavalinkManager extends events_1.EventEmitter {
                                 token: update.token,
                                 endpoint: update.endpoint,
                                 sessionId: sessionId2Use,
-                            }
-                        }
+                            },
+                        },
                     });
                     if (this.options?.advancedOptions?.enableDebugEvents) {
                         this.emit("debug", Constants_1.DebugEvents.NoAudioDebug, {
@@ -516,7 +516,7 @@ class LavalinkManager extends events_1.EventEmitter {
                         });
                     }
                     if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing sessionId", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, } });
+                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Sent updatePlayer for voice token session", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, playerVoice: player.voice, update });
                 }
                 return;
             }

package/dist/cjs/structures/LavalinkManagerStatics.js

@@ -39,11 +39,24 @@ exports.DefaultSources = {
     "dz": "dzsearch",
     "dzsearch": "dzsearch",
     "dzisrc": "dzisrc",
+    "dzrec": "dzrec",
     // yandexmusic
     "yandex music": "ymsearch",
     "yandexmusic": "ymsearch",
     "yandex": "ymsearch",
     "ymsearch": "ymsearch",
+    "ymrec": "ymrec",
+    // VK Music (lavasrc)
+    "vksearch": "vksearch",
+    "vkmusic": "vksearch",
+    "vk music": "vksearch",
+    "vkrec": "vkrec",
+    "vk": "vksearch",
+    // Qobuz (lavasrc)
+    "qbsearch": "qbsearch",
+    "qobuz": "qbsearch",
+    "qbisrc": "qbisrc",
+    "qbrec": "qbrec",
     // speak PLUGIN
     "speak": "speak",
     "tts": "tts",
@@ -66,6 +79,12 @@ exports.DefaultSources = {
     "https": "https",
     "link": "link",
     "uri": "uri",
+    // tidal
+    "tidal": "tdsearch",
+    "td": "tdsearch",
+    "tidal music": "tdsearch",
+    "tdsearch": "tdsearch",
+    "tdrec": "tdrec",
     // jiosaavn
     "jiosaavn": "jssearch",
     "js": "jssearch",
@@ -118,6 +137,8 @@ exports.SourceLinksRegexes = {
     SpotifyAlbumRegex: /(https?:\/\/)(www\.)?open\.spotify\.com\/((?<region>[a-zA-Z-]+)\/)?(user\/(?<user>[a-zA-Z0-9-_]+)\/)?album\/(?<identifier>[a-zA-Z0-9-_]+)/,
     AllSpotifyRegex: /(https?:\/\/)(www\.)?open\.spotify\.com\/((?<region>[a-zA-Z-]+)\/)?(user\/(?<user>[a-zA-Z0-9-_]+)\/)?(?<type>track|album|playlist|artist|episode|show)\/(?<identifier>[a-zA-Z0-9-_]+)/,
     appleMusic: /https?:\/\/?(?:www\.)?music\.apple\.com\/(\S+)/,
+    /** From tidal */
+    tidal: /https?:\/\/?(?:www\.)?(?:tidal|listen)\.tidal\.com\/(?<type>track|album|playlist|artist)\/(?<identifier>[a-zA-Z0-9-_]+)/,
     /** From jiosaavn-plugin */
     jiosaavn: /(https?:\/\/)(www\.)?jiosaavn\.com\/(?<type>song|album|featured|artist)\/([a-zA-Z0-9-_\/,]+)/,
     /** FROM DUNCTE BOT PLUGIN */

package/dist/cjs/structures/Node.d.ts

@@ -53,18 +53,6 @@ export declare class LavalinkNode {
      * ```
      */
     constructor(options: LavalinkNodeOptions, manager: NodeManager);
-    /**
-     * Parse url params correctly for lavalink requests, including support for urls and uris.
-     * @param url input url object
-     * @param extraQueryUrlParams UrlSearchParams to use in a encodedURI, useful for example for flowertts
-     * @returns the url as a valid string
-     *
-     * @example
-     * ```ts
-     * player.node.getRequestingUrl(new URL(`http://localhost:2333/v4/loadtracks?identifier=Never gonna give you up`));
-     * ```
-     */
-    private getRequestingUrl;
     /**
      * Raw Request util function
      * @param endpoint endpoint string

package/dist/cjs/structures/Node.js

@@ -91,32 +91,6 @@ class LavalinkNode {
         this.options.regions = (this.options.regions || []).map(a => a.toLowerCase());
         Object.defineProperty(this, Utils_1.NodeSymbol, { configurable: true, value: true });
     }
-    /**
-     * Parse url params correctly for lavalink requests, including support for urls and uris.
-     * @param url input url object
-     * @param extraQueryUrlParams UrlSearchParams to use in a encodedURI, useful for example for flowertts
-     * @returns the url as a valid string
-     *
-     * @example
-     * ```ts
-     * player.node.getRequestingUrl(new URL(`http://localhost:2333/v4/loadtracks?identifier=Never gonna give you up`));
-     * ```
-     */
-    getRequestingUrl(url, extraQueryUrlParams) {
-        if (!url.searchParams.size)
-            return `${url.origin}${url.pathname}`;
-        const keysToAdd = [];
-        for (const [paramKey, paramValue] of url.searchParams.entries()) {
-            const decoded = decodeURIComponent(paramValue).trim(); // double decoding, once internally, a second time if decoded by provided user.
-            if (decoded.includes("://") && !/^https?:\/\//.test(decoded)) { // uri, but not url.
-                const [key, ...values] = decoded.split("://");
-                keysToAdd.push(`${paramKey}=${encodeURI(`${key}://${encodeURIComponent(values.join("://"))}${extraQueryUrlParams && extraQueryUrlParams?.size > 0 ? `?${extraQueryUrlParams.toString()}` : ""}`)}`);
-                continue;
-            }
-            keysToAdd.push(`${paramKey}=${encodeURIComponent(decoded)}`);
-        }
-        return `${url.origin}${url.pathname}?${keysToAdd.join("&")}`;
-    }
     /**
      * Raw Request util function
      * @param endpoint endpoint string
@@ -131,7 +105,7 @@ class LavalinkNode {
      */
     async rawRequest(endpoint, modify) {
         const options = {
-            path: `/${this.version}/${endpoint.replace(/^\//gm, "")}`,
+            path: `/${this.version}/${endpoint.startsWith("/") ? endpoint.slice(1) : endpoint}`,
             method: "GET",
             headers: {
                 "Authorization": this.options.authorization
@@ -141,7 +115,12 @@ class LavalinkNode {
         modify?.(options);
         const url = new URL(`${this.restAddress}${options.path}`);
         url.searchParams.append("trace", "true");
-        const urlToUse = this.getRequestingUrl(url, options?.extraQueryUrlParams);
+        if (options.extraQueryUrlParams && options.extraQueryUrlParams?.size > 0) {
+            for (const [paramKey, paramValue] of options.extraQueryUrlParams.entries()) {
+                url.searchParams.append(paramKey, paramValue);
+            }
+        }
+        const urlToUse = url.toString();
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { path, extraQueryUrlParams, ...fetchOptions } = options; // destructure fetch only options
         const response = await fetch(urlToUse, fetchOptions);
@@ -180,20 +159,17 @@ class LavalinkNode {
         if (["bcsearch", "bandcamp"].includes(Query.source) && !this.info.sourceManagers.includes("bandcamp")) {
             throw new Error("Bandcamp Search only works on the player (lavaplayer version < 2.2.0!");
         }
-        let uri = `/loadtracks?identifier=`;
+        const requestUrl = new URL(`${this.restAddress}/loadtracks`);
         if (/^https?:\/\//.test(Query.query) || ["http", "https", "link", "uri"].includes(Query.source)) { // if it's a link simply encode it
-            const url = encodeURIComponent(Query.query);
-            uri += url;
+            requestUrl.searchParams.append("identifier", Query.query);
         }
         else { // if not make a query out of it
-            if (Query.source !== "local")
-                uri += `${Query.source}:`; // only add the query source string if it's not a local track
-            if (Query.source === "ftts")
-                uri += `//${encodeURIComponent(Query.query)}`;
-            else
-                uri += encodeURIComponent(Query.query);
+            const fttsPrefix = Query.source === "ftts" ? "//" : "";
+            const prefix = Query.source !== "local" ? `${Query.source}:${fttsPrefix}` : "";
+            requestUrl.searchParams.append("identifier", `${prefix}${Query.query}`);
         }
-        const res = await this.request(uri, (options) => {
+        const requestPathAndSearch = requestUrl.pathname + requestUrl.search;
+        const res = await this.request(requestPathAndSearch, (options) => {
             if (typeof query === "object" && typeof query.extraQueryUrlParams?.size === "number" && query.extraQueryUrlParams?.size > 0) {
                 options.extraQueryUrlParams = query.extraQueryUrlParams;
             }
@@ -221,7 +197,7 @@ class LavalinkNode {
                 thumbnail: (res.data.info?.artworkUrl) || (res.data.pluginInfo?.artworkUrl) || ((typeof res.data?.info?.selectedTrack !== "number" || res.data?.info?.selectedTrack === -1) ? null : resTracks[res.data?.info?.selectedTrack] ? (resTracks[res.data?.info?.selectedTrack]?.info?.artworkUrl || resTracks[res.data?.info?.selectedTrack]?.info?.pluginInfo?.artworkUrl) : null) || null,
                 uri: res.data.info?.url || res.data.info?.uri || res.data.info?.link || res.data.pluginInfo?.url || res.data.pluginInfo?.uri || res.data.pluginInfo?.link || null,
                 selectedTrack: typeof res.data?.info?.selectedTrack !== "number" || res.data?.info?.selectedTrack === -1 ? null : resTracks[res.data?.info?.selectedTrack] ? this.NodeManager.LavalinkManager.utils.buildTrack(resTracks[res.data?.info?.selectedTrack], requestUser) : null,
-                duration: resTracks.length ? resTracks.reduce((acc, cur) => acc + (cur?.info?.length || 0), 0) : 0,
+                duration: resTracks.length ? resTracks.reduce((acc, cur) => acc + (cur?.info?.duration || cur?.info?.length || 0), 0) : 0,
             } : null,
             tracks: (resTracks.length ? resTracks.map(t => this.NodeManager.LavalinkManager.utils.buildTrack(t, requestUser)) : [])
         };
@@ -1090,7 +1066,7 @@ class LavalinkNode {
                     player.ping.ws = payload.state.ping >= 0 ? payload.state.ping : player.ping.ws <= 0 && player.connected ? null : player.ping.ws || 0;
                     if (!player.createdTimeStamp && payload.state.time)
                         player.createdTimeStamp = payload.state.time;
-                    if (player.filterManager.filterUpdatedState === true && ((player.queue.current?.info?.duration || 0) <= (player.LavalinkManager.options.advancedOptions.maxFilterFixDuration || 600_000) || (0, path_1.isAbsolute)(player.queue.current?.info?.uri))) {
+                    if (player.filterManager.filterUpdatedState === true && ((player.queue.current?.info?.duration || 0) <= (player.LavalinkManager.options.advancedOptions.maxFilterFixDuration || 600_000) || (player.queue.current?.info?.uri && (0, path_1.isAbsolute)(player.queue.current?.info?.uri)))) {
                         player.filterManager.filterUpdatedState = false;
                         if (this.NodeManager.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
                             this.NodeManager.LavalinkManager.emit("debug", Constants_1.DebugEvents.PlayerUpdateFilterFixApply, {
@@ -1295,8 +1271,15 @@ class LavalinkNode {
         }
         this.NodeManager.LavalinkManager.emit("trackStuck", player, track || this.getTrackOfPayload(payload), payload);
         // If there are no songs in the queue
-        if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying")))
-            return this.queueEnd(player, track || this.getTrackOfPayload(payload), payload);
+        if (!player.queue.tracks.length && (player.repeatMode === "off" || player.get("internal_stopPlaying"))) {
+            try { //Sometimes the trackStuck event triggers from the Lavalink server, but the track continues playing or resumes after. We explicitly end the track in such cases
+                await player.node.updatePlayer({ guildId: player.guildId, playerOptions: { track: { encoded: null } } }); //trackEnd -> queueEnd 
+                return;
+            }
+            catch {
+                return this.queueEnd(player, track || this.getTrackOfPayload(payload), payload);
+            }
+        }
         // remove the current track, and enqueue the next one
         await (0, Utils_1.queueTrackEnd)(player);
         // if no track available, end queue
@@ -1305,7 +1288,7 @@ class LavalinkNode {
         }
         // play track if autoSkip is true
         if (this.NodeManager.LavalinkManager.options.autoSkip && player.queue.current) {
-            player.play({ noReplace: true });
+            player.play({ track: player.queue.current, noReplace: false }); // Replace the stuck track with the new track.
         }
         return;
     }
@@ -1336,22 +1319,22 @@ class LavalinkNode {
         return;
     }
     /** @private util function for handling SponsorBlock Segmentloaded event */
-    async SponsorBlockSegmentLoaded(player, track, payload) {
+    SponsorBlockSegmentLoaded(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("SegmentsLoaded", player, track || this.getTrackOfPayload(payload), payload);
         return;
     }
     /** @private util function for handling SponsorBlock SegmentSkipped event */
-    async SponsorBlockSegmentSkipped(player, track, payload) {
+    SponsorBlockSegmentSkipped(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("SegmentSkipped", player, track || this.getTrackOfPayload(payload), payload);
         return;
     }
     /** @private util function for handling SponsorBlock Chaptersloaded event */
-    async SponsorBlockChaptersLoaded(player, track, payload) {
+    SponsorBlockChaptersLoaded(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("ChaptersLoaded", player, track || this.getTrackOfPayload(payload), payload);
         return;
     }
     /** @private util function for handling SponsorBlock Chaptersstarted event */
-    async SponsorBlockChapterStarted(player, track, payload) {
+    SponsorBlockChapterStarted(player, track, payload) {
         this.NodeManager.LavalinkManager.emit("ChapterStarted", player, track || this.getTrackOfPayload(payload), payload);
         return;
     }
@@ -1477,7 +1460,8 @@ class LavalinkNode {
                 if (player.queue.current) {
                     if (payload.type === "TrackEndEvent")
                         this.NodeManager.LavalinkManager.emit("trackEnd", player, track, payload);
-                    return player.play({ noReplace: true, paused: false });
+                    if (this.NodeManager.LavalinkManager.options.autoSkip)
+                        return player.play({ noReplace: true, paused: false });
                 }
             }
             else {

package/dist/cjs/structures/Player.js

@@ -74,6 +74,9 @@ class Player {
      * @param LavalinkManager
      */
     constructor(options, LavalinkManager) {
+        if (typeof options?.customData === "object")
+            for (const [key, value] of Object.entries(options.customData))
+                this.set(key, value);
         this.options = options;
         this.filterManager = new Filters_1.FilterManager(this);
         this.LavalinkManager = LavalinkManager;
@@ -267,6 +270,8 @@ class Player {
                     delete options.clientTrack;
                 if (options && "track" in options)
                     delete options.track;
+                // get rid of the current song without shifting the queue, so that the shifting can happen inside the next .play() call when "autoSkipOnResolveError" is true
+                await (0, Utils_1.queueTrackEnd)(this, true);
                 // try to play the next track if possible
                 if (this.LavalinkManager.options?.autoSkipOnResolveError === true && this.queue.tracks[0])
                     return this.play(options);
@@ -402,6 +407,8 @@ class Player {
         const now = performance.now();
         await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { paused: true } });
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
+        // emit the event
+        this.LavalinkManager.emit("playerPaused", this, this.queue.current);
         return this;
     }
     /**
@@ -414,6 +421,8 @@ class Player {
         const now = performance.now();
         await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { paused: false } });
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
+        // emit the event
+        this.LavalinkManager.emit("playerResumed", this, this.queue.current);
         return this;
     }
     /**
@@ -679,6 +688,7 @@ class Player {
         }
         const data = this.toJSON();
         const currentTrack = this.queue.current;
+        const segments = await this.getSponsorBlock().catch(() => []);
         const voiceData = this.voice;
         if (!voiceData.endpoint ||
             !voiceData.sessionId ||
@@ -703,6 +713,33 @@ class Player {
                     }
                 });
             });
+            const hasSponsorBlock = this.node.info?.plugins?.find(v => v.name === "sponsorblock-plugin");
+            if (hasSponsorBlock) {
+                if (segments.length) {
+                    await this.setSponsorBlock(segments).catch(error => {
+                        if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                            this.LavalinkManager.emit("debug", Constants_1.DebugEvents.PlayerChangeNode, {
+                                state: "error",
+                                error: error,
+                                message: `Player > changeNode() Unable to set SponsorBlock Segments`,
+                                functionLayer: "Player > changeNode()",
+                            });
+                        }
+                    });
+                }
+                else {
+                    await this.setSponsorBlock().catch(error => {
+                        if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                            this.LavalinkManager.emit("debug", Constants_1.DebugEvents.PlayerChangeNode, {
+                                state: "error",
+                                error: error,
+                                message: `Player > changeNode() Unable to set SponsorBlock Segments`,
+                                functionLayer: "Player > changeNode()",
+                            });
+                        }
+                    });
+                }
+            }
             if (currentTrack) { // If there is a current track, send it to the new node.
                 await this.node.updatePlayer({
                     guildId: this.guildId,
@@ -716,6 +753,8 @@ class Player {
                     }
                 });
             }
+            this.paused = data.paused;
+            this.playing = data.playing;
             this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
             return this.node.id;
         }

package/dist/cjs/structures/Types/Manager.d.ts

@@ -172,6 +172,8 @@ export interface LavalinkManagerEvents {
      * @event Manager#LyricsNotFound
      */
     "LyricsNotFound": (player: Player, track: Track | UnresolvedTrack | null, payload: LyricsNotFoundEvent) => void;
+    "playerResumed": (player: Player, track: Track | UnresolvedTrack | null) => void;
+    "playerPaused": (player: Player, track: Track | UnresolvedTrack | null) => void;
 }
 /**
  * The Bot client Options needed for the manager

package/dist/cjs/structures/Types/Player.d.ts

@@ -73,6 +73,8 @@ export interface PlayerOptions {
     instaUpdateFiltersFix?: boolean;
     /** If a volume should be applied via filters instead of lavalink-volume */
     applyVolumeAsFilter?: boolean;
+    /** Custom Data for the player get/set datastorage */
+    customData?: anyObject;
 }
 export type anyObject = {
     [key: string | number]: string | number | null | anyObject;

package/dist/cjs/structures/Types/Track.d.ts

@@ -4,7 +4,7 @@ import type { Base64 } from "./Utils.js";
 /** Sourcenames provided by lavalink server */
 export type LavalinkSourceNames = "youtube" | "youtubemusic" | "soundcloud" | "bandcamp" | "twitch";
 /** Source Names provided by lava src plugin */
-export type LavalinkPlugin_LavaSrc_SourceNames = "deezer" | "spotify" | "applemusic" | "yandexmusic" | "flowery-tts";
+export type LavalinkPlugin_LavaSrc_SourceNames = "deezer" | "spotify" | "applemusic" | "yandexmusic" | "flowery-tts" | "vkmusic" | "tidal" | "qobuz";
 /** Source Names provided by jiosaavan plugin */
 export type LavalinkPlugin_JioSaavn_SourceNames = "jiosaavn";
 /** The SourceNames provided by lavalink */

package/dist/cjs/structures/Types/Utils.d.ts

@@ -11,7 +11,7 @@ export type Opaque<T, K> = T & {
 export type IntegerNumber = Opaque<number, 'Int'>;
 /** Opqaue tyep for floatnumber */
 export type FloatNumber = Opaque<number, 'Float'>;
-export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "ymsearch";
+export type LavaSrcSearchPlatformBase = "spsearch" | "sprec" | "amsearch" | "dzsearch" | "dzisrc" | "dzrec" | "ymsearch" | "ymrec" | "vksearch" | "vkrec" | "tdsearch" | "tdrec" | "qbsearch" | "qbisrc" | "qbrec";
 export type LavaSrcSearchPlatform = LavaSrcSearchPlatformBase | "ftts";
 export type JioSaavnSearchPlatform = "jssearch" | "jsrec";
 export type DuncteSearchPlatform = "speak" | "phsearch" | "pornhub" | "porn" | "tts";
@@ -20,9 +20,9 @@ export type LavalinkClientSearchPlatformResolve = "bandcamp" | "bc";
 export type LavalinkSearchPlatform = "ytsearch" | "ytmsearch" | "scsearch" | "bcsearch" | LavaSrcSearchPlatform | DuncteSearchPlatform | JioSaavnSearchPlatform | LavalinkClientSearchPlatform;
 export type ClientCustomSearchPlatformUtils = "local" | "http" | "https" | "link" | "uri";
 export type ClientSearchPlatform = ClientCustomSearchPlatformUtils | // for file/link requests
-"youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "musicyoutube" | "music youtube" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "musicapple" | "music apple" | "sp" | "spsuggestion" | "spotify" | "spotify.com" | "spotifycom" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic" | "flowerytts" | "flowery" | "flowery.tts" | LavalinkClientSearchPlatformResolve | LavalinkClientSearchPlatform | "js" | "jiosaavn";
+"youtube" | "yt" | "youtube music" | "youtubemusic" | "ytm" | "musicyoutube" | "music youtube" | "soundcloud" | "sc" | "am" | "apple music" | "applemusic" | "apple" | "musicapple" | "music apple" | "sp" | "spsuggestion" | "spotify" | "spotify.com" | "spotifycom" | "dz" | "deezer" | "yandex" | "yandex music" | "yandexmusic" | "vk" | "vk music" | "vkmusic" | "tidal" | "tidal music" | "qobuz" | "flowerytts" | "flowery" | "flowery.tts" | LavalinkClientSearchPlatformResolve | LavalinkClientSearchPlatform | "js" | "jiosaavn" | "td" | "tidal" | "tdrec";
 export type SearchPlatform = LavalinkSearchPlatform | ClientSearchPlatform;
-export type SourcesRegex = "YoutubeRegex" | "YoutubeMusicRegex" | "SoundCloudRegex" | "SoundCloudMobileRegex" | "DeezerTrackRegex" | "DeezerArtistRegex" | "DeezerEpisodeRegex" | "DeezerMixesRegex" | "DeezerPageLinkRegex" | "DeezerPlaylistRegex" | "DeezerAlbumRegex" | "AllDeezerRegex" | "AllDeezerRegexWithoutPageLink" | "SpotifySongRegex" | "SpotifyPlaylistRegex" | "SpotifyArtistRegex" | "SpotifyEpisodeRegex" | "SpotifyShowRegex" | "SpotifyAlbumRegex" | "AllSpotifyRegex" | "mp3Url" | "m3uUrl" | "m3u8Url" | "mp4Url" | "m4aUrl" | "wavUrl" | "aacpUrl" | "tiktok" | "mixcloud" | "musicYandex" | "radiohost" | "bandcamp" | "jiosaavn" | "appleMusic" | "TwitchTv" | "vimeo";
+export type SourcesRegex = "YoutubeRegex" | "YoutubeMusicRegex" | "SoundCloudRegex" | "SoundCloudMobileRegex" | "DeezerTrackRegex" | "DeezerArtistRegex" | "DeezerEpisodeRegex" | "DeezerMixesRegex" | "DeezerPageLinkRegex" | "DeezerPlaylistRegex" | "DeezerAlbumRegex" | "AllDeezerRegex" | "AllDeezerRegexWithoutPageLink" | "SpotifySongRegex" | "SpotifyPlaylistRegex" | "SpotifyArtistRegex" | "SpotifyEpisodeRegex" | "SpotifyShowRegex" | "SpotifyAlbumRegex" | "AllSpotifyRegex" | "mp3Url" | "m3uUrl" | "m3u8Url" | "mp4Url" | "m4aUrl" | "wavUrl" | "aacpUrl" | "tiktok" | "mixcloud" | "musicYandex" | "radiohost" | "bandcamp" | "jiosaavn" | "appleMusic" | "tidal" | "TwitchTv" | "vimeo";
 export interface PlaylistInfo {
     /** The playlist name */
     name: string;
@@ -92,13 +92,13 @@ export interface TrackEndEvent extends PlayerEvent {
 export interface TrackExceptionEvent extends PlayerEvent {
     type: "TrackExceptionEvent";
     exception?: Exception;
-    tracK: LavalinkTrack;
+    track: LavalinkTrack;
     error: string;
 }
 export interface TrackStuckEvent extends PlayerEvent {
     type: "TrackStuckEvent";
     thresholdMs: number;
-    tracK: LavalinkTrack;
+    track: LavalinkTrack;
 }
 export interface WebSocketClosedEvent extends PlayerEvent {
     type: "WebSocketClosedEvent";

package/dist/cjs/structures/Utils.d.ts

@@ -20,7 +20,7 @@ export declare function parseLavalinkConnUrl(connectionUrl: string): {
     port: number;
 };
 export declare class ManagerUtils {
-    LavalinkManager: LavalinkManager | null;
+    LavalinkManager: LavalinkManager | undefined;
     constructor(LavalinkManager?: LavalinkManager);
     buildPluginInfo(data: any, clientData?: any): any;
     buildTrack(data: LavalinkTrack | Track, requester: unknown): Track;
@@ -112,4 +112,4 @@ export declare class MiniMap<K, V> extends Map<K, V> {
     map<T>(fn: (value: V, key: K, miniMap: this) => T): T[];
     map<This, T>(fn: (this: This, value: V, key: K, miniMap: this) => T, thisArg: This): T[];
 }
-export declare function queueTrackEnd(player: Player): Promise<Track>;
+export declare function queueTrackEnd(player: Player, dontShiftQueue?: boolean): Promise<Track>;

package/dist/cjs/structures/Utils.js

@@ -30,7 +30,7 @@ function parseLavalinkConnUrl(connectionUrl) {
     };
 }
 class ManagerUtils {
-    LavalinkManager = null;
+    LavalinkManager = undefined;
     constructor(LavalinkManager) {
         this.LavalinkManager = LavalinkManager;
     }
@@ -307,6 +307,9 @@ class ManagerUtils {
         if (LavalinkManagerStatics_1.SourceLinksRegexes.jiosaavn.test(queryString) && !node.info?.sourceManagers?.includes("jiosaavn")) {
             throw new Error("Query / Link Provided for this Source but Lavalink Node has not 'jiosaavn' (via jiosaavn-plugin) enabled");
         }
+        if (LavalinkManagerStatics_1.SourceLinksRegexes.tidal.test(queryString) && !node.info?.sourceManagers?.includes("tidal")) {
+            throw new Error("Query / Link Provided for this Source but Lavalink Node has not 'tidal' enabled");
+        }
         return;
     }
     transformQuery(query) {
@@ -371,6 +374,12 @@ class ManagerUtils {
         if (source === "speak" && !node.info?.plugins?.find(c => c.name.toLowerCase().includes(LavalinkManagerStatics_1.LavalinkPlugins.DuncteBot_Plugin.toLowerCase()))) {
             throw new Error("Lavalink Node has not 'speak' enabled, which is required to have 'speak' work");
         }
+        if (source === "tdsearch" && !node.info?.sourceManagers?.includes("tidal")) {
+            throw new Error("Lavalink Node has not 'tidal' enabled, which is required to have 'tdsearch' work");
+        }
+        if (source === "tdrec" && !node.info?.sourceManagers?.includes("tidal")) {
+            throw new Error("Lavalink Node has not 'tidal' enabled, which is required to have 'tdrec' work");
+        }
         if (source === "tts" && !node.info?.plugins?.find(c => c.name.toLowerCase().includes(LavalinkManagerStatics_1.LavalinkPlugins.GoogleCloudTTS.toLowerCase()))) {
             throw new Error("Lavalink Node has not 'tts' enabled, which is required to have 'tts' work");
         }
@@ -386,6 +395,21 @@ class ManagerUtils {
         if (source === "ytsearch" && !node.info?.sourceManagers?.includes("youtube")) {
             throw new Error("Lavalink Node has not 'youtube' enabled, which is required to have 'ytsearch' work");
         }
+        if (source === "vksearch" && !node.info?.sourceManagers?.includes("vkmusic")) {
+            throw new Error("Lavalink Node has not 'vkmusic' enabled, which is required to have 'vksearch' work");
+        }
+        if (source === "vkrec" && !node.info?.sourceManagers?.includes("vkmusic")) {
+            throw new Error("Lavalink Node has not 'vkmusic' enabled, which is required to have 'vkrec' work");
+        }
+        if (source === "qbsearch" && !node.info?.sourceManagers?.includes("qobuz")) {
+            throw new Error("Lavalink Node has not 'qobuz' enabled, which is required to have 'qbsearch' work");
+        }
+        if (source === "qbisrc" && !node.info?.sourceManagers?.includes("qobuz")) {
+            throw new Error("Lavalink Node has not 'qobuz' enabled, which is required to have 'qbisrc' work");
+        }
+        if (source === "qbrec" && !node.info?.sourceManagers?.includes("qobuz")) {
+            throw new Error("Lavalink Node has not 'qobuz' enabled, which is required to have 'qbrec' work");
+        }
         return;
     }
 }
@@ -418,7 +442,7 @@ class MiniMap extends Map {
     }
 }
 exports.MiniMap = MiniMap;
-async function queueTrackEnd(player) {
+async function queueTrackEnd(player, dontShiftQueue = false) {
     if (player.queue.current && !player.queue.current?.pluginInfo?.clientData?.previousTrack) { // If there was a current Track already and repeatmode === true, add it to the queue.
         player.queue.previous.unshift(player.queue.current);
         if (player.queue.previous.length > player.queue.options.maxPreviousTracks)
@@ -428,10 +452,10 @@ async function queueTrackEnd(player) {
     // and if repeatMode == queue, add it back to the queue!
     if (player.repeatMode === "queue" && player.queue.current)
         player.queue.tracks.push(player.queue.current);
-    // change the current Track to the next upcoming one
-    const nextSong = player.queue.tracks.shift();
+    // change the current Track to the next upcoming one 
+    const nextSong = dontShiftQueue ? null : player.queue.tracks.shift();
     try {
-        if (player.LavalinkManager.utils.isUnresolvedTrack(nextSong))
+        if (nextSong && player.LavalinkManager.utils.isUnresolvedTrack(nextSong))
             await nextSong.resolve(player);
         player.queue.current = nextSong || null;
         // save it in the DB
@@ -448,7 +472,7 @@ async function queueTrackEnd(player) {
         }
         player.LavalinkManager.emit("trackError", player, player.queue.current, error);
         // try to play the next track if possible
-        if (player.LavalinkManager.options?.autoSkipOnResolveError === true && player.queue.tracks[0])
+        if (!dontShiftQueue && player.LavalinkManager.options?.autoSkipOnResolveError === true && player.queue.tracks[0])
             return queueTrackEnd(player);
     }
     // return the new current Track

package/dist/esm/structures/CustomSearches/BandCampSearch.js

@@ -5,7 +5,9 @@ export const bandCampSearch = async (player, query, requestUser) => {
         console.log(`Lavalink-Client-Debug | SEARCHING | - ${query} on lavalink-client`);
     player.LavalinkManager.utils.validateQueryString(player.node, query);
     try {
-        const data = await fetch(`https://bandcamp.com/api/nusearch/2/autocomplete?q=${encodeURIComponent(query)}`, {
+        const requestUrl = new URL("https://bandcamp.com/api/nusearch/2/autocomplete");
+        requestUrl.searchParams.append("q", query);
+        const data = await fetch(requestUrl.toString(), {
             headers: {
                 'User-Agent': 'android-async-http/1.4.1 (http://loopj.com/android-async-http)',
                 'Cookie': '$Version=1'

package/dist/esm/structures/LavalinkManager.js

@@ -492,7 +492,7 @@ export class LavalinkManager extends EventEmitter {
                         functionLayer: "LavalinkManager > sendRawData()",
                     });
                     if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Sent updatePlayer for voice token session", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, playerVoice: player.voice, update });
+                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing sessionId", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, update, playerVoice: player.voice });
                 }
                 else {
                     await player.node.updatePlayer({
@@ -502,8 +502,8 @@ export class LavalinkManager extends EventEmitter {
                                 token: update.token,
                                 endpoint: update.endpoint,
                                 sessionId: sessionId2Use,
-                            }
-                        }
+                            },
+                        },
                     });
                     if (this.options?.advancedOptions?.enableDebugEvents) {
                         this.emit("debug", DebugEvents.NoAudioDebug, {
@@ -513,7 +513,7 @@ export class LavalinkManager extends EventEmitter {
                         });
                     }
                     if (this.options?.advancedOptions?.debugOptions?.noAudio === true)
-                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Can't send updatePlayer for voice token session - Missing sessionId", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, } });
+                        console.debug("Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Sent updatePlayer for voice token session", { voice: { token: update.token, endpoint: update.endpoint, sessionId: sessionId2Use, }, playerVoice: player.voice, update });
                 }
                 return;
             }