lavalink-client 2.7.0 → 2.7.2

package/dist/index.mjs

@@ -307,6 +307,15 @@ import { EventEmitter } from "events";
 import { isAbsolute } from "path";
 import WebSocket from "ws";
 
+// src/structures/Types/Node.ts
+var ReconnectionState = /* @__PURE__ */ ((ReconnectionState2) => {
+  ReconnectionState2["IDLE"] = "IDLE";
+  ReconnectionState2["RECONNECTING"] = "RECONNECTING";
+  ReconnectionState2["PENDING"] = "PENDING";
+  ReconnectionState2["DESTROYING"] = "DESTROYING";
+  return ReconnectionState2;
+})(ReconnectionState || {});
+
 // src/structures/Utils.ts
 import { URL as URL2 } from "url";
 import { isRegExp } from "util/types";
@@ -1010,12 +1019,14 @@ var LavalinkNode = class {
   resuming = { enabled: true, timeout: null };
   /** Actual Lavalink Information of the Node */
   info = null;
+  /** current state of the Reconnections */
+  reconnectionState = "IDLE" /* IDLE */;
   /** The Node Manager of this Node */
   NodeManager = null;
   /** The Reconnection Timeout */
   reconnectTimeout = void 0;
-  /** The Reconnection Attempt counter */
-  reconnectAttempts = 1;
+  /** The Reconnection Attempt counter (array of datetimes when it tried it.) */
+  reconnectAttempts = [];
   /** The Socket of the Lavalink */
   socket = null;
   /** Version of what the Lavalink Server should be */
@@ -1038,6 +1049,7 @@ var LavalinkNode = class {
       secure: false,
       retryAmount: 5,
       retryDelay: 1e4,
+      retryTimespan: -1,
       requestSignalTimeoutMS: 1e4,
       heartBeatInterval: 3e4,
       closeOnError: true,
@@ -1294,6 +1306,7 @@ var LavalinkNode = class {
         functionLayer: "LavalinkNode > nodeEvent > stats > heartBeat()"
       });
     }
+    this.resetAckTimeouts(false, true);
     if (this.pingTimeout) clearTimeout(this.pingTimeout);
     this.pingTimeout = setTimeout(() => {
       this.pingTimeout = null;
@@ -1390,13 +1403,11 @@ var LavalinkNode = class {
         this.socket?.close(1e3, "Node-Destroy");
         this.socket?.removeAllListeners();
         this.socket = null;
-        this.reconnectAttempts = 1;
-        clearTimeout(this.reconnectTimeout);
+        this.resetReconnectionAttempts();
         if (deleteNode) {
           this.NodeManager.emit("destroy", this, destroyReason);
           this.NodeManager.nodes.delete(this.id);
-          clearInterval(this.heartBeatInterval);
-          clearTimeout(this.pingTimeout);
+          this.resetAckTimeouts(true, true);
         } else {
           this.NodeManager.emit("disconnect", this, { code: 1e3, reason: destroyReason });
         }
@@ -1405,13 +1416,11 @@ var LavalinkNode = class {
       this.socket?.close(1e3, "Node-Destroy");
       this.socket?.removeAllListeners();
       this.socket = null;
-      this.reconnectAttempts = 1;
-      clearTimeout(this.reconnectTimeout);
+      this.resetReconnectionAttempts();
       if (deleteNode) {
         this.NodeManager.emit("destroy", this, destroyReason);
         this.NodeManager.nodes.delete(this.id);
-        clearInterval(this.heartBeatInterval);
-        clearTimeout(this.pingTimeout);
+        this.resetAckTimeouts(true, true);
       } else {
         this.NodeManager.emit("disconnect", this, { code: 1e3, reason: destroyReason });
       }
@@ -1435,8 +1444,7 @@ var LavalinkNode = class {
     this.socket?.close(1e3, "Node-Disconnect");
     this.socket?.removeAllListeners();
     this.socket = null;
-    this.reconnectAttempts = 1;
-    clearTimeout(this.reconnectTimeout);
+    this.resetReconnectionAttempts();
     this.NodeManager.emit("disconnect", this, { code: 1e3, reason: disconnectReason });
   }
   /**
@@ -1806,46 +1814,91 @@ var LavalinkNode = class {
   get restAddress() {
     return `http${this.options.secure ? "s" : ""}://${this.options.host}:${this.options.port}`;
   }
+  /**
+   * If already trying to reconnect or pending, return
+   */
+  get isNodeReconnecting() {
+    return this.reconnectionState !== "IDLE" /* IDLE */;
+  }
   /**
    * Reconnect to the lavalink node
-   * @param instaReconnect @default false wether to instantly try to reconnect
+   * @param force @default false Wether to instantly try to reconnect (force it)
    * @returns void
    *
    * @example
    * ```ts
-   * await player.node.reconnect();
+   * await player.node.reconnect(true); //true forcefully trys the reconnect
    * ```
    */
-  reconnect(instaReconnect = false) {
+  reconnect(force = false) {
+    if (this.isNodeReconnecting) {
+      return;
+    }
+    this.reconnectionState = "PENDING" /* PENDING */;
     this.NodeManager.emit("reconnectinprogress", this);
-    if (instaReconnect) {
-      if (this.reconnectAttempts >= this.options.retryAmount) {
-        const error = new Error(`Unable to connect after ${this.options.retryAmount} attempts.`);
-        this.NodeManager.emit("error", this, error);
-        return this.destroy("NodeReconnectFail" /* NodeReconnectFail */);
-      }
-      this.NodeManager.emit("reconnecting", this);
-      this.connect();
-      this.reconnectAttempts++;
+    if (force) {
+      this.executeReconnect();
       return;
     }
+    if (this.reconnectTimeout) clearTimeout(this.reconnectTimeout);
     this.reconnectTimeout = setTimeout(() => {
       this.reconnectTimeout = null;
-      if (this.reconnectAttempts >= this.options.retryAmount) {
-        const error = new Error(`Unable to connect after ${this.options.retryAmount} attempts.`);
-        this.NodeManager.emit("error", this, error);
-        return this.destroy("NodeReconnectFail" /* NodeReconnectFail */);
-      }
-      this.NodeManager.emit("reconnecting", this);
-      this.connect();
-      this.reconnectAttempts++;
+      this.executeReconnect();
     }, this.options.retryDelay || 1e3);
   }
+  get reconnectionAttemptCount() {
+    const maxAllowedTimestan = this.options.retryTimespan || -1;
+    if (maxAllowedTimestan <= 0) return this.reconnectAttempts.length;
+    return this.reconnectAttempts.filter((timestamp) => Date.now() - timestamp <= maxAllowedTimestan).length;
+  }
+  /**
+   * Private Utility function to execute the reconnection
+  */
+  executeReconnect() {
+    if (this.reconnectionAttemptCount >= this.options.retryAmount) {
+      const error = new Error(`Unable to connect after ${this.options.retryAmount} attempts.`);
+      this.reconnectionState = "DESTROYING" /* DESTROYING */;
+      this.NodeManager.emit("error", this, error);
+      this.destroy("NodeReconnectFail" /* NodeReconnectFail */);
+      return;
+    }
+    this.reconnectAttempts.push(Date.now());
+    this.reconnectionState = "RECONNECTING" /* RECONNECTING */;
+    this.NodeManager.emit("reconnecting", this);
+    this.connect();
+  }
+  /**
+   * Private function to reset the reconnection attempts
+   * @returns
+   */
+  resetReconnectionAttempts() {
+    this.reconnectionState = "IDLE" /* IDLE */;
+    this.reconnectAttempts = [];
+    clearTimeout(this.reconnectTimeout);
+    this.reconnectTimeout = null;
+    return;
+  }
+  /**
+   * Private function to reset timeouts/intervals for heartbeating/pinging
+   * @param heartbeat
+   * @param ping
+   * @returns
+   */
+  resetAckTimeouts(heartbeat = true, ping = true) {
+    if (ping) {
+      if (this.pingTimeout) clearTimeout(this.pingTimeout);
+      this.pingTimeout = null;
+    }
+    if (heartbeat) {
+      if (this.heartBeatInterval) clearInterval(this.heartBeatInterval);
+      this.heartBeatInterval = null;
+    }
+    return;
+  }
   /** @private util function for handling opening events from websocket */
   async open() {
     this.isAlive = true;
-    this.reconnectAttempts = 1;
-    if (this.reconnectTimeout) clearTimeout(this.reconnectTimeout);
+    this.resetReconnectionAttempts();
     if (this.options.enablePingOnStatsCheck) this.heartBeat();
     if (this.heartBeatInterval) clearInterval(this.heartBeatInterval);
     if (this.options.heartBeatInterval > 0) {
@@ -1870,7 +1923,7 @@ var LavalinkNode = class {
   }
   /** @private util function for handling closing events from websocket */
   close(code, reason) {
-    if (this.pingTimeout) clearTimeout(this.pingTimeout);
+    this.resetAckTimeouts(true, true);
     try {
       if (this.socket) {
         this.socket.removeAllListeners();
@@ -1886,7 +1939,6 @@ var LavalinkNode = class {
       }
     }
     this.isAlive = false;
-    if (this.heartBeatInterval) clearInterval(this.heartBeatInterval);
     if (code === 1006 && !reason) reason = "Socket got terminated due to no ping connection";
     if (code === 1e3 && reason === "Node-Disconnect") return;
     this.NodeManager.emit("disconnect", this, { code, reason });
@@ -1908,6 +1960,7 @@ var LavalinkNode = class {
   error(error) {
     if (!error) return;
     this.NodeManager.emit("error", this, error);
+    this.reconnect();
     if (this.options.closeOnError) {
       if (this.heartBeatInterval) clearInterval(this.heartBeatInterval);
       if (this.pingTimeout) clearTimeout(this.pingTimeout);
@@ -1971,6 +2024,7 @@ var LavalinkNode = class {
         this.handleEvent(payload);
         break;
       case "ready":
+        this.resetReconnectionAttempts();
         this.sessionId = payload.sessionId;
         this.resuming.enabled = payload.resumed;
         if (payload.resumed === true) {
@@ -2340,10 +2394,7 @@ var LavalinkNode = class {
           });
         }
         this.NodeManager.LavalinkManager.emit("playerQueueEmptyStart", player, this.NodeManager.LavalinkManager.options.playerOptions.onEmptyQueue?.destroyAfterMs);
-        if (player.get("internal_queueempty")) {
-          clearTimeout(player.get("internal_queueempty"));
-          player.set("internal_queueempty", void 0);
-        }
+        if (player.get("internal_queueempty")) clearTimeout(player.get("internal_queueempty"));
         player.set("internal_queueempty", setTimeout(() => {
           player.set("internal_queueempty", void 0);
           if (player.queue.current) {
@@ -2649,7 +2700,13 @@ var bandCampSearch = async (player, query, requestUser) => {
         "Cookie": "$Version=1"
       }
     });
-    const json = await data.json();
+    if (!data.ok) throw new Error(`Bandcamp Error: ${data.statusText}`);
+    let json = null;
+    try {
+      json = await data.json();
+    } catch {
+      throw new Error("Invalid JSON response from Bandcamp");
+    }
     tracks = json?.results?.filter((x) => !!x && typeof x === "object" && "type" in x && x.type === "t").map?.((item) => player.LavalinkManager.utils.buildUnresolvedTrack({
       uri: item.url || item.uri,
       artworkUrl: item.img,
@@ -2864,15 +2921,15 @@ var FilterManager = class {
     const lavalinkFilterData = this.data.pluginFilters?.["lavalink-filter-plugin"] || { echo: { decay: this.data.pluginFilters?.echo?.decay && !this.data.pluginFilters?.echo?.echoLength ? this.data.pluginFilters.echo.decay : 0, delay: this.data.pluginFilters?.echo?.delay || 0 }, reverb: { gains: [], delays: [], ...this.data.pluginFilters.reverb } };
     this.filters.lavalinkFilterPlugin.echo = lavalinkFilterData.echo.decay !== 0 || lavalinkFilterData.echo.delay !== 0;
     this.filters.lavalinkFilterPlugin.reverb = lavalinkFilterData.reverb?.delays?.length !== 0 || lavalinkFilterData.reverb?.gains?.length !== 0;
-    this.filters.lavalinkLavaDspxPlugin.highPass = Object.values(this.data.pluginFilters["high-pass"] || {}).length > 0;
-    this.filters.lavalinkLavaDspxPlugin.lowPass = Object.values(this.data.pluginFilters["low-pass"] || {}).length > 0;
-    this.filters.lavalinkLavaDspxPlugin.normalization = Object.values(this.data.pluginFilters.normalization || {}).length > 0;
-    this.filters.lavalinkLavaDspxPlugin.echo = Object.values(this.data.pluginFilters.echo || {}).length > 0 && typeof this.data.pluginFilters?.echo?.delay === "undefined";
-    this.filters.lowPass = this.data.lowPass.smoothing !== 0;
-    this.filters.karaoke = Object.values(this.data.karaoke).some((v) => v !== 0);
+    this.filters.lavalinkLavaDspxPlugin.highPass = Object.values(this.data.pluginFilters?.["high-pass"] || {}).length > 0;
+    this.filters.lavalinkLavaDspxPlugin.lowPass = Object.values(this.data.pluginFilters?.["low-pass"] || {}).length > 0;
+    this.filters.lavalinkLavaDspxPlugin.normalization = Object.values(this.data.pluginFilters?.normalization || {}).length > 0;
+    this.filters.lavalinkLavaDspxPlugin.echo = Object.values(this.data.pluginFilters?.echo || {}).length > 0 && typeof this.data.pluginFilters?.echo?.delay === "undefined";
+    this.filters.lowPass = this.privateNot0(this.data.lowPass?.smoothing);
+    this.filters.karaoke = Object.values(this.data.karaoke ?? {}).some((v) => v !== 0);
     if ((this.filters.nightcore || this.filters.vaporwave) && oldFilterTimescale) {
-      if (oldFilterTimescale.pitch !== this.data.timescale.pitch || oldFilterTimescale.rate !== this.data.timescale.rate || oldFilterTimescale.speed !== this.data.timescale.speed) {
-        this.filters.custom = Object.values(this.data.timescale).some((v) => v !== 1);
+      if (oldFilterTimescale.pitch !== this.data.timescale?.pitch || oldFilterTimescale.rate !== this.data.timescale?.rate || oldFilterTimescale.speed !== this.data.timescale?.speed) {
+        this.filters.custom = Object.values(this.data.timescale || {}).some((v) => v !== 1);
         this.filters.nightcore = false;
         this.filters.vaporwave = false;
       }
@@ -3685,8 +3742,11 @@ var Queue = class {
       this.queueChanges.tracksAdd(this.guildId, (Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).flat(2).filter((v) => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v)), index, oldStored, this.utils.toJSON());
     } catch {
     }
-    let spliced = TrackOrTracks ? this.tracks.splice(index, amount, ...(Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).flat(2).filter((v) => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v))) : this.tracks.splice(index, amount);
-    spliced = Array.isArray(spliced) ? spliced : [spliced];
+    const spliced = TrackOrTracks ? this.tracks.splice(
+      index,
+      amount,
+      ...(Array.isArray(TrackOrTracks) ? TrackOrTracks : [TrackOrTracks]).flat(2).filter((v) => this.managerUtils.isTrack(v) || this.managerUtils.isUnresolvedTrack(v))
+    ) : this.tracks.splice(index, amount);
     if (typeof this.queueChanges?.tracksRemoved === "function") try {
       this.queueChanges.tracksRemoved(this.guildId, spliced, index, oldStored, this.utils.toJSON());
     } catch {
@@ -4251,6 +4311,7 @@ var Player = class {
     else this.set("internal_autoplayStopPlaying", void 0);
     const now = performance.now();
     await this.node.updatePlayer({ guildId: this.guildId, playerOptions: { track: { encoded: null } } });
+    this.paused = false;
     this.ping.lavalink = Math.round((performance.now() - now) / 10) / 100;
     return this;
   }
@@ -5053,6 +5114,7 @@ var LavalinkManager = class extends EventEmitter2 {
           if (this.options?.advancedOptions?.debugOptions?.noAudio === true) console.debug(`Lavalink-Client-Debug | NO-AUDIO [::] sendRawData function, Function to assing sessionId provided, but no found in Payload: ${safeStringify(update, 2)}`);
         }
         player.voiceChannelId = update.channel_id;
+        player.options.voiceChannelId = update.channel_id;
         const selfMuteChanged = typeof update.self_mute === "boolean" && player.voiceState.selfMute !== update.self_mute;
         const serverMuteChanged = typeof update.mute === "boolean" && player.voiceState.serverMute !== update.mute;
         const selfDeafChanged = typeof update.self_deaf === "boolean" && player.voiceState.selfDeaf !== update.self_deaf;
@@ -5095,11 +5157,13 @@ var LavalinkManager = class extends EventEmitter2 {
             if (player.queue.tracks.length) {
               return void await player.play({ paused: previousPaused });
             }
-            this.emit("debug", "PlayerAutoReconnect" /* PlayerAutoReconnect */, {
-              state: "log",
-              message: `Auto reconnected, but nothing to play`,
-              functionLayer: "LavalinkManager > sendRawData()"
-            });
+            if (this.options?.advancedOptions?.enableDebugEvents) {
+              this.emit("debug", "PlayerAutoReconnect" /* PlayerAutoReconnect */, {
+                state: "log",
+                message: `Auto reconnected, but nothing to play`,
+                functionLayer: "LavalinkManager > sendRawData()"
+              });
+            }
             return;
           } catch (e) {
             console.error(e);
@@ -5133,6 +5197,7 @@ export {
   Queue,
   QueueSaver,
   QueueSymbol,
+  ReconnectionState,
   SourceLinksRegexes,
   TrackSymbol,
   UnresolvedTrackSymbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "description": "Easy, flexible and feature-rich lavalink@v4 Client. Both for Beginners and Proficients.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -55,12 +55,12 @@
   },
   "homepage": "https://tomato6966.github.io/lavalink-client/",
   "devDependencies": {
-    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/eslintrc": "^3.3.3",
     "@eslint/js": "^9.39.1",
     "@types/node": "^24.10.1",
     "@types/ws": "^8.18.1",
-    "@typescript-eslint/eslint-plugin": "^8.46.4",
-    "@typescript-eslint/parser": "^8.46.4",
+    "@typescript-eslint/eslint-plugin": "^8.48.0",
+    "@typescript-eslint/parser": "^8.48.0",
     "eslint": "^9.39.1",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"