lavalink-client 2.4.4 → 2.4.5

package/dist/cjs/structures/Node.js

@@ -1159,6 +1159,8 @@ class LavalinkNode {
     }
     /** @private util function for handling trackEnd event */
     async trackEnd(player, track, payload) {
+        if (player.get('internal_nodeChanging') === true)
+            return; // Check if nodeChange is in Progress than stop the trackEnd Event from being triggered.
         const trackToUse = track || this.getTrackOfPayload(payload);
         // If a track was forcibly played
         if (payload.reason === "replaced") {
@@ -1374,6 +1376,8 @@ class LavalinkNode {
     }
     /** private util function for handling the queue end event */
     async queueEnd(player, track, payload) {
+        if (player.get('internal_nodeChanging') === true)
+            return; // Check if nodeChange is in Progress than stop the queueEnd Event from being triggered.
         // add previous track to the queue!
         player.queue.current = null;
         player.playing = false;

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

@@ -217,8 +217,9 @@ export declare class Player {
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id
+     * @param checkSources If it should check if the sources are supported by the new node
      */
-    changeNode(newNode: LavalinkNode | string): Promise<string>;
+    changeNode(newNode: LavalinkNode | string, checkSources?: boolean): Promise<string>;
     /** Converts the Player including Queue to a Json state */
     toJSON(): PlayerJson;
 }

package/dist/cjs/structures/Player.js

@@ -459,11 +459,11 @@ class Player {
                 throw new RangeError("Can't skip more than the queue size");
             await this.queue.splice(0, skipTo - 1);
         }
-        if (!this.playing)
+        if (!this.playing && !this.queue.current)
             return (this.play(), this);
         const now = performance.now();
         this.set("internal_skipped", true);
-        await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { track: { encoded: null } } });
+        await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { track: { encoded: null }, paused: false } });
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
         return this;
     }
