aqualink 2.15.1 → 2.16.1

package/build/structures/Aqua.js

@@ -29,7 +29,6 @@ const RECONNECT_DELAY = 400
 const CACHE_VALID_TIME = 12000
 const NODE_TIMEOUT = 30000
 const MAX_CACHE_SIZE = 20
-const MAX_BROKEN_PLAYERS = 50
 const MAX_FAILOVER_QUEUE = 50
 const MAX_REBUILD_LOCKS = 100
 const WRITE_BUFFER_SIZE = 100
@@ -279,7 +278,6 @@ class Aqua extends EventEmitter {
         this._brokenPlayers.set(player.guildId, state)
       }
     }
-    this._trimBrokenPlayers()
   }
 
   async _rebuildBrokenPlayers(node) {
@@ -786,7 +784,6 @@ class Aqua extends EventEmitter {
       }
     }
 
-    this._trimBrokenPlayers()
     if (this._failoverQueue.size > MAX_FAILOVER_QUEUE) this._failoverQueue.clear()
     if (this._rebuildLocks.size > MAX_REBUILD_LOCKS) this._rebuildLocks.clear()
 
@@ -795,12 +792,6 @@ class Aqua extends EventEmitter {
       if (!this.nodeMap.has(id)) this._nodeStates.delete(id)
     }
   }
-
-  _trimBrokenPlayers() {
-    if (this._brokenPlayers.size <= MAX_BROKEN_PLAYERS) return
-    const sorted = [...this._brokenPlayers.entries()].sort((a, b) => a[1].brokenAt - b[1].brokenAt)
-    sorted.slice(0, sorted.length - MAX_BROKEN_PLAYERS).forEach(([id]) => this._brokenPlayers.delete(id))
-  }
 }
 
 module.exports = Aqua

package/build/structures/AqualinkEvents.js

@@ -31,7 +31,13 @@ const AqualinkEvents = {
   PlayerCreate: 'playerCreate',
   PlayerDestroy: 'playerDestroy',
   PlayersRebuilt: 'playersRebuilt',
+  VolumeChanged: 'volumeChanged',
+  FiltersChanged: 'filtersChanged',
+  Seek: 'seek',
+  PlayerCreated: 'playerCreated',
+  PlayerConnected: 'playerConnected',
+  PlayerDestroyed: 'playerDestroyed',
   PlayerMigrated: 'playerMigrated'
 };
 
-module.exports = { AqualinkEvents };
+module.exports = { AqualinkEvents };

package/build/structures/Player.js

@@ -18,6 +18,12 @@ const EVENT_HANDLERS = Object.freeze({
   WebSocketClosedEvent: 'socketClosed',
   LyricsLineEvent: 'lyricsLine',
   LyricsFoundEvent: 'lyricsFound',
+  VolumeChangedEvent: 'volumeChanged',
+  FiltersChangedEvent: 'filtersChanged',
+  SeekEvent: 'seekEvent',
+  PlayerCreatedEvent: 'playerCreated',
+  PlayerConnectedEvent: 'playerConnected',
+  PlayerDestroyedEvent: 'playerDestroyed',
   LyricsNotFoundEvent: 'lyricsNotFound'
 })
 
