aqualink 1.7.0-beta5 → 1.7.0-beta6

package/build/structures/Aqua.js

@@ -6,28 +6,27 @@ const { version: pkgVersion } = require("../../package.json");
 const URL_REGEX = /^https?:\/\//;
 
 class Aqua extends EventEmitter {
-        /**
-     * @param {Object} client - The client instance.
-     * @param {Array<Object>} nodes - An array of node configurations.
-     * @param {Object} options - Configuration options for Aqua.
-     * @param {Function} options.send - Function to send data.
-     * @param {string} [options.defaultSearchPlatform="ytsearch"] - Default search platform. Options include:
-     *     - "youtube music": "ytmsearch"
-     *     - "youtube": "ytsearch"
-     *     - "spotify": "spsearch"
-     *     - "jiosaavn": "jssearch"
-     *     - "soundcloud": "scsearch"
-     *     - "deezer": "dzsearch"
-     *     - "tidal": "tdsearch"
-     *     - "applemusic": "amsearch"
-     *     - "bandcamp": "bcsearch"
-     * @param {string} [options.restVersion="v4"] - Version of the REST API.
-     * @param {Array<Object>} [options.plugins=[]] - Plugins to load.
-     * @param {string} [options.shouldDeleteMessage='none'] - Should delete your message? (true, false)
-     * @param {boolean} [options.autoResume=false] - Automatically resume tracks on reconnect.
-     * @param {boolean} [options.infiniteReconnects=false] - Reconnect infinitely (default: false).
-     */
-    constructor(client, nodes, options) {
+    /**
+ * @param {Object} client - The client instance.
+ * @param {Array<Object>} nodes - An array of node configurations.
+ * @param {Object} options - Configuration options for Aqua.
+ * @param {Function} options.send - Function to send data.
+ * @param {string} [options.defaultSearchPlatform="ytsearch"] - Default search platform. Options include:
+ *     - "youtube music": "ytmsearch"
+ *     - "youtube": "ytsearch"
+ *     - "spotify": "spsearch"
+ *     - "jiosaavn": "jssearch"
+ *     - "soundcloud": "scsearch"
+ *     - "deezer": "dzsearch"
+ *     - "tidal": "tdsearch"
+ *     - "applemusic": "amsearch"
+ *     - "bandcamp": "bcsearch"
+ * @param {string} [options.restVersion="v4"] - Version of the REST API.
+ * @param {Array<Object>} [options.plugins=[]] - Plugins to load.
+ * @param {boolean} [options.autoResume=false] - Automatically resume tracks on reconnect.
+ * @param {boolean} [options.infiniteReconnects=false] - Reconnect infinitely (default: false).
+ */
+    constructor(client, nodes, options = {}) {
         super();
         this.validateInputs(client, nodes, options);
         this.client = client;
@@ -36,22 +35,33 @@ class Aqua extends EventEmitter {
         this.players = new Map();
         this.clientId = null;
         this.initiated = false;
-        this.shouldDeleteMessage = options.shouldDeleteMessage || false;
-        this.defaultSearchPlatform = options.defaultSearchPlatform || "ytsearch";
-        this.restVersion = options.restVersion || "v4";
-        this.plugins = options.plugins || [];
-        this.version = pkgVersion;
         this.options = options;
-        this.send = options.send;
-        this.autoResume = options.autoResume || false;
-        this.infiniteReconnects = options.infiniteReconnects || false;
+
+        this.shouldDeleteMessage = this.getOption(options, 'shouldDeleteMessage', false);
+        this.defaultSearchPlatform = this.getOption(options, 'defaultSearchPlatform', 'ytsearch');
+        this.leaveOnEnd =  this.getOption(options, 'leaveOnEnd', true);
+        this.restVersion = this.getOption(options, 'restVersion', 'v4');
+        this.plugins = this.getOption(options, 'plugins', []);
+        this.version = pkgVersion;
+        this.send = options.send || this.defaultSendFunction;
+        this.autoResume = this.getOption(options, 'autoResume', false);
+        this.infiniteReconnects = this.getOption(options, 'infiniteReconnects', false);
+        
         this.setMaxListeners(0);
     }
 
+    getOption(options, key, defaultValue) {
+        return options.hasOwnProperty(key) ? options[key] : defaultValue;
+    }
+
+    defaultSendFunction(payload) {
+        const guild = this.client.guilds.cache.get(payload.d.guild_id);
+        if (guild) guild.shard.send(payload);
+    }
+
     validateInputs(client, nodes, options) {
         if (!client) throw new Error("Client is required to initialize Aqua");
         if (!Array.isArray(nodes) || !nodes.length) throw new Error(`Nodes must be a non-empty Array (Received ${typeof nodes})`);
-        if (typeof options?.send !== "function") throw new Error("Send function is required to initialize Aqua");
     }
 
     get leastUsedNodes() {

package/build/structures/Node.js

@@ -3,7 +3,7 @@ const { Rest } = require("./Rest");
 
 class Node {
     #ws = null;
-    #statsCache = {};
+    #statsCache = new Map();
     #lastStatsRequest = 0;
     #reconnectAttempted = 0;
     #reconnectTimeoutId = null;
@@ -37,7 +37,7 @@ class Node {
         this.infiniteReconnects = options?.infiniteReconnects ?? false;
         this.connected = false;
         this.info = null;
-        this.stats = Object.freeze(this.#createStats());
+        this.stats = this.#createStats();
     }
 
     #createStats() {
@@ -47,24 +47,25 @@ class Node {
             uptime: 0,
             memory: { free: 0, used: 0, allocated: 0, reservable: 0, freePercentage: 0, usedPercentage: 0 },
             cpu: { cores: 0, systemLoad: 0, lavalinkLoad: 0, lavalinkLoadPercentage: 0 },
-            frameStats: { sent: null, nulled: null, deficit: null },
+            frameStats: { sent: 0, nulled: 0, deficit: 0 },
             ping: 0
         };
     }
 
     async connect() {
         this.#cleanup();
-        try {
-            this.#ws = new WebSocket(this.wsUrl.href, {
-                headers: this.#constructHeaders(),
-                perMessageDeflate: false
-            });
-            this.#setupWebSocketListeners();
-            this.aqua.emit('debug', this.name, 'Connecting...');
-        } catch (err) {
-            this.aqua.emit('debug', this.name, `Connection failed: ${err.message}`);
-            this.#reconnect();
-        }
+        this.#ws = new WebSocket(this.wsUrl.href, {
+            headers: this.#constructHeaders(),
+            perMessageDeflate: false,
+            handshakeTimeout: 5000
+        });
+
+        this.#ws.once('open', () => {
+            this.#onOpen();
+        });
+
+        this.#setupWebSocketListeners();
+        this.aqua.emit('debug', this.name, 'Connecting...');
     }
 
     #cleanup() {
