aqualink 1.8.1-beta2 → 1.8.1-beta3

package/README.md

@@ -31,8 +31,12 @@ This code is based in riffy, but its an 100% Rewrite made from scratch...
 
 # Brick by brick, 1.8.0 Update (yay)
 
-- Misc changes on FetchImage (improves the overall checking and speed)
+### 1.8.1-beta3 Update:
+- Use pool for connections (Experimental, help me improve it.)
+- Remade some stuff on node related to caching
 
+### 1.8.0
+- Misc changes on FetchImage (improves the overall checking and speed)
 - Rewrite `AQUA` module
   - Remade the resolve logic (improves the speed by a lot)
   - Fixes many memory usages related to nodes
@@ -109,7 +113,7 @@ const nodes = [
     }
 ];
 
-const aqua = new Aqua(client, nodes, {
+const aqua = Aqua(client, nodes, {
   defaultSearchPlatform: "ytsearch",
   restVersion: "v4",
   autoResume: false,

package/build/structures/Aqua.js

@@ -1,9 +1,9 @@
 "use strict";
 
 const { EventEmitter } = require("node:events");
-const  Node = require("./Node");
-const  Player  = require("./Player");
-const  Track  = require("./Track");
+const Node = require("./Node");
+const Player = require("./Player");
+const Track = require("./Track");
 const { version: pkgVersion } = require("../../package.json");
 const URL_REGEX = /^https?:\/\//;
 

package/build/structures/Connection.js

@@ -37,7 +37,7 @@ class Connection {
                 : `Voice Server: ${newRegion}`;
 
             this.aqua.emit("debug", `[Player ${this.guildId} - CONNECTION] ${message}`);
-            this._updatePlayerVoiceData(); 
+            this._updatePlayerVoiceData();
         }
     }
 

package/build/structures/Node.js

@@ -1,13 +1,13 @@
 "use strict";
-
 const WebSocket = require("ws");
-const  Rest  = require("./Rest");
+const Rest = require("./Rest");
 
 class Node {
     #ws = null;
-    #lastStatsRequest = 0;
     #reconnectAttempted = 0;
     #reconnectTimeoutId = null;
+    static BACKOFF_MULTIPLIER = 1.5;
+    static MAX_BACKOFF = 60000;
 
     constructor(aqua, connOptions, options = {}) {
         const {
@@ -38,15 +38,15 @@ class Node {
         this.infiniteReconnects = options.infiniteReconnects || false;
         this.connected = false;
         this.info = null;
-        this.stats = this.#createStats();
-
+        this.defaultStats = this.#createDefaultStats();
+        this.stats = { ...this.defaultStats };
         this._onOpen = this.#onOpen.bind(this);
         this._onError = this.#onError.bind(this);
         this._onMessage = this.#onMessage.bind(this);
         this._onClose = this.#onClose.bind(this);
     }
 
-    #createStats() {
+    #createDefaultStats() {
         return {
             players: 0,
             playingPlayers: 0,
@@ -62,14 +62,11 @@ class Node {
         this.#ws = new WebSocket(this.wsUrl.href, {
             headers: this.#constructHeaders(),
             perMessageDeflate: false,
-            handshakeTimeout: 30000
         });
-
         this.#ws.once("open", this._onOpen);
         this.#ws.once("error", this._onError);
         this.#ws.on("message", this._onMessage);
         this.#ws.once("close", this._onClose);
-        this.aqua.emit("debug", this.name, "Connecting...");
     }
 
     #constructHeaders() {
@@ -86,30 +83,46 @@ class Node {
         this.connected = true;
         this.#reconnectAttempted = 0;
         this.aqua.emit("debug", this.name, `Connected to ${this.wsUrl.href}`);
-        try {
-            this.info = await this.rest.makeRequest("GET", "/v4/info");
-            if (this.autoResume) await this.resumePlayers();
-        } catch (err) {
-            this.info = null;
-            if (!this.aqua.bypassChecks?.nodeFetchInfo) {
-                this.aqua.emit("error", `Failed to fetch node info: ${err.message}`);
+        
+        if (this.autoResume) {
+            try {
+                this.info = await this.rest.makeRequest("GET", "/v4/info");
+                await this.resumePlayers();
+            } catch (err) {
+                this.info = null;
+                if (!this.aqua.bypassChecks?.nodeFetchInfo) {
+                    this.aqua.emit("error", `Failed to fetch node info: ${err.message}`);
+                }
             }
         }
     }
 
     async getStats() {
-        if (!this.connected) return this.stats;
-        const now = Date.now();
-        const STATS_COOLDOWN = 60000;
-        if (now - this.#lastStatsRequest < STATS_COOLDOWN) return this.stats;
+        const stats = await this.rest.makeRequest("GET", "/v4/stats");
+        this.stats = { ...this.defaultStats, ...stats };
+        return this.stats;
+    }
+
+    async #onMessage(msg) {
+        let payload;
         try {
-            const stats = await this.rest.makeRequest("GET", "/v4/stats");
-            this.stats = { ...this.#createStats(), ...stats };
-            this.#lastStatsRequest = now;
-        } catch (err) {
-            this.aqua.emit("debug", `Stats fetch error: ${err.message}`);
+            payload = JSON.parse(msg);
+        } catch {
+            return;
+        }
+        const op = payload?.op;
+        if (!op) return;
+
+        switch (op) {
+            case "stats":
+                this.#updateStats(payload);
+                break;
+            case "ready":
+                this.#handleReadyOp(payload);
+                break;
+            default:
+                this.#handlePlayerOp(payload);
         }
-        return this.stats;
     }
 
     #updateStats(payload) {
@@ -120,7 +133,7 @@ class Node {
             memory: this.#updateMemoryStats(payload.memory),
             cpu: this.#updateCpuStats(payload.cpu),
             frameStats: this.#updateFrameStats(payload.frameStats)
-        };
+        }; 
     }
 
     #updateMemoryStats(memory = {}) {
@@ -156,30 +169,6 @@ class Node {
         };
     }
 
- #onMessage(msg) {
-        let payload;
-        try {
-            payload = JSON.parse(msg);
-        } catch {
-            return;
-        }
-
-        const op = payload?.op;
-        if (!op) return;
-
-        // Use switch for better performance with multiple conditions
-        switch (op) {
-            case "stats":
-                this.#updateStats(payload);
-                break;
-            case "ready":
-                this.#handleReadyOp(payload);
-                break;
-            default:
-                this.#handlePlayerOp(payload);
-        }
-    }
-
     #handleReadyOp(payload) {
         if (this.sessionId !== payload.sessionId) {
             this.sessionId = payload.sessionId;
@@ -209,22 +198,18 @@ class Node {
             setTimeout(() => this.connect(), 10000);
             return;
         }
-
         if (this.#reconnectAttempted >= this.reconnectTries) {
             this.aqua.emit("nodeError", this, 
                 new Error(`Max reconnection attempts reached (${this.reconnectTries})`));
             this.destroy(true);
             return;
         }
-
         clearTimeout(this.#reconnectTimeoutId);
-        
         const jitter = Math.random() * 10000;
         const backoffTime = Math.min(
             this.reconnectTimeout * Math.pow(Node.BACKOFF_MULTIPLIER, this.#reconnectAttempted) + jitter,
             Node.MAX_BACKOFF
         );
-
         this.#reconnectTimeoutId = setTimeout(() => {
             this.#reconnectAttempted++;
             this.aqua.emit("nodeReconnect", {
@@ -236,22 +221,6 @@ class Node {
         }, backoffTime);
     }
 
-    get penalties() {
-        if (!this.connected) return Number.MAX_SAFE_INTEGER;
-        
-        let penalties = this.stats.players;
-        
-        const { cpu, frameStats } = this.stats;
-        if (cpu?.systemLoad) {
-            penalties += Math.round(Math.pow(1.05, 100 * cpu.systemLoad) * 10 - 10);
-        }
-        if (frameStats) {
-            penalties += frameStats.deficit + (frameStats.nulled * 2);
-        }
-        
-        return penalties;
-    }
-
     destroy(clean = false) {
         if (clean) {
             this.aqua.emit("nodeDestroy", this);
@@ -269,9 +238,7 @@ class Node {
         this.aqua.nodeMap.delete(this.name);
         this.aqua.emit("nodeDestroy", this);
         this.info = null;
-        this.#lastStatsRequest = 0;
-        this.stats = this.#createStats();
     }
 }
 
-module.exports = Node 
+module.exports = Node;

package/build/structures/Rest.js

@@ -1,8 +1,8 @@
 "use strict";
-const { request } = require("undici");
+const { Pool } = require("undici");
 
 class Rest {
-    constructor(aqua, { secure, host, port, sessionId, password }) {
+    constructor(aqua, { secure, host, port, sessionId, password,}) {
         this.aqua = aqua;
         this.sessionId = sessionId;
         this.version = "v4";
@@ -11,6 +11,9 @@ class Rest {
             "Content-Type": "application/json",
             Authorization: password,
         };
+        this.client = new Pool(this.baseUrl, {
+            pipelining: 1,
+        });
     }
 
     setSessionId(sessionId) {
@@ -19,21 +22,15 @@ class Rest {
 
     async makeRequest(method, endpoint, body = null) {
         const options = {
+            path: endpoint,
             method,
             headers: this.headers,
-            body: body ? JSON.stringify(body) : undefined,
+            ...(body && { body: JSON.stringify(body) }),
         };
-
         try {
-            const { statusCode, headers, body: responseBody } = await request(`${this.baseUrl}${endpoint}`, options);
-            this.aqua.emit("apiResponse", endpoint, { status: statusCode, headers: headers });
-
-            if (statusCode === 204) {
-                return null;
-            }
-
-            const data = await responseBody.text();
-            return data ? JSON.parse(data) : null;
+            const response = await this.client.request(options);
+            const { statusCode } = response;
+            return statusCode === 204 ? null : await response.body.json();
         } catch (error) {
             throw new Error(`Request to ${endpoint} failed: ${error.message}`);
         }
@@ -43,16 +40,21 @@ class Rest {
         const validSegments = segments.filter(segment => segment && segment.trim());
         return '/' + validSegments.join('/');
     }
+
     validateSessionId() {
         if (!this.sessionId) {
             throw new Error("Session ID is not set.");
         }
     }
 
-    updatePlayer({ guildId, data }) {
-        if ((data.track?.encoded && data.track?.identifier) || (data.encodedTrack && data.identifier)) {
+    async updatePlayer({ guildId, data }) {
+        const hasEncodedTrack = data.track?.encoded && data.track?.identifier;
+        const hasEncodedTrackAlt = data.encodedTrack && data.identifier;
+
+        if (hasEncodedTrack || hasEncodedTrackAlt) {
             throw new Error("Cannot provide both 'encoded' and 'identifier' for track");
         }
+
         this.validateSessionId();
         const endpoint = this.buildEndpoint(this.version, "sessions", this.sessionId, "players", guildId) + "?noReplace=false";
         return this.makeRequest("PATCH", endpoint, data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aqualink",
-  "version": "1.8.1-beta2",
+  "version": "1.8.1-beta3",
   "description": "An Lavalink wrapper, focused in speed, performance, and features, Based in Riffy!",
   "main": "build/index.js",
   "types": "index.d.ts",