magmastream 2.9.0-dev.3 → 2.9.0-dev.5

package/dist/index.d.ts

@@ -678,11 +678,26 @@ declare abstract class AutoPlayUtils {
      * @hidden
      */
     static init(manager: Manager): void;
-    static getRecommendedTracks(player: Player, track: Track, attempt?: number): Promise<Track[]>;
+    /**
+     * Gets recommended tracks for the given track.
+     * @param track The track to get recommended tracks for.
+     * @returns An array of recommended tracks.
+     */
+    static getRecommendedTracks(track: Track): Promise<Track[]>;
+    /**
+     * Gets recommended tracks from Last.fm for the given track.
+     * @param track The track to get recommended tracks for.
+     * @param apiKey The API key for Last.fm.
+     * @returns An array of recommended tracks.
+     */
     static getRecommendedTracksFromLastFm(track: Track, apiKey: string): Promise<Track[]>;
-    static getRecommendedTracksFromSource(track: Track, mappedPlatform: string): Promise<Track[]>;
-    static getRecommendedTracksFromYouTube(track: Track): Promise<Track[]>;
-    static selectPlatform(enabledSources: string[]): SearchPlatform | null;
+    /**
+     * Gets recommended tracks from the given source.
+     * @param track The track to get recommended tracks for.
+     * @param platform The source to get recommended tracks from.
+     * @returns An array of recommended tracks.
+     */
+    static getRecommendedTracksFromSource(track: Track, platform: string): Promise<Track[]>;
 }
 /** Gets or extends structures to extend the built in, or already extended, classes to add more functionality. */
 declare abstract class Structure {
@@ -901,7 +916,7 @@ declare class Manager extends EventEmitter {
      * @param options.enabledPlugins - An array of enabledPlugins to load.
      * @param options.nodes - An array of node options to create nodes from.
      * @param options.playNextOnEnd - Whether to automatically play the first track in the queue when the player is created.
-     * @param options.autoPlaySearchPlatform - The search platform autoplay will use. Fallback to Youtube if not found.
+     * @param options.autoPlaySearchPlatforms - The search platform autoplay will use. Fallback to Youtube if not found.
      * @param options.enablePriorityMode - Whether to use the priority when selecting a node to play on.
      * @param options.clientName - The name of the client to send to Lavalink.
      * @param options.defaultSearchPlatform - The default search platform to use when searching for tracks.
@@ -1118,9 +1133,10 @@ interface ManagerOptions {
     enablePriorityMode?: boolean;
     /** Automatically play the next track when the current one ends. */
     playNextOnEnd?: boolean;
-    /** The search platform autoplay should use
-     * Use enum `SearchPlatform`. */
-    autoPlaySearchPlatform?: SearchPlatform;
+    /** An array of search platforms to use for autoplay. First to last matters
+     * Use enum `AutoPlayPlatform`.
+     */
+    autoPlaySearchPlatforms?: AutoPlayPlatform[];
     /** The client ID to use. */
     clientId?: string;
     /** Value to use for the `Client-Name` header. */
@@ -1202,6 +1218,14 @@ declare enum SearchPlatform {
     YouTube = "ytsearch",
     YouTubeMusic = "ytmsearch"
 }
+declare enum AutoPlayPlatform {
+    Spotify = "spotify",
+    Deezer = "deezer",
+    SoundCloud = "soundcloud",
+    Tidal = "tidal",
+    VKMusic = "vkmusic",
+    YouTube = "youtube"
+}
 declare enum PlayerStateEventTypes {
     AutoPlayChange = "playerAutoplay",
     ConnectionChange = "playerConnection",
@@ -1402,7 +1426,7 @@ declare class Player {
     /** The autoplay state of the player. */
     isAutoplay: boolean;
     /** The number of times to try autoplay before emitting queueEnd. */
-    autoplayTries: number | null;
+    autoplayTries: number;
     private static _manager;
     private readonly data;
     private dynamicLoopInterval;
@@ -2136,5 +2160,5 @@ declare class Plugin {
     load(manager: Manager): void;
 }
 
-export { AutoPlayUtils, AvailableFilters, Filters, LoadTypes, Manager, ManagerEventTypes, Node, Player, PlayerStateEventTypes, Plugin, Queue, Rest, SearchPlatform, SeverityTypes, SponsorBlockSegment, StateTypes, Structure, TrackEndReasonTypes, TrackPartial, TrackSourceTypes, TrackUtils, UseNodeOptions };
+export { AutoPlayPlatform, AutoPlayUtils, AvailableFilters, Filters, LoadTypes, Manager, ManagerEventTypes, Node, Player, PlayerStateEventTypes, Plugin, Queue, Rest, SearchPlatform, SeverityTypes, SponsorBlockSegment, StateTypes, Structure, TrackEndReasonTypes, TrackPartial, TrackSourceTypes, TrackUtils, UseNodeOptions };
 export type { CPUStats, EqualizerBand, Exception, Extendable, FrameStats, LavalinkInfo, LavalinkResponse, LoadType, Lyrics, LyricsLine, ManagerEvents, ManagerOptions, MemoryStats, NodeMessage, NodeOptions, NodeStats, Payload, PlayOptions, PlayerEvent, PlayerEventType, PlayerEvents, PlayerOptions, PlayerUpdate, PlaylistData, PlaylistInfoData, PlaylistRawData, SearchQuery, SearchResult, Severity, Sizes, SponsorBlockChapterStarted, SponsorBlockChaptersLoaded, SponsorBlockSegmentEventType, SponsorBlockSegmentEvents, SponsorBlockSegmentSkipped, SponsorBlockSegmentsLoaded, State, Track, TrackData, TrackDataInfo, TrackEndEvent, TrackEndReason, TrackExceptionEvent, TrackPluginInfo, TrackSourceName, TrackStartEvent, TrackStuckEvent, UseNodeOption, VoicePacket, VoiceServer, VoiceState, WebSocketClosedEvent };

package/dist/structures/Manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManagerEventTypes = exports.PlayerStateEventTypes = exports.SearchPlatform = exports.UseNodeOptions = exports.TrackPartial = exports.Manager = void 0;
+exports.ManagerEventTypes = exports.PlayerStateEventTypes = exports.AutoPlayPlatform = exports.SearchPlatform = exports.UseNodeOptions = exports.TrackPartial = exports.Manager = void 0;
 const tslib_1 = require("tslib");
 const Utils_1 = require("./Utils");
 const collection_1 = require("@discordjs/collection");
@@ -27,7 +27,7 @@ class Manager extends events_1.EventEmitter {
      * @param options.enabledPlugins - An array of enabledPlugins to load.
      * @param options.nodes - An array of node options to create nodes from.
      * @param options.playNextOnEnd - Whether to automatically play the first track in the queue when the player is created.
-     * @param options.autoPlaySearchPlatform - The search platform autoplay will use. Fallback to Youtube if not found.
+     * @param options.autoPlaySearchPlatforms - The search platform autoplay will use. Fallback to Youtube if not found.
      * @param options.enablePriorityMode - Whether to use the priority when selecting a node to play on.
      * @param options.clientName - The name of the client to send to Lavalink.
      * @param options.defaultSearchPlatform - The default search platform to use when searching for tracks.
@@ -61,7 +61,6 @@ class Manager extends events_1.EventEmitter {
             enablePriorityMode: false,
             clientName: "Magmastream",
             defaultSearchPlatform: SearchPlatform.YouTube,
-            // autoPlaySearchPlatform: SearchPlatform.YouTube,
             useNode: UseNodeOptions.LeastPlayers,
             maxPreviousTracks: options.maxPreviousTracks ?? 20,
             ...options,
@@ -392,6 +391,7 @@ class Manager extends events_1.EventEmitter {
                             voiceChannelId: state.options.voiceChannelId,
                             selfDeafen: state.options.selfDeafen,
                             volume: lavaPlayer.volume || state.options.volume,
+                            node: nodeId,
                         };
                         this.emit(ManagerEventTypes.Debug, `[MANAGER] Recreating player: ${state.guildId} from saved file: ${JSON.stringify(state.options)}`);
                         const player = this.create(playerOptions);
@@ -924,6 +924,15 @@ var SearchPlatform;
     SearchPlatform["YouTube"] = "ytsearch";
     SearchPlatform["YouTubeMusic"] = "ytmsearch";
 })(SearchPlatform || (exports.SearchPlatform = SearchPlatform = {}));
+var AutoPlayPlatform;
+(function (AutoPlayPlatform) {
+    AutoPlayPlatform["Spotify"] = "spotify";
+    AutoPlayPlatform["Deezer"] = "deezer";
+    AutoPlayPlatform["SoundCloud"] = "soundcloud";
+    AutoPlayPlatform["Tidal"] = "tidal";
+    AutoPlayPlatform["VKMusic"] = "vkmusic";
+    AutoPlayPlatform["YouTube"] = "youtube";
+})(AutoPlayPlatform || (exports.AutoPlayPlatform = AutoPlayPlatform = {}));
 var PlayerStateEventTypes;
 (function (PlayerStateEventTypes) {
     PlayerStateEventTypes["AutoPlayChange"] = "playerAutoplay";

package/dist/structures/Node.js

@@ -602,13 +602,13 @@ class Node {
      */
     async handleAutoplay(player, attempt = 0) {
         // If autoplay is not enabled or all attempts have failed, early exit
-        if (!player.isAutoplay || attempt === player.autoplayTries || !player.queue.previous.length)
+        if (!player.isAutoplay || attempt > player.autoplayTries || !player.queue.previous.length)
             return false;
         const lastTrack = player.queue.previous[player.queue.previous.length - 1];
         lastTrack.requester = player.get("Internal_BotUser");
         if (!lastTrack)
             return false;
-        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(player, lastTrack, attempt);
+        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(lastTrack);
         if (tracks.length) {
             player.queue.add(tracks[0]);
             await player.play();
@@ -716,13 +716,13 @@ class Node {
             this.manager.emit(Manager_1.ManagerEventTypes.QueueEnd, player, track, payload);
             return;
         }
-        let attempts = 1;
+        let attempt = 1;
         let success = false;
-        while (attempts <= player.autoplayTries) {
-            success = await this.handleAutoplay(player, attempts);
+        while (attempt <= player.autoplayTries) {
+            success = await this.handleAutoplay(player, attempt);
             if (success)
                 return;
-            attempts++;
+            attempt++;
         }
         // If all attempts fail, reset the player state and emit queueEnd
         player.playing = false;

package/dist/structures/Player.js

@@ -50,7 +50,7 @@ class Player {
     /** The autoplay state of the player. */
     isAutoplay = false;
     /** The number of times to try autoplay before emitting queueEnd. */
-    autoplayTries = null;
+    autoplayTries = 3;
     static _manager;
     data = {};
     dynamicLoopInterval = null;
@@ -375,7 +375,7 @@ class Player {
      * @returns {Promise<Track[]>} - Array of recommended tracks.
      */
     async getRecommendedTracks(track) {
-        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(this, track);
+        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(track);
         return tracks;
     }
     /**

package/dist/structures/Utils.js

@@ -143,58 +143,42 @@ class AutoPlayUtils {
             throw new Error("AutoPlayUtils.init() requires a valid Manager instance.");
         this.manager = manager;
     }
-    static async getRecommendedTracks(player, track, attempt = 0) {
+    /**
+     * Gets recommended tracks for the given track.
+     * @param track The track to get recommended tracks for.
+     * @returns An array of recommended tracks.
+     */
+    static async getRecommendedTracks(track) {
         const node = this.manager.useableNode;
         if (!node) {
             throw new Error("No available nodes.");
         }
-        if (!player.isAutoplay) {
-            return [];
-        }
-        if (attempt >= player.autoplayTries) {
-            return [];
-        }
-        if (!player.queue.previous.length) {
-            return [];
-        }
         const apiKey = this.manager.options.lastFmApiKey;
         const enabledSources = node.info.sourceManagers;
-        const { autoPlaySearchPlatform } = this.manager.options;
-        const supportedPlatforms = ["spotify", "deezer", "soundcloud", "youtube"];
-        const platformMapping = {
-            [Manager_1.SearchPlatform.AppleMusic]: "applemusic",
-            [Manager_1.SearchPlatform.Bandcamp]: "bandcamp",
-            [Manager_1.SearchPlatform.Deezer]: "deezer",
-            [Manager_1.SearchPlatform.Jiosaavn]: "jiosaavn",
-            [Manager_1.SearchPlatform.SoundCloud]: "soundcloud",
-            [Manager_1.SearchPlatform.Spotify]: "spotify",
-            [Manager_1.SearchPlatform.Tidal]: "tidal",
-            [Manager_1.SearchPlatform.VKMusic]: "vkmusic",
-            [Manager_1.SearchPlatform.YouTube]: "youtube",
-            [Manager_1.SearchPlatform.YouTubeMusic]: "youtube",
-        };
-        const mappedPlatform = platformMapping[autoPlaySearchPlatform];
-        // Last attempt fallback to YouTube
-        if (attempt === player.autoplayTries - 1 && player.autoplayTries > 1 && enabledSources.includes("youtube")) {
-            return await this.getRecommendedTracksFromYouTube(track);
-        }
-        // Check if the preferred autoplay platform is supported and enabled
-        if (mappedPlatform && supportedPlatforms.includes(mappedPlatform) && enabledSources.includes(mappedPlatform)) {
-            return await this.getRecommendedTracksFromSource(track, mappedPlatform);
+        const autoPlaySearchPlatforms = this.manager.options.autoPlaySearchPlatforms;
+        // Iterate over autoplay platforms in order of priority
+        for (const platform of autoPlaySearchPlatforms) {
+            if (enabledSources.includes(platform)) {
+                const recommendedTracks = await this.getRecommendedTracksFromSource(track, platform);
+                // If tracks are found, return them immediately
+                if (recommendedTracks.length > 0) {
+                    return recommendedTracks;
+                }
+            }
         }
         // Check if Last.fm API is available
         if (apiKey) {
             return await this.getRecommendedTracksFromLastFm(track, apiKey);
         }
-        // Fallback to YouTube if all else fails
-        if (enabledSources.includes("youtube")) {
-            return await this.getRecommendedTracksFromYouTube(track);
-        }
         return [];
     }
+    /**
+     * Gets recommended tracks from Last.fm for the given track.
+     * @param track The track to get recommended tracks for.
+     * @param apiKey The API key for Last.fm.
+     * @returns An array of recommended tracks.
+     */
     static async getRecommendedTracksFromLastFm(track, apiKey) {
-        const enabledSources = this.manager.useableNode.info.sourceManagers;
-        const selectedSource = this.selectPlatform(enabledSources);
         let { author: artist } = track;
         const { title } = track;
         if (!artist || !title) {
@@ -206,7 +190,7 @@ class AutoPlayUtils {
                     return [];
                 }
                 const randomTrack = response.data.toptracks.track[Math.floor(Math.random() * response.data.toptracks.track.length)];
-                const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, track.requester);
+                const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: this.manager.options.defaultSearchPlatform }, track.requester);
                 if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
                     return [];
                 }
@@ -233,7 +217,7 @@ class AutoPlayUtils {
             response = await axios_1.default.get(url);
         }
         catch (error) {
-            console.log(error);
+            console.error("[AutoPlay] Error fetching similar tracks from Last.fm:", error);
             return [];
         }
         if (response.data.error || !response.data.similartracks?.track?.length) {
@@ -244,7 +228,7 @@ class AutoPlayUtils {
                 return [];
             }
             const randomTrack = retryResponse.data.toptracks.track[Math.floor(Math.random() * retryResponse.data.toptracks.track.length)];
-            const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, track.requester);
+            const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: this.manager.options.defaultSearchPlatform }, track.requester);
             if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
                 return [];
             }
@@ -258,7 +242,7 @@ class AutoPlayUtils {
         if (!randomTrack) {
             return [];
         }
-        const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, track.requester);
+        const res = await this.manager.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: this.manager.options.defaultSearchPlatform }, track.requester);
         if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
             return [];
         }
@@ -269,12 +253,103 @@ class AutoPlayUtils {
         }
         return res.tracks;
     }
-    static async getRecommendedTracksFromSource(track, mappedPlatform) {
-        switch (mappedPlatform) {
+    /**
+     * Gets recommended tracks from the given source.
+     * @param track The track to get recommended tracks for.
+     * @param platform The source to get recommended tracks from.
+     * @returns An array of recommended tracks.
+     */
+    static async getRecommendedTracksFromSource(track, platform) {
+        switch (platform) {
             case "spotify":
-                try {
-                    if (!track.uri.includes("spotify")) {
-                        const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.Spotify }, track.requester);
+                {
+                    try {
+                        if (!track.uri.includes("spotify")) {
+                            const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.Spotify }, track.requester);
+                            if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                                return [];
+                            }
+                            if (res.loadType === LoadTypes.Playlist) {
+                                res.tracks = res.playlist.tracks;
+                            }
+                            if (!res.tracks.length) {
+                                return [];
+                            }
+                            track = res.tracks[0];
+                        }
+                        const TOTP_SECRET = new Uint8Array([
+                            53, 53, 48, 55, 49, 52, 53, 56, 53, 51, 52, 56, 55, 52, 57, 57, 53, 57, 50, 50, 52, 56, 54, 51, 48, 51, 50, 57, 51, 52, 55,
+                        ]);
+                        const hmac = crypto_1.default.createHmac("sha1", TOTP_SECRET);
+                        function generateTotp() {
+                            const counter = Math.floor(Date.now() / 30000);
+                            const counterBuffer = Buffer.alloc(8);
+                            counterBuffer.writeBigInt64BE(BigInt(counter));
+                            hmac.update(counterBuffer);
+                            const hmacResult = hmac.digest();
+                            const offset = hmacResult[hmacResult.length - 1] & 15;
+                            const truncatedValue = ((hmacResult[offset] & 127) << 24) | ((hmacResult[offset + 1] & 255) << 16) | ((hmacResult[offset + 2] & 255) << 8) | (hmacResult[offset + 3] & 255);
+                            const totp = (truncatedValue % 1000000).toString().padStart(6, "0");
+                            return [totp, counter * 30000];
+                        }
+                        const [totp, timestamp] = generateTotp();
+                        const params = {
+                            reason: "transport",
+                            productType: "embed",
+                            totp: totp,
+                            totpVer: 5,
+                            ts: timestamp,
+                        };
+                        let body;
+                        try {
+                            const response = await axios_1.default.get("https://open.spotify.com/get_access_token", { params });
+                            body = response.data;
+                        }
+                        catch (error) {
+                            console.error("[AutoPlay] Failed to get spotify access token:", error.response?.status, error.response?.data || error.message);
+                            return [];
+                        }
+                        let json;
+                        try {
+                            const response = await axios_1.default.get(`https://api.spotify.com/v1/recommendations`, {
+                                params: { limit: 10, seed_tracks: track.identifier },
+                                headers: {
+                                    Authorization: `Bearer ${body.accessToken}`,
+                                    "Content-Type": "application/json",
+                                },
+                            });
+                            json = response.data;
+                        }
+                        catch (error) {
+                            console.error("[AutoPlay] Failed to fetch spotify recommendations:", error.response?.status, error.response?.data || error.message);
+                            return [];
+                        }
+                        if (!json.tracks || !json.tracks.length) {
+                            return [];
+                        }
+                        const recommendedTrackId = json.tracks[Math.floor(Math.random() * json.tracks.length)].id;
+                        const res = await this.manager.search({ query: `https://open.spotify.com/track/${recommendedTrackId}`, source: Manager_1.SearchPlatform.Spotify }, track.requester);
+                        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                            return [];
+                        }
+                        if (res.loadType === LoadTypes.Playlist) {
+                            res.tracks = res.playlist.tracks;
+                        }
+                        if (!res.tracks.length) {
+                            return [];
+                        }
+                        return res.tracks;
+                    }
+                    catch (error) {
+                        console.error("[AutoPlay] Unexpected spotify error:", error.message || error);
+                        return [];
+                    }
+                }
+                break;
+            case "deezer":
+                {
+                    if (!track.uri.includes("deezer")) {
+                        const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.Deezer }, track.requester);
                         if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
                             return [];
                         }
@@ -286,254 +361,252 @@ class AutoPlayUtils {
                         }
                         track = res.tracks[0];
                     }
-                    const TOTP_SECRET = new Uint8Array([
-                        53, 53, 48, 55, 49, 52, 53, 56, 53, 51, 52, 56, 55, 52, 57, 57, 53, 57, 50, 50, 52, 56, 54, 51, 48, 51, 50, 57, 51, 52, 55,
-                    ]);
-                    const hmac = crypto_1.default.createHmac("sha1", TOTP_SECRET);
-                    function generateTotp() {
-                        const counter = Math.floor(Date.now() / 30000);
-                        const counterBuffer = Buffer.alloc(8);
-                        counterBuffer.writeBigInt64BE(BigInt(counter));
-                        hmac.update(counterBuffer);
-                        const hmacResult = hmac.digest();
-                        const offset = hmacResult[hmacResult.length - 1] & 15;
-                        const truncatedValue = ((hmacResult[offset] & 127) << 24) | ((hmacResult[offset + 1] & 255) << 16) | ((hmacResult[offset + 2] & 255) << 8) | (hmacResult[offset + 3] & 255);
-                        const totp = (truncatedValue % 1000000).toString().padStart(6, "0");
-                        return [totp, counter * 30000];
+                    const identifier = `dzrec:${track.identifier}`;
+                    const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                    if (!recommendedResult) {
+                        return [];
+                    }
+                    let tracks = [];
+                    let playlist = null;
+                    const requester = track.requester;
+                    switch (recommendedResult.loadType) {
+                        case LoadTypes.Search:
+                            tracks = recommendedResult.data.map((track) => TrackUtils.build(track, requester));
+                            break;
+                        case LoadTypes.Track:
+                            tracks = [TrackUtils.build(recommendedResult.data, requester)];
+                            break;
+                        case LoadTypes.Playlist: {
+                            const playlistData = recommendedResult.data;
+                            tracks = playlistData.tracks.map((track) => TrackUtils.build(track, requester));
+                            playlist = {
+                                name: playlistData.info.name,
+                                playlistInfo: playlistData.pluginInfo,
+                                requester: requester,
+                                tracks,
+                                duration: tracks.reduce((acc, cur) => acc + (cur.duration || 0), 0),
+                            };
+                            break;
+                        }
                     }
-                    const [totp, timestamp] = generateTotp();
-                    const params = {
-                        reason: "transport",
-                        productType: "embed",
-                        totp: totp,
-                        totpVer: 5,
-                        ts: timestamp,
-                    };
-                    let body;
-                    try {
-                        const response = await axios_1.default.get("https://open.spotify.com/get_access_token", { params });
-                        body = response.data;
+                    const result = { loadType: recommendedResult.loadType, tracks, playlist };
+                    if (result.loadType === LoadTypes.Empty || result.loadType === LoadTypes.Error) {
+                        return [];
                     }
-                    catch (error) {
-                        console.error("[AutoPlay] Failed to get access token:", error.response?.status, error.response?.data || error.message);
+                    if (result.loadType === LoadTypes.Playlist) {
+                        result.tracks = result.playlist.tracks;
+                    }
+                    if (!result.tracks.length) {
                         return [];
                     }
-                    let json;
+                    return result.tracks;
+                }
+                break;
+            case "soundcloud":
+                {
+                    if (!track.uri.includes("soundcloud")) {
+                        const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.SoundCloud }, track.requester);
+                        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                            return [];
+                        }
+                        if (res.loadType === LoadTypes.Playlist) {
+                            res.tracks = res.playlist.tracks;
+                        }
+                        if (!res.tracks.length) {
+                            return [];
+                        }
+                        track = res.tracks[0];
+                    }
                     try {
-                        const response = await axios_1.default.get(`https://api.spotify.com/v1/recommendations`, {
-                            params: { limit: 10, seed_tracks: track.identifier },
-                            headers: {
-                                Authorization: `Bearer ${body.accessToken}`,
-                                "Content-Type": "application/json",
-                            },
+                        const recommendedRes = await axios_1.default.get(`${track.uri}/recommended`).catch((err) => {
+                            console.error(`[AutoPlay] Failed to fetch SoundCloud recommendations. Status: ${err.response?.status || "Unknown"}`, err.message);
+                            return null;
                         });
-                        json = response.data;
+                        if (!recommendedRes) {
+                            return [];
+                        }
+                        const html = recommendedRes.data;
+                        const dom = new jsdom_1.JSDOM(html);
+                        const document = dom.window.document;
+                        const secondNoscript = document.querySelectorAll("noscript")[1];
+                        const sectionElement = secondNoscript.querySelector("section");
+                        const articleElements = sectionElement.querySelectorAll("article");
+                        if (!articleElements || articleElements.length === 0) {
+                            return [];
+                        }
+                        const urls = Array.from(articleElements)
+                            .map((articleElement) => {
+                            const h2Element = articleElement.querySelector('h2[itemprop="name"]');
+                            const aElement = h2Element?.querySelector('a[itemprop="url"]');
+                            return aElement ? `https://soundcloud.com${aElement.getAttribute("href")}` : null;
+                        })
+                            .filter(Boolean);
+                        if (!urls.length) {
+                            return [];
+                        }
+                        const randomUrl = urls[Math.floor(Math.random() * urls.length)];
+                        const res = await this.manager.search({ query: randomUrl, source: Manager_1.SearchPlatform.SoundCloud }, track.requester);
+                        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                            return [];
+                        }
+                        if (res.loadType === LoadTypes.Playlist) {
+                            res.tracks = res.playlist.tracks;
+                        }
+                        if (!res.tracks.length) {
+                            return [];
+                        }
+                        return res.tracks;
                     }
                     catch (error) {
-                        console.error("[AutoPlay] Failed to fetch recommendations:", error.response?.status, error.response?.data || error.message);
-                        return [];
-                    }
-                    if (!json.tracks || !json.tracks.length) {
+                        console.error("[AutoPlay] Error occurred while fetching soundcloud recommendations:", error);
                         return [];
                     }
-                    const recommendedTrackId = json.tracks[Math.floor(Math.random() * json.tracks.length)].id;
-                    const res = await this.manager.search({ query: `https://open.spotify.com/track/${recommendedTrackId}`, source: Manager_1.SearchPlatform.Spotify }, track.requester);
-                    if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
-                        return [];
+                }
+                break;
+            case "youtube":
+                {
+                    const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => track.uri.includes(url));
+                    let videoID = null;
+                    if (hasYouTubeURL) {
+                        videoID = track.uri.split("=").pop();
                     }
-                    if (res.loadType === LoadTypes.Playlist) {
-                        res.tracks = res.playlist.tracks;
+                    else {
+                        const searchResult = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.YouTube }, track.requester);
+                        videoID = searchResult.tracks[0]?.uri.split("=").pop();
                     }
-                    if (!res.tracks.length) {
+                    if (!videoID) {
                         return [];
                     }
-                    return res.tracks;
-                }
-                catch (error) {
-                    console.error("[AutoPlay] Unexpected error:", error.message || error);
-                    return [];
-                }
-            case "deezer":
-                if (!track.uri.includes("deezer")) {
-                    const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.Deezer }, track.requester);
+                    let randomIndex;
+                    let searchURI;
+                    do {
+                        randomIndex = Math.floor(Math.random() * 23) + 2;
+                        searchURI = `https://www.youtube.com/watch?v=${videoID}&list=RD${videoID}&index=${randomIndex}`;
+                    } while (track.uri.includes(searchURI));
+                    const res = await this.manager.search({ query: searchURI, source: Manager_1.SearchPlatform.YouTube }, track.requester);
                     if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
                         return [];
                     }