@@ -639,11 +639,37 @@ class Player {
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id
+     * @param checkSources If it should check if the sources are supported by the new node
      */
-    async changeNode(newNode) {
+    async changeNode(newNode, checkSources = true) {
         const updateNode = typeof newNode === "string" ? this.LavalinkManager.nodeManager.nodes.get(newNode) : newNode;
         if (!updateNode)
             throw new Error("Could not find the new Node");
+        if (!updateNode.connected)
+            throw new Error("The provided Node is not active or disconnected");
+        if (this.node.id === updateNode.id)
+            throw new Error("Player is already on the provided Node");
+        if (this.get("internal_nodeChanging") === true)
+            throw new Error("Player is already changing the node please wait");
+        if (checkSources) {
+            const isDefaultSource = () => {
+                try {
+                    this.LavalinkManager.utils.validateSourceString(updateNode, this.LavalinkManager.options.playerOptions.defaultSearchPlatform);
+                    return true;
+                }
+                catch {
+                    return false;
+                }
+            };
+            if (!isDefaultSource())
+                throw new RangeError(`defaultSearchPlatform "${this.LavalinkManager.options.playerOptions.defaultSearchPlatform}" is not supported by the newNode`);
+            if (this.queue.current || this.queue.tracks.length) { // Check if all queued track sources are supported by the new node
+                const trackSources = new Set([this.queue.current, ...this.queue.tracks].map(track => track.info.sourceName));
+                const missingSources = [...trackSources].filter(source => !updateNode.info.sourceManagers.includes(source));
+                if (missingSources.length)
+                    throw new RangeError(`Sources missing for Node ${updateNode.id}: ${missingSources.join(', ')}`);
+            }
+        }
         if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
             this.LavalinkManager.emit("debug", Constants_1.DebugEvents.PlayerChangeNode, {
                 state: "log",
@@ -653,23 +679,60 @@ class Player {
         }
         const data = this.toJSON();
         const currentTrack = this.queue.current;
-        await this.node.destroyPlayer(this.guildId);
+        const voiceData = this.voice;
+        if (!voiceData.endpoint ||
+            !voiceData.sessionId ||
+            !voiceData.token)
+            throw new Error("Voice Data is missing, can't change the node");
+        this.set("internal_nodeChanging", true); // This will stop execution of trackEnd or queueEnd event while changing the node
+        if (this.node.connected)
+            await this.node.destroyPlayer(this.guildId); // destroy the player on the currentNode if it's connected
         this.node = updateNode;
         const now = performance.now();
-        await this.connect();
-        await this.node.updatePlayer({
-            guildId: this.guildId,
-            noReplace: false,
-            playerOptions: {
-                position: data.position,
-                volume: Math.round(Math.max(Math.min(data.volume, 1000), 0)),
-                paused: data.paused,
-                filters: { ...data.filters, equalizer: data.equalizer },
-                track: currentTrack ?? undefined
-            },
-        });
-        this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
-        return this.node.id;
+        try {
+            await this.connect();
+            const endpoint = `/sessions/${this.node.sessionId}/players/${this.guildId}`; //Send the VoiceData to the newly connected node.
+            await this.node.request(endpoint, r => {
+                r.method = "PATCH";
+                r.headers["Content-Type"] = "application/json";
+                r.body = JSON.stringify({
+                    voice: {
+                        token: voiceData.token,
+                        endpoint: voiceData.endpoint,
+                        sessionId: voiceData.sessionId
+                    }
+                });
+            });
+            if (currentTrack) { // If there is a current track, send it to the new node.
+                await this.node.updatePlayer({
+                    guildId: this.guildId,
+                    noReplace: false,
+                    playerOptions: {
+                        track: currentTrack ?? null,
+                        position: currentTrack ? data.position : 0,
+                        volume: data.lavalinkVolume,
+                        paused: data.paused,
+                        //filters: { ...data.filters, equalizer: data.equalizer }, Sending filters on nodeChange causes issues (player gets dicsonnected)
+                    }
+                });
+            }
+            this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
+            return this.node.id;
+        }
+        catch (error) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                this.LavalinkManager.emit("debug", Constants_1.DebugEvents.PlayerChangeNode, {
+                    state: "error",
+                    error: error,
+                    message: `Player.changeNode() execution failed`,
+                    functionLayer: "Player > changeNode()",
+                });
+            }
+            throw new Error(`Failed to change the node: ${error}`);
+        }
+        finally {
+            this.set("internal_nodeChanging", undefined);
+        }
     }
     /** Converts the Player including Queue to a Json state */
     toJSON() {

package/dist/esm/structures/Node.js

@@ -1155,6 +1155,8 @@ export class LavalinkNode {
     }
     /** @private util function for handling trackEnd event */
     async trackEnd(player, track, payload) {
+        if (player.get('internal_nodeChanging') === true)
+            return; // Check if nodeChange is in Progress than stop the trackEnd Event from being triggered.
         const trackToUse = track || this.getTrackOfPayload(payload);
         // If a track was forcibly played
         if (payload.reason === "replaced") {
@@ -1370,6 +1372,8 @@ export class LavalinkNode {
     }
     /** private util function for handling the queue end event */
     async queueEnd(player, track, payload) {
+        if (player.get('internal_nodeChanging') === true)
+            return; // Check if nodeChange is in Progress than stop the queueEnd Event from being triggered.
         // add previous track to the queue!
         player.queue.current = null;
         player.playing = false;

package/dist/esm/structures/Player.d.ts

@@ -217,8 +217,9 @@ export declare class Player {
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id
+     * @param checkSources If it should check if the sources are supported by the new node
      */
-    changeNode(newNode: LavalinkNode | string): Promise<string>;
+    changeNode(newNode: LavalinkNode | string, checkSources?: boolean): Promise<string>;
     /** Converts the Player including Queue to a Json state */
     toJSON(): PlayerJson;
 }

package/dist/esm/structures/Player.js

@@ -456,11 +456,11 @@ export class Player {
                 throw new RangeError("Can't skip more than the queue size");
             await this.queue.splice(0, skipTo - 1);
         }
-        if (!this.playing)
+        if (!this.playing && !this.queue.current)
             return (this.play(), this);
         const now = performance.now();
         this.set("internal_skipped", true);
-        await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { track: { encoded: null } } });
+        await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { track: { encoded: null }, paused: false } });
         this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
         return this;
     }
@@ -636,11 +636,37 @@ export class Player {
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id
+     * @param checkSources If it should check if the sources are supported by the new node
      */
-    async changeNode(newNode) {
+    async changeNode(newNode, checkSources = true) {
         const updateNode = typeof newNode === "string" ? this.LavalinkManager.nodeManager.nodes.get(newNode) : newNode;
         if (!updateNode)
             throw new Error("Could not find the new Node");
+        if (!updateNode.connected)
+            throw new Error("The provided Node is not active or disconnected");
+        if (this.node.id === updateNode.id)
+            throw new Error("Player is already on the provided Node");
+        if (this.get("internal_nodeChanging") === true)
+            throw new Error("Player is already changing the node please wait");
+        if (checkSources) {
+            const isDefaultSource = () => {
+                try {
+                    this.LavalinkManager.utils.validateSourceString(updateNode, this.LavalinkManager.options.playerOptions.defaultSearchPlatform);
+                    return true;
+                }
+                catch {
+                    return false;
+                }
+            };
+            if (!isDefaultSource())
+                throw new RangeError(`defaultSearchPlatform "${this.LavalinkManager.options.playerOptions.defaultSearchPlatform}" is not supported by the newNode`);
+            if (this.queue.current || this.queue.tracks.length) { // Check if all queued track sources are supported by the new node
+                const trackSources = new Set([this.queue.current, ...this.queue.tracks].map(track => track.info.sourceName));
+                const missingSources = [...trackSources].filter(source => !updateNode.info.sourceManagers.includes(source));
+                if (missingSources.length)
+                    throw new RangeError(`Sources missing for Node ${updateNode.id}: ${missingSources.join(', ')}`);
+            }
+        }
         if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
             this.LavalinkManager.emit("debug", DebugEvents.PlayerChangeNode, {
                 state: "log",
@@ -650,23 +676,60 @@ export class Player {
         }
         const data = this.toJSON();
         const currentTrack = this.queue.current;
-        await this.node.destroyPlayer(this.guildId);
+        const voiceData = this.voice;
+        if (!voiceData.endpoint ||
+            !voiceData.sessionId ||
+            !voiceData.token)
+            throw new Error("Voice Data is missing, can't change the node");
+        this.set("internal_nodeChanging", true); // This will stop execution of trackEnd or queueEnd event while changing the node
+        if (this.node.connected)
+            await this.node.destroyPlayer(this.guildId); // destroy the player on the currentNode if it's connected
         this.node = updateNode;
         const now = performance.now();
-        await this.connect();
-        await this.node.updatePlayer({
-            guildId: this.guildId,
-            noReplace: false,
-            playerOptions: {
-                position: data.position,
-                volume: Math.round(Math.max(Math.min(data.volume, 1000), 0)),
-                paused: data.paused,
-                filters: { ...data.filters, equalizer: data.equalizer },
-                track: currentTrack ?? undefined
-            },
-        });
-        this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
-        return this.node.id;
+        try {
+            await this.connect();
+            const endpoint = `/sessions/${this.node.sessionId}/players/${this.guildId}`; //Send the VoiceData to the newly connected node.
+            await this.node.request(endpoint, r => {
+                r.method = "PATCH";
+                r.headers["Content-Type"] = "application/json";
+                r.body = JSON.stringify({
+                    voice: {
+                        token: voiceData.token,
+                        endpoint: voiceData.endpoint,
+                        sessionId: voiceData.sessionId
+                    }
+                });
+            });
+            if (currentTrack) { // If there is a current track, send it to the new node.
+                await this.node.updatePlayer({
+                    guildId: this.guildId,
+                    noReplace: false,
+                    playerOptions: {
+                        track: currentTrack ?? null,
+                        position: currentTrack ? data.position : 0,
+                        volume: data.lavalinkVolume,
+                        paused: data.paused,
+                        //filters: { ...data.filters, equalizer: data.equalizer }, Sending filters on nodeChange causes issues (player gets dicsonnected)
+                    }
+                });
+            }
+            this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
+            return this.node.id;
+        }
+        catch (error) {
+            if (this.LavalinkManager.options?.advancedOptions?.enableDebugEvents) {
+                this.LavalinkManager.emit("debug", DebugEvents.PlayerChangeNode, {
+                    state: "error",
+                    error: error,
+                    message: `Player.changeNode() execution failed`,
+                    functionLayer: "Player > changeNode()",
+                });
+            }
+            throw new Error(`Failed to change the node: ${error}`);
+        }
+        finally {
+            this.set("internal_nodeChanging", undefined);
+        }
     }
     /** Converts the Player including Queue to a Json state */
     toJSON() {

package/dist/types/structures/Player.d.ts

@@ -217,8 +217,9 @@ export declare class Player {
     /**
      * Move the player on a different Audio-Node
      * @param newNode New Node / New Node Id
+     * @param checkSources If it should check if the sources are supported by the new node
      */
-    changeNode(newNode: LavalinkNode | string): Promise<string>;
+    changeNode(newNode: LavalinkNode | string, checkSources?: boolean): Promise<string>;
     /** Converts the Player including Queue to a Json state */
     toJSON(): PlayerJson;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -58,22 +58,22 @@
   },
   "homepage": "https://tomato6966.github.io/lavalink-client/",
   "devDependencies": {
-    "@eslint/eslintrc": "^3.1.0",
-    "@eslint/js": "^9.11.0",
-    "@types/node": "^22.5.5",
-    "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^8.6.0",
-    "@typescript-eslint/parser": "^8.6.0",
-    "eslint": "^9.11.0",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.18.0",
+    "@types/node": "^22.10.5",
+    "@types/ws": "^8.5.13",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
+    "eslint": "^9.18.0",
     "tsc-alias": "^1.8.10",
-    "typescript": "^5.6.2"
+    "typescript": "^5.7.3"
   },
   "dependencies": {
-    "tslib": "^2.7.0",
+    "tslib": "^2.8.1",
     "ws": "^8.18.0"
   },
   "engines": {
     "node": ">=18.0.0",
-    "bun": ">=1.0.0"
+    "bun": ">=1.1.27"
   }
 }