magmastream 2.10.3-dev.2 → 2.10.3

package/dist/structures/Utils.d.ts

@@ -83,7 +83,7 @@ export declare abstract class AutoPlayUtils {
      * @param platform The source to get recommended tracks from.
      * @returns An array of recommended tracks.
      */
-    static getRecommendedTracksFromSource(track: Track, platform: AutoPlayPlatform): Promise<Track[]>;
+    static getRecommendedTracksFromSource(track: Track, platform: AutoPlayPlatform, node?: import("./Node").Node): Promise<Track[]>;
     /**
      * Searches for a track using the manager and returns resolved tracks.
      * @param query The search query (artist - title).

package/dist/structures/Utils.js

@@ -63,7 +63,7 @@ class TrackUtils {
         if (typeof track !== "object" || track === null)
             return false;
         const trackRecord = track;
-        return REQUIRED_TRACK_KEYS.every((key) => typeof trackRecord[key] === "string");
+        return REQUIRED_TRACK_KEYS.every((key) => (key === "uri" ? typeof trackRecord[key] === "string" || trackRecord[key] === null : typeof trackRecord[key] === "string"));
     }
     /**
      * Checks if the provided argument is a valid Track array.
@@ -97,17 +97,32 @@ class TrackUtils {
         }
         try {
             const sourceNameMap = {
+                amazonmusic: "AmazonMusic",
+                anghami: "Anghami",
                 applemusic: "AppleMusic",
+                audiomack: "Audiomack",
                 audius: "Audius",
                 bandcamp: "Bandcamp",
+                bilibili: "Bilibili",
                 deezer: "Deezer",
+                eternalbox: "EternalBox",
+                flowery: "Flowery",
+                gaana: "Gaana",
+                googledrive: "GoogleDrive",
+                googletts: "GoogleTTS",
+                iheartradio: "IHeartRadio",
                 jiosaavn: "Jiosaavn",
+                lastfm: "LastFM",
+                netease: "Netease",
                 soundcloud: "SoundCloud",
                 spotify: "Spotify",
                 tidal: "Tidal",
                 youtube: "YouTube",
                 vkmusic: "VKMusic",
+                nicovideo: "NicoVideo",
+                pandora: "Pandora",
                 qobuz: "Qobuz",
+                shazam: "Shazam",
                 http: "Http",
                 tts: "Tts",
                 clypit: "Clypit",
@@ -131,14 +146,14 @@ class TrackUtils {
                 uri: data.info.uri,
                 artworkUrl: data.info?.artworkUrl ?? null,
                 sourceName: sourceNameMap[data.info?.sourceName?.toLowerCase() ?? ""] ?? data.info?.sourceName,
-                thumbnail: data.info.uri.includes("youtube") ? `https://img.youtube.com/vi/${data.info.identifier}/default.jpg` : null,
+                thumbnail: data.info.uri?.includes("youtube") ? `https://img.youtube.com/vi/${data.info.identifier}/default.jpg` : null,
                 displayThumbnail(size = "default") {
                     const finalSize = SIZES.find((s) => s === size) ?? "default";
-                    return this.uri.includes("youtube") ? `https://img.youtube.com/vi/${data.info.identifier}/${finalSize}.jpg` : null;
+                    return this.uri?.includes("youtube") ? `https://img.youtube.com/vi/${data.info.identifier}/${finalSize}.jpg` : null;
                 },
                 requester: requester,
                 pluginInfo: data.pluginInfo,
-                customData: {},
+                customData: data.userData ?? {},
                 isAutoplay: isAutoplay,
             };
             track.displayThumbnail = track.displayThumbnail.bind(track);
@@ -180,7 +195,7 @@ class TrackUtils {
             return track;
         track.displayThumbnail = function (size = "default") {
             const finalSize = SIZES.find((s) => s === size) ?? "default";
-            return this.uri.includes("youtube") ? `https://img.youtube.com/vi/${this.identifier}/${finalSize}.jpg` : null;
+            return this.uri?.includes("youtube") ? `https://img.youtube.com/vi/${this.identifier}/${finalSize}.jpg` : null;
         }.bind(track);
         return track;
     }
@@ -228,7 +243,14 @@ class AutoPlayUtils {
         // Iterate over autoplay platforms in order of priority
         for (const platform of autoPlaySearchPlatforms) {
             if (enabledSources.includes(platform)) {
-                const recommendedTracks = await this.getRecommendedTracksFromSource(track, platform);
+                let recommendedTracks;
+                try {
+                    recommendedTracks = await this.getRecommendedTracksFromSource(track, platform, node);
+                }
+                catch (error) {
+                    this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[AUTOPLAY] Failed to fetch recommendations from ${platform}: ${error instanceof Error ? error.message : String(error)}`);
+                    continue;
+                }
                 // If tracks are found, return them immediately
                 if (recommendedTracks.length > 0) {
                     return recommendedTracks;
@@ -316,8 +338,12 @@ class AutoPlayUtils {
      * @param platform The source to get recommended tracks from.
      * @returns An array of recommended tracks.
      */
-    static async getRecommendedTracksFromSource(track, platform) {
+    static async getRecommendedTracksFromSource(track, platform, node = this.manager.useableNode) {
         const requester = track.requester;
+        if (!track.uri)
+            return [];
+        if (!node)
+            return [];
         const parsedURL = new URL(track.uri);
         switch (platform) {
             case Enums_1.AutoPlayPlatform.Spotify: {
@@ -334,8 +360,8 @@ class AutoPlayUtils {
                 // 	return match ? match[1] : null;
                 // };
                 // const identifier = `sprec:seed_artists=${extractSpotifyArtistID(track.pluginInfo.artistUrl)}&seed_tracks=${track.identifier}`;
-                const identifier = `sprec:mix:track:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const identifier = node.isNodeLink ? `sprec:seed_tracks=${track.identifier}` : `sprec:mix:track:${track.identifier}`;
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -348,7 +374,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 const identifier = `dzrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -412,14 +438,14 @@ class AutoPlayUtils {
             }
             case Enums_1.AutoPlayPlatform.YouTube: {
                 const allowedYouTubeHosts = ["youtube.com", "youtu.be"];
-                const hasYouTubeURL = allowedYouTubeHosts.some((url) => track.uri.includes(url));
+                const hasYouTubeURL = allowedYouTubeHosts.some((url) => track.uri?.includes(url));
                 let videoID = null;
                 if (hasYouTubeURL) {
-                    videoID = track.uri.split("=").pop();
+                    videoID = track.uri?.split("=").pop() ?? null;
                 }
                 else {
                     const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.YouTube, requester);
-                    if (!resolvedTrack)
+                    if (!resolvedTrack?.uri)
                         return [];
                     videoID = resolvedTrack.uri.split("=").pop();
                 }
@@ -431,7 +457,7 @@ class AutoPlayUtils {
                 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));
+                } while (track.uri?.includes(searchURI));
                 const resolvedTracks = await this.resolveTracksFromQuery(searchURI, Enums_1.SearchPlatform.YouTube, requester);
                 const filteredTracks = resolvedTracks.filter((resolvedTrack) => resolvedTrack.uri !== track.uri);
                 return filteredTracks;
@@ -445,7 +471,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 const identifier = `tdrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -458,7 +484,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 const identifier = `vkrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -471,7 +497,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 const identifier = `qbrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -484,7 +510,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 const identifier = `ymrec:${track.identifier}`;
-                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
@@ -513,6 +539,7 @@ class AutoPlayUtils {
                 case Enums_1.LoadTypes.Playlist:
                     return searchResult.playlist.tracks;
                 case Enums_1.LoadTypes.Track:
+                case Enums_1.LoadTypes.Episode:
                 case Enums_1.LoadTypes.Search:
                 case Enums_1.LoadTypes.Short:
                     return searchResult.tracks;
@@ -548,6 +575,7 @@ class AutoPlayUtils {
                 case Enums_1.LoadTypes.Playlist:
                     return searchResult.playlist.tracks[0] || null;
                 case Enums_1.LoadTypes.Track:
+                case Enums_1.LoadTypes.Episode:
                 case Enums_1.LoadTypes.Search:
                 case Enums_1.LoadTypes.Short:
                     return searchResult.tracks[0] || null;
@@ -575,6 +603,7 @@ class AutoPlayUtils {
         if (TrackUtils.isErrorOrEmptySearchResult(recommendedResult))
             return [];
         switch (recommendedResult.loadType) {
+            case Enums_1.LoadTypes.Episode:
             case Enums_1.LoadTypes.Track: {
                 const data = recommendedResult.data;
                 if (!this.isTrackData(data)) {
@@ -739,7 +768,20 @@ class PlayerUtils {
                         karaoke: player.filters.karaoke ?? null,
                         rotation: player.filters.rotation ?? null,
                         timescale: player.filters.timescale ?? null,
+                        tremolo: player.filters.tremoloOptions ?? null,
                         vibrato: player.filters.vibrato ?? null,
+                        channelMix: player.filters.channelMix ?? null,
+                        lowPass: player.filters.lowPass ?? null,
+                        highpass: player.filters.highpass ?? null,
+                        echo: player.filters.echo ?? null,
+                        chorus: player.filters.chorus ?? null,
+                        compressor: player.filters.compressor ?? null,
+                        flanger: player.filters.flanger ?? null,
+                        phaser: player.filters.phaser ?? null,
+                        phonograph: player.filters.phonograph ?? null,
+                        spatial: player.filters.spatial ?? null,
+                        tape: player.filters.tape ?? null,
+                        pluginFilters: player.filters.pluginFilters ?? {},
                         reverb: player.filters.reverb ?? null,
                         volume: player.filters.volume ?? 1.0,
                         bassBoostlevel: player.filters.bassBoostlevel ?? null,

package/dist/utils/managerCheck.js

@@ -37,10 +37,11 @@ function managerCheck(options, isWrapper = false) {
     }
     // Validate defaultSearchPlatform option
     if (typeof defaultSearchPlatform !== "undefined") {
-        if (!Object.values(Enums_1.SearchPlatform).includes(defaultSearchPlatform)) {
+        const validSearchPlatforms = [...Object.values(Enums_1.SearchPlatform), ...Object.values(Enums_1.NodeLinkSearchPlatform), ...Object.values(Enums_1.NodeLinkRecommendationPlatform)];
+        if (!validSearchPlatforms.includes(defaultSearchPlatform)) {
             throw new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.MANAGER_INVALID_CONFIG,
-                message: `Manager option "defaultSearchPlatform" must be one of: ${Object.values(Enums_1.SearchPlatform).join(", ")}.`,
+                message: `Manager option "defaultSearchPlatform" must be one of: ${validSearchPlatforms.join(", ")}.`,
                 context: { option: "defaultSearchPlatform", value: defaultSearchPlatform },
             });
         }

package/package.json

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