-                    if (res.loadType === LoadTypes.Playlist) {
-                        res.tracks = res.playlist.tracks;
+                    const filteredTracks = res.tracks.filter((t) => t.uri !== track.uri);
+                    return filteredTracks;
+                }
+                break;
+            case "tidal":
+                {
+                    if (!track.uri.includes("tidal")) {
+                        const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.Tidal }, track.requester);
+                        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                            return [];
+                        }
+                        if (res.loadType === LoadTypes.Playlist) {
+                            res.tracks = res.playlist.tracks;
+                        }
+                        if (!res.tracks.length) {
+                            return [];
+                        }
+                        track = res.tracks[0];
                     }
-                    if (!res.tracks.length) {
+                    const identifier = `tdrec:${track.identifier}`;
+                    const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                    if (!recommendedResult) {
                         return [];
                     }
-                    track = res.tracks[0];
-                }
-                const identifier = `dzrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
-                if (!recommendedResult) {
-                    return [];
-                }
-                let tracks = [];
-                let playlist = null;
-                const requester = track.requester;
-                switch (recommendedResult.loadType) {
-                    case LoadTypes.Search:
-                        tracks = recommendedResult.data.map((track) => TrackUtils.build(track, requester));
-                        break;
-                    case LoadTypes.Track:
-                        tracks = [TrackUtils.build(recommendedResult.data, requester)];
-                        break;
-                    case LoadTypes.Playlist: {
-                        const playlistData = recommendedResult.data;
-                        tracks = playlistData.tracks.map((track) => TrackUtils.build(track, requester));
-                        playlist = {
-                            name: playlistData.info.name,
-                            playlistInfo: playlistData.pluginInfo,
-                            requester: requester,
-                            tracks,
-                            duration: tracks.reduce((acc, cur) => acc + (cur.duration || 0), 0),
-                        };
-                        break;
+                    let tracks = [];
+                    let playlist = null;
+                    const requester = track.requester;
+                    switch (recommendedResult.loadType) {
+                        case LoadTypes.Search:
+                            tracks = recommendedResult.data.map((track) => TrackUtils.build(track, requester));
+                            break;
+                        case LoadTypes.Track:
+                            tracks = [TrackUtils.build(recommendedResult.data, requester)];
+                            break;
+                        case LoadTypes.Playlist: {
+                            const playlistData = recommendedResult.data;
+                            tracks = playlistData.tracks.map((track) => TrackUtils.build(track, requester));
+                            playlist = {
+                                name: playlistData.info.name,
+                                playlistInfo: playlistData.pluginInfo,
+                                requester: requester,
+                                tracks,
+                                duration: tracks.reduce((acc, cur) => acc + (cur.duration || 0), 0),
+                            };
+                            break;
+                        }
                     }
-                }
-                const result = { loadType: recommendedResult.loadType, tracks, playlist };
-                if (result.loadType === LoadTypes.Empty || result.loadType === LoadTypes.Error) {
-                    return [];
-                }
-                if (result.loadType === LoadTypes.Playlist) {
-                    result.tracks = result.playlist.tracks;
-                }
-                if (!result.tracks.length) {
-                    return [];
-                }
-                return result.tracks;
-            case "soundcloud":
-                if (!track.uri.includes("soundcloud")) {
-                    const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.SoundCloud }, track.requester);
-                    if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                    const result = { loadType: recommendedResult.loadType, tracks, playlist };
+                    if (result.loadType === LoadTypes.Empty || result.loadType === LoadTypes.Error) {
                         return [];
                     }
-                    if (res.loadType === LoadTypes.Playlist) {
-                        res.tracks = res.playlist.tracks;
+                    if (result.loadType === LoadTypes.Playlist) {
+                        result.tracks = result.playlist.tracks;
                     }
-                    if (!res.tracks.length) {
+                    if (!result.tracks.length) {
                         return [];
                     }
-                    track = res.tracks[0];
+                    return result.tracks;
                 }
-                try {
-                    const recommendedRes = await axios_1.default.get(`${track.uri}/recommended`).catch((err) => {
-                        console.error(`[AutoPlay] Failed to fetch SoundCloud recommendations. Status: ${err.response?.status || "Unknown"}`, err.message);
-                        return null;
-                    });
-                    if (!recommendedRes) {
-                        return [];
+                break;
+            case "vkmusic":
+                {
+                    if (!track.uri.includes("vk.com") && !track.uri.includes("vk.ru")) {
+                        const res = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.VKMusic }, track.requester);
+                        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                            return [];
+                        }
+                        if (res.loadType === LoadTypes.Playlist) {
+                            res.tracks = res.playlist.tracks;
+                        }
+                        if (!res.tracks.length) {
+                            return [];
+                        }
+                        track = res.tracks[0];
                     }
-                    const html = recommendedRes.data;
-                    const dom = new jsdom_1.JSDOM(html);
-                    const document = dom.window.document;
-                    const secondNoscript = document.querySelectorAll("noscript")[1];
-                    const sectionElement = secondNoscript.querySelector("section");
-                    const articleElements = sectionElement.querySelectorAll("article");
-                    if (!articleElements || articleElements.length === 0) {
+                    const identifier = `vkrec:${track.identifier}`;
+                    const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                    if (!recommendedResult) {
                         return [];
                     }
-                    const urls = Array.from(articleElements)
-                        .map((articleElement) => {
-                        const h2Element = articleElement.querySelector('h2[itemprop="name"]');
-                        const aElement = h2Element?.querySelector('a[itemprop="url"]');
-                        return aElement ? `https://soundcloud.com${aElement.getAttribute("href")}` : null;
-                    })
-                        .filter(Boolean);
-                    if (!urls.length) {
-                        return [];
+                    let tracks = [];
+                    let playlist = null;
+                    const requester = track.requester;
+                    switch (recommendedResult.loadType) {
+                        case LoadTypes.Search:
+                            tracks = recommendedResult.data.map((track) => TrackUtils.build(track, requester));
+                            break;
+                        case LoadTypes.Track:
+                            tracks = [TrackUtils.build(recommendedResult.data, requester)];
+                            break;
+                        case LoadTypes.Playlist: {
+                            const playlistData = recommendedResult.data;
+                            tracks = playlistData.tracks.map((track) => TrackUtils.build(track, requester));
+                            playlist = {
+                                name: playlistData.info.name,
+                                playlistInfo: playlistData.pluginInfo,
+                                requester: requester,
+                                tracks,
+                                duration: tracks.reduce((acc, cur) => acc + (cur.duration || 0), 0),
+                            };
+                            break;
+                        }
                     }
-                    const randomUrl = urls[Math.floor(Math.random() * urls.length)];
-                    const res = await this.manager.search({ query: randomUrl, source: Manager_1.SearchPlatform.SoundCloud }, track.requester);
-                    if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
+                    const result = { loadType: recommendedResult.loadType, tracks, playlist };
+                    if (result.loadType === LoadTypes.Empty || result.loadType === LoadTypes.Error) {
                         return [];
                     }
-                    if (res.loadType === LoadTypes.Playlist) {
-                        res.tracks = res.playlist.tracks;
+                    if (result.loadType === LoadTypes.Playlist) {
+                        result.tracks = result.playlist.tracks;
                     }
-                    if (!res.tracks.length) {
+                    if (!result.tracks.length) {
                         return [];
                     }
-                    return res.tracks;
-                }
-                catch (error) {
-                    console.error("[AutoPlay] Error occurred while fetching recommendations:", error);
-                    return [];
+                    return result.tracks;
                 }
-            case "youtube":
-                return this.getRecommendedTracksFromYouTube(track);
+                break;
             default:
                 return [];
         }
     }
