aqualink 1.0.5 → 1.1.0

package/README.md

@@ -20,6 +20,27 @@ This code is based in riffy, but its an 100% Rewrite made from scratch...
 # Docs (Wiki)
 - https://github.com/ToddyTheNoobDud/AquaLink/wiki
 
+# Yay, Version 1.1.0 is released ! aqualink so cool
+
++ Fixed stop
++ Fixed Destroy
++ Fixed disconnect
++ Improved events
++ Optimize more
++ Improved queue system
++ Improved speed
++ Remove useless code
++ Add more features...
++ Fixed some resolve() methods
++ Improved debug / logging
++ Add new option: shouldDeleteMessage (true, false, if true will delete the nowPlayingMessage, false will not delete)
++ Add nowPlayingMessage
++ Rewrited REST Manager (1,5x faster, less memory usage, less cpu usage, less latency)
++ Rewrited NODE Manager (A bit faster, less memory usage, less cpu, Less temp objects, better error handling)
++ Rewrite Connection Manager (Faster, less bugs, less useless checking, fixed an random memory leak)
++ Updated Aqua.js (added shouldDeleteMessage, some misc update for playlist)
++ Added playlist support for Track (testing)
+
 # How to install
 
 `npm install aqualink`

package/build/structures/Aqua.js

