aqualink 2.12.0 → 2.12.2

package/build/structures/Aqua.js

@@ -142,6 +142,7 @@ class Aqua extends EventEmitter {
     this._onNodeConnect = async node => {
       this._invalidateCache()
       await this._rebuildBrokenPlayers(node)
+      this._performCleanup()
     }
     this._onNodeDisconnect = node => {
       this._invalidateCache()
@@ -759,33 +760,59 @@ class Aqua extends EventEmitter {
 
   _performCleanup() {
     const now = Date.now();
+
     const expiredPlayers = [];
     for (const [guildId, state] of this._brokenPlayers) {
-      if (now - state.brokenAt > BROKEN_PLAYER_TTL) expiredPlayers.push(guildId);
+      if (now - state.brokenAt > BROKEN_PLAYER_TTL) {
+        expiredPlayers.push(guildId);
+      }
+    }
+    for (const guildId of expiredPlayers) {
+      this._brokenPlayers.delete(guildId);
     }
-    for (const guildId of expiredPlayers) this._brokenPlayers.delete(guildId);
+
     const expiredNodes = [];
     for (const [nodeId, ts] of this._lastFailoverAttempt) {
-      if (now - ts > FAILOVER_CLEANUP_TTL) expiredNodes.push(nodeId);
+      if (now - ts > FAILOVER_CLEANUP_TTL) {
+        expiredNodes.push(nodeId);
+      }
     }
     for (const nodeId of expiredNodes) {
       this._lastFailoverAttempt.delete(nodeId);
       this._failoverQueue.delete(nodeId);
     }
-    if (this._brokenPlayers.size > 0) {
+
+    if (this._brokenPlayers.size > 100) {
       const oldest = [...this._brokenPlayers.entries()]
         .sort((a, b) => a[1].brokenAt - b[1].brokenAt)
         .slice(0, this._brokenPlayers.size - 50);
-      for (const [guildId] of oldest) this._brokenPlayers.delete(guildId);
+      for (const [guildId] of oldest) {
+        this._brokenPlayers.delete(guildId);
+      }
+    }
+
+    if (this._failoverQueue.size > 50) {
+      this._failoverQueue.clear();
     }
-    if (this._failoverQueue.size > 0) this._failoverQueue.clear();
-    if (this._lastFailoverAttempt.size > 0) this._lastFailoverAttempt.clear();
-    if (this._nodeStates.size > 0) this._nodeStates.clear();
-    if (this._nodeLoadCache.size > 0) {
+
+    if (this._lastFailoverAttempt.size > 50) {
+      this._lastFailoverAttempt.clear();
+    }
+
+    for (const [nodeId, state] of this._nodeStates) {
+      if (!this.nodeMap.has(nodeId)) {
+        this._nodeStates.delete(nodeId);
+      }
+    }
+
+    this._invalidateCache();
+
+    if (this._nodeLoadCache.size > 20) {
       this._nodeLoadCache.clear();
       this._nodeLoadCacheTime.clear();
     }
-    this.emit("debug", `Cleaned up some stuff :) `);
+
+    this.emit("debug", `Cleanup: broken=${this._brokenPlayers.size}, failover=${this._failoverQueue.size}, players=${this.players.size}`);
   }
 
   _getAvailableNodes(excludeNode) {

package/build/structures/Connection.js

@@ -31,10 +31,10 @@ const _functions = {
 
 class OptimizedPayloadPool {
   constructor() {
-    this.pool = new Array(POOL_SIZE)
-    this.size = POOL_SIZE
+    this.pool = new Array(POOL_SIZE);
+    this.size = POOL_SIZE;
     for (let i = 0; i < POOL_SIZE; i++) {
-      this.pool[i] = this._createPayload()
+      this.pool[i] = this._createPayload();
     }
   }
 
@@ -51,22 +51,36 @@ class OptimizedPayloadPool {
         },
         volume: null
       }
-    }
+    };
   }
 
   acquire() {
-    return this.size > 0 ? this.pool[--this.size] : this._createPayload()
+    return this.size > 0 ? this.pool[--this.size] : this._createPayload();
   }
 
   release(payload) {
-    if (!payload || this.size >= POOL_SIZE) return
-    payload.guildId = null
-    _functions.resetVoicePayload(payload.data.voice)
-    payload.data.volume = null
-    this.pool[this.size++] = payload
+    if (!payload || this.size >= POOL_SIZE) return;
+
+    payload.guildId = null;
+    const voice = payload.data.voice;
+    voice.token = null;
+    voice.endpoint = null;
+    voice.sessionId = null;
+    voice.resume = undefined;
+    voice.sequence = undefined;
+    payload.data.volume = null;
+
+    this.pool[this.size++] = payload;
   }
-}
 
+  destroy() {
+    for (let i = 0; i < this.size; i++) {
+      this.pool[i] = null;
+    }
+    this.pool = null;
+    this.size = 0;
+  }
+}
 const sharedPool = new OptimizedPayloadPool()
 
 class Connection {

package/build/structures/Player.js

@@ -283,53 +283,78 @@ class Player extends EventEmitter {
   }
 
   destroy({ preserveClient = true, skipRemote = false } = {}) {
-    if (this.destroyed) return this
+    if (this.destroyed) return this;
+
+    this.destroyed = true;
+
     if (this._voiceWatchdogTimer) {
-      clearInterval(this._voiceWatchdogTimer)
-      this._voiceWatchdogTimer = null
+      clearInterval(this._voiceWatchdogTimer);
+      this._voiceWatchdogTimer = null;
     }
-    this.destroyed = true
-    this.connected = this.playing = this.paused = this.isAutoplay = false
-    this.isAutoplay = false
-    this.autoplayRetries = this.reconnectionRetries = 0
-    this.voiceChannel = null
-    this.nowPlayingMessage = null
-    this.off('playerUpdate', this._boundPlayerUpdate)
-    this.off('event', this._boundEvent)
+
+    this.connected = this.playing = this.paused = this.isAutoplay = false;
+    this.isAutoplay = false;
+    this.autoplayRetries = this.reconnectionRetries = 0;
+    this.voiceChannel = null;
+    this.nowPlayingMessage = null;
+
+    this.removeAllListeners();
+    this.off('playerUpdate', this._boundPlayerUpdate);
+    this.off('event', this._boundEvent);
+
     if (this.aqua && this._boundAquaPlayerMove) {
-      try {
-        this.aqua.off('playerMove', this._boundAquaPlayerMove)
-      } catch (error) {
-        this.aqua.emit('debug', new Error(`Failed to remove aqua playerMove listener: ${error.message}`))
-      }
+      this.aqua.removeListener('playerMove', this._boundAquaPlayerMove);
+      this.aqua.off('playerMove', this._boundAquaPlayerMove);
     }
 
-    this._updateBatcher?.destroy()
-    this.connection?.destroy()
-    this.watchdogTimer && _functions.safeUnref(this.watchdogTimer)
-    this.watchdogTimer = null
-    this.removeAllListeners()
-    this._updateBatcher?.destroy()
-    this._updateBatcher = null
+    if (this._updateBatcher) {
+      this._updateBatcher.destroy();
+      this._updateBatcher = null;
+    }
 
-    this.connection = null
-    this.filters = null
-    this.queue = null
-    this.previousTracks = null
-    this.previousIdentifiers = null
-    this._dataStore = null
+    if (this.connection) {
+      this.connection.destroy();
+      this.connection = null;
+    }
+
+    if (this.queue) {
+      this.queue.clear();
+      this.queue = null;
+    }
+
+    if (this.previousTracks) {
+      this.previousTracks.clear();
+      this.previousTracks = null;
+    }
+
+    if (this.previousIdentifiers) {
+      this.previousIdentifiers.clear();
+      this.previousIdentifiers = null;
+    }
+
+    this.filters = null;
+    this._dataStore = null;
+    this.current = null;
+    this.autoplaySeed = null;
+
+    this._boundPlayerUpdate = null;
+    this._boundEvent = null;
+    this._boundAquaPlayerMove = null;
 
     if (!skipRemote) {
       try {
-        this.send({ guild_id: this.guildId, channel_id: null })
-        this.aqua?.destroyPlayer?.(this.guildId)
-        this.nodes?.connected && this.nodes?.rest?.destroyPlayer?.(this.guildId).catch(_functions.noop)
-      } catch { }
+        this.send({ guild_id: this.guildId, channel_id: null });
+        this.aqua?.destroyPlayer?.(this.guildId);
+        this.nodes?.connected && this.nodes?.rest?.destroyPlayer?.(this.guildId).catch(() => { });
+      } catch (e) { }
     }
-    this.clearData()
-    if (!preserveClient) this.aqua = this.nodes = null
-    return this
 
+    if (!preserveClient) {
+      this.aqua = null;
+      this.nodes = null;
+    }
+
+    return this;
   }
 
   pause(paused) {

package/build/structures/Track.js

@@ -107,7 +107,7 @@ class Track {
 
   isValid() {
     return (typeof this.track === 'string' && this.track.length > 0)
-        || (typeof this.uri === 'string' && this.uri.length > 0);
+      || (typeof this.uri === 'string' && this.uri.length > 0);
   }
 
   dispose() {
@@ -115,6 +115,15 @@ class Track {
     this.requester = null;
     this.node = null;
     this.nodes = null;
+    this.playlist = null;
+
+    this.track = null;
+    this.identifier = '';
+    this.author = '';
+    this.title = '';
+    this.uri = '';
+    this.sourceName = '';
+    this.artworkUrl = '';
   }
 
   _computeArtworkFromKnownSources() {

package/package.json

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