-    static async getRecommendedTracksFromYouTube(track) {
-        const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => track.uri.includes(url));
-        let videoID = null;
-        if (hasYouTubeURL) {
-            videoID = track.uri.split("=").pop();
-        }
-        else {
-            const searchResult = await this.manager.search({ query: `${track.author} - ${track.title}`, source: Manager_1.SearchPlatform.YouTube }, track.requester);
-            videoID = searchResult.tracks[0]?.uri.split("=").pop();
-        }
-        if (!videoID) {
-            return [];
-        }
-        let randomIndex;
-        let searchURI;
-        do {
-            randomIndex = Math.floor(Math.random() * 23) + 2;
-            searchURI = `https://www.youtube.com/watch?v=${videoID}&list=RD${videoID}&index=${randomIndex}`;
-        } while (track.uri.includes(searchURI));
-        const res = await this.manager.search({ query: searchURI, source: Manager_1.SearchPlatform.YouTube }, track.requester);
-        if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) {
-            return [];
-        }
-        const filteredTracks = res.tracks.filter((t) => t.uri !== track.uri);
-        return filteredTracks;
-    }
-    static selectPlatform(enabledSources) {
-        const { autoPlaySearchPlatform } = this.manager.options;
-        const platformMapping = {
-            [Manager_1.SearchPlatform.AppleMusic]: "applemusic",
-            [Manager_1.SearchPlatform.Bandcamp]: "bandcamp",
-            [Manager_1.SearchPlatform.Deezer]: "deezer",
-            [Manager_1.SearchPlatform.Jiosaavn]: "jiosaavn",
-            [Manager_1.SearchPlatform.SoundCloud]: "soundcloud",
-            [Manager_1.SearchPlatform.Spotify]: "spotify",
-            [Manager_1.SearchPlatform.Tidal]: "tidal",
-            [Manager_1.SearchPlatform.VKMusic]: "vkmusic",
-            [Manager_1.SearchPlatform.YouTube]: "youtube",
-            [Manager_1.SearchPlatform.YouTubeMusic]: "youtube",
-        };
-        // Try the autoPlaySearchPlatform first
-        if (enabledSources.includes(platformMapping[autoPlaySearchPlatform])) {
-            return autoPlaySearchPlatform;
-        }
-        // Fallback to other platforms in a predefined order
-        const fallbackPlatforms = [
-            Manager_1.SearchPlatform.Spotify,
-            Manager_1.SearchPlatform.Deezer,
-            Manager_1.SearchPlatform.SoundCloud,
-            Manager_1.SearchPlatform.AppleMusic,
-            Manager_1.SearchPlatform.Bandcamp,
-            Manager_1.SearchPlatform.Jiosaavn,
-            Manager_1.SearchPlatform.Tidal,
-            Manager_1.SearchPlatform.VKMusic,
-            Manager_1.SearchPlatform.YouTubeMusic,
-            Manager_1.SearchPlatform.YouTube,
-        ];
-        for (const platform of fallbackPlatforms) {
-            if (enabledSources.includes(platformMapping[platform])) {
-                return platform;
-            }
-        }
-        return null;
-    }
 }
 exports.AutoPlayUtils = AutoPlayUtils;
 /** Gets or extends structures to extend the built in, or already extended, classes to add more functionality. */