@@ -13,6 +13,7 @@ class Aqua extends EventEmitter {
      * @param {string} [options.defaultSearchPlatform="ytsearch"] - Default search platform.
      * @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)
      */
     constructor(client, nodes, options) {
         super();
@@ -27,6 +28,7 @@ class Aqua extends EventEmitter {
         this.clientId = null;
         this.initiated = false;
         this.sessionId = null;
+        this.shouldDeleteMessage = options.shouldDeleteMessage || "false";
         this.defaultSearchPlatform = options.defaultSearchPlatform || "ytmsearch";
         this.restVersion = options.restVersion || "v3";
         this.plugins = options.plugins || [];
@@ -225,21 +227,28 @@ class Aqua extends EventEmitter {
      * @param {Node} requestNode - The node that handled the request.
      */
     loadTracks(response, requester, requestNode) {
-        this.tracks = [];
-        if (response.loadType === "track") {
-            if (response.data) {
-                this.tracks.push(new Track(response.data, requester, requestNode));
-            }
-        } else if (response.loadType === "playlist") {
-            this.tracks = response.data?.tracks.map(track => new Track(track, requester, requestNode)) || [];
-            this.playlistInfo = response.data?.info || null;
-        } else if (response.loadType === "search") {
-            this.tracks = response.data.map(track => new Track(track, requester, requestNode));
+
+        switch (response.loadType) {
+            case "track":
+                if (response.data) {
+                    this.tracks.push(new Track(response.data, requester, requestNode));
+                }
+                break;
+            case "playlist":
+                this.tracks = response.data?.tracks?.map(track => new Track(track, requester, requestNode)) || [];
+                this.playlistInfo = {
+                    name: response.data?.info?.name || response.data?.info?.title,
+                    ...response.data?.info,
+                } || null;
+                break;
+            case "search":
+                this.tracks = response.data?.map(track => new Track(track, requester, requestNode));
+                break;
         }
+
         this.loadType = response.loadType;
         this.pluginInfo = response.pluginInfo || {};
     }
-
     /**
      * Constructs the response object for the resolved tracks.
      * @returns {Object} The constructed response.
@@ -254,6 +263,7 @@ class Aqua extends EventEmitter {
         };
     }
 
+
     /**
      * Gets the player associated with the specified guild ID.
      * @param {string} guildId - The ID of the guild.

package/build/structures/Connection.js

@@ -10,6 +10,8 @@ class Connection {
         this.selfDeaf = false;
         this.selfMute = false;
         this.voiceChannel = player.voiceChannel;
+        this.lastUpdateTime = 0; // Track the last update time to throttle updates
+        this.updateThrottle = 1000; // Throttle updates to every 1000 ms (1 second)
     }
 
     /**
@@ -27,6 +29,7 @@ class Connection {
         this.voice.endpoint = endpoint;
         this.voice.token = token;
         this.region = endpoint.split(".")[0].replace(/[0-9]/g, "");
+
         this.player.aqua.emit("debug", `[Player ${this.player.guildId} - CONNECTION] ${previousVoiceRegion ? `Changed Voice Region from ${previousVoiceRegion} to ${this.region}` : `Voice Server: ${this.region}`}`);
 
         if (this.player.paused) {
@@ -70,15 +73,15 @@ class Connection {
     /**
      * Updates the player voice data.
      */
-    updatePlayerVoiceData() {
-        this.player.nodes.rest.updatePlayer({
-            guildId: this.player.guildId,
-            data: {
-                voice: this.voice,
-                volume: this.player.volume
-            }
-        });
-    }
-}
+    updatePlayerVoiceData() { 
+        this.player.nodes.rest.updatePlayer({ 
+            guildId: this.player.guildId, 
+            data: { 
+                voice: this.voice, 
+                volume: this.player.volume 
+            } 
+        }); 
+    } 
+} 
 
-module.exports = { Connection };
+module.exports = { Connection };

package/build/structures/Node.js

@@ -1,4 +1,3 @@
-
 const WebSocket = require("ws");
 const { Rest } = require("./Rest");
 
@@ -19,22 +18,18 @@ class Node {
         this.secure = nodes.secure || false;
         this.sessionId = nodes.sessionId || null;
         this.rest = new Rest(aqua, this);
-
         this.wsUrl = `ws${this.secure ? 's' : ''}://${this.host}:${this.port}/v4/websocket`;
-        this.restUrl = `http${this.secure ? 's' : ''}://${this.host}:${this.port}`;
-        
         this.ws = null;
         this.regions = nodes.regions || [];
         this.info = null;
         this.connected = false;
-
         this.resumeKey = options.resumeKey || null;
         this.resumeTimeout = options.resumeTimeout || 60;
         this.autoResume = options.autoResume || false;
-
         this.reconnectTimeout = options.reconnectTimeout || 5000;
         this.reconnectTries = options.reconnectTries || 3;
         this.reconnectAttempted = 0;
+        this.lastStatsRequest = 0; // Track the last time stats were requested
     }
 
     initializeStats() {
@@ -61,16 +56,9 @@ class Node {
         };
     }
 
-    /**
-     * Fetches the lavalink node's information.
-     * @param {Object} [options] Options to pass to the rest request.
-     * @param {boolean} [options.includeHeaders=false] Include headers in the response.
-     * @returns {Promise<Object>} The lavalink node's information.
-     */
     async fetchInfo(options = {}) {
         return await this.rest.makeRequest("GET", `/v4/info`, null, options.includeHeaders);
     }
-    
 
     async connect() {
         if (this.ws) this.ws.close();
@@ -100,12 +88,12 @@ class Node {
     async onOpen() {
         this.connected = true;
         this.aqua.emit('debug', this.name, `Connected to Lavalink at ${this.wsUrl}`);
-
-        this.info = await this.fetchInfo()
-            .catch(err => {
-                this.aqua.emit('debug', `Failed to fetch info: ${err.message}`);
-                return null;
-            });
+        try {
+            this.info = await this.fetchInfo();
+        } catch (err) {
+            this.aqua.emit('debug', `Failed to fetch info: ${err.message}`);
+            this.info = null;
+        }
 
         if (!this.info && !this.aqua.bypassChecks.nodeFetchInfo) {
             throw new Error(`Failed to fetch node info.`);
@@ -114,30 +102,26 @@ class Node {
         if (this.autoResume) {
             this.resumePlayers();
         }
-
         this.lastStats = 0;
     }
 
     async getStats() {
-        if (Date.now() - this.lastStats < 5000) {
-            return this.stats;
+        const now = Date.now();
+        if (now - this.lastStatsRequest < 5000) {
+            return this.stats; // Return cached stats if requested too soon
         }
-        
-    
-        const stats = await this.rest.makeRequest("GET", `/v4/stats`)
-            .catch(err => {
-                this.aqua.emit('debug', `Error fetching stats: ${err.message}`);
-                return null;
-           });
-    
-        if (stats) {
+
+        try {
+            const stats = await this.rest.makeRequest("GET", `/v4/stats`);
             this.stats = { ...this.stats, ...stats };
-            this.lastStats = Date.now();
+            this.lastStatsRequest = now; // Update last request time
+            return stats;
+        } catch (err) {
+            this.aqua.emit('debug', `Error fetching stats: ${err.message}`);
+            return this.stats; // Return last known stats on error
         }
-        return stats;
     }
 
-
     resumePlayers() {
         for (const player of this.aqua.players.values()) {
             if (player.node === this) {
@@ -153,13 +137,10 @@ class Node {
     onMessage(msg) {
         if (Array.isArray(msg)) msg = Buffer.concat(msg);
         if (msg instanceof ArrayBuffer) msg = Buffer.from(msg);
-
         const payload = JSON.parse(msg.toString());
         if (!payload.op) return;
-
         this.aqua.emit("raw", "Node", payload);
         this.aqua.emit("debug", this.name, `Received update: ${JSON.stringify(payload)}`);
-
         this.handlePayload(payload);
     }
 
@@ -201,7 +182,6 @@ class Node {
             this.aqua.emit("nodeError", this, new Error(`Unable to connect after ${this.reconnectTries} attempts.`));
             return this.destroy();
         }
-
         setTimeout(() => {
             this.aqua.emit("nodeReconnect", this);
             this.connect();
@@ -216,17 +196,13 @@ class Node {
             this.aqua.nodes.delete(this.name);
             return;
         }
-
         if (!this.connected) return;
-
         this.aqua.players.forEach((player) => {
             if (player.node === this) player.destroy();
         });
-
         if (this.ws) this.ws.close(1000, "destroy");
         this.ws?.removeAllListeners();
         this.ws = null;
-
         this.aqua.emit("nodeDestroy", this);
         this.aqua.nodeMap.delete(this.name);
         this.connected = false;
@@ -255,4 +231,4 @@ class Node {
     }
 }
 
-module.exports = { Node };
+module.exports = { Node };

package/build/structures/Player.js

@@ -16,7 +16,7 @@ class Player extends EventEmitter {
      * @param {number} [options.defaultVolume=100] - The default volume level (0-200).
      * @param {string} [options.loop='none'] - The loop mode ('none', 'track', 'queue').
      */
-    constructor(aqua, nodes, options) {
+    constructor(aqua, nodes, options = {}) {
         super();
         this.aqua = aqua;
         this.nodes = nodes;
@@ -40,6 +40,9 @@ class Player extends EventEmitter {
         this.timestamp = 0;
         this.ping = 0;
         this.isAutoplay = false;
+        this.nowPlayingMessage = null;
+        
+        this.shouldDeleteMessage = options.shouldDeleteMessage ?? true;
 
         this.setupEventListeners();
     }
@@ -62,7 +65,6 @@ class Player extends EventEmitter {
         this.position = state.position;
         this.ping = state.ping;
         this.timestamp = state.time;
-
     }
 
     /**
@@ -83,18 +85,24 @@ class Player extends EventEmitter {
 
     /**
      * Plays the next track in the queue.
+     * @param {Object} options - Options for playing the next track.
+     * @param {string} options.query - The query to search for the next track.
+     * @param {boolean} options.force - Whether to force play the next track even if the queue is empty.
      * @returns {Promise<Player>} The player instance.
      * @throws {Error} If the player is not connected.
+     * @throws {Error} If the queue is empty and force is not set to true.
+     * @description This method plays the next track in the queue.
+     * @event play
      */
     async play() {
-        if (!this.connected) throw new Error("Player connection is not established. Please connect first.");
+        if (!this.connected) throw new Error("Bro go on and use the connection first");
+        if (!this.queue.length) return;
+
         this.current = this.queue.shift();
-        if (!this.current) return this;
 
         if (!this.current.track) {
             this.current = await this.current.resolve(this.aqua);
         }
-
         this.playing = true;
         this.position = 0;
 
@@ -102,6 +110,7 @@ class Player extends EventEmitter {
         await this.updatePlayer({ track: { encoded: this.current.track } });
         return this;
     }
+
     /**
      * Connects the player to the voice channel.
      * @param {Object} [options=this] - Connection options.
@@ -307,10 +316,12 @@ class Player extends EventEmitter {
      * @param {Object} payload - The event payload.
      */
     trackEnd(player, track, payload) {
-        this.addToPreviousTrack(this.current);
+        if (this.shouldDeleteMessage && this.nowPlayingMessage) {
+            this.nowPlayingMessage.delete();
+            this.nowPlayingMessage = null;
+        }
         if (["loadfailed", "cleanup"].includes(payload.reason.replace("_", "").toLowerCase())) {
             if (player.queue.length === 0) {
-                this.playing = false;
                 return this.aqua.emit("queueEnd", player);
             }
             this.aqua.emit("trackEnd", player, payload);
@@ -326,7 +337,6 @@ class Player extends EventEmitter {
             return player.play();
         }
         if (player.queue.length === 0) {
-            this.playing = false;
             return this.aqua.emit("queueEnd", player);
         } else {
             this.aqua.emit("trackEnd", player, payload);
@@ -439,4 +449,5 @@ class Player extends EventEmitter {
     }
 }
 
-module.exports = { Player };
+module.exports = { Player };
+

package/build/structures/Queue.js

@@ -100,3 +100,4 @@ class Queue extends Array {
 }
 
 module.exports = { Queue };
+

package/build/structures/Rest.js

@@ -1,5 +1,4 @@
 const { fetch: undiciFetch } = require("undici");
-const nodeUtil = require("node:util");
 
 class Rest {
     constructor(aqua, options) {
@@ -9,10 +8,10 @@ class Rest {
         this.password = options.password;
         this.version = options.restVersion;
         this.calls = 0;
-        this.queue = []; 
-        this.maxQueueSize = options.maxQueueSize || 100; 
-        this.maxConcurrentRequests = options.maxConcurrentRequests || 5; 
-        this.activeRequests = 0; 
+        this.queue = [];
+        this.maxQueueSize = options.maxQueueSize || 100;
+        this.maxConcurrentRequests = options.maxConcurrentRequests || 5;
+        this.activeRequests = 0;
     }
 
     setSessionId(sessionId) {
@@ -24,22 +23,23 @@ class Rest {
             "Content-Type": "application/json",
             Authorization: this.password,
         };
-        const requestOptions = {
-            method,
-            headers,
-            body: body ? JSON.stringify(body) : null,
-        };
+
         try {
-            const response = await undiciFetch(`${this.url}${endpoint}`, requestOptions);
+            const response = await undiciFetch(`${this.url}${endpoint}`, {
+                method,
+                headers,
+                body: body && JSON.stringify(body),
+            });
             this.calls++;
             const data = await this.parseResponse(response);
             this.aqua.emit("apiResponse", endpoint, response);
             this.aqua.emit(
                 "debug",
-                `[Rest] ${method} ${endpoint} ${body ? `body: ${JSON.stringify(body)}` : ""} -> Status Code: ${response.status} Response: ${nodeUtil.inspect(data)}`
+                `[Rest] ${method} ${endpoint} ${body ? `body: ${JSON.stringify(body)}` : ""} -> Status Code: ${response.status} Response(body): ${JSON.stringify(data)}`
             );
             return includeHeaders ? { data, headers: response.headers } : data;
         } catch (error) {
+            this.aqua.emit("debug", `Network error during request: ${method} ${this.url}${endpoint}`, { cause: error });
             throw new Error(`Network error during request: ${method} ${this.url}${endpoint}`, { cause: error });
         }
     }
@@ -50,15 +50,18 @@ class Rest {
 
     async updatePlayer(options) {
         const requestBody = { ...options.data };
+
         if ((requestBody.track && requestBody.track.encoded && requestBody.track.identifier) ||
             (requestBody.encodedTrack && requestBody.identifier)) {
             throw new Error(`Cannot provide both 'encoded' and 'identifier' for track in Update Player Endpoint`);
         }
+
         if (this.version === "v3" && options.data?.track) {
             const { track } = requestBody;
             delete requestBody.track;
             Object.assign(requestBody, track.encoded ? { encodedTrack: track.encoded } : { identifier: track.identifier });
         }
+
         return this.makeRequest("PATCH", `/${this.version}/sessions/${this.sessionId}/players/${options.guildId}?noReplace=false`, requestBody);
     }
 
@@ -70,7 +73,7 @@ class Rest {
         return this.makeRequest("GET", `/${this.version}/loadtracks?identifier=${encodeURIComponent(identifier)}`);
     }
 
-    async decodeTrack(track, node) {
+    async decodeTrack(track) {
         return this.makeRequest("GET", `/${this.version}/decodetrack?encodedTrack=${encodeURIComponent(track)}`);
     }
 
@@ -79,10 +82,7 @@ class Rest {
     }
 
     async getStats() {
-        if (this.version === "v3") {
-            return this.makeRequest("GET", `/${this.version}/stats`);
-        }
-        return this.makeRequest("GET", `/${this.version}/stats/all`);
+        return this.makeRequest("GET", this.version === "v3" ? `/${this.version}/stats` : `/${this.version}/stats/all`);
     }
 
     async getInfo() {
@@ -98,23 +98,19 @@ class Rest {
     }
 
     async parseResponse(response) {
-        if (response.status === 204) {
-            return null;
-        }
+        if (response.status === 204) return null;
         try {
-            const contentType = response.headers.get("Content-Type");
-            return await response[contentType.includes("text/plain") ? "text" : "json"]();
+            return response.headers.get("Content-Type").includes("text/plain") ? await response.text() : await response.json();
         } catch (error) {
             this.aqua.emit("debug", `[Rest - Error] Failed to process response from ${response.url}: ${error}`);
             return null;
         }
     }
-    /**
-     * Cleans up resources related to the queue.
-     */
+
     cleanupQueue() {
-        this.queue = []; 
+        this.queue = [];
     }
 }
 
-module.exports = { Rest };
+module.exports = { Rest };
+

package/build/structures/Track.js

@@ -7,7 +7,7 @@ const { getImageUrl } = require("../handlers/fetchImage");
  */
 class Track {
     /**
-     * @param {{ encoded: string, info: { identifier: string, isSeekable: boolean, author: string, length: number, isStream: boolean, position: number, title: string, uri: string, sourceName: string, thumbnail: string, track: string, tracks: Array<Track>, playlist: { name: string, selectedTrack: number } } }} data
+     * @param {{ encoded: string, info: { identifier: string, isSeekable: boolean, author: string, length: number, isStream: boolean, position: number, title: string, uri: string, sourceName: string, artworkUrl: string, track: string, tracks: Array<Track>, playlist: { name: string, selectedTrack: number } } }} data
      * @param {Player} requester
      * @param {Node} nodes
      */
@@ -17,6 +17,7 @@ class Track {
         this.requester = requester;
         this.nodes = nodes;
         this.track = data.encoded || Buffer.from(data.track, "base64").toString("utf8");
+        this.playlist = data.playlist || null;
     }
 
     /**
@@ -62,14 +63,18 @@ class Track {
     updateTrackInfo(track) {
         this.info.identifier = track.info.identifier;
         this.track = track.track;
+        if (track.playlist) {
+            this.playlist = track.playlist;
+        }
     }
 
     /**
      * @private
      */
     cleanup() {
-        this.rawData = this.track = this.info = null;
+        this.rawData = this.track = this.info = this.playlist = null;
     }
 }
 
 module.exports = { Track };
+

package/package.json

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