lavalink-client 2.4.2 → 2.4.4

package/README.md

@@ -789,3 +789,22 @@ if(previousTrack) {
     *Allows you to inmplement a custom playerVoiceEmpty handler*
 
 - Added the new events and configuration to the docs
+
+## **Version 2.4.1**
+
+- Did some cleanup and comment removal + removed the playerVoiceEmptyStart because it would mean i'd need to add voice-state tracking, which wasn't the plan of doing by the client.
+
+## **Verison 2.4.2**
+
+- Merged [PR#78](https://github.com/Tomato6966/lavalink-client/pull/78) from @hwangsihu - Added the configs to eslint ignore
+- Merged [PR#80](https://github.com/Tomato6966/lavalink-client/pull/80) from @EvilG-MC - Argument Typo fix in resume event type declaration
+- Merged [PR#83](https://github.com/Tomato6966/lavalink-client/pull/83) from @EvilG-MC - Fix if statement in Node#syncPlayerData() to allow syncing of "single entry objects"
+- Some minor improvements by removing unnecessary spreading
+
+## **Version 2.4.3**
+- `managerOptions#playerOptions.onDisconnect.autoReconnect`:
+  - Added the option `managerOptions#playerOptions.onDisconnect.autoReconnectOnlyWithTracks` to control wether to try reconnecting only when there are tracks in the queue / current track or not
+  - Added a new debug log for that
+  - Added the try to play the next track if there is no current track
+    - *There was a problem trying to auto-reconnect on-Disconnect while the queue was empty, which caused the player to get destroyed by that and log the error in console "`There is no Track in the Queue, nor provided in the PlayOptions`"*
+    - *Now you have to handle that case manually if you want to or set autoReconnectOnlyWithTracks to false (default)*

package/dist/cjs/structures/LavalinkManager.js

@@ -83,7 +83,8 @@ class LavalinkManager extends events_1.EventEmitter {
                 defaultSearchPlatform: options?.playerOptions?.defaultSearchPlatform ?? "ytsearch",
                 onDisconnect: {
                     destroyPlayer: options?.playerOptions?.onDisconnect?.destroyPlayer ?? true,
-                    autoReconnect: options?.playerOptions?.onDisconnect?.autoReconnect ?? false
+                    autoReconnect: options?.playerOptions?.onDisconnect?.autoReconnect ?? false,
+                    autoReconnectOnlyWithTracks: options?.playerOptions?.onDisconnect?.autoReconnectOnlyWithTracks ?? false,
                 },
                 onEmptyQueue: {
                     autoPlayFunction: options?.playerOptions?.onEmptyQueue?.autoPlayFunction ?? null,
@@ -569,13 +570,14 @@ class LavalinkManager extends events_1.EventEmitter {
                     this.emit("playerSuppressChange", player, player.voiceState.suppress);
             }
             else {
-                if (this.options?.playerOptions?.onDisconnect?.destroyPlayer === true) {
+                const { autoReconnectOnlyWithTracks, destroyPlayer, autoReconnect } = this.options?.playerOptions?.onDisconnect ?? {};
+                if (destroyPlayer === true) {
                     return void await player.destroy(Constants_1.DestroyReasons.Disconnected);
                 }
-                this.emit("playerDisconnect", player, player.voiceChannelId);
-                if (this.options?.playerOptions?.onDisconnect?.autoReconnect === true) {
+                if (autoReconnect === true) {
                     try {
-                        const positionPrevios = player.position;
+                        const previousPosition = player.position;
+                        const previousPaused = player.paused;
                         if (this.options?.advancedOptions?.enableDebugEvents) {
                             this.emit("debug", Constants_1.DebugEvents.PlayerAutoReconnect, {
                                 state: "log",
@@ -583,12 +585,23 @@ class LavalinkManager extends events_1.EventEmitter {
                                 functionLayer: "LavalinkManager > sendRawData()",
                             });
                         }
-                        await player.connect();
+                        // connect if there are tracks & autoReconnectOnlyWithTracks = true or autoReconnectOnlyWithTracks is false
+                        if (!autoReconnectOnlyWithTracks || (autoReconnectOnlyWithTracks && (player.queue.current || player.queue.tracks.length))) {
+                            await player.connect();
+                        }
                         // replay the current playing stream
-                        await player.play({
-                            position: positionPrevios,
-                            paused: player.paused,
-                            clientTrack: player.queue.current,
+                        if (player.queue.current) {
+                            return void await player.play({ position: previousPosition, paused: previousPaused, clientTrack: player.queue.current, });
+                        }
+                        // try to play the next track
+                        if (player.queue.tracks.length) {
+                            return void await player.play({ paused: previousPaused });
+                        }
+                        // debug log if nothing was possible
+                        this.emit("debug", Constants_1.DebugEvents.PlayerAutoReconnect, {
+                            state: "log",
+                            message: `Auto reconnected, but nothing to play`,
+                            functionLayer: "LavalinkManager > sendRawData()",
                         });
                     }
                     catch (e) {
@@ -596,6 +609,7 @@ class LavalinkManager extends events_1.EventEmitter {
                         return void await player.destroy(Constants_1.DestroyReasons.PlayerReconnectFail);
                     }
                 }
+                this.emit("playerDisconnect", player, player.voiceChannelId);
                 player.voiceChannelId = null;
                 player.voice = Object.assign({});
                 return;

package/dist/cjs/structures/Node.js

@@ -142,12 +142,11 @@ class LavalinkNode {
         const url = new URL(`${this.restAddress}${options.path}`);
         url.searchParams.append("trace", "true");
         const urlToUse = this.getRequestingUrl(url, options?.extraQueryUrlParams);
-        const originalOptions = structuredClone(options);
-        delete options.path;
-        delete options.extraQueryUrlParams;
-        const response = await fetch(urlToUse, options);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { path, extraQueryUrlParams, ...fetchOptions } = options; // destructure fetch only options
+        const response = await fetch(urlToUse, fetchOptions);
         this.calls++;
-        return { response, options: originalOptions };
+        return { response, options: options };
     }
     async request(endpoint, modify, parseAsText) {
         if (!this.connected)
@@ -1425,7 +1424,7 @@ class LavalinkNode {
             }
         }
         player.set("internal_skipped", false);
-        player.set("internal_autoplayStopPlaying", Date.now());
+        player.set("internal_autoplayStopPlaying", undefined);
         if (track && !track?.pluginInfo?.clientData?.previousTrack) { // If there was a current Track already and repeatmode === true, add it to the queue.
             player.queue.previous.unshift(track);
             if (player.queue.previous.length > player.queue.options.maxPreviousTracks)

package/dist/cjs/structures/Queue.js

@@ -217,7 +217,7 @@ class Queue {
             try {
                 this.queueChanges.tracksAdd(this.guildId, (Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v)), this.tracks.length, oldStored, this.utils.toJSON());
             }
-            catch (e) { /*  */ }
+            catch { /*  */ }
         // save the queue
         await this.utils.save();
         // return the amount of the tracks
@@ -243,7 +243,7 @@ class Queue {
             try {
                 this.queueChanges.tracksAdd(this.guildId, (Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v)), index, oldStored, this.utils.toJSON());
             }
-            catch (e) { /*  */ }
+            catch { /*  */ }
         // remove the tracks (and add the new ones)
         let spliced = TrackOrTracks ? this.tracks.splice(index, amount, ...(Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v))) : this.tracks.splice(index, amount);
         // get the spliced array
@@ -253,7 +253,7 @@ class Queue {
             try {
                 this.queueChanges.tracksRemoved(this.guildId, spliced, index, oldStored, this.utils.toJSON());
             }
-            catch (e) { /* */ }
+            catch { /* */ }
         // save the queue
         await this.utils.save();
         // return the things
@@ -302,7 +302,7 @@ class Queue {
                 try {
                     this.queueChanges.tracksRemoved(this.guildId, removed, removeQueryTrack, oldStored, this.utils.toJSON());
                 }
-                catch (e) { /* */ }
+                catch { /* */ }
             await this.utils.save();
             return { removed };
         }
@@ -321,7 +321,7 @@ class Queue {
                     try {
                         this.queueChanges.tracksRemoved(this.guildId, removed, removeQueryTrack, oldStored, this.utils.toJSON());
                     }
-                    catch (e) { /* */ }
+                    catch { /* */ }
                 await this.utils.save();
                 return { removed };
             }
@@ -345,7 +345,7 @@ class Queue {
                 try {
                     this.queueChanges.tracksRemoved(this.guildId, removed, tracksToRemove.map(v => v.i), oldStored, this.utils.toJSON());
                 }
-                catch (e) { /* */ }
+                catch { /* */ }
             await this.utils.save();
             return { removed };
         }
@@ -363,7 +363,7 @@ class Queue {
             try {
                 this.queueChanges.tracksRemoved(this.guildId, removed, toRemove, oldStored, this.utils.toJSON());
             }
-            catch (e) { /* */ }
+            catch { /* */ }
         await this.utils.save();
         return { removed };
     }

package/dist/cjs/structures/Types/Manager.d.ts

@@ -200,6 +200,8 @@ export interface ManagerPlayerOptions {
     onDisconnect?: {
         /** Try to reconnect? -> If fails -> Destroy */
         autoReconnect?: boolean;
+        /** Only try to reconnect if there are tracks in the queue */
+        autoReconnectOnlyWithTracks?: boolean;
         /** Instantly destroy player (overrides autoReconnect) | Don't provide == disable feature*/
         destroyPlayer?: boolean;
     };

package/dist/esm/structures/LavalinkManager.js

@@ -80,7 +80,8 @@ export class LavalinkManager extends EventEmitter {
                 defaultSearchPlatform: options?.playerOptions?.defaultSearchPlatform ?? "ytsearch",
                 onDisconnect: {
                     destroyPlayer: options?.playerOptions?.onDisconnect?.destroyPlayer ?? true,
-                    autoReconnect: options?.playerOptions?.onDisconnect?.autoReconnect ?? false
+                    autoReconnect: options?.playerOptions?.onDisconnect?.autoReconnect ?? false,
+                    autoReconnectOnlyWithTracks: options?.playerOptions?.onDisconnect?.autoReconnectOnlyWithTracks ?? false,
                 },
                 onEmptyQueue: {
                     autoPlayFunction: options?.playerOptions?.onEmptyQueue?.autoPlayFunction ?? null,
@@ -566,13 +567,14 @@ export class LavalinkManager extends EventEmitter {
                     this.emit("playerSuppressChange", player, player.voiceState.suppress);
             }
             else {
-                if (this.options?.playerOptions?.onDisconnect?.destroyPlayer === true) {
+                const { autoReconnectOnlyWithTracks, destroyPlayer, autoReconnect } = this.options?.playerOptions?.onDisconnect ?? {};
+                if (destroyPlayer === true) {
                     return void await player.destroy(DestroyReasons.Disconnected);
                 }
-                this.emit("playerDisconnect", player, player.voiceChannelId);
-                if (this.options?.playerOptions?.onDisconnect?.autoReconnect === true) {
+                if (autoReconnect === true) {
                     try {
-                        const positionPrevios = player.position;
+                        const previousPosition = player.position;
+                        const previousPaused = player.paused;
                         if (this.options?.advancedOptions?.enableDebugEvents) {
                             this.emit("debug", DebugEvents.PlayerAutoReconnect, {
                                 state: "log",
@@ -580,12 +582,23 @@ export class LavalinkManager extends EventEmitter {
                                 functionLayer: "LavalinkManager > sendRawData()",
                             });
                         }
-                        await player.connect();
+                        // connect if there are tracks & autoReconnectOnlyWithTracks = true or autoReconnectOnlyWithTracks is false
+                        if (!autoReconnectOnlyWithTracks || (autoReconnectOnlyWithTracks && (player.queue.current || player.queue.tracks.length))) {
+                            await player.connect();
+                        }
                         // replay the current playing stream
-                        await player.play({
-                            position: positionPrevios,
-                            paused: player.paused,
-                            clientTrack: player.queue.current,
+                        if (player.queue.current) {
+                            return void await player.play({ position: previousPosition, paused: previousPaused, clientTrack: player.queue.current, });
+                        }
+                        // try to play the next track
+                        if (player.queue.tracks.length) {
+                            return void await player.play({ paused: previousPaused });
+                        }
+                        // debug log if nothing was possible
+                        this.emit("debug", DebugEvents.PlayerAutoReconnect, {
+                            state: "log",
+                            message: `Auto reconnected, but nothing to play`,
+                            functionLayer: "LavalinkManager > sendRawData()",
                         });
                     }
                     catch (e) {
@@ -593,6 +606,7 @@ export class LavalinkManager extends EventEmitter {
                         return void await player.destroy(DestroyReasons.PlayerReconnectFail);
                     }
                 }
+                this.emit("playerDisconnect", player, player.voiceChannelId);
                 player.voiceChannelId = null;
                 player.voice = Object.assign({});
                 return;

package/dist/esm/structures/Node.js

@@ -138,12 +138,11 @@ export class LavalinkNode {
         const url = new URL(`${this.restAddress}${options.path}`);
         url.searchParams.append("trace", "true");
         const urlToUse = this.getRequestingUrl(url, options?.extraQueryUrlParams);
-        const originalOptions = structuredClone(options);
-        delete options.path;
-        delete options.extraQueryUrlParams;
-        const response = await fetch(urlToUse, options);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { path, extraQueryUrlParams, ...fetchOptions } = options; // destructure fetch only options
+        const response = await fetch(urlToUse, fetchOptions);
         this.calls++;
-        return { response, options: originalOptions };
+        return { response, options: options };
     }
     async request(endpoint, modify, parseAsText) {
         if (!this.connected)
@@ -1421,7 +1420,7 @@ export class LavalinkNode {
             }
         }
         player.set("internal_skipped", false);
-        player.set("internal_autoplayStopPlaying", Date.now());
+        player.set("internal_autoplayStopPlaying", undefined);
         if (track && !track?.pluginInfo?.clientData?.previousTrack) { // If there was a current Track already and repeatmode === true, add it to the queue.
             player.queue.previous.unshift(track);
             if (player.queue.previous.length > player.queue.options.maxPreviousTracks)

package/dist/esm/structures/Queue.js

@@ -212,7 +212,7 @@ export class Queue {
             try {
                 this.queueChanges.tracksAdd(this.guildId, (Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v)), this.tracks.length, oldStored, this.utils.toJSON());
             }
-            catch (e) { /*  */ }
+            catch { /*  */ }
         // save the queue
         await this.utils.save();
         // return the amount of the tracks
@@ -238,7 +238,7 @@ export class Queue {
             try {
                 this.queueChanges.tracksAdd(this.guildId, (Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v)), index, oldStored, this.utils.toJSON());
             }
-            catch (e) { /*  */ }
+            catch { /*  */ }
         // remove the tracks (and add the new ones)
         let spliced = TrackOrTracks ? this.tracks.splice(index, amount, ...(Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).filter(v => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v))) : this.tracks.splice(index, amount);
         // get the spliced array
@@ -248,7 +248,7 @@ export class Queue {
             try {
                 this.queueChanges.tracksRemoved(this.guildId, spliced, index, oldStored, this.utils.toJSON());
             }
-            catch (e) { /* */ }
+            catch { /* */ }
         // save the queue
         await this.utils.save();
         // return the things
@@ -297,7 +297,7 @@ export class Queue {
                 try {
                     this.queueChanges.tracksRemoved(this.guildId, removed, removeQueryTrack, oldStored, this.utils.toJSON());
                 }
-                catch (e) { /* */ }
+                catch { /* */ }
             await this.utils.save();
             return { removed };
         }
@@ -316,7 +316,7 @@ export class Queue {
                     try {
                         this.queueChanges.tracksRemoved(this.guildId, removed, removeQueryTrack, oldStored, this.utils.toJSON());
                     }
-                    catch (e) { /* */ }
+                    catch { /* */ }
                 await this.utils.save();
                 return { removed };
             }
@@ -340,7 +340,7 @@ export class Queue {
                 try {
                     this.queueChanges.tracksRemoved(this.guildId, removed, tracksToRemove.map(v => v.i), oldStored, this.utils.toJSON());
                 }
-                catch (e) { /* */ }
+                catch { /* */ }
             await this.utils.save();
             return { removed };
         }
@@ -358,7 +358,7 @@ export class Queue {
             try {
                 this.queueChanges.tracksRemoved(this.guildId, removed, toRemove, oldStored, this.utils.toJSON());
             }
-            catch (e) { /* */ }
+            catch { /* */ }
         await this.utils.save();
         return { removed };
     }

package/dist/esm/structures/Types/Manager.d.ts

@@ -200,6 +200,8 @@ export interface ManagerPlayerOptions {
     onDisconnect?: {
         /** Try to reconnect? -> If fails -> Destroy */
         autoReconnect?: boolean;
+        /** Only try to reconnect if there are tracks in the queue */
+        autoReconnectOnlyWithTracks?: boolean;
         /** Instantly destroy player (overrides autoReconnect) | Don't provide == disable feature*/
         destroyPlayer?: boolean;
     };

package/dist/types/structures/Types/Manager.d.ts

@@ -200,6 +200,8 @@ export interface ManagerPlayerOptions {
     onDisconnect?: {
         /** Try to reconnect? -> If fails -> Destroy */
         autoReconnect?: boolean;
+        /** Only try to reconnect if there are tracks in the queue */
+        autoReconnectOnlyWithTracks?: boolean;
         /** Instantly destroy player (overrides autoReconnect) | Don't provide == disable feature*/
         destroyPlayer?: boolean;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "2.4.2",
+  "version": "2.4.4",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",