magmastream 2.6.0-beta.8 → 2.6.1

package/README.md

@@ -44,6 +44,7 @@ Also you can join the [Discord Support Server](https://discord.com/invite/HV59Z3
 | [Lunio](https://discord.com/api/oauth2/authorize?client_id=945030475779551415&permissions=61991952&scope=bot+applications.commands)                                                                                                                   | vexi          |
 | [JukeDisc](https://discord.com/oauth2/authorize?client_id=1109751797549105176&permissions=968552214080&scope=bot+applications.commands)                                                                                                               | Theo          |
 | [Cool Music](https://discord.com/oauth2/authorize?client_id=923529398425096193&permissions=12888394808&redirect_uri=https%3A%2F%2Fdiscord.gg%2Fcool-music-support-925619107460698202&response_type=code&scope=bot%20identify%20applications.commands) | Itz Random    |
+| [Soundy](https://dsc.gg/sndy) | iaMJ          |
 
 If you want to add your own bot create a pull request with your bot added. Please add your full name.
 

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Message, User, ClientUser } from 'discord.js';
 import WebSocket from 'ws';
 import { Collection } from '@discordjs/collection';
@@ -203,6 +202,8 @@ declare class Player {
     manager: Manager;
     /** The autoplay state of the player. */
     isAutoplay: boolean;
+    /** The number of times to try autoplay before emitting queueEnd. */
+    autoplayTries: number;
     private static _manager;
     private readonly data;
     private dynamicLoopInterval;
@@ -271,7 +272,7 @@ declare class Player {
      * @param autoplayState
      * @param botUser
      */
-    setAutoplay(autoplayState: boolean, botUser: object): this;
+    setAutoplay(autoplayState: boolean, botUser: object, tries?: number): this;
     /**
      * Gets recommended tracks and returns an array of tracks.
      * @param track
@@ -527,7 +528,6 @@ declare class Node {
     extractSpotifyTrackID(url: string): string | null;
     extractSpotifyArtistID(url: string): string | null;
     private handleAutoplay;
-    private handleSpotifyAutoplay;
     private handleFailedTrack;
     private handleRepeatedTrack;
     private playNextTrack;
@@ -912,9 +912,9 @@ declare class Manager extends EventEmitter {
     constructor(options: ManagerOptions);
     /**
      * Initiates the Manager.
-     * @param clientId
+     * @param clientId - The Discord client ID (required).
      */
-    init(clientId?: string): this;
+    init(clientId: string): this;
     /**
      * Searches the enabled sources based off the URL or the `source` property.
      * @param query
@@ -997,6 +997,11 @@ interface ManagerOptions {
     defaultSearchPlatform?: SearchPlatform;
     /** Whether the YouTube video titles should be replaced if the Author does not exactly match. */
     replaceYouTubeCredentials?: boolean;
+    /** The last.fm API key.
+     * If you need to create one go here: https://www.last.fm/api/account/create.
+     * If you already have one, get it from here: https://www.last.fm/api/accounts.
+     */
+    lastFmApiKey: string;
     /**
      * Function to send data to the websocket.
      * @param id
@@ -1004,7 +1009,23 @@ interface ManagerOptions {
      */
     send(id: string, payload: Payload): void;
 }
-type SearchPlatform = "deezer" | "soundcloud" | "youtube music" | "youtube" | "spotify" | "jiosaavn" | "tidal" | "applemusic" | "bandcamp";
+declare const UseNodeOptions: {
+    readonly leastLoad: "leastLoad";
+    readonly leastPlayers: "leastPlayers";
+};
+type UseNodeOption = keyof typeof UseNodeOptions;
+declare const SearchPlatforms: {
+    readonly deezer: "deezer";
+    readonly soundcloud: "soundcloud";
+    readonly "youtube music": "youtube music";
+    readonly youtube: "youtube";
+    readonly spotify: "spotify";
+    readonly jiosaavn: "jiosaavn";
+    readonly tidal: "tidal";
+    readonly applemusic: "applemusic";
+    readonly bandcamp: "bandcamp";
+};
+type SearchPlatform = keyof typeof SearchPlatforms;
 type PlayerStateEventType = "connectionChange" | "playerCreate" | "playerDestroy" | "channelChange" | "volumeChange" | "pauseChange" | "queueChange" | "trackChange" | "repeatChange" | "autoplayChange";
 interface SearchQuery {
     /** The source to search from. */
@@ -1034,9 +1055,25 @@ interface PlaylistRawData {
     /** The tracks of the playlist */
     tracks: TrackData[];
 }
+interface PlaylistInfoData {
+    /** Url to playlist. */
+    url: string;
+    /** Type is always playlist in that case. */
+    type: string;
+    /** ArtworkUrl of playlist */
+    artworkUrl: string;
+    /** Number of total tracks in playlist */
+    totalTracks: number;
+    /** Author of playlist */
+    author: string;
+}
 interface PlaylistData {
     /** The playlist name. */
     name: string;
+    /** Requester of playlist. */
+    requester: User | ClientUser;
+    /** More playlist information. */
+    playlistInfo: PlaylistInfoData[];
     /** The length of the playlist. */
     duration: number;
     /** The songs of the playlist. */
@@ -1071,4 +1108,4 @@ interface ManagerEvents {
     chaptersLoaded: [player: Player, track: Track | UnresolvedTrack, payload: SponsorBlockChaptersLoaded];
 }
 
-export { type CPUStats, type EqualizerBand, type Exception, type Extendable, type FrameStats, type LavalinkInfo, type LavalinkResponse, type LoadType, Manager, type ManagerEvents, type ManagerOptions, type MemoryStats, Node, type NodeMessage, type NodeOptions, type NodeStats, type Payload, type PlayOptions, Player, type PlayerEvent, type PlayerEventType, type PlayerEvents, type PlayerOptions, type PlayerStateEventType, type PlayerUpdate, type PlaylistData, type PlaylistRawData, Plugin, Queue, type SearchPlatform, type SearchQuery, type SearchResult, type Severity, type Sizes, type SponsorBlockChapterStarted, type SponsorBlockChaptersLoaded, type SponsorBlockSegment, type SponsorBlockSegmentEventType, type SponsorBlockSegmentEvents, type SponsorBlockSegmentSkipped, type SponsorBlockSegmentsLoaded, type State, Structure, type Track, type TrackData, type TrackDataInfo, type TrackEndEvent, type TrackEndReason, type TrackExceptionEvent, type TrackPluginInfo, type TrackSourceName, type TrackStartEvent, type TrackStuckEvent, TrackUtils, type UnresolvedQuery, type UnresolvedTrack, type VoicePacket, type VoiceServer, type VoiceState, type WebSocketClosedEvent, validSponsorBlocks };
+export { type CPUStats, type EqualizerBand, type Exception, type Extendable, type FrameStats, type LavalinkInfo, type LavalinkResponse, type LoadType, Manager, type ManagerEvents, type ManagerOptions, type MemoryStats, Node, type NodeMessage, type NodeOptions, type NodeStats, type Payload, type PlayOptions, Player, type PlayerEvent, type PlayerEventType, type PlayerEvents, type PlayerOptions, type PlayerStateEventType, type PlayerUpdate, type PlaylistData, type PlaylistInfoData, type PlaylistRawData, Plugin, Queue, type SearchPlatform, SearchPlatforms, type SearchQuery, type SearchResult, type Severity, type Sizes, type SponsorBlockChapterStarted, type SponsorBlockChaptersLoaded, type SponsorBlockSegment, type SponsorBlockSegmentEventType, type SponsorBlockSegmentEvents, type SponsorBlockSegmentSkipped, type SponsorBlockSegmentsLoaded, type State, Structure, type Track, type TrackData, type TrackDataInfo, type TrackEndEvent, type TrackEndReason, type TrackExceptionEvent, type TrackPluginInfo, type TrackSourceName, type TrackStartEvent, type TrackStuckEvent, TrackUtils, type UnresolvedQuery, type UnresolvedTrack, type UseNodeOption, UseNodeOptions, type VoicePacket, type VoiceServer, type VoiceState, type WebSocketClosedEvent, validSponsorBlocks };

package/dist/structures/Manager.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Manager = void 0;
+exports.SearchPlatforms = exports.UseNodeOptions = exports.Manager = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable no-async-promise-executor */
 const Utils_1 = require("./Utils");
@@ -337,17 +337,19 @@ class Manager extends events_1.EventEmitter {
     }
     /**
      * Initiates the Manager.
-     * @param clientId
+     * @param clientId - The Discord client ID (required).
      */
     init(clientId) {
-        if (this.initiated)
+        if (this.initiated) {
             return this;
-        if (typeof clientId !== "undefined")
-            this.options.clientId = clientId;
-        if (typeof this.options.clientId !== "string")
-            throw new Error('"clientId" set is not type of "string"');
-        if (!this.options.clientId)
-            throw new Error('"clientId" is not set. Pass it in Manager#init() or as a option in the constructor.');
+        }
+        // Validate clientId
+        if (typeof clientId !== "string" || !/^\d+$/.test(clientId)) {
+            throw new Error('"clientId" must be a valid Discord client ID.');
+        }
+        // Set the validated clientId
+        this.options.clientId = clientId;
+        // Attempt to connect nodes
         for (const node of this.nodes.values()) {
             try {
                 node.connect();
@@ -400,6 +402,8 @@ class Manager extends events_1.EventEmitter {
             if (res.loadType === "playlist") {
                 playlist = {
                     name: playlistData.info.name,
+                    playlistInfo: playlistData.pluginInfo,
+                    requester: requester,
                     tracks: playlistData.tracks.map((track) => Utils_1.TrackUtils.build(track, requester)),
                     duration: playlistData.tracks.reduce((acc, cur) => acc + (cur.info.length || 0), 0),
                 };
@@ -610,3 +614,18 @@ class Manager extends events_1.EventEmitter {
     }
 }
 exports.Manager = Manager;
+exports.UseNodeOptions = {
+    leastLoad: "leastLoad",
+    leastPlayers: "leastPlayers",
+};
+exports.SearchPlatforms = {
+    deezer: "deezer",
+    soundcloud: "soundcloud",
+    "youtube music": "youtube music",
+    youtube: "youtube",
+    spotify: "spotify",
+    jiosaavn: "jiosaavn",
+    tidal: "tidal",
+    applemusic: "applemusic",
+    bandcamp: "bandcamp",
+};

package/dist/structures/Node.js

@@ -8,6 +8,7 @@ const nodeCheck_1 = tslib_1.__importDefault(require("../utils/nodeCheck"));
 const ws_1 = tslib_1.__importDefault(require("ws"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const axios_1 = tslib_1.__importDefault(require("axios"));
 exports.validSponsorBlocks = ["sponsor", "selfpromo", "interaction", "intro", "outro", "preview", "music_offtopic", "filler"];
 const sessionIdsFilePath = path_1.default.join(process.cwd(), "node_modules", "magmastream", "dist", "sessionData", "sessionIds.json");
 let sessionIdsMap = new Map();
@@ -367,72 +368,103 @@ class Node {
         return match ? match[1] : null;
     }
     // Handle autoplay
-    async handleAutoplay(player, track) {
+    async handleAutoplay(player, track, attempt = 0) {
+        if (!player.isAutoplay || attempt === player.autoplayTries || !player.queue.previous)
+            return false;
         const previousTrack = player.queue.previous;
-        if (!player.isAutoplay || !previousTrack)
-            return;
-        const hasSpotifyURL = ["spotify.com", "open.spotify.com"].some((url) => previousTrack.uri.includes(url));
-        if (hasSpotifyURL) {
-            const spotifySuccess = await this.handleSpotifyAutoplay(player); // Check if Spotify autoplay was successful
-            if (spotifySuccess)
-                return; // If successful, exit the function
+        const apiKey = this.manager.options.lastFmApiKey;
+        // If Last.fm API is not available and YouTube is not supported
+        if (!apiKey && !this.info.sourceManagers.includes("youtube"))
+            return false;
+        // Handle YouTube autoplay logic
+        if ((!apiKey && this.info.sourceManagers.includes("youtube")) ||
+            (attempt === player.autoplayTries - 1 && !(apiKey && player.autoplayTries === 1) && this.info.sourceManagers.includes("youtube"))) {
+            const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => previousTrack.uri.includes(url));
+            const videoID = hasYouTubeURL
+                ? previousTrack.uri.split("=").pop()
+                : (await player.search(`${previousTrack.author} - ${previousTrack.title}`, player.get("Internal_BotUser"))).tracks[0]?.uri.split("=").pop();
+            if (!videoID)
+                return false;
+            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 player.search(searchURI, player.get("Internal_BotUser"));
+            if (res.loadType === "empty" || res.loadType === "error")
+                return false;
+            const foundTrack = res.tracks.find((t) => t.uri !== track.uri && t.author !== track.author && t.title !== track.title);
+            if (!foundTrack)
+                return false;
+            player.queue.add(foundTrack);
+            player.play();
+            return true;
         }
-        const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => previousTrack.uri.includes(url));
-        let videoID = previousTrack.uri.substring(previousTrack.uri.indexOf("=") + 1);
-        if (!hasYouTubeURL) {
-            const res = await player.search(`${previousTrack.author} - ${previousTrack.title}`, player.get("Internal_BotUser"));
-            videoID = res.tracks[0].uri.substring(res.tracks[0].uri.indexOf("=") + 1);
+        // Handle Last.fm-based autoplay logic
+        let { author: artist } = previousTrack;
+        const { title, uri } = previousTrack;
+        const enabledSources = this.info.sourceManagers;
+        const isSpotifyEnabled = enabledSources.includes("spotify");
+        const isSpotifyUri = uri.includes("spotify.com");
+        let selectedSource = null;
+        if (isSpotifyEnabled && isSpotifyUri) {
+            selectedSource = "spotify";
         }
-        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 player.search(searchURI, player.get("Internal_BotUser"));
-        if (res.loadType === "empty" || res.loadType === "error")
-            return;
-        let tracks = res.tracks;
-        if (res.loadType === "playlist")
-            tracks = res.playlist.tracks;
-        const foundTrack = tracks.sort(() => Math.random() - 0.5).find((shuffledTrack) => shuffledTrack.uri !== track.uri);
-        if (!foundTrack)
-            return;
-        if (this.manager.options.replaceYouTubeCredentials) {
-            foundTrack.author = foundTrack.author.replace("- Topic", "");
-            foundTrack.title = foundTrack.title.replace("Topic -", "");
-            if (foundTrack.title.includes("-")) {
-                const [author, title] = foundTrack.title.split("-").map((str) => str.trim());
-                foundTrack.author = author;
-                foundTrack.title = title;
+        else {
+            selectedSource = this.manager.options.defaultSearchPlatform;
+        }
+        if (!artist || !title) {
+            if (!title) {
+                const noTitleUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
+                const response = await axios_1.default.get(noTitleUrl);
+                if (response.data.error || !response.data.toptracks?.track?.length)
+                    return false;
+                const randomTrack = response.data.toptracks.track[Math.floor(Math.random() * response.data.toptracks.track.length)];
+                const res = await player.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, player.get("Internal_BotUser"));
+                if (res.loadType === "empty" || res.loadType === "error")
+                    return false;
+                const foundTrack = res.tracks.find((t) => t.uri !== track.uri);
+                if (!foundTrack)
+                    return false;
+                player.queue.add(foundTrack);
+                player.play();
+                return true;
+            }
+            else if (!artist) {
+                const noArtistUrl = `https://ws.audioscrobbler.com/2.0/?method=track.search&track=${title}&api_key=${apiKey}&format=json`;
+                const response = await axios_1.default.get(noArtistUrl);
+                artist = response.data.results.trackmatches?.track?.[0]?.artist;
+                if (!artist)
+                    return false;
             }
         }
-        player.queue.add(foundTrack);
-        player.play();
-    }
-    async handleSpotifyAutoplay(player) {
-        const previousTrack = player.queue.previous;
-        const node = this.manager.useableNodes;
-        const isSpotifyPluginEnabled = node.info.plugins.some((plugin) => plugin.name === "lavasrc-plugin");
-        const isSpotifySourceManagerEnabled = node.info.sourceManagers.includes("spotify");
-        if (!isSpotifySourceManagerEnabled || !isSpotifyPluginEnabled)
-            return false;
-        const trackID = this.extractSpotifyTrackID(previousTrack.uri);
-        const artistID = this.extractSpotifyArtistID(previousTrack.pluginInfo.artistUrl);
-        let identifier = [trackID && `seed_tracks=${trackID}`, artistID && `seed_artists=${artistID}`].filter(Boolean).join("&");
-        if (identifier) {
-            identifier = `sprec:${identifier}`;
+        const url = `https://ws.audioscrobbler.com/2.0/?method=track.getSimilar&artist=${artist}&track=${title}&limit=10&autocorrect=1&api_key=${apiKey}&format=json`;
+        const response = await axios_1.default.get(url);
+        if (response.data.error || !response.data.similartracks?.track?.length) {
+            const retryUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
+            const retryResponse = await axios_1.default.get(retryUrl);
+            if (retryResponse.data.error || !retryResponse.data.toptracks?.track?.length)
+                return false;
+            const randomTrack = retryResponse.data.toptracks.track[Math.floor(Math.random() * retryResponse.data.toptracks.track.length)];
+            const res = await player.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, player.get("Internal_BotUser"));
+            if (res.loadType === "empty" || res.loadType === "error")
+                return false;
+            const foundTrack = res.tracks.find((t) => t.uri !== track.uri);
+            if (!foundTrack)
+                return false;
+            player.queue.add(foundTrack);
+            player.play();
+            return true;
         }
-        if (!identifier)
-            return false;
-        const recommendedResult = (await node.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
-        if (recommendedResult.loadType !== "playlist")
+        const randomTrack = response.data.similartracks.track[Math.floor(Math.random() * response.data.similartracks.track.length)];
+        const res = await player.search({ query: `${randomTrack.artist.name} - ${randomTrack.name}`, source: selectedSource }, player.get("Internal_BotUser"));
+        if (res.loadType === "empty" || res.loadType === "error")
             return false;
-        const playlistData = recommendedResult.data;
-        const recommendedTrack = playlistData.tracks[0];
-        if (!recommendedTrack)
+        const foundTrack = res.tracks.find((t) => t.uri !== track.uri);
+        if (!foundTrack)
             return false;
-        player.queue.add(Utils_1.TrackUtils.build(recommendedTrack, player.get("Internal_BotUser")));
+        player.queue.add(foundTrack);
         player.play();
         return true;
     }
@@ -480,13 +512,22 @@ class Node {
         player.queue.previous = player.queue.current;
         player.queue.current = null;
         if (!player.isAutoplay) {
-            player.queue.previous = player.queue.current;
-            player.queue.current = null;
             player.playing = false;
             this.manager.emit("queueEnd", player, track, payload);
             return;
         }
-        await this.handleAutoplay(player, track);
+        let attempts = 1;
+        let success = false;
+        while (attempts <= player.autoplayTries) {
+            success = await this.handleAutoplay(player, track, attempts);
+            if (success)
+                return;
+            attempts++;
+        }
+        // If all attempts fail, reset the player state and emit queueEnd
+        player.queue.previous = null;
+        player.playing = false;
+        this.manager.emit("queueEnd", player, track, payload);
     }
     trackStuck(player, track, payload) {
         player.stop();

package/dist/structures/Player.js

@@ -47,6 +47,8 @@ class Player {
     manager;
     /** The autoplay state of the player. */
     isAutoplay = false;
+    /** The number of times to try autoplay before emitting queueEnd. */
+    autoplayTries = 3;
     static _manager;
     data = {};
     dynamicLoopInterval;
@@ -116,7 +118,7 @@ class Player {
         if (!this.voiceChannel)
             throw new RangeError("No voice channel has been set.");
         this.state = "CONNECTING";
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.manager.options.send(this.guild, {
             op: 4,
             d: {
@@ -135,7 +137,7 @@ class Player {
         if (this.voiceChannel === null)
             return this;
         this.state = "DISCONNECTING";
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.pause(true);
         this.manager.options.send(this.guild, {
             op: 4,
@@ -153,7 +155,7 @@ class Player {
     }
     /** Destroys the player. */
     destroy(disconnect = true) {
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.state = "DESTROYING";
         if (disconnect) {
             this.disconnect();
@@ -170,10 +172,10 @@ class Player {
     setVoiceChannel(channel) {
         if (typeof channel !== "string")
             throw new TypeError("Channel must be a non-empty string.");
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.voiceChannel = channel;
         this.connect();
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "channelChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "voiceChannelChange");
         return this;
     }
     /**
@@ -183,9 +185,9 @@ class Player {
     setTextChannel(channel) {
         if (typeof channel !== "string")
             throw new TypeError("Channel must be a non-empty string.");
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.textChannel = channel;
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "channelChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "textChannelChange");
         return this;
     }
     /** Sets the now playing message. */
@@ -234,15 +236,19 @@ class Player {
      * @param autoplayState
      * @param botUser
      */
-    setAutoplay(autoplayState, botUser) {
+    setAutoplay(autoplayState, botUser, tries = 3) {
         if (typeof autoplayState !== "boolean") {
             throw new TypeError("autoplayState must be a boolean.");
         }
         if (typeof botUser !== "object") {
             throw new TypeError("botUser must be a user-object.");
         }
-        const oldPlayer = { ...this };
+        if (typeof tries !== "number" || tries < 1) {
+            tries = 3; // Default to 3 if invalid
+        }
+        const oldPlayer = this ? { ...this } : null;
         this.isAutoplay = autoplayState;
+        this.autoplayTries = tries;
         this.set("Internal_BotUser", botUser);
         this.manager.emit("playerStateUpdate", oldPlayer, this, "autoplayChange");
         return this;
@@ -324,7 +330,7 @@ class Player {
     setVolume(volume) {
         if (isNaN(volume))
             throw new TypeError("Volume must be a number.");
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.node.rest.updatePlayer({
             guildId: this.options.guild,
             data: {
@@ -361,7 +367,7 @@ class Player {
     setTrackRepeat(repeat) {
         if (typeof repeat !== "boolean")
             throw new TypeError('Repeat can only be "true" or "false".');
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         if (repeat) {
             this.trackRepeat = true;
             this.queueRepeat = false;
@@ -372,7 +378,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackRepeatChange");
         return this;
     }
     /**
@@ -382,7 +388,7 @@ class Player {
     setQueueRepeat(repeat) {
         if (typeof repeat !== "boolean")
             throw new TypeError('Repeat can only be "true" or "false".');
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         if (repeat) {
             this.trackRepeat = false;
             this.queueRepeat = true;
@@ -393,7 +399,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "queueRepeatChange");
         return this;
     }
     /**
@@ -408,7 +414,7 @@ class Player {
         if (this.queue.size <= 1) {
             throw new RangeError("The queue size must be greater than 1.");
         }
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         if (repeat) {
             this.trackRepeat = false;
             this.queueRepeat = false;
@@ -429,7 +435,7 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = false;
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "repeatChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "dynamicRepeatChange");
         return this;
     }
     /** Restarts the current track to the start. */
@@ -449,7 +455,7 @@ class Player {
     }
     /** Stops the current track, optionally give an amount to skip to, e.g 5 would play the 5th song. */
     stop(amount) {
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         if (typeof amount === "number" && amount > 1) {
             if (amount > this.queue.length)
                 throw new RangeError("Cannot skip more than the queue length.");
@@ -461,7 +467,7 @@ class Player {
                 encodedTrack: null,
             },
         });
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChangeStop");
         return this;
     }
     /**
@@ -473,7 +479,7 @@ class Player {
             throw new RangeError('Pause can only be "true" or "false".');
         if (this.paused === pause || !this.queue.totalSize)
             return this;
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.playing = !pause;
         this.paused = pause;
         this.node.rest.updatePlayer({
@@ -487,10 +493,10 @@ class Player {
     }
     /** Go back to the previous song. */
     previous() {
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         this.queue.unshift(this.queue.previous);
         this.stop();
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChangePrevious");
         return this;
     }
     /**
@@ -504,7 +510,7 @@ class Player {
         if (isNaN(position)) {
             throw new RangeError("Position must be a number.");
         }
-        const oldPlayer = { ...this };
+        const oldPlayer = this ? { ...this } : null;
         if (position < 0 || position > this.queue.current.duration)
             position = Math.max(Math.min(position, this.queue.current.duration), 0);
         this.position = position;
@@ -514,7 +520,7 @@ class Player {
                 position: position,
             },
         });
-        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this, "trackChangeSeek");
         return this;
     }
 }

package/dist/structures/Queue.js

@@ -40,7 +40,7 @@ class Queue extends Array {
     add(track, offset) {
         const trackInfo = Array.isArray(track) ? track.map((t) => JSON.stringify(t, null, 2)).join(", ") : JSON.stringify(track, null, 2);
         this.manager.emit("debug", `[QUEUE] Added ${Array.isArray(track) ? track.length : 1} track(s) to queue: ${trackInfo}`);
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         if (!Utils_1.TrackUtils.validate(track)) {
             throw new RangeError('Track must be a "Track" or "Track[]".');
         }
@@ -77,10 +77,10 @@ class Queue extends Array {
                 }
             }
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueTrackAdd");
     }
     remove(startOrPosition = 0, end) {
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         if (typeof end !== "undefined") {
             // Validate input for `start` and `end`
             if (isNaN(Number(startOrPosition)) || isNaN(Number(end))) {
@@ -91,34 +91,34 @@ class Queue extends Array {
             }
             const removedTracks = this.splice(startOrPosition, end - startOrPosition);
             this.manager.emit("debug", `[QUEUE] Removed ${removedTracks.length} track(s) from player: ${this.guild} from position ${startOrPosition} to ${end}.`);
-            this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+            this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueTrackRemove");
             return;
         }
         // Single item removal when no end specified
         const removedTrack = this.splice(startOrPosition, 1);
         this.manager.emit("debug", `[QUEUE] Removed 1 track from player: ${this.guild} from position ${startOrPosition}: ${JSON.stringify(removedTrack[0], null, 2)}`);
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueTrackRemoveSingle");
         return;
     }
     /** Clears the queue. */
     clear() {
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         this.splice(0);
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueClear");
         this.manager.emit("debug", `[QUEUE] Cleared the queue for: ${this.guild}`);
     }
     /** Shuffles the queue. */
     shuffle() {
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         for (let i = this.length - 1; i > 0; i--) {
             const j = Math.floor(Math.random() * (i + 1));
             [this[i], this[j]] = [this[j], this[i]];
         }
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueShuffle");
         this.manager.emit("debug", `[QUEUE] Shuffled the queue for: ${this.guild}`);
     }
     userBlockShuffle() {
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         const userTracks = new Map();
         this.forEach((track) => {
             const user = track.requester.id;
@@ -138,11 +138,11 @@ class Queue extends Array {
         }
         this.splice(0);
         this.add(shuffledQueue);
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueUserBlockShuffle");
         this.manager.emit("debug", `[QUEUE] userBlockShuffled the queue for: ${this.guild}`);
     }
     roundRobinShuffle() {
-        const oldPlayer = { ...this.manager.players.get(this.guild) };
+        const oldPlayer = this.manager.players.get(this.guild) ? { ...this.manager.players.get(this.guild) } : null;
         const userTracks = new Map();
         this.forEach((track) => {
             const user = track.requester.id;
@@ -171,7 +171,7 @@ class Queue extends Array {
         }
         this.splice(0);
         this.add(shuffledQueue);
-        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueChange");
+        this.manager.emit("playerStateUpdate", oldPlayer, this.manager.players.get(this.guild), "queueRobinShuffle");
         this.manager.emit("debug", `[QUEUE] roundRobinShuffled the queue for: ${this.guild}`);
     }
 }

package/dist/utils/managerCheck.js

@@ -1,22 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = managerCheck;
+const Manager_1 = require("../structures/Manager");
 function managerCheck(options) {
     if (!options)
         throw new TypeError("ManagerOptions must not be empty.");
-    const { autoPlay, clientId, clientName, defaultSearchPlatform, nodes, plugins, send, trackPartial, usePriority, useNode, replaceYouTubeCredentials } = options;
-    if (typeof autoPlay !== "undefined" && typeof autoPlay !== "boolean") {
+    const { autoPlay, clientName, defaultSearchPlatform, nodes, plugins, send, trackPartial, usePriority, useNode, replaceYouTubeCredentials, lastFmApiKey } = options;
+    if (typeof autoPlay !== "boolean") {
         throw new TypeError('Manager option "autoPlay" must be a boolean.');
     }
-    if (typeof clientId !== "undefined" && !/^\d+$/.test(clientId)) {
-        throw new TypeError('Manager option "clientId" must be a non-empty string.');
-    }
-    if (typeof clientName !== "undefined" && typeof clientName !== "string") {
-        throw new TypeError('Manager option "clientName" must be a string.');
+    if (typeof clientName !== "undefined") {
+        if (typeof clientName !== "string" || clientName.trim().length === 0) {
+            throw new TypeError('Manager option "clientName" must be a non-empty string.');
+        }
     }
-    if (typeof defaultSearchPlatform !== "undefined" && typeof defaultSearchPlatform !== "string") {
-        throw new TypeError('Manager option "defaultSearchPlatform" must be a string.');
+    if (typeof defaultSearchPlatform !== "undefined") {
+        if (typeof defaultSearchPlatform !== "string" || !Object.values(Manager_1.SearchPlatforms).includes(defaultSearchPlatform)) {
+            throw new TypeError(`Manager option "defaultSearchPlatform" must be one of: ${Object.values(Manager_1.SearchPlatforms).join(", ")}.`);
+        }
     }
-    if (typeof nodes !== "undefined" && !Array.isArray(nodes)) {
+    if (typeof nodes === "undefined" || !Array.isArray(nodes)) {
         throw new TypeError('Manager option "nodes" must be an array.');
     }
     if (typeof plugins !== "undefined" && !Array.isArray(plugins)) {
@@ -25,16 +28,21 @@ function managerCheck(options) {
     if (typeof send !== "function") {
         throw new TypeError('Manager option "send" must be present and a function.');
     }
-    if (typeof trackPartial !== "undefined" && !Array.isArray(trackPartial)) {
-        throw new TypeError('Manager option "trackPartial" must be a string array.');
+    if (typeof trackPartial !== "undefined") {
+        if (!Array.isArray(trackPartial)) {
+            throw new TypeError('Manager option "trackPartial" must be an array.');
+        }
+        if (!trackPartial.every(item => typeof item === "string")) {
+            throw new TypeError('Manager option "trackPartial" must be an array of strings.');
+        }
     }
     if (typeof usePriority !== "undefined" && typeof usePriority !== "boolean") {
         throw new TypeError('Manager option "usePriority" must be a boolean.');
     }
     if (usePriority) {
         for (let index = 0; index < nodes.length; index++) {
-            if (!nodes[index].priority) {
-                throw new TypeError(`Missing node option "priority" at position ${index}`);
+            if (typeof nodes[index].priority !== 'number' || isNaN(nodes[index].priority)) {
+                throw new TypeError(`Missing or invalid node option "priority" at position ${index}`);
             }
         }
     }
@@ -42,12 +50,14 @@ function managerCheck(options) {
         if (typeof useNode !== "string") {
             throw new TypeError('Manager option "useNode" must be a string "leastLoad" or "leastPlayers".');
         }
-        if (useNode !== "leastLoad" && useNode !== "leastPlayers") {
-            throw new TypeError('Manager option must be either "leastLoad" or "leastPlayers".');
+        if (!(useNode in Manager_1.UseNodeOptions)) {
+            throw new TypeError('Manager option "useNode" must be either "leastLoad" or "leastPlayers".');
         }
     }
     if (typeof replaceYouTubeCredentials !== "undefined" && typeof replaceYouTubeCredentials !== "boolean") {
         throw new TypeError('Manager option "replaceYouTubeCredentials" must be a boolean.');
     }
+    if (typeof lastFmApiKey !== "undefined" && (typeof lastFmApiKey !== "string" || lastFmApiKey.trim().length === 0)) {
+        throw new TypeError('Manager option "lastFmApiKey" must be a non-empty string.');
+    }
 }
-exports.default = managerCheck;

package/dist/utils/nodeCheck.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = nodeCheck;
 function nodeCheck(options) {
     if (!options)
         throw new TypeError("NodeOptions must not be empty.");
@@ -38,4 +39,3 @@ function nodeCheck(options) {
         throw new TypeError('Node option "priority" must be a number.');
     }
 }
-exports.default = nodeCheck;

package/dist/utils/playerCheck.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = playerCheck;
 function playerCheck(options) {
     if (!options)
         throw new TypeError("PlayerOptions must not be empty.");
@@ -26,4 +27,3 @@ function playerCheck(options) {
         throw new TypeError('Player option "volume" must be a number.');
     }
 }
-exports.default = playerCheck;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.6.0-beta.8",
+	"version": "2.6.1",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -15,23 +15,23 @@
 	},
 	"devDependencies": {
 		"@favware/rollup-type-bundler": "^3.3.0",
-		"@types/lodash": "^4.17.9",
-		"@types/node": "^20.16.10",
-		"@types/ws": "^8.5.12",
+		"@types/lodash": "^4.17.14",
+		"@types/node": "^20.17.12",
+		"@types/ws": "^8.5.13",
 		"@typescript-eslint/eslint-plugin": "^7.18.0",
 		"@typescript-eslint/parser": "^7.18.0",
 		"eslint": "^8.57.1",
 		"npm-run-all": "^4.1.5",
-		"typedoc": "^0.25.13",
-		"typedoc-plugin-no-inherit": "^1.4.0",
-		"typescript": "^5.4.5"
+		"typedoc": "^0.27.6",
+		"typedoc-plugin-no-inherit": "^1.5.0",
+		"typescript": "^5.7.3"
 	},
 	"dependencies": {
 		"@discordjs/collection": "^2.1.1",
-		"axios": "^1.7.7",
+		"axios": "^1.7.9",
 		"events": "^3.3.0",
 		"lodash": "^4.17.21",
-		"tslib": "^2.7.0",
+		"tslib": "^2.8.1",
 		"ws": "^8.18.0"
 	},
 	"peerDependencies": {