@@ -301,7 +307,7 @@ class Player extends EventEmitter {
       this.playing = true
       this.paused = false
       this.position = 0
-      await this.batchUpdatePlayer({guildId: this.guildId, encodedTrack: this.current.track}, true)
+      await this.batchUpdatePlayer({guildId: this.guildId, track: { encoded: this.current.track} }, true)
       return this
     } catch (error) {
       this.aqua.emit(AqualinkEvents.Error, error)
@@ -430,8 +436,8 @@ class Player extends EventEmitter {
       this._dataStore.clear()
       this._dataStore = null
     }
-
-    if (this.current?.dispose) this.current.dispose()
+    // if autoResume is enabled, ig it will need to be keeped in case the connection dies somehow, so don't dispose it
+    if (this.current?.dispose && !this.aqua.options.autoResume) this.current.dispose()
     this.connection = this.filters = this.current = this.autoplaySeed = null
 
     if (!skipRemote) {
@@ -449,17 +455,16 @@ class Player extends EventEmitter {
   pause(paused) {
     if (this.destroyed || this.paused === !!paused) return this
     this.paused = !!paused
-    this.batchUpdatePlayer({guildId: this.guildId, paused: this.paused}, true)
+    this.batchUpdatePlayer({guildId: this.guildId, paused: this.paused}, true).catch(() => {})
     return this
   }
 
   seek(position) {
     if (this.destroyed || !this.playing || !_functions.isNum(position)) return this
     const len = this.current?.info?.length || 0
-    const pos = position === 0 ? 0 : this.position + position
-    const clamped = len ? Math.min(Math.max(pos, 0), len) : Math.max(pos, 0)
+    const clamped = len ? Math.min(Math.max(position, 0), len) : Math.max(position, 0)
     this.position = clamped
-    this.batchUpdatePlayer({guildId: this.guildId, position: clamped}, true)
+    this.batchUpdatePlayer({guildId: this.guildId, position: clamped}, true).catch(() => {})
     return this
   }
 
@@ -467,7 +472,7 @@ class Player extends EventEmitter {
     if (this.destroyed || !this.playing) return this
     this.playing = this.paused = false
     this.position = 0
-    this.batchUpdatePlayer({guildId: this.guildId, encodedTrack: null}, true)
+    this.batchUpdatePlayer({guildId: this.guildId, track: {encoded: null}}, true).catch(() => {})
     return this
   }
 
@@ -475,7 +480,7 @@ class Player extends EventEmitter {
     const vol = _functions.clamp(volume)
     if (this.destroyed || this.volume === vol) return this
     this.volume = vol
-    this.batchUpdatePlayer({guildId: this.guildId, volume: vol})
+    this.batchUpdatePlayer({guildId: this.guildId, volume: vol}).catch(() => {})
     return this
   }
 
@@ -492,7 +497,7 @@ class Player extends EventEmitter {
     const id = _functions.toId(channel)
     if (!id) throw new TypeError('Invalid text channel')
     this.textChannel = id
-    this.batchUpdatePlayer({guildId: this.guildId, text_channel: id})
+    this.batchUpdatePlayer({guildId: this.guildId, text_channel: id}).catch(() => {})
     return this
   }
 
@@ -552,6 +557,11 @@ class Player extends EventEmitter {
     return null
   }
 
+  async getLoadLyrics(encodedTrack) {
+    if (this.destroyed || !this.nodes?.rest) return null
+    return this.nodes.rest.getLoadLyrics(encodedTrack)
+  }
+
   subscribeLiveLyrics() {
     return this.destroyed ? Promise.reject(new Error('Player destroyed')) : this.nodes?.rest?.subscribeLiveLyrics(this.guildId, false)
   }
@@ -821,6 +831,21 @@ class Player extends EventEmitter {
     this.aqua.emit(AqualinkEvents.LyricsLine, this, track, payload)
   }
 
+  async volumeChanged(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.VolumeChanged, this, track, payload)
+  }
+
+  async filtersChanged(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.FiltersChanged, this, track, payload)
+  }
+
+  async seekEvent(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.Seek, this, track, payload)
+  }
+
   async lyricsFound(player, track, payload) {
     if (this.destroyed) return
     this.aqua.emit(AqualinkEvents.LyricsFound, this, track, payload)
@@ -831,6 +856,20 @@ class Player extends EventEmitter {
     this.aqua.emit(AqualinkEvents.LyricsNotFound, this, track, payload)
   }
 
+  async playerCreated(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.PlayerCreated, this, payload)
+  }
+
+  async playerConnected(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.PlayerConnected, this, payload)
+  }
+  async playerDestroyed(player, track, payload) {
+    if (this.destroyed) return
+    this.aqua.emit(AqualinkEvents.PlayerDestroyed, this, payload)
+  }
+
   _handleAquaPlayerMove(oldChannel, newChannel) {
     if (_functions.toId(oldChannel) !== _functions.toId(this.voiceChannel)) return
     this.voiceChannel = _functions.toId(newChannel)

package/build/structures/Rest.js

@@ -1,33 +1,28 @@
-'use strict'
-
-const { Buffer } = require('node:buffer')
-const { Agent: HttpsAgent, request: httpsRequest } = require('node:https')
-const { Agent: HttpAgent, request: httpRequest } = require('node:http')
-const http2 = require('node:http2')
-const { createBrotliDecompress, createUnzip } = require('node:zlib')
-
-const privateData = new WeakMap()
-
-const isValidBase64Char = code =>
-  (code >= 65 && code <= 90) || (code >= 97 && code <= 122) ||
-  (code >= 48 && code <= 57) || code === 43 || code === 47 ||
-  code === 61 || code === 95 || code === 45
-
-const isValidBase64 = str => {
-  if (typeof str !== 'string' || !str) return false
-  const len = str.length
-  if (len % 4 === 1) return false
-  for (let i = 0; i < len; i++) {
-    if (!isValidBase64Char(str.charCodeAt(i))) return false
-  }
-  return true
-}
+const { Buffer } = require('buffer')
+const { Agent: HttpsAgent, request: httpsRequest } = require('https')
+const { Agent: HttpAgent, request: httpRequest } = require('http')
+const http2 = require('http2')
+const { createBrotliDecompress, createUnzip, brotliDecompressSync, unzipSync } = require('zlib')
+
+const BASE64_LOOKUP = new Uint8Array(256)
+for (let i = 65; i <= 90; i++) BASE64_LOOKUP[i] = 1
+for (let i = 97; i <= 122; i++) BASE64_LOOKUP[i] = 1
+for (let i = 48; i <= 57; i++) BASE64_LOOKUP[i] = 1
+BASE64_LOOKUP[43] = BASE64_LOOKUP[47] = BASE64_LOOKUP[61] = BASE64_LOOKUP[95] = BASE64_LOOKUP[45] = 1
+
+const ENCODING_BR = 1
+const ENCODING_GZIP = 2
+const ENCODING_DEFLATE = 3
+const ENCODING_NONE = 0
 
 const MAX_RESPONSE_SIZE = 10485760
+const SMALL_RESPONSE_THRESHOLD = 512
+const COMPRESSION_MIN_SIZE = 1024
 const API_VERSION = 'v4'
 const UTF8_ENCODING = 'utf8'
 const JSON_CONTENT_TYPE = 'application/json'
 const HTTP2_THRESHOLD = 1024
+const MAX_HEADER_POOL = 10
 
 const ERRORS = Object.freeze({
   NO_SESSION: new Error('Session ID required'),
@@ -37,6 +32,25 @@ const ERRORS = Object.freeze({
   RESPONSE_ABORTED: new Error('Response aborted')
 })
 
+const _isValidBase64 = (str) => {
+  if (typeof str !== 'string' || !str) return false
+  const len = str.length
+  if (len % 4 === 1) return false
+  for (let i = 0; i < len; i++) {
+    if (!BASE64_LOOKUP[str.charCodeAt(i)]) return false
+  }
+  return true
+}
+
+const _getEncodingType = (encodingHeader) => {
+  if (!encodingHeader) return ENCODING_NONE
+  const firstChar = encodingHeader.charCodeAt(0)
+  if (firstChar === 98 && encodingHeader.startsWith('br')) return ENCODING_BR
+  if (firstChar === 103 && encodingHeader.startsWith('gzip')) return ENCODING_GZIP
+  if (firstChar === 100 && encodingHeader.startsWith('deflate')) return ENCODING_DEFLATE
+  return ENCODING_NONE
+}
+
 class Rest {
   constructor(aqua, node) {
     this.aqua = aqua
@@ -48,7 +62,6 @@ class Rest {
     const host = node.host.includes(':') && !node.host.startsWith('[') ? `[${node.host}]` : node.host
     this.baseUrl = `${protocol}//${host}:${node.port}`
     this._apiBase = `/${API_VERSION}`
-    this._sessionPath = this.sessionId ? `${this._apiBase}/sessions/${this.sessionId}` : null
 
     this._endpoints = Object.freeze({
       loadtracks: `${this._apiBase}/loadtracks?identifier=`,
@@ -68,7 +81,7 @@ class Rest {
     this.defaultHeaders = Object.freeze({
       Authorization: String(node.auth || node.password || ''),
       Accept: 'application/json, */*;q=0.5',
-      'Accept-Encoding': 'gzip, deflate, br',
+      'Accept-Encoding': 'br, gzip, deflate',
       'User-Agent': `Aqualink/${aqua?.version || '1.0'} (Node.js ${process.version})`
     })
 
@@ -77,10 +90,6 @@ class Rest {
     this.useHttp2 = !!(aqua?.options?.useHttp2)
     this._h2 = null
     this._h2CleanupTimer = null
-
-    privateData.set(this, {
-      cleanupCallbacks: new Set()
-    })
   }
 
   _setupAgent(node) {
@@ -105,26 +114,31 @@ class Rest {
 
     this.agent = new (node.ssl ? HttpsAgent : HttpAgent)(agentOpts)
     this.request = node.ssl ? httpsRequest : httpRequest
+
+    const origCreateConnection = this.agent.createConnection
+    this.agent.createConnection = (options, callback) => {
+      const socket = origCreateConnection.call(this.agent, options, callback)
+      socket.setNoDelay(true)
+      socket.setKeepAlive(true, 500)
+      socket.unref?.()
+      return socket
+    }
   }
 
   setSessionId(sessionId) {
     this.sessionId = sessionId
-    this._sessionPath = sessionId ? `${this._apiBase}/sessions/${sessionId}` : null
   }
 
   _getSessionPath() {
-    if (!this._sessionPath) {
-      if (!this.sessionId) throw ERRORS.NO_SESSION
-      this._sessionPath = `${this._apiBase}/sessions/${this.sessionId}`
-    }
-    return this._sessionPath
+    if (!this.sessionId) throw ERRORS.NO_SESSION
+    return `${this._apiBase}/sessions/${this.sessionId}`
   }
 
   _buildHeaders(hasPayload, payloadLength) {
     if (!hasPayload) return this.defaultHeaders
 
     let headers = this._headerPool.pop()
-    if (!headers) headers = {}
+    if (!headers) headers = Object.create(null)
 
     headers.Authorization = this.defaultHeaders.Authorization
     headers.Accept = this.defaultHeaders.Accept
@@ -137,11 +151,13 @@ class Rest {
   }
 
   _returnHeadersToPool(headers) {
-    if (headers !== this.defaultHeaders && this._headerPool.length < 10) {
-      const keys = Object.keys(headers)
-      for (let i = 0; i < keys.length; i++) {
-        delete headers[keys[i]]
-      }
+    if (headers !== this.defaultHeaders && this._headerPool.length < MAX_HEADER_POOL) {
+      headers.Authorization = null
+      headers.Accept = null
+      headers['Accept-Encoding'] = null
+      headers['User-Agent'] = null
+      headers['Content-Type'] = null
+      headers['Content-Length'] = null
       this._headerPool.push(headers)
     }
   }
@@ -151,7 +167,6 @@ class Rest {
     const payload = body === undefined ? undefined : (typeof body === 'string' ? body : JSON.stringify(body))
     const payloadLength = payload ? Buffer.byteLength(payload, UTF8_ENCODING) : 0
     const headers = this._buildHeaders(!!payload, payloadLength)
-
     const useHttp2 = this.useHttp2 && payloadLength >= HTTP2_THRESHOLD
 
     try {
@@ -165,29 +180,31 @@ class Rest {
 
   _makeHttp1Request(method, url, headers, payload) {
     return new Promise((resolve, reject) => {
-      let req
-      let timeoutId
+      let req = null
+      let timeoutId = null
       let resolved = false
-      const chunks = []
+      let chunks = []
       let totalSize = 0
+      let preallocatedBuffer = null
 
       const cleanup = () => {
         if (timeoutId) {
           clearTimeout(timeoutId)
           timeoutId = null
         }
-        chunks.length = 0
+        chunks = null
+        preallocatedBuffer = null
       }
 
       const complete = (isSuccess, value) => {
-        if (resolved) return
+        if (resolved) return;
         resolved = true
         cleanup()
         if (req && !isSuccess) req.destroy()
         isSuccess ? resolve(value) : reject(value)
       }
 
-      req = this.request(url, { method, headers, agent: this.agent, timeout: this.timeout }, res => {
+      req = this.request(url, { method, headers, agent: this.agent, timeout: this.timeout }, (res) => {
         cleanup()
 
         const status = res.statusCode
@@ -195,38 +212,123 @@ class Rest {
 
         const contentLength = res.headers['content-length']
         if (contentLength === '0') return res.resume(), complete(true, null)
-        if (contentLength && parseInt(contentLength, 10) > MAX_RESPONSE_SIZE) {
+
+        const clInt = contentLength ? parseInt(contentLength, 10) : 0
+        if (clInt > MAX_RESPONSE_SIZE) {
+          res.resume()
           return complete(false, ERRORS.RESPONSE_TOO_LARGE)
         }
 
-        const encoding = (res.headers['content-encoding'] || '').split(',')[0].trim()
+        const encodingType = _getEncodingType(res.headers['content-encoding'])
+
+        if (clInt > 0 && clInt < SMALL_RESPONSE_THRESHOLD && encodingType === ENCODING_NONE) {
+          res.once('data', (chunk) => {
+            const text = chunk.toString(UTF8_ENCODING)
+            let result = text
+            const contentType = res.headers['content-type'] || ''
+
+            if (contentType.charCodeAt(0) === 97 && contentType.includes('application/json')) {
+              try {
+                result = JSON.parse(text)
+              } catch (err) {
+                return complete(false, new Error(`JSON parse error: ${err.message}`))
+              }
+            }
+
+            if (status >= 400) {
+              const error = new Error(`HTTP ${status} ${method} ${url}`)
+              error.statusCode = status
+              error.statusMessage = res.statusMessage
+              error.headers = res.headers
+              error.body = result
+              error.url = url
+              return complete(false, error)
+            }
+
+            complete(true, result)
+          })
+          res.once('error', (err) => complete(false, err))
+          return;
+        }
+
+        if (clInt > 0 && clInt <= MAX_RESPONSE_SIZE) {
+          preallocatedBuffer = Buffer.allocUnsafe(clInt)
+          chunks = []
+        } else {
+          chunks = []
+        }
+
         let stream = res
 
-        if (encoding === 'br' || encoding === 'gzip' || encoding === 'deflate') {
-          const decompressor = encoding === 'br' ? createBrotliDecompress() : createUnzip()
-          decompressor.once('error', err => complete(false, err))
-          res.pipe(decompressor)
-          stream = decompressor
+        if (encodingType !== ENCODING_NONE) {
+          if (clInt > 0 && clInt < COMPRESSION_MIN_SIZE) {
+            const compressedChunks = []
+            res.on('data', (chunk) => compressedChunks.push(chunk))
+            res.once('end', () => {
+              try {
+                const compressed = Buffer.concat(compressedChunks)
+                const decompressed = encodingType === ENCODING_BR
+                  ? brotliDecompressSync(compressed)
+                  : unzipSync(compressed)
+                const text = decompressed.toString(UTF8_ENCODING)
+                let result = text
+                const contentType = res.headers['content-type'] || ''
+
+                if (contentType.charCodeAt(0) === 97 && contentType.includes('application/json')) {
+                  result = JSON.parse(text)
+                }
+
+                if (status >= 400) {
+                  const error = new Error(`HTTP ${status} ${method} ${url}`)
+                  error.statusCode = status
+                  error.statusMessage = res.statusMessage
+                  error.headers = res.headers
+                  error.body = result
+                  error.url = url
+                  return complete(false, error)
+                }
+
+                complete(true, result)
+              } catch (err) {
+                complete(false, err)
+              }
+            })
+            res.once('error', (err) => complete(false, err))
+            return;
+          } else {
+            const decompressor = encodingType === ENCODING_BR ? createBrotliDecompress() : createUnzip()
+            decompressor.once('error', (err) => complete(false, err))
+            res.pipe(decompressor)
+            stream = decompressor
+          }
         }
 
         res.once('aborted', () => complete(false, ERRORS.RESPONSE_ABORTED))
-        res.once('error', err => complete(false, err))
-
-        stream.on('data', chunk => {
-          totalSize += chunk.length
-          if (totalSize > MAX_RESPONSE_SIZE) return complete(false, ERRORS.RESPONSE_TOO_LARGE)
-          chunks.push(chunk)
+        res.once('error', (err) => complete(false, err))
+
+        stream.on('data', (chunk) => {
+          if (preallocatedBuffer) {
+            chunk.copy(preallocatedBuffer, totalSize)
+            totalSize += chunk.length
+          } else {
+            totalSize += chunk.length
+            if (totalSize > MAX_RESPONSE_SIZE) return complete(false, ERRORS.RESPONSE_TOO_LARGE)
+            chunks.push(chunk)
+          }
         })
 
         stream.once('end', () => {
           if (totalSize === 0) return complete(true, null)
 
-          const buffer = chunks.length === 1 ? chunks[0] : Buffer.concat(chunks, totalSize)
+          const buffer = preallocatedBuffer
+            ? preallocatedBuffer.slice(0, totalSize)
+            : (chunks.length === 1 ? chunks[0] : Buffer.concat(chunks, totalSize))
           const text = buffer.toString(UTF8_ENCODING)
-
           let result = text
           const contentType = res.headers['content-type'] || ''
-          if (contentType.includes('application/json')) {try {
+
+          if (contentType.charCodeAt(0) === 97 && contentType.includes('application/json')) {
+            try {
               result = JSON.parse(text)
             } catch (err) {
               return complete(false, new Error(`JSON parse error: ${err.message}`))
@@ -247,41 +349,43 @@ class Rest {
         })
       })
 
-      req.once('error', err => complete(false, err))
-      req.once('socket', socket => {
-        socket.setNoDelay(true)
-        socket.setKeepAlive(true, 500)
-        socket.unref?.()
-      })
-
+      req.once('error', (err) => complete(false, err))
       timeoutId = setTimeout(() => complete(false, new Error(`Request timeout: ${this.timeout}ms`)), this.timeout)
       payload ? req.end(payload) : req.end()
     })
   }
 
-  async _makeHttp2Request(method, path, headers, payload) {
+  _getOrCreateHttp2Session() {
     if (!this._h2 || this._h2.closed || this._h2.destroyed) {
-      this._closeHttp2Session()
+      if (this._h2) this._h2 = null
 
       this._h2 = http2.connect(this.baseUrl)
 
       if (this._h2CleanupTimer) clearTimeout(this._h2CleanupTimer)
       this._h2CleanupTimer = setTimeout(() => this._closeHttp2Session(), 60000)
+      this._h2CleanupTimer.unref()
 
-      this._h2.once('error', () => this._closeHttp2Session())
-      this._h2.once('close', () => this._closeHttp2Session())
+      this._h2.once('error', () => { this._h2 = null })
+      this._h2.once('close', () => { this._h2 = null })
       this._h2.socket?.unref?.()
     }
 
+    return this._h2
+  }
+
+  async _makeHttp2Request(method, path, headers, payload) {
+    const session = this._getOrCreateHttp2Session()
+
     return new Promise((resolve, reject) => {
-      let req
-      let timeoutId
+      let req = null
+      let timeoutId = null
       let resolved = false
-      const chunks = []
+      let chunks = []
       let totalSize = 0
+      let preallocatedBuffer = null
 
       const complete = (isSuccess, value) => {
-        if (resolved) return
+        if (resolved) return;
         resolved = true
 
         if (timeoutId) {
@@ -289,12 +393,13 @@ class Rest {
           timeoutId = null
         }
 
-        chunks.length = 0
+        chunks = null
+        preallocatedBuffer = null
         if (req && !isSuccess) req.close(http2.constants.NGHTTP2_CANCEL)
         isSuccess ? resolve(value) : reject(value)
       }
 
-      const h = {
+      const h2Headers = {
         ':method': method,
         ':path': path,
         Authorization: headers.Authorization,
@@ -303,12 +408,12 @@ class Rest {
         'User-Agent': headers['User-Agent']
       }
 
-      if (headers['Content-Type']) h['Content-Type'] = headers['Content-Type']
-      if (headers['Content-Length']) h['Content-Length'] = headers['Content-Length']
+      if (headers['Content-Type']) h2Headers['Content-Type'] = headers['Content-Type']
+      if (headers['Content-Length']) h2Headers['Content-Length'] = headers['Content-Length']
 
-      req = this._h2.request(h)
+      req = session.request(h2Headers)
 
-      req.once('response', respHeaders => {
+      req.once('response', (respHeaders) => {
         if (timeoutId) {
           clearTimeout(timeoutId)
           timeoutId = null
@@ -316,33 +421,48 @@ class Rest {
 
         const status = respHeaders[':status'] || 0
         const cl = respHeaders['content-length']
+
         if (status === 204 || cl === '0') return req.resume(), complete(true, null)
-        if (cl && parseInt(cl, 10) > MAX_RESPONSE_SIZE) {
-          return req.resume(), complete(false, ERRORS.RESPONSE_TOO_LARGE)
+
+        const clInt = cl ? parseInt(cl, 10) : 0
+        if (clInt > MAX_RESPONSE_SIZE) {
+          req.resume()
+          return complete(false, ERRORS.RESPONSE_TOO_LARGE)
+        }
+
+        if (clInt > 0 && clInt <= MAX_RESPONSE_SIZE) {
+          preallocatedBuffer = Buffer.allocUnsafe(clInt)
         }
 
-        const enc = (respHeaders['content-encoding'] || '').split(',')[0].trim()
-        const decompressor = (enc === 'br' || enc === 'gzip' || enc === 'deflate')
-          ? (enc === 'br' ? createBrotliDecompress() : createUnzip())
+        const encodingType = _getEncodingType(respHeaders['content-encoding'])
+        const decompressor = encodingType !== ENCODING_NONE
+          ? (encodingType === ENCODING_BR ? createBrotliDecompress() : createUnzip())
           : null
         const stream = decompressor ? req.pipe(decompressor) : req
 
-        if (decompressor) decompressor.once('error', err => complete(false, err))
-        req.once('error', err => complete(false, err))
-
-        stream.on('data', chunk => {
-          totalSize += chunk.length
-          if (totalSize > MAX_RESPONSE_SIZE) return complete(false, ERRORS.RESPONSE_TOO_LARGE)
-          chunks.push(chunk)
+        if (decompressor) decompressor.once('error', (err) => complete(false, err))
+        req.once('error', (err) => complete(false, err))
+
+        stream.on('data', (chunk) => {
+          if (preallocatedBuffer) {
+            chunk.copy(preallocatedBuffer, totalSize)
+            totalSize += chunk.length
+          } else {
+            totalSize += chunk.length
+            if (totalSize > MAX_RESPONSE_SIZE) return complete(false, ERRORS.RESPONSE_TOO_LARGE)
+            chunks.push(chunk)
+          }
         })
 
         stream.once('end', () => {
           if (totalSize === 0) return complete(true, null)
 
-          const buffer = chunks.length === 1 ? chunks[0] : Buffer.concat(chunks, totalSize)
+          const buffer = preallocatedBuffer
+            ? preallocatedBuffer.slice(0, totalSize)
+            : (chunks.length === 1 ? chunks[0] : Buffer.concat(chunks, totalSize))
           const text = buffer.toString(UTF8_ENCODING)
+          let result = null
 
-          let result
           try {
             result = JSON.parse(text)
           } catch (err) {
@@ -403,14 +523,14 @@ class Rest {
   }
 
   async decodeTrack(encodedTrack) {
-    if (!isValidBase64(encodedTrack)) throw ERRORS.INVALID_TRACK
+    if (!_isValidBase64(encodedTrack)) throw ERRORS.INVALID_TRACK
     return this.makeRequest('GET', `${this._endpoints.decodetrack}${encodeURIComponent(encodedTrack)}`)
   }
 
   async decodeTracks(encodedTracks) {
     if (!Array.isArray(encodedTracks) || encodedTracks.length === 0) throw ERRORS.INVALID_TRACKS
     for (let i = 0; i < encodedTracks.length; i++) {
-      if (!isValidBase64(encodedTracks[i])) throw ERRORS.INVALID_TRACKS
+      if (!_isValidBase64(encodedTracks[i])) throw ERRORS.INVALID_TRACKS
     }
     return this.makeRequest('POST', this._endpoints.decodetracks, encodedTracks)
   }
@@ -442,7 +562,7 @@ class Rest {
   async getLyrics({ track, skipTrackSource = false }) {
     const guildId = track?.guild_id ?? track?.guildId
     const encoded = track?.encoded
-    const hasEncoded = typeof encoded === 'string' && encoded.length > 0 && isValidBase64(encoded)
+    const hasEncoded = typeof encoded === 'string' && encoded.length > 0 && _isValidBase64(encoded)
     const title = track?.info?.title
 
     if (!track || (!guildId && !hasEncoded && !title)) {
@@ -505,15 +625,6 @@ class Rest {
   }
 
   destroy() {
-    const privateInfo = privateData.get(this)
-
-    if (privateInfo?.cleanupCallbacks) {
-      for (const callback of privateInfo.cleanupCallbacks) {
-        try { callback() } catch {}
-      }
-      privateInfo.cleanupCallbacks.clear()
-    }
-
     if (this.agent) {
       this.agent.destroy()
       this.agent = null
@@ -531,8 +642,6 @@ class Rest {
     this.request = null
     this.defaultHeaders = null
     this._endpoints = null
-
-    privateData.delete(this)
   }
 }
 

package/package.json

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