@@ -73,21 +74,28 @@ class Node {
             this.#ws.terminate();
             this.#ws = null;
         }
+        this.info = null;
+        this.#statsCache.clear();
     }
 
     #constructHeaders() {
-        const headers = {
+        return {
             Authorization: this.password,
             "User-Id": this.aqua.clientId,
             "Client-Name": `Aqua/${this.aqua.version}`,
+            ...(this.sessionId && { "Session-Id": this.sessionId }),
+            ...(this.resumeKey && { "Resume-Key": this.resumeKey })
         };
-        if (this.sessionId) headers["Session-Id"] = this.sessionId;
-        if (this.resumeKey) headers["Resume-Key"] = this.resumeKey;
-        return Object.freeze(headers);
     }
 
     #setupWebSocketListeners() {
         if (!this.#ws) return;
+        
+        this.#ws.removeAllListeners('open');
+        this.#ws.removeAllListeners('error');
+        this.#ws.removeAllListeners('message');
+        this.#ws.removeAllListeners('close');
+    
         this.#ws.once("open", this.#onOpen.bind(this));
         this.#ws.once("error", this.#onError.bind(this));
         this.#ws.on("message", this.#onMessage.bind(this));
@@ -107,18 +115,20 @@ class Node {
             }
         }
     }
-
     async getStats() {
+        if (!this.connected) return this.stats;
+    
         const now = Date.now();
         const STATS_COOLDOWN = 60000;
+    
         if (now - this.#lastStatsRequest < STATS_COOLDOWN) {
-            return this.#statsCache[this.name] ?? this.stats;
+            return this.stats;
         }
+    
         try {
             const stats = await this.rest.makeRequest("GET", "/v4/stats");
-            this.#updateStats(stats);
+            this.stats = { ...this.#createStats(), ...stats };
             this.#lastStatsRequest = now;
-            this.#statsCache[this.name] = this.stats;
             return this.stats;
         } catch (err) {
             this.aqua.emit('debug', `Stats fetch error: ${err.message}`);
@@ -128,60 +138,58 @@ class Node {
 
     #updateStats(payload) {
         if (!payload) return;
-        this.stats = Object.freeze({
-            players: payload.players ?? 0,
-            playingPlayers: payload.playingPlayers ?? 0,
-            uptime: payload.uptime ?? 0,
-            ping: payload.ping ?? 0,
+        this.stats = {
+            ...this.stats,
+            ...payload,
             memory: this.#updateMemoryStats(payload.memory),
             cpu: this.#updateCpuStats(payload.cpu),
             frameStats: this.#updateFrameStats(payload.frameStats)
-        });
+        };
     }
 
     #updateMemoryStats(memory = {}) {
         const allocated = memory.allocated ?? 0;
         const free = memory.free ?? 0;
         const used = memory.used ?? 0;
-        return Object.freeze({
+        return {
             free,
             used,
             allocated,
             reservable: memory.reservable ?? 0,
             freePercentage: allocated ? (free / allocated) * 100 : 0,
             usedPercentage: allocated ? (used / allocated) * 100 : 0
-        });
+        };
     }
 
     #updateCpuStats(cpu = {}) {
         const cores = cpu.cores ?? 0;
-        return Object.freeze({
+        return {
             cores,
             systemLoad: cpu.systemLoad ?? 0,
             lavalinkLoad: cpu.lavalinkLoad ?? 0,
             lavalinkLoadPercentage: cores ? (cpu.lavalinkLoad / cores) * 100 : 0
-        });
+        };
     }
 
     #updateFrameStats(frameStats = {}) {
-        if (!frameStats) {
-            return Object.freeze({
-                sent: 0,
-                nulled: 0,
-                deficit: 0
-            });
-        }
+        if (!frameStats) return {};
+        return {
+            sent: frameStats.sent ?? 0,
+            nulled: frameStats.nulled ?? 0,
+            deficit: frameStats.deficit ?? 0
+        };
     }
 
     #onMessage(msg) {
         try {
             const payload = JSON.parse(msg.toString());
             if (!payload?.op) return;
+
             switch (payload.op) {
-                case "stats":
+                case 'stats':
                     this.#updateStats(payload);
                     break;
-                case "ready":
+                case 'ready':
                     this.#handleReadyOp(payload);
                     break;
                 default:
@@ -222,16 +230,28 @@ class Node {
             return;
         }
 
-        clearTimeout(this.#reconnectTimeoutId);
-        if (++this.#reconnectAttempted >= this.reconnectTries) {
+        const jitter = Math.random() * 10000;
+        const backoffTime = Math.min(
+            this.reconnectTimeout * Math.pow(1.5, this.#reconnectAttempted) + jitter,
+            30000
+        );
+
+        if (this.#reconnectAttempted >= this.reconnectTries && !this.infiniteReconnects) {
             this.aqua.emit("nodeError", this, new Error(`Max reconnection attempts reached (${this.reconnectTries})`));
-            return this.destroy();
+            this.destroy(true);
+            return;
         }
 
+        clearTimeout(this.#reconnectTimeoutId);
         this.#reconnectTimeoutId = setTimeout(() => {
-            this.aqua.emit("nodeReconnect", this, this.#reconnectAttempted);
+            this.#reconnectAttempted++;
+            this.aqua.emit("nodeReconnect", {
+                nodeName: this.name,
+                attempt: this.#reconnectAttempted,
+                backoffTime
+            });
             this.connect();
-        }, this.reconnectTimeout * Math.pow(2, this.#reconnectAttempted)); // Exponential backoff
+        }, backoffTime);
     }
 
     get penalties() {
@@ -264,8 +284,8 @@ class Node {
         this.aqua.nodeMap.delete(this.name);
         this.aqua.emit("nodeDestroy", this);
         this.info = null;
-        this.#statsCache = {};
-        this.stats = Object.freeze(this.#createStats());
+        this.#statsCache.clear();
+        this.stats = this.#createStats();
     }
 }
 

package/build/structures/Player.js

@@ -33,7 +33,8 @@ class Player extends EventEmitter {
         this.ping = 0;
         this.nowPlayingMessage = null;
         this.previousTracks = [];
-        this.shouldDeleteMessage = options.shouldDeleteMessage ?? true;
+        this.shouldDeleteMessage = options.shouldDeleteMessage; 
+        this.leaveOnEnd = options.leaveOnEnd
 
         this.boundHandleEvent = this.handleEvent.bind(this);
         this.boundOnPlayerUpdate = this.onPlayerUpdate.bind(this);
@@ -277,9 +278,12 @@ class Player extends EventEmitter {
 
         if (player.queue.isEmpty()) {
             this.playing = false;
-            this.aqua.emit("queueEnd", player);
-            return this.cleanup();
+            if (this.leaveOnEnd) {
+                await this.cleanup();
+            }
+            return this.aqua.emit("queueEnd", player);
         }
+    
 
         return player.play();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aqualink",
-  "version": "1.7.0-beta5",
+  "version": "1.7.0-beta6",
   "description": "An Lavalink wrapper, focused in speed, performance, and features, Based in Riffy!",
   "main": "build/index.js",
   "scripts": {