package/dist/utils/managerCheck.js

@@ -10,35 +10,38 @@ const Manager_1 = require("../structures/Manager");
 function managerCheck(options) {
     if (!options)
         throw new TypeError("ManagerOptions must not be empty.");
-    const { playNextOnEnd, clientName, defaultSearchPlatform, autoPlaySearchPlatform, nodes, enabledPlugins, send, trackPartial, enablePriorityMode, useNode, normalizeYouTubeTitles, lastFmApiKey, maxPreviousTracks, } = options;
+    const { playNextOnEnd, clientName, defaultSearchPlatform, autoPlaySearchPlatforms, nodes, enabledPlugins, send, trackPartial, enablePriorityMode, useNode, normalizeYouTubeTitles, lastFmApiKey, maxPreviousTracks, } = options;
     // Validate playNextOnEnd option
     if (typeof playNextOnEnd !== "boolean") {
         throw new TypeError('Manager option "playNextOnEnd" must be a boolean.');
     }
     // Validate clientName option
-    if (typeof clientName !== "undefined") {
+    if (typeof clientName !== undefined) {
         if (typeof clientName !== "string" || clientName.trim().length === 0) {
             throw new TypeError('Manager option "clientName" must be a non-empty string.');
         }
     }
     // Validate defaultSearchPlatform option
-    if (typeof defaultSearchPlatform !== "undefined") {
+    if (typeof defaultSearchPlatform !== undefined) {
         if (!Object.values(Manager_1.SearchPlatform).includes(defaultSearchPlatform)) {
             throw new TypeError(`Manager option "defaultSearchPlatform" must be one of: ${Object.values(Manager_1.SearchPlatform).join(", ")}.`);
         }
     }
-    // Validate autoPlaySearchPlatform
-    if (typeof autoPlaySearchPlatform !== "undefined") {
-        if (!Object.values(Manager_1.SearchPlatform).includes(autoPlaySearchPlatform)) {
-            throw new TypeError(`Manager option "autoPlaySearchPlatform" must be one of: ${Object.values(Manager_1.SearchPlatform).join(", ")}.`);
+    // Validate autoPlaySearchPlatforms
+    if (autoPlaySearchPlatforms !== undefined) {
+        if (!Array.isArray(autoPlaySearchPlatforms)) {
+            throw new TypeError('Manager option "autoPlaySearchPlatforms" must be an array.');
+        }
+        if (!autoPlaySearchPlatforms.every((platform) => Object.values(Manager_1.AutoPlayPlatform).includes(platform))) {
+            throw new TypeError(`Manager option "autoPlaySearchPlatforms" must be an array of valid AutoPlayPlatform values.`);
         }
     }
     // Validate nodes option
-    if (typeof nodes === "undefined" || !Array.isArray(nodes)) {
+    if (typeof nodes === undefined || !Array.isArray(nodes)) {
         throw new TypeError('Manager option "nodes" must be an array.');
     }
     // Validate enabledPlugins option
-    if (typeof enabledPlugins !== "undefined" && !Array.isArray(enabledPlugins)) {
+    if (typeof enabledPlugins !== undefined && !Array.isArray(enabledPlugins)) {
         throw new TypeError('Manager option "enabledPlugins" must be a Plugin array.');
     }
     // Validate send option
@@ -46,7 +49,7 @@ function managerCheck(options) {
         throw new TypeError('Manager option "send" must be present and a function.');
     }
     // Validate trackPartial option
-    if (typeof trackPartial !== "undefined") {
+    if (typeof trackPartial !== undefined) {
         if (!Array.isArray(trackPartial)) {
             throw new TypeError('Manager option "trackPartial" must be an array.');
         }
@@ -55,7 +58,7 @@ function managerCheck(options) {
         }
     }
     // Validate enablePriorityMode option
-    if (typeof enablePriorityMode !== "undefined" && typeof enablePriorityMode !== "boolean") {
+    if (typeof enablePriorityMode !== undefined && typeof enablePriorityMode !== "boolean") {
         throw new TypeError('Manager option "enablePriorityMode" must be a boolean.');
     }
     // Validate node priority if enablePriorityMode is enabled
@@ -67,7 +70,7 @@ function managerCheck(options) {
         }
     }
     // Validate useNode option
-    if (typeof useNode !== "undefined") {
+    if (typeof useNode !== undefined) {
         if (typeof useNode !== "string") {
             throw new TypeError('Manager option "useNode" must be a string "leastLoad" or "leastPlayers".');
         }
@@ -76,15 +79,15 @@ function managerCheck(options) {
         }
     }
     // Validate normalizeYouTubeTitles option
-    if (typeof normalizeYouTubeTitles !== "undefined" && typeof normalizeYouTubeTitles !== "boolean") {
+    if (typeof normalizeYouTubeTitles !== undefined && typeof normalizeYouTubeTitles !== "boolean") {
         throw new TypeError('Manager option "normalizeYouTubeTitles" must be a boolean.');
     }
     // Validate lastFmApiKey option
-    if (typeof lastFmApiKey !== "undefined" && (typeof lastFmApiKey !== "string" || lastFmApiKey.trim().length === 0)) {
+    if (typeof lastFmApiKey !== undefined && (typeof lastFmApiKey !== "string" || lastFmApiKey.trim().length === 0)) {
         throw new TypeError('Manager option "lastFmApiKey" must be a non-empty string.');
     }
     // Validate maxPreviousTracks option
-    if (typeof maxPreviousTracks !== "undefined") {
+    if (typeof maxPreviousTracks !== undefined) {
         if (typeof maxPreviousTracks !== "number" || isNaN(maxPreviousTracks)) {
             throw new TypeError('Manager option "maxPreviousTracks" must be a number.');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.0-dev.3",
+	"version": "2.9.0-dev.5",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",