lavalink-client 2.7.1 → 2.7.2

package/dist/index.js

@@ -47,6 +47,7 @@ __export(index_exports, {
   Queue: () => Queue,
   QueueSaver: () => QueueSaver,
   QueueSymbol: () => QueueSymbol,
+  ReconnectionState: () => ReconnectionState,
   SourceLinksRegexes: () => SourceLinksRegexes,
   TrackSymbol: () => TrackSymbol,
   UnresolvedTrackSymbol: () => UnresolvedTrackSymbol,
@@ -367,6 +368,15 @@ var import_events = require("events");
 var import_path = require("path");
 var import_ws = __toESM(require("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
 var import_node_url = require("url");
 var import_types = require("util/types");
@@ -1070,12 +1080,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 */
@@ -1098,6 +1110,7 @@ var LavalinkNode = class {
       secure: false,
       retryAmount: 5,
       retryDelay: 1e4,
+      retryTimespan: -1,
       requestSignalTimeoutMS: 1e4,
       heartBeatInterval: 3e4,
       closeOnError: true,
@@ -1355,6 +1368,7 @@ var LavalinkNode = class {
       });
     }
     this.resetAckTimeouts(false, true);
+    if (this.pingTimeout) clearTimeout(this.pingTimeout);
     this.pingTimeout = setTimeout(() => {
       this.pingTimeout = null;
       if (!this.socket) {
@@ -1861,47 +1875,66 @@ 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.reconnectAttempts = 1;
+    this.reconnectionState = "IDLE" /* IDLE */;
+    this.reconnectAttempts = [];
     clearTimeout(this.reconnectTimeout);
     this.reconnectTimeout = null;
     return;
@@ -1988,6 +2021,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);
@@ -2421,10 +2455,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) {
@@ -5228,6 +5259,7 @@ var LavalinkManager = class extends import_events2.EventEmitter {
   Queue,
   QueueSaver,
   QueueSymbol,
+  ReconnectionState,
   SourceLinksRegexes,
   TrackSymbol,
   UnresolvedTrackSymbol,

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,
@@ -1295,6 +1307,7 @@ var LavalinkNode = class {
       });
     }
     this.resetAckTimeouts(false, true);
+    if (this.pingTimeout) clearTimeout(this.pingTimeout);
     this.pingTimeout = setTimeout(() => {
       this.pingTimeout = null;
       if (!this.socket) {
@@ -1801,47 +1814,66 @@ 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.reconnectAttempts = 1;
+    this.reconnectionState = "IDLE" /* IDLE */;
+    this.reconnectAttempts = [];
     clearTimeout(this.reconnectTimeout);
     this.reconnectTimeout = null;
     return;
@@ -1928,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);
@@ -2361,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) {
@@ -5167,6 +5197,7 @@ export {
   Queue,
   QueueSaver,
   QueueSymbol,
+  ReconnectionState,
   SourceLinksRegexes,
   TrackSymbol,
   UnresolvedTrackSymbol,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lavalink-client",
-  "version": "2.7.1",
+  "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",