magmastream 2.9.0-dev.0 → 2.9.0-dev.2

package/dist/index.d.ts

@@ -200,7 +200,7 @@ declare class Node {
      * @remarks
      * If the node is already connected, this method will do nothing.
      * If the node has a session ID, it will be sent in the headers of the WebSocket connection.
-     * If the node has no session ID but the `resumeStatus` option is true, it will use the session ID
+     * If the node has no session ID but the `enableSessionResumeOption` option is true, it will use the session ID
      * stored in the sessionIds.json file if it exists.
      */
     connect(): void;
@@ -477,21 +477,21 @@ interface NodeOptions {
     /** The password for the node. */
     password?: string;
     /** Whether the host uses SSL. */
-    secure?: boolean;
+    useSSL?: boolean;
     /** The identifier for the node. */
     identifier?: string;
-    /** The retryAmount for the node. */
-    retryAmount?: number;
-    /** The retryDelay for the node. */
-    retryDelay?: number;
+    /** The maxRetryAttempts for the node. */
+    maxRetryAttempts?: number;
+    /** The retryDelayMs for the node. */
+    retryDelayMs?: number;
     /** Whether to resume the previous session. */
-    resumeStatus?: boolean;
+    enableSessionResumeOption?: boolean;
     /** The time the lavalink server will wait before it removes the player. */
-    resumeTimeout?: number;
+    sessionTimeoutMs?: number;
     /** The timeout used for api calls. */
-    requestTimeout?: number;
+    apiRequestTimeoutMs?: number;
     /** Priority of the node. */
-    priority?: number;
+    nodePriority?: number;
 }
 interface NodeStats {
     /** The amount of players on the node. */
@@ -898,11 +898,11 @@ declare class Manager extends EventEmitter {
     /**
      * Initiates the Manager class.
      * @param options
-     * @param options.plugins - An array of plugins to load.
+     * @param options.enabledPlugins - An array of enabledPlugins to load.
      * @param options.nodes - An array of node options to create nodes from.
-     * @param options.autoPlay - Whether to automatically play the first track in the queue when the player is created.
+     * @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.usePriority - Whether to use the priority when selecting a node to play on.
+     * @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.
      * @param options.useNode - The strategy to use when selecting a node to play on.
@@ -997,10 +997,10 @@ declare class Manager extends EventEmitter {
      */
     loadPlayerStates(nodeId: string): Promise<void>;
     /**
-     * Returns the node to use based on the configured `useNode` and `usePriority` options.
-     * If `usePriority` is true, the node is chosen based on priority, otherwise it is chosen based on the `useNode` option.
+     * Returns the node to use based on the configured `useNode` and `enablePriorityMode` options.
+     * If `enablePriorityMode` is true, the node is chosen based on priority, otherwise it is chosen based on the `useNode` option.
      * If `useNode` is "leastLoad", the node with the lowest load is chosen, if it is "leastPlayers", the node with the fewest players is chosen.
-     * If `usePriority` is false and `useNode` is not set, the node with the lowest load is chosen.
+     * If `enablePriorityMode` is false and `useNode` is not set, the node with the lowest load is chosen.
      * @returns {Node} The node to use.
      */
     get useableNode(): Node;
@@ -1114,9 +1114,11 @@ interface Payload {
     };
 }
 interface ManagerOptions {
-    /** Whether players should automatically play the next song. */
-    autoPlay?: boolean;
-    /** The search platform autoplay should use. Fallback to YouTube if not found.
+    /** Enable priority mode over least player count or load balancing? */
+    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;
     /** The client ID to use. */
@@ -1125,6 +1127,8 @@ interface ManagerOptions {
     clientName?: string;
     /** The array of shard IDs connected to this manager instance. */
     clusterId?: number;
+    /** List of plugins to load. */
+    enabledPlugins?: Plugin[];
     /** The default search platform to use.
      * Use enum `SearchPlatform`. */
     defaultSearchPlatform?: SearchPlatform;
@@ -1136,16 +1140,12 @@ interface ManagerOptions {
     maxPreviousTracks?: number;
     /** The array of nodes to connect to. */
     nodes?: NodeOptions[];
-    /** A array of plugins to use. */
-    plugins?: Plugin[];
     /** Whether the YouTube video titles should be replaced if the Author does not exactly match. */
-    replaceYouTubeCredentials?: boolean;
+    normalizeYouTubeTitles?: boolean;
     /** An array of track properties to keep. `track` will always be present. */
     trackPartial?: TrackPartial[];
     /** Use the least amount of players or least load? */
     useNode?: UseNodeOptions.LeastLoad | UseNodeOptions.LeastPlayers;
-    /** Use priority mode over least amount of player or load? */
-    usePriority?: boolean;
     /**
      * Function to send data to the websocket.
      * @param id The ID of the node to send the data to.

package/dist/structures/Manager.js

@@ -24,11 +24,11 @@ class Manager extends events_1.EventEmitter {
     /**
      * Initiates the Manager class.
      * @param options
-     * @param options.plugins - An array of plugins to load.
+     * @param options.enabledPlugins - An array of enabledPlugins to load.
      * @param options.nodes - An array of node options to create nodes from.
-     * @param options.autoPlay - Whether to automatically play the first track in the queue when the player is created.
+     * @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.usePriority - Whether to use the priority when selecting a node to play on.
+     * @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.
      * @param options.useNode - The strategy to use when selecting a node to play on.
@@ -48,17 +48,17 @@ class Manager extends events_1.EventEmitter {
             delete options.trackPartial;
         }
         this.options = {
-            plugins: [],
+            enabledPlugins: [],
             nodes: [
                 {
                     identifier: "default",
                     host: "localhost",
-                    resumeStatus: false,
-                    resumeTimeout: 1000,
+                    enableSessionResumeOption: false,
+                    sessionTimeoutMs: 1000,
                 },
             ],
-            autoPlay: true,
-            usePriority: false,
+            playNextOnEnd: true,
+            enablePriorityMode: false,
             clientName: "Magmastream",
             defaultSearchPlatform: SearchPlatform.YouTube,
             // autoPlaySearchPlatform: SearchPlatform.YouTube,
@@ -125,8 +125,8 @@ class Manager extends events_1.EventEmitter {
                 this.emit(ManagerEventTypes.NodeError, node, err);
             }
         }
-        if (this.options.plugins) {
-            for (const [index, plugin] of this.options.plugins.entries()) {
+        if (this.options.enabledPlugins) {
+            for (const [index, plugin] of this.options.enabledPlugins.entries()) {
                 if (!(plugin instanceof __1.Plugin))
                     throw new RangeError(`Plugin at index ${index} does not extend Plugin.`);
                 plugin.load(this);
@@ -175,7 +175,7 @@ class Manager extends events_1.EventEmitter {
                     break;
                 }
             }
-            if (this.options.replaceYouTubeCredentials) {
+            if (this.options.normalizeYouTubeTitles) {
                 const processTrack = (track) => {
                     if (!/(youtube\.com|youtu\.be)/.test(track.uri))
                         return track;
@@ -447,7 +447,6 @@ class Manager extends events_1.EventEmitter {
                         }
                         else {
                             player.paused = false;
-                            player.playing = true;
                         }
                         if (state.trackRepeat)
                             player.setTrackRepeat(true);
@@ -530,14 +529,14 @@ class Manager extends events_1.EventEmitter {
         this.emit(ManagerEventTypes.Debug, "[MANAGER] Finished loading saved players.");
     }
     /**
-     * Returns the node to use based on the configured `useNode` and `usePriority` options.
-     * If `usePriority` is true, the node is chosen based on priority, otherwise it is chosen based on the `useNode` option.
+     * Returns the node to use based on the configured `useNode` and `enablePriorityMode` options.
+     * If `enablePriorityMode` is true, the node is chosen based on priority, otherwise it is chosen based on the `useNode` option.
      * If `useNode` is "leastLoad", the node with the lowest load is chosen, if it is "leastPlayers", the node with the fewest players is chosen.
-     * If `usePriority` is false and `useNode` is not set, the node with the lowest load is chosen.
+     * If `enablePriorityMode` is false and `useNode` is not set, the node with the lowest load is chosen.
      * @returns {Node} The node to use.
      */
     get useableNode() {
-        return this.options.usePriority
+        return this.options.enablePriorityMode
             ? this.priorityNode
             : this.options.useNode === UseNodeOptions.LeastLoad
                 ? this.leastLoadNode.first()
@@ -850,13 +849,13 @@ class Manager extends events_1.EventEmitter {
      */
     get priorityNode() {
         // Filter out nodes that are not connected or have a priority of 0
-        const filteredNodes = this.nodes.filter((node) => node.connected && node.options.priority > 0);
+        const filteredNodes = this.nodes.filter((node) => node.connected && node.options.nodePriority > 0);
         // Calculate the total weight
-        const totalWeight = filteredNodes.reduce((total, node) => total + node.options.priority, 0);
+        const totalWeight = filteredNodes.reduce((total, node) => total + node.options.nodePriority, 0);
         // Map the nodes to their weights
         const weightedNodes = filteredNodes.map((node) => ({
             node,
-            weight: node.options.priority / totalWeight,
+            weight: node.options.nodePriority / totalWeight,
         }));
         // Generate a random number between 0 and 1
         const randomNumber = Math.random();

package/dist/structures/Node.js

@@ -61,13 +61,13 @@ class Node {
         this.options = {
             port: 2333,
             password: "youshallnotpass",
-            secure: false,
-            retryAmount: 30,
-            retryDelay: 60000,
-            priority: 0,
+            useSSL: false,
+            maxRetryAttempts: 30,
+            retryDelayMs: 60000,
+            nodePriority: 0,
             ...options,
         };
-        if (this.options.secure) {
+        if (this.options.useSSL) {
             this.options.port = 443;
         }
         this.options.identifier = options.identifier || options.host;
@@ -179,7 +179,7 @@ class Node {
      * @remarks
      * If the node is already connected, this method will do nothing.
      * If the node has a session ID, it will be sent in the headers of the WebSocket connection.
-     * If the node has no session ID but the `resumeStatus` option is true, it will use the session ID
+     * If the node has no session ID but the `enableSessionResumeOption` option is true, it will use the session ID
      * stored in the sessionIds.json file if it exists.
      */
     connect() {
@@ -194,11 +194,11 @@ class Node {
         if (this.sessionId) {
             headers["Session-Id"] = this.sessionId;
         }
-        else if (this.options.resumeStatus && sessionIdsMap.has(compositeKey)) {
+        else if (this.options.enableSessionResumeOption && sessionIdsMap.has(compositeKey)) {
             this.sessionId = sessionIdsMap.get(compositeKey) || null;
             headers["Session-Id"] = this.sessionId;
         }
-        this.socket = new ws_1.default(`ws${this.options.secure ? "s" : ""}://${this.address}/v4/websocket`, { headers });
+        this.socket = new ws_1.default(`ws${this.options.useSSL ? "s" : ""}://${this.address}/v4/websocket`, { headers });
         this.socket.on("open", this.open.bind(this));
         this.socket.on("close", this.close.bind(this));
         this.socket.on("message", this.message.bind(this));
@@ -210,7 +210,7 @@ class Node {
             options: {
                 clientId: this.manager.options.clientId,
                 clientName: this.manager.options.clientName,
-                secure: this.options.secure,
+                useSSL: this.options.useSSL,
                 identifier: this.options.identifier,
             },
         };
@@ -279,17 +279,17 @@ class Node {
             identifier: this.options.identifier,
             connected: this.connected,
             reconnectAttempts: this.reconnectAttempts,
-            retryAmount: this.options.retryAmount,
-            retryDelay: this.options.retryDelay,
+            maxRetryAttempts: this.options.maxRetryAttempts,
+            retryDelayMs: this.options.retryDelayMs,
         };
         // Emit a debug event indicating the node is attempting to reconnect
         this.manager.emit(Manager_1.ManagerEventTypes.Debug, `[NODE] Reconnecting node: ${JSON.stringify(debugInfo)}`);
         // Schedule the reconnection attempt after the specified retry delay
         this.reconnectTimeout = setTimeout(async () => {
             // Check if the maximum number of retry attempts has been reached
-            if (this.reconnectAttempts >= this.options.retryAmount) {
+            if (this.reconnectAttempts >= this.options.maxRetryAttempts) {
                 // Emit an error event and destroy the node if retries are exhausted
-                const error = new Error(`Unable to connect after ${this.options.retryAmount} attempts.`);
+                const error = new Error(`Unable to connect after ${this.options.maxRetryAttempts} attempts.`);
                 this.manager.emit(Manager_1.ManagerEventTypes.NodeError, this, error);
                 return await this.destroy();
             }
@@ -301,7 +301,7 @@ class Node {
             this.connect();
             // Increment the reconnect attempts counter
             this.reconnectAttempts++;
-        }, this.options.retryDelay);
+        }, this.options.retryDelayMs);
     }
     /**
      * Handles the "open" event emitted by the WebSocket connection.
@@ -431,10 +431,10 @@ class Node {
                     // Load player states from the JSON file
                     await this.manager.loadPlayerStates(this.options.identifier);
                 }
-                if (this.options.resumeStatus) {
+                if (this.options.enableSessionResumeOption) {
                     await this.rest.patch(`/v4/sessions/${this.sessionId}`, {
-                        resuming: this.options.resumeStatus,
-                        timeout: this.options.resumeTimeout,
+                        resuming: this.options.enableSessionResumeOption,
+                        timeout: this.options.sessionTimeoutMs,
                     });
                 }
                 break;
@@ -615,187 +615,7 @@ class Node {
         else {
             return false;
         }
-        // // Determine if YouTube should be used
-        // // If Last.fm is not available, use YouTube as a fallback
-        // // If YouTube is available and this is the last attempt, use YouTube
-        // const shouldUseYouTube =
-        // 	(!apiKey && enabledSources.includes("youtube")) || // Fallback to YouTube if Last.fm is not available
-        // 	(attempt === player.autoplayTries - 1 && player.autoplayTries > 1 && enabledSources.includes("youtube")); // Use YouTube on the last attempt
-        // if (shouldUseYouTube) {
-        // 	// Use YouTube-based autoplay
-        // 	return await this.handleYouTubeAutoplay(player, lastTrack);
-        // }
-        // // Handle Last.fm-based autoplay (or other platforms)
-        // const selectedSource = this.selectPlatform(enabledSources);
-        // if (selectedSource) {
-        // 	// Use the selected source to handle autoplay
-        // 	return await this.handlePlatformAutoplay(player, lastTrack, selectedSource, apiKey);
-        // }
-        // // If no source is available, return false
-        // return false;
-        return false;
     }
-    // return response.data.similartracks.track.filter((t: { uri: string }) => t.uri !== track.uri);
-    // /**
-    //  * Selects a platform from the given enabled sources.
-    //  * @param {string[]} enabledSources - The enabled sources to select from.
-    //  * @returns {SearchPlatform | null} - The selected platform or null if none was found.
-    //  */
-    // public selectPlatform(enabledSources: string[]): SearchPlatform | null {
-    // 	const { autoPlaySearchPlatform } = this.manager.options;
-    // 	const platformMapping: { [key in SearchPlatform]: string } = {
-    // 		[SearchPlatform.AppleMusic]: "applemusic",
-    // 		[SearchPlatform.Bandcamp]: "bandcamp",
-    // 		[SearchPlatform.Deezer]: "deezer",
-    // 		[SearchPlatform.Jiosaavn]: "jiosaavn",
-    // 		[SearchPlatform.SoundCloud]: "soundcloud",
-    // 		[SearchPlatform.Spotify]: "spotify",
-    // 		[SearchPlatform.Tidal]: "tidal",
-    // 		[SearchPlatform.VKMusic]: "vkmusic",
-    // 		[SearchPlatform.YouTube]: "youtube",
-    // 		[SearchPlatform.YouTubeMusic]: "youtube",
-    // 	};
-    // 	// Try the autoPlaySearchPlatform first
-    // 	if (enabledSources.includes(platformMapping[autoPlaySearchPlatform])) {
-    // 		return autoPlaySearchPlatform;
-    // 	}
-    // 	// Fallback to other platforms in a predefined order
-    // 	const fallbackPlatforms = [
-    // 		SearchPlatform.Spotify,
-    // 		SearchPlatform.Deezer,
-    // 		SearchPlatform.SoundCloud,
-    // 		SearchPlatform.AppleMusic,
-    // 		SearchPlatform.Bandcamp,
-    // 		SearchPlatform.Jiosaavn,
-    // 		SearchPlatform.Tidal,
-    // 		SearchPlatform.VKMusic,
-    // 		SearchPlatform.YouTubeMusic,
-    // 		SearchPlatform.YouTube,
-    // 	];
-    // 	for (const platform of fallbackPlatforms) {
-    // 		if (enabledSources.includes(platformMapping[platform])) {
-    // 			return platform;
-    // 		}
-    // 	}
-    // 	return null;
-    // }
-    // /**
-    //  * Handles Last.fm-based autoplay.
-    //  * @param {Player} player - The player instance.
-    //  * @param {Track} previousTrack - The previous track.
-    //  * @param {SearchPlatform} platform - The selected platform.
-    //  * @param {string} apiKey - The Last.fm API key.
-    //  * @returns {Promise<boolean>} - Whether the autoplay was successful.
-    //  */
-    // private async handlePlatformAutoplay(player: Player, previousTrack: Track, platform: SearchPlatform, apiKey: string): Promise<boolean> {
-    // 	let { author: artist } = previousTrack;
-    // 	const { title } = previousTrack;
-    // 	if (!artist || !title) {
-    // 		if (!title) {
-    // 			// No title provided, search for the artist's top tracks
-    // 			const noTitleUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 			const response = await axios.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: platform },
-    // 				player.get("Internal_BotUser") as User | ClientUser
-    // 			);
-    // 			if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return false;
-    // 			const foundTrack = res.tracks.find((t) => t.uri !== previousTrack.uri);
-    // 			if (!foundTrack) return false;
-    // 			player.queue.add(foundTrack);
-    // 			await player.play();
-    // 			return true;
-    // 		}
-    // 		if (!artist) {
-    // 			// No artist provided, search for the track title
-    // 			const noArtistUrl = `https://ws.audioscrobbler.com/2.0/?method=track.search&track=${title}&api_key=${apiKey}&format=json`;
-    // 			const response = await axios.get(noArtistUrl);
-    // 			artist = response.data.results.trackmatches?.track?.[0]?.artist;
-    // 			if (!artist) return false;
-    // 		}
-    // 	}
-    // 	// Search for similar tracks to the current track
-    // 	const url = `https://ws.audioscrobbler.com/2.0/?method=track.getSimilar&artist=${artist}&track=${title}&limit=10&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 	let response: axios.AxiosResponse;
-    // 	try {
-    // 		response = await axios.get(url);
-    // 	} catch (error) {
-    // 		if (error) return false;
-    // 	}
-    // 	if (response.data.error || !response.data.similartracks?.track?.length) {
-    // 		// Retry the request if the first attempt fails
-    // 		const retryUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 		const retryResponse = await axios.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: platform },
-    // 			player.get("Internal_BotUser") as User | ClientUser
-    // 		);
-    // 		if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return false;
-    // 		const foundTrack = res.tracks.find((t) => t.uri !== previousTrack.uri);
-    // 		if (!foundTrack) return false;
-    // 		player.queue.add(foundTrack);
-    // 		await player.play();
-    // 		return true;
-    // 	}
-    // 	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: platform },
-    // 		player.get("Internal_BotUser") as User | ClientUser
-    // 	);
-    // 	if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return false;
-    // 	const foundTrack = res.tracks.find((t) => t.uri !== previousTrack.uri);
-    // 	if (!foundTrack) return false;
-    // 	player.queue.add(foundTrack);
-    // 	await player.play();
-    // 	return true;
-    // }
-    // /**
-    //  * Handles YouTube-based autoplay.
-    //  * @param {Player} player - The player instance.
-    //  * @param {Track} previousTrack - The previous track.
-    //  * @returns {Promise<boolean>} - Whether the autoplay was successful.
-    //  */
-    // private async handleYouTubeAutoplay(player: Player, previousTrack: Track): Promise<boolean> {
-    // 	// Check if the previous track has a YouTube URL
-    // 	const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => previousTrack.uri.includes(url));
-    // 	// Get the video ID from the previous track's URL
-    // 	const videoID = hasYouTubeURL
-    // 		? previousTrack.uri.split("=").pop()
-    // 		: (
-    // 				await this.manager.search(
-    // 					{ query: `${previousTrack.author} - ${previousTrack.title}`, source: SearchPlatform.YouTube },
-    // 					player.get("Internal_BotUser") as User | ClientUser
-    // 				)
-    // 		  ).tracks[0]?.uri
-    // 				.split("=")
-    // 				.pop();
-    // 	// If the video ID is not found, return false
-    // 	if (!videoID) return false;
-    // 	// Get a random video index between 2 and 24
-    // 	let randomIndex: number;
-    // 	let searchURI: string;
-    // 	do {
-    // 		// Generate a random index between 2 and 24
-    // 		randomIndex = Math.floor(Math.random() * 23) + 2;
-    // 		// Build the search URI
-    // 		searchURI = `https://www.youtube.com/watch?v=${videoID}&list=RD${videoID}&index=${randomIndex}`;
-    // 	} while (previousTrack.uri.includes(searchURI));
-    // 	// Search for the video and return false if the search fails
-    // 	const res = await this.manager.search({ query: searchURI, source: SearchPlatform.YouTube }, player.get("Internal_BotUser") as User | ClientUser);
-    // 	if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return false;
-    // 	// Find a track that is not the same as the current track
-    // 	const foundTrack = res.tracks.find((t) => t.uri !== previousTrack.uri && t.author !== previousTrack.author && t.title !== previousTrack.title);
-    // 	// If no track is found, return false
-    // 	if (!foundTrack) return false;
-    // 	// Add the found track to the queue and play it
-    // 	player.queue.add(foundTrack);
-    // 	await player.play();
-    // 	return true;
-    // }
     /**
      * Handles the scenario when a track fails to play or load.
      * Shifts the queue to the next track and emits a track end event.
@@ -815,7 +635,7 @@ class Node {
             return;
         }
         this.manager.emit(Manager_1.ManagerEventTypes.TrackEnd, player, track, payload);
-        if (this.manager.options.autoPlay)
+        if (this.manager.options.playNextOnEnd)
             await player.play();
     }
     /**
@@ -832,7 +652,7 @@ class Node {
      */
     async handleRepeatedTrack(player, track, payload) {
         const { queue, trackRepeat, queueRepeat } = player;
-        const { autoPlay } = this.manager.options;
+        const { playNextOnEnd } = this.manager.options;
         if (trackRepeat) {
             // Prevent duplicate repeat insertion
             if (queue[0] !== queue.current) {
@@ -855,7 +675,7 @@ class Node {
             return;
         }
         // If autoplay is enabled, play the next track
-        if (autoPlay)
+        if (playNextOnEnd)
             await player.play();
     }
     /**
@@ -875,7 +695,7 @@ class Node {
         // Emit the track end event
         this.manager.emit(Manager_1.ManagerEventTypes.TrackEnd, player, track, payload);
         // If autoplay is enabled, play the next track
-        if (this.manager.options.autoPlay)
+        if (this.manager.options.playNextOnEnd)
             await player.play();
     }
     /**

package/dist/structures/Player.js

@@ -377,117 +377,7 @@ class Player {
     async getRecommendedTracks(track) {
         const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(this, track);
         return tracks;
-        // const node = this.manager.useableNode;
-        // if (!node) {
-        // 	throw new Error("No available nodes.");
-        // }
-        // if (!TrackUtils.validate(track)) {
-        // 	throw new RangeError('"Track must be a "Track" or "Track[]');
-        // }
-        // // Get the Last.fm API key and the available source managers
-        // const apiKey = this.manager.options.lastFmApiKey;
-        // const enabledSources = node.info.sourceManagers;
-        // // Determine if YouTube should be used
-        // if (!apiKey && enabledSources.includes("youtube")) {
-        // 	// Use YouTube-based autoplay
-        // 	return await this.handleYouTubeRecommendations(track);
-        // }
-        // if (!apiKey) return [];
-        // // Handle Last.fm-based autoplay (or other platforms)
-        // const selectedSource = node.selectPlatform(enabledSources);
-        // if (selectedSource) {
-        // 	// Use the selected source to handle autoplay
-        // 	return await this.handlePlatformAutoplay(track, selectedSource, apiKey);
-        // }
-        // // If no source is available, return false
-        // return [];
     }
-    // /**
-    //  * Handles YouTube-based recommendations.
-    //  * @param {Track} track - The track to find recommendations for.
-    //  * @returns {Promise<Track[]>} - Array of recommended tracks.
-    //  */
-    // private async handleYouTubeRecommendations(track: Track): Promise<Track[]> {
-    // 	// Check if the previous track has a YouTube URL
-    // 	const hasYouTubeURL = ["youtube.com", "youtu.be"].some((url) => track.uri.includes(url));
-    // 	// Get the video ID from the previous track's URL
-    // 	let videoID: string | null = null;
-    // 	if (hasYouTubeURL) {
-    // 		videoID = track.uri.split("=").pop();
-    // 	} else {
-    // 		const searchResult = await this.manager.search({ query: `${track.author} - ${track.title}`, source: SearchPlatform.YouTube }, track.requester);
-    // 		videoID = searchResult.tracks[0]?.uri.split("=").pop();
-    // 	}
-    // 	// If the video ID is not found, return false
-    // 	if (!videoID) return [];
-    // 	// Get a random video index between 2 and 24
-    // 	let randomIndex: number;
-    // 	let searchURI: string;
-    // 	do {
-    // 		// Generate a random index between 2 and 24
-    // 		randomIndex = Math.floor(Math.random() * 23) + 2;
-    // 		// Build the search URI
-    // 		searchURI = `https://www.youtube.com/watch?v=${videoID}&list=RD${videoID}&index=${randomIndex}`;
-    // 	} while (track.uri.includes(searchURI));
-    // 	// Search for the video and return false if the search fails
-    // 	const res = await this.manager.search({ query: searchURI, source: SearchPlatform.YouTube }, track.requester);
-    // 	if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return [];
-    // 	// Return all track titles that do not have the same URI as the track.uri from before
-    // 	return res.tracks.filter((t) => t.uri !== track.uri);
-    // }
-    // /**
-    //  * Handles Last.fm-based autoplay (or other platforms).
-    //  * @param {Track} track - The track to find recommendations for.
-    //  * @param {SearchPlatform} source - The selected search platform.
-    //  * @param {string} apiKey - The Last.fm API key.
-    //  * @returns {Promise<Track[]>} - Array of recommended tracks.
-    //  */
-    // private async handlePlatformAutoplay(track: Track, source: SearchPlatform, apiKey: string): Promise<Track[]> {
-    // 	let { author: artist } = track;
-    // 	const { title } = track;
-    // 	if (!artist || !title) {
-    // 		if (!title) {
-    // 			// No title provided, search for the artist's top tracks
-    // 			const noTitleUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 			const response = await axios.get(noTitleUrl);
-    // 			if (response.data.error || !response.data.toptracks?.track?.length) 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: source }, track.requester);
-    // 			if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return [];
-    // 			const filteredTracks = res.tracks.filter((t) => t.uri !== track.uri);
-    // 			if (!filteredTracks) return [];
-    // 			return filteredTracks;
-    // 		}
-    // 		if (!artist) {
-    // 			// No artist provided, search for the track title
-    // 			const noArtistUrl = `https://ws.audioscrobbler.com/2.0/?method=track.search&track=${title}&api_key=${apiKey}&format=json`;
-    // 			const response = await axios.get(noArtistUrl);
-    // 			artist = response.data.results.trackmatches?.track?.[0]?.artist;
-    // 			if (!artist) return [];
-    // 		}
-    // 	}
-    // 	// Search for similar tracks to the current track
-    // 	const url = `https://ws.audioscrobbler.com/2.0/?method=track.getSimilar&artist=${artist}&track=${title}&limit=10&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 	let response: axios.AxiosResponse;
-    // 	try {
-    // 		response = await axios.get(url);
-    // 	} catch (error) {
-    // 		if (error) return [];
-    // 	}
-    // 	if (response.data.error || !response.data.similartracks?.track?.length) {
-    // 		// Retry the request if the first attempt fails
-    // 		const retryUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-    // 		const retryResponse = await axios.get(retryUrl);
-    // 		if (retryResponse.data.error || !retryResponse.data.toptracks?.track?.length) 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: source }, track.requester);
-    // 		if (res.loadType === LoadTypes.Empty || res.loadType === LoadTypes.Error) return [];
-    // 		const filteredTracks = res.tracks.filter((t) => t.uri !== track.uri);
-    // 		if (!filteredTracks) return [];
-    // 		return filteredTracks;
-    // 	}
-    // 	return response.data.similartracks.track.filter((t: { uri: string }) => t.uri !== track.uri);
-    // }
     /**
      * Sets the volume of the player.
      * @param {number} volume - The new volume. Must be between 0 and 1000.

package/dist/structures/Rest.js

@@ -18,7 +18,7 @@ class Rest {
     manager;
     constructor(node, manager) {
         this.node = node;
-        this.url = `http${node.options.secure ? "s" : ""}://${node.options.host}:${node.options.port}`;
+        this.url = `http${node.options.useSSL ? "s" : ""}://${node.options.host}:${node.options.port}`;
         this.sessionId = node.sessionId;
         this.password = node.options.password;
         this.manager = manager;

package/dist/utils/managerCheck.js

@@ -10,10 +10,10 @@ const Manager_1 = require("../structures/Manager");
 function managerCheck(options) {
     if (!options)
         throw new TypeError("ManagerOptions must not be empty.");
-    const { autoPlay, clientName, defaultSearchPlatform, autoPlaySearchPlatform, nodes, plugins, send, trackPartial, usePriority, useNode, replaceYouTubeCredentials, lastFmApiKey, maxPreviousTracks, } = options;
-    // Validate autoPlay option
-    if (typeof autoPlay !== "boolean") {
-        throw new TypeError('Manager option "autoPlay" must be a boolean.');
+    const { playNextOnEnd, clientName, defaultSearchPlatform, autoPlaySearchPlatform, 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") {
@@ -37,9 +37,9 @@ function managerCheck(options) {
     if (typeof nodes === "undefined" || !Array.isArray(nodes)) {
         throw new TypeError('Manager option "nodes" must be an array.');
     }
-    // Validate plugins option
-    if (typeof plugins !== "undefined" && !Array.isArray(plugins)) {
-        throw new TypeError('Manager option "plugins" must be a Plugin array.');
+    // Validate enabledPlugins option
+    if (typeof enabledPlugins !== "undefined" && !Array.isArray(enabledPlugins)) {
+        throw new TypeError('Manager option "enabledPlugins" must be a Plugin array.');
     }
     // Validate send option
     if (typeof send !== "function") {
@@ -54,15 +54,15 @@ function managerCheck(options) {
             throw new TypeError('Manager option "trackPartial" must be an array of valid TrackPartial values.');
         }
     }
-    // Validate usePriority option
-    if (typeof usePriority !== "undefined" && typeof usePriority !== "boolean") {
-        throw new TypeError('Manager option "usePriority" must be a boolean.');
+    // Validate enablePriorityMode option
+    if (typeof enablePriorityMode !== "undefined" && typeof enablePriorityMode !== "boolean") {
+        throw new TypeError('Manager option "enablePriorityMode" must be a boolean.');
     }
-    // Validate node priority if usePriority is enabled
-    if (usePriority) {
+    // Validate node priority if enablePriorityMode is enabled
+    if (enablePriorityMode) {
         for (let index = 0; index < nodes.length; index++) {
-            if (typeof nodes[index].priority !== "number" || isNaN(nodes[index].priority)) {
-                throw new TypeError(`Missing or invalid node option "priority" at position ${index}`);
+            if (typeof nodes[index].nodePriority !== "number" || isNaN(nodes[index].nodePriority)) {
+                throw new TypeError(`Missing or invalid node option "nodePriority" at position ${index}`);
             }
         }
     }
@@ -75,9 +75,9 @@ function managerCheck(options) {
             throw new TypeError('Manager option "useNode" must be either "leastLoad" or "leastPlayers".');
         }
     }
-    // Validate replaceYouTubeCredentials option
-    if (typeof replaceYouTubeCredentials !== "undefined" && typeof replaceYouTubeCredentials !== "boolean") {
-        throw new TypeError('Manager option "replaceYouTubeCredentials" must be a boolean.');
+    // Validate normalizeYouTubeTitles option
+    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)) {

package/dist/utils/nodeCheck.js

@@ -12,7 +12,7 @@ function nodeCheck(options) {
         throw new TypeError("NodeOptions must not be empty.");
     // Validate the host option
     // The host option must be present and be a non-empty string.
-    const { host, identifier, password, port, resumeStatus, resumeTimeout, retryAmount, retryDelay, secure, priority } = options;
+    const { host, identifier, password, port, enableSessionResumeOption, sessionTimeoutMs, maxRetryAttempts, retryDelayMs, useSSL, nodePriority } = options;
     if (typeof host !== "string" || !/.+/.test(host)) {
         throw new TypeError('Node option "host" must be present and be a non-empty string.');
     }
@@ -31,34 +31,34 @@ function nodeCheck(options) {
     if (typeof port !== "undefined" && typeof port !== "number") {
         throw new TypeError('Node option "port" must be a number.');
     }
-    // Validate the resumeStatus option
-    // The resumeStatus option must be a boolean or undefined.
-    if (typeof resumeStatus !== "undefined" && typeof resumeStatus !== "boolean") {
-        throw new TypeError('Node option "resumeStatus" must be a boolean.');
+    // Validate the enableSessionResumeOption option
+    // The enableSessionResumeOption option must be a boolean or undefined.
+    if (typeof enableSessionResumeOption !== "undefined" && typeof enableSessionResumeOption !== "boolean") {
+        throw new TypeError('Node option "enableSessionResumeOption" must be a boolean.');
     }
-    // Validate the resumeTimeout option
-    // The resumeTimeout option must be a number or undefined.
-    if (typeof resumeTimeout !== "undefined" && typeof resumeTimeout !== "number") {
-        throw new TypeError('Node option "resumeTimeout" must be a number.');
+    // Validate the sessionTimeoutMs option
+    // The sessionTimeoutMs option must be a number or undefined.
+    if (typeof sessionTimeoutMs !== "undefined" && typeof sessionTimeoutMs !== "number") {
+        throw new TypeError('Node option "sessionTimeoutMs" must be a number.');
     }
-    // Validate the retryAmount option
-    // The retryAmount option must be a number or undefined.
-    if (typeof retryAmount !== "undefined" && typeof retryAmount !== "number") {
-        throw new TypeError('Node option "retryAmount" must be a number.');
+    // Validate the maxRetryAttempts option
+    // The maxRetryAttempts option must be a number or undefined.
+    if (typeof maxRetryAttempts !== "undefined" && typeof maxRetryAttempts !== "number") {
+        throw new TypeError('Node option "maxRetryAttempts" must be a number.');
     }
-    // Validate the retryDelay option
-    // The retryDelay option must be a number or undefined.
-    if (typeof retryDelay !== "undefined" && typeof retryDelay !== "number") {
-        throw new TypeError('Node option "retryDelay" must be a number.');
+    // Validate the retryDelayMs option
+    // The retryDelayMs option must be a number or undefined.
+    if (typeof retryDelayMs !== "undefined" && typeof retryDelayMs !== "number") {
+        throw new TypeError('Node option "retryDelayMs" must be a number.');
     }
-    // Validate the secure option
-    // The secure option must be a boolean or undefined.
-    if (typeof secure !== "undefined" && typeof secure !== "boolean") {
-        throw new TypeError('Node option "secure" must be a boolean.');
+    // Validate the useSSL option
+    // The useSSL option must be a boolean or undefined.
+    if (typeof useSSL !== "undefined" && typeof useSSL !== "boolean") {
+        throw new TypeError('Node option "useSSL" must be a boolean.');
     }
-    // Validate the priority option
-    // The priority option must be a number or undefined.
-    if (typeof priority !== "undefined" && typeof priority !== "number") {
-        throw new TypeError('Node option "priority" must be a number.');
+    // Validate the nodePriority option
+    // The nodePriority option must be a number or undefined.
+    if (typeof nodePriority !== "undefined" && typeof nodePriority !== "number") {
+        throw new TypeError('Node option "nodePriority" must be a number.');
     }
 }

package/package.json

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