aqualink 2.20.1 → 3.1.0

package/build/structures/Rest.js

@@ -134,6 +134,7 @@ class Rest {
     this.aqua = aqua
     this.node = node
     this.sessionId = node.sessionId
+    this._sessionGeneration = 0
     this.timeout = node.timeout || 30000
 
     const protocol = node.ssl ? 'https:' : 'http:'
@@ -172,6 +173,7 @@ class Rest {
 
     this._headerPool = []
     this._tlsOptions = null
+    this._autoplayAgent = null
     this._setupAgent(node)
     this.useHttp2 = !!aqua?.options?.useHttp2
     this._h2 = null
@@ -207,8 +209,21 @@ class Rest {
     this.agent = new (node.ssl ? HttpsAgent : HttpAgent)(opts)
     this.request = node.ssl ? httpsRequest : httpRequest
 
-    if (node.ssl && autoplayModule?.setSharedAgent) {
-      autoplayModule.setSharedAgent(this.agent)
+    if (autoplayModule?.setSharedAgent) {
+      if (node.ssl) {
+        this._autoplayAgent = this.agent
+      } else {
+        this._autoplayAgent = new HttpsAgent({
+          keepAlive: true,
+          maxSockets: node.maxSockets || 128,
+          maxFreeSockets: node.maxFreeSockets || 64,
+          freeSocketTimeout: node.freeSocketTimeout || 15000,
+          keepAliveMsecs: node.keepAliveMsecs || 500,
+          scheduling: 'lifo',
+          timeout: this.timeout
+        })
+      }
+      autoplayModule.setSharedAgent(this._autoplayAgent)
     }
 
     const origCreate = this.agent.createConnection.bind(this.agent)
@@ -222,10 +237,18 @@ class Rest {
 
   setSessionId(sessionId) {
     this.sessionId = sessionId
+    this._sessionGeneration++
   }
 
-  _getSessionPath() {
+  _getSessionPath(generation) {
     if (!this.sessionId) throw ERRORS.NO_SESSION
+    if (generation != null && generation !== this._sessionGeneration) {
+      const staleErr = new Error(
+        `Stale session: sessionId was updated (expected gen ${generation}, current ${this._sessionGeneration}) for session ${this.sessionId}`
+      )
+      staleErr.statusCode = 404
+      throw staleErr
+    }
     return `${this._apiBase}/sessions/${this.sessionId}`
   }
 
@@ -625,28 +648,33 @@ class Rest {
   }
 
   async updatePlayer({ guildId, data, noReplace = false }) {
+    const gen = this._sessionGeneration
     return this.makeRequest(
       'PATCH',
-      `${this._getSessionPath()}/players/${guildId}?noReplace=${noReplace}`,
+      `${this._getSessionPath(gen)}/players/${guildId}?noReplace=${noReplace}`,
       data
     )
   }
 
   async getPlayer(guildId) {
+    const gen = this._sessionGeneration
     return this.makeRequest(
       'GET',
-      `${this._getSessionPath()}/players/${guildId}`
+      `${this._getSessionPath(gen)}/players/${guildId}`
     )
   }
 
   async getPlayers() {
-    return this.makeRequest('GET', `${this._getSessionPath()}/players`)
+    const gen = this._sessionGeneration
+    return this.makeRequest('GET', `${this._getSessionPath(gen)}/players`)
   }
 
-  async destroyPlayer(guildId) {
+  async destroyPlayer(guildId, abortSignal) {
+    const gen = this._sessionGeneration
+    if (abortSignal?.aborted) return null
     return this.makeRequest(
       'DELETE',
-      `${this._getSessionPath()}/players/${guildId}`
+      `${this._getSessionPath(gen)}/players/${guildId}`
     )
   }
 
@@ -719,9 +747,10 @@ class Rest {
 
     if (guildId) {
       try {
+        const gen = this._sessionGeneration
         const lyrics = await this.makeRequest(
           'GET',
-          `${this._getSessionPath()}/players/${guildId}/track/lyrics?skipTrackSource=${skip}`
+          `${this._getSessionPath(gen)}/players/${guildId}/track/lyrics?skipTrackSource=${skip}`
         )
         if (this._validLyrics(lyrics)) return lyrics
       } catch {}
@@ -762,10 +791,11 @@ class Rest {
 
   async subscribeLiveLyrics(guildId, skipTrackSource = false) {
     try {
+      const gen = this._sessionGeneration
       return (
         (await this.makeRequest(
           'POST',
-          `${this._getSessionPath()}/players/${guildId}/lyrics/subscribe?skipTrackSource=${skipTrackSource ? 'true' : 'false'}`
+          `${this._getSessionPath(gen)}/players/${guildId}/lyrics/subscribe?skipTrackSource=${skipTrackSource ? 'true' : 'false'}`
         )) === null
       )
     } catch {
@@ -775,10 +805,11 @@ class Rest {
 
   async unsubscribeLiveLyrics(guildId) {
     try {
+      const gen = this._sessionGeneration
       return (
         (await this.makeRequest(
           'DELETE',
-          `${this._getSessionPath()}/players/${guildId}/lyrics/subscribe`
+          `${this._getSessionPath(gen)}/players/${guildId}/lyrics/subscribe`
         )) === null
       )
     } catch {
@@ -845,10 +876,18 @@ class Rest {
   }
 
   destroy() {
+    const autoplayAgent = this._autoplayAgent
+    const primaryAgent = this.agent
     if (this.agent) {
       this.agent.destroy()
       this.agent = null
     }
+    if (autoplayAgent && autoplayAgent !== primaryAgent) {
+      autoplayAgent.destroy?.()
+    }
+    if (autoplayModule?.setSharedAgent && autoplayAgent) {
+      autoplayModule.setSharedAgent(null)
+    }
     this._closeH2()
     if (this._headerPool) {
       this._headerPool.length = 0
@@ -859,6 +898,7 @@ class Rest {
       this.request =
       this.defaultHeaders =
       this._endpoints =
+      this._autoplayAgent =
         null
     this.calls = 0
   }

package/build/structures/Track.js

@@ -65,7 +65,7 @@ class Track {
 
     const platform =
       opts.platform || aqua?.options?.defaultSearchPlatform || 'ytsearch'
-    const node = opts.node || this.node || this.nodes
+    const node = opts.nodes || opts.node || this.node || this.nodes
 
     let query = this.uri
     if (!query) {
@@ -83,7 +83,7 @@ class Track {
     if (!query) return null
 
     const payload = { query, source: platform, requester: this.requester }
-    if (node) payload.node = node
+    if (node) payload.nodes = node
 
     let result
     try {

package/package.json

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