aqualink 2.0.1 → 2.0.2

package/README.md

@@ -23,12 +23,19 @@ This code is based in riffy, but its an 100% Rewrite made from scratch...
   - https://github.com/DRSchlaubi/lyrics.kt (?)
   - https://github.com/DuncteBot/java-timed-lyrics (RECOMMENDED)
   
-# Tralalero Tralala 2.0.1 Released  
+# Tralalero Tralala 2.0.2 Released  
 ---
-
-### Now aqualink is 100% depedency free!
-  - Use ws for websocket (much more stable, better performance)
-  - Added http2 support on rest
+- Updated the `PLAYER` module
+  - Now uses Set() and WeakMap()
+  - More simple logic
+  - Improved error handling, and also a bit of memory management
+  - Rewrite the shuffle() method to use Fisher-Yates shuffle
+  - Fix updatePlayer sending an extra pause request
+  - Improved the clean up system (correctly uses clearData now)
+
+- Updated the `NODE` module
+  - Optimized stats creating / reusing
+  - Some stuff i made on the reconnecting system
 
 # Docs (Wiki)
 - https://github.com/ToddyTheNoobDud/AquaLink/wiki

package/build/structures/Node.js

@@ -37,16 +37,7 @@ class Node {
         this.infiniteReconnects = options.infiniteReconnects || false;
         this.connected = false;
         this.info = null;
-        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);
-    }
-
-    #createDefaultStats() {
-        return {
+        this.stats = {
             players: 0,
             playingPlayers: 0,
             uptime: 0,
@@ -55,8 +46,13 @@ class Node {
             frameStats: { sent: 0, nulled: 0, deficit: 0 },
             ping: 0
         };
+        this._onOpen = this.#onOpen.bind(this);
+        this._onError = this.#onError.bind(this);
+        this._onMessage = this.#onMessage.bind(this);
+        this._onClose = this.#onClose.bind(this);
     }
 
+
     async connect() {
         this.#ws = new WebSocket(this.wsUrl.href, {
             headers: this.#constructHeaders(),
@@ -97,10 +93,8 @@ class Node {
     }
 
     async getStats() {
-        const stats = await this.rest.getStats();
-        if (JSON.stringify(this.stats) !== JSON.stringify({ ...this.defaultStats, ...stats })) {
-            this.stats = { ...this.defaultStats, ...stats };
-        }
+        const newStats = await this.rest.getStats();
+        Object.assign(this.stats, newStats);
         return this.stats;
     }
 
@@ -141,48 +135,41 @@ class Node {
 
     #updateStats(payload) {
         if (!payload) return;
-        const newStats = {
-            ...this.stats,
-            ...payload,
-            memory: this.#updateMemoryStats(payload.memory),
-            cpu: this.#updateCpuStats(payload.cpu),
-            frameStats: this.#updateFrameStats(payload.frameStats)
-        };
-        if (JSON.stringify(this.stats) !== JSON.stringify(newStats)) {
-            this.stats = newStats;
-        }
-    }
 
-    #updateMemoryStats(memory = {}) {
-        const allocated = memory.allocated || 0;
-        const free = memory.free || 0;
-        const used = memory.used || 0;
-        return {
+        this.stats.players = payload.players || this.stats.players;
+        this.stats.playingPlayers = payload.playingPlayers || this.stats.playingPlayers;
+        this.stats.uptime = payload.uptime || this.stats.uptime;
+        this.stats.ping = payload.ping || this.stats.ping;
+
+        const memory = payload.memory || {};
+        const allocated = memory.allocated || this.stats.memory.allocated;
+        const free = memory.free || this.stats.memory.free;
+        const used = memory.used || this.stats.memory.used;
+
+        this.stats.memory = {
             free,
             used,
             allocated,
-            reservable: memory.reservable || 0,
-            freePercentage: allocated ? (free / allocated) * 100 : 0,
-            usedPercentage: allocated ? (used / allocated) * 100 : 0
+            reservable: memory.reservable || this.stats.memory.reservable,
+            freePercentage: allocated ? (free / allocated) * 100 : this.stats.memory.freePercentage,
+            usedPercentage: allocated ? (used / allocated) * 100 : this.stats.memory.usedPercentage
         };
-    }
 
-    #updateCpuStats(cpu = {}) {
-        const cores = cpu.cores || 0;
-        return {
+        const cpu = payload.cpu || {};
+        const cores = cpu.cores || this.stats.cpu.cores;
+
+        this.stats.cpu = {
             cores,
-            systemLoad: cpu.systemLoad || 0,
-            lavalinkLoad: cpu.lavalinkLoad || 0,
-            lavalinkLoadPercentage: cores ? (cpu.lavalinkLoad / cores) * 100 : 0
+            systemLoad: cpu.systemLoad || this.stats.cpu.systemLoad,
+            lavalinkLoad: cpu.lavalinkLoad || this.stats.cpu.lavalinkLoad,
+            lavalinkLoadPercentage: cores ? (cpu.lavalinkLoad / cores) * 100 : this.stats.cpu.lavalinkLoadPercentage
         };
-    }
 
-    #updateFrameStats(frameStats = {}) {
-        if (!frameStats) return { sent: 0, nulled: 0, deficit: 0 };
-        return {
-            sent: frameStats.sent || 0,
-            nulled: frameStats.nulled || 0,
-            deficit: frameStats.deficit || 0
+        const frameStats = payload.frameStats || {};
+        this.stats.frameStats = {
+            sent: frameStats.sent || this.stats.frameStats.sent,
+            nulled: frameStats.nulled || this.stats.frameStats.nulled,
+            deficit: frameStats.deficit || this.stats.frameStats.deficit
         };
     }
 

package/build/structures/Player.js

@@ -11,6 +11,7 @@ class Player extends EventEmitter {
         TRACK: "track",
         QUEUE: "queue"
     });
+
     static EVENT_HANDLERS = Object.freeze({
         TrackStartEvent: "trackStart",
         TrackEndEvent: "trackEnd",
@@ -19,7 +20,8 @@ class Player extends EventEmitter {
         TrackChangeEvent: "trackChange",
         WebSocketClosedEvent: "socketClosed"
     });
-    static validModes = ["none", "track", "queue"]
+
+    static validModes = new Set(Object.values(Player.LOOP_MODES));
 
     constructor(aqua, nodes, options = {}) {
         super();
@@ -31,7 +33,7 @@ class Player extends EventEmitter {
         this.connection = new Connection(this);
         this.filters = new Filters(this);
         this.volume = Math.min(Math.max(options.defaultVolume ?? 100, 0), 200);
-        this.loop = Player.LOOP_MODES[options.loop?.toUpperCase()] || Player.LOOP_MODES.NONE;
+        this.loop = Player.validModes.has(options.loop) ? options.loop : Player.LOOP_MODES.NONE;
         this.queue = new Queue();
         this.previousTracks = [];
         this.shouldDeleteMessage = options.shouldDeleteMessage ?? false;
@@ -45,23 +47,19 @@ class Player extends EventEmitter {
         this.ping = 0;
         this.nowPlayingMessage = null;
 
-        this.onPlayerUpdate = ({ state }) => state && Object.assign(this, state) && this.aqua.emit("playerUpdate", this, { state });
-        this.handleEvent = async (payload) => {
-            const player = this.aqua.players.get(payload.guildId);
-            if (!player) return;
+        this.on("playerUpdate", ({ state }) => {
+            if (state) Object.assign(this, state);
+            this.aqua.emit("playerUpdate", this, { state });
+        });
+
+        this.on("event", async (payload) => {
             const handler = Player.EVENT_HANDLERS[payload.type];
             if (handler && typeof this[handler] === "function") {
-                await this[handler](player, this.current, payload);
+                await this[handler](this, this.current, payload);
             } else {
                 this.handleUnknownEvent(payload);
             }
-        };
-        if (!this.listenerCount("playerUpdate")) {
-            this.on("playerUpdate", this.onPlayerUpdate);
-        }
-        if (!this.listenerCount("event")) {
-            this.on("event", this.handleEvent);
-        }
+        });
     }
 
     get previous() {
@@ -107,11 +105,13 @@ class Player extends EventEmitter {
         this.nowPlayingMessage?.delete().catch(() => { });
         this.aqua.destroyPlayer(this.guildId);
         this.nodes.rest.destroyPlayer(this.guildId);
+        this.clearData();
         this.removeAllListeners();
         return this;
     }
 
     pause(paused) {
+        if (this.paused === paused) return this;
         this.paused = paused;
         this.updatePlayer({ paused });
         return this;
@@ -184,7 +184,10 @@ class Player extends EventEmitter {
         return this;
     }
     shuffle() {
-        this.queue = this.queue.sort(() => Math.random() - 0.5);
+        for (let i = this.queue.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [this.queue[i], this.queue[j]] = [this.queue[j], this.queue[i]];
+        }
         return this;
     }
 
@@ -213,14 +216,16 @@ class Player extends EventEmitter {
 
     async trackEnd(player, track, payload) {
         if (this.shouldDeleteMessage && this.nowPlayingMessage) {
-            await this.nowPlayingMessage.delete().catch(() => { });
-            this.nowPlayingMessage = null;
+            try {
+                await this.nowPlayingMessage.delete();
+                this.nowPlayingMessage = null;
+            } catch {}
         }
 
         const reason = payload.reason?.replace("_", "").toLowerCase();
-
-        if (reason === "loadfailed" || reason === "cleanup") {
-            if (player.queue.isEmpty()) {
+        if (["loadfailed", "cleanup"].includes(reason)) {
+            if (!player.queue.length) {
+                this.clearData();
                 this.aqua.emit("queueEnd", player);
             } else {
                 await player.play();
@@ -228,20 +233,16 @@ class Player extends EventEmitter {
             return;
         }
 
-        switch (this.loop) {
-            case Player.LOOP_MODES.TRACK:
-                this.aqua.emit("trackRepeat", player, track);
-                player.queue.unshift(track);
-                break;
-            case Player.LOOP_MODES.QUEUE:
-                this.aqua.emit("queueRepeat", player, track);
-                player.queue.push(track);
-                break;
+        if (this.loop === Player.LOOP_MODES.TRACK) {
+            player.queue.unshift(track);
+        } else if (this.loop === Player.LOOP_MODES.QUEUE) {
+            player.queue.push(track);
         }
 
         if (player.queue.isEmpty()) {
             this.playing = false;
             if (this.leaveOnEnd) {
+                this.clearData();   
                 this.cleanup();
             }
             this.aqua.emit("queueEnd", player);
@@ -290,11 +291,11 @@ class Player extends EventEmitter {
     }
 
     clearData() {
+        if (this.previousTracks) this.previousTracks.length = 0;
         this.#dataStore = new WeakMap();
         return this;
     }
 
-
     updatePlayer(data) {
         return this.nodes.rest.updatePlayer({ guildId: this.guildId, data });
     }
@@ -313,7 +314,6 @@ class Player extends EventEmitter {
     updateTrackState(playing, paused) {
         this.playing = playing;
         this.paused = paused;
-        this.updatePlayer({ paused });
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aqualink",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "An Lavalink client, focused in pure performance and features",
   "main": "build/index.js",
   "types": "index.d.ts",