aqualink 2.9.13 → 2.10.1

package/build/structures/Node.js

@@ -3,8 +3,7 @@
 const WebSocket = require('ws')
 const Rest = require('./Rest')
 
-const LYRICS_OP_REGEX = /^Lyrics/
-const JSON_START_REGEX = /^\s*[{[]/
+const JSON_START_CHAR = /^[\s{[]/
 const WS_READY_STATES = Object.freeze({ OPEN: 1, CLOSED: 3 })
 
 class Node {
@@ -16,6 +15,16 @@ class Node {
   static JITTER_FACTOR = 0.2
   static WS_CLOSE_NORMAL = 1000
 
+  stats = {
+    players: 0,
+    playingPlayers: 0,
+    uptime: 0,
+    memory: { free: 0, used: 0, allocated: 0, reservable: 0 },
+    cpu: { cores: 0, systemLoad: 0, lavalinkLoad: 0 },
+    frameStats: { sent: 0, nulled: 0, deficit: 0 },
+    ping: 0
+  }
+
   constructor(aqua, connOptions, options = {}) {
     this.aqua = aqua
 
@@ -35,7 +44,7 @@ class Node {
     this.password = password
     this.sessionId = sessionId
     this.regions = regions
-    this.secure = Boolean(secure)
+    this.secure = !!secure
     this.wsUrl = `ws${secure ? 's' : ''}://${host}:${port}/v4/websocket`
 
     this.rest = new Rest(aqua, this)
@@ -61,52 +70,15 @@ class Node {
     this.reconnectTimeoutId = null
     this.isDestroyed = false
 
-    this._boundHandlers = this._createBoundHandlers()
     this._headers = this._buildHeaders()
-    this._initStats()
-  }
-
-  _createBoundHandlers() {
-    return {
-      onOpen: () => this._handleOpen(),
-      onError: error => this._handleError(error),
-      onMessage: msg => this._handleMessage(msg),
-      onClose: (code, reason) => this._handleClose(code, reason)
-    }
   }
 
-  _initStats() {
-    this.stats = {
-      players: 0,
-      playingPlayers: 0,
-      uptime: 0,
-      memory: { free: 0, used: 0, allocated: 0, reservable: 0, freePercentage: 0, usedPercentage: 0 },
-      cpu: { cores: 0, systemLoad: 0, lavalinkLoad: 0, lavalinkLoadPercentage: 0 },
-      frameStats: { sent: 0, nulled: 0, deficit: 0 },
-      ping: 0
-    }
-  }
-
-  _buildHeaders() {
-    const headers = {
-      'Authorization': this.password,
-      'User-Id': this.aqua.clientId,
-      'Client-Name': `Aqua/${this.aqua.version} (https://github.com/ToddyTheNoobDud/AquaLink)`
-    }
-
-    if (this.sessionId) {
-      headers['Session-Id'] = this.sessionId
-    }
-
-    return headers
-  }
-
-  async _handleOpen() {
+  _handleOpen = async () => {
     this.connected = true
     this.reconnectAttempted = 0
     this._emitDebug('WebSocket connection established')
 
-    if (this.aqua.bypassChecks?.nodeFetchInfo) return;
+    if (this.aqua.bypassChecks?.nodeFetchInfo) return
 
     try {
       this.info = await this.rest.makeRequest('GET', '/v4/info')
@@ -121,14 +93,14 @@ class Node {
     }
   }
 
-  _handleError(error) {
+  _handleError = (error) => {
     this.aqua.emit('nodeError', this, error)
   }
 
-  _handleMessage(msg) {
-    if (!JSON_START_REGEX.test(msg)) {
+  _handleMessage = (msg) => {
+    if (!JSON_START_CHAR.test(msg)) {
       this._emitDebug(`Invalid JSON format: ${msg.slice(0, 100)}...`)
-      return;
+      return
     }
 
     let payload
@@ -136,29 +108,55 @@ class Node {
       payload = JSON.parse(msg)
     } catch {
       this._emitDebug(`JSON parse failed: ${msg.slice(0, 100)}...`)
-      return;
+      return
     }
 
+
     const { op, guildId } = payload
-    if (!op) return;
+    if (!op) return
 
-    switch (op) {
-      case 'stats':
-        this._updateStats(payload)
-        break
-      case 'ready':
-        this._handleReady(payload)
-        break
-      default:
-        this._handleCustomOp(op, guildId, payload)
+    if (typeof op === 'number') {
+      this._handleNumericOp(op, guildId, payload);
+      return;
+    }
+
+    if (op === 'stats') {
+      this._updateStats(payload)
+    } else if (op === 'ready') {
+      this._handleReady(payload)
+    } else {
+      this._handleCustomOp(op, guildId, payload)
+    }
+  }
+
+  _handleClose = (code, reason) => {
+    this.connected = false
+    const reasonStr = reason?.toString() || 'No reason provided'
+
+    this.aqua.emit('nodeDisconnect', this, { code, reason: reasonStr })
+    this.aqua.handleNodeFailover(this)
+    this._scheduleReconnect(code)
+  }
+
+  _buildHeaders() {
+    const headers = {
+      Authorization: this.password,
+      'User-Id': this.aqua.clientId,
+      'Client-Name': `Aqua/${this.aqua.version} (https://github.com/ToddyTheNoobDud/AquaLink)`
     }
+
+    if (this.sessionId) {
+      headers['Session-Id'] = this.sessionId
+    }
+
+    return headers
   }
 
   _handleCustomOp(op, guildId, payload) {
-    if (LYRICS_OP_REGEX.test(op)) {
+    if (op.startsWith('Lyrics')) {
       const player = guildId ? this.aqua.players.get(guildId) : null
       this.aqua.emit(op, player, payload.track || null, payload)
-      return;
+      return
     }
 
     if (guildId) {
@@ -167,13 +165,28 @@ class Node {
     }
   }
 
-  _handleClose(code, reason) {
-    this.connected = false
-    const reasonStr = reason?.toString() || 'No reason provided'
+  _handleNumericOp(op, guildId, payload) {
+    const player = guildId ? this.aqua.players.get(guildId) : null;
 
-    this.aqua.emit('nodeDisconnect', this, { code, reason: reasonStr })
-    this.aqua.handleNodeFailover(this)
-    this._scheduleReconnect(code)
+    switch (op) {
+      case 2:
+        if (player?.connection) {
+          player.connection.setServerUpdate(payload.d);
+        }
+        break;
+      case 5:
+        if (player?.connection) {
+          player.connection.updateSequence(payload.d.sequence);
+        }
+        break;
+
+      case 9:
+        this.aqua.emit('debug', `[Player ${guildId}] Voice resumed successfully`);
+        break;
+
+      default:
+        this.aqua.emit('debug', `Unknown numeric op ${op} for guild ${guildId}`);
+    }
   }
 
   _scheduleReconnect(code) {
@@ -181,19 +194,19 @@ class Node {
 
     if (code === Node.WS_CLOSE_NORMAL || this.isDestroyed) {
       this._emitDebug('WebSocket closed normally, not reconnecting')
-      return;
+      return
     }
 
     if (this.infiniteReconnects) {
       this.aqua.emit('nodeReconnect', this, 'Infinite reconnects enabled, trying again in 10 seconds')
       this.reconnectTimeoutId = setTimeout(() => this.connect(), 10000)
-      return;
+      return
     }
 
     if (this.reconnectAttempted >= this.reconnectTries) {
       this._emitError(new Error(`Max reconnection attempts reached (${this.reconnectTries})`))
       this.destroy(true)
-      return;
+      return
     }
 
     const backoffTime = this._calcBackoff()
@@ -221,12 +234,12 @@ class Node {
     }
   }
 
-  async connect() {
-    if (this.isDestroyed) return;
+  connect() {
+    if (this.isDestroyed) return
 
     if (this.ws?.readyState === WS_READY_STATES.OPEN) {
       this._emitDebug('WebSocket already connected')
-      return;
+      return
     }
 
     this._cleanup()
@@ -236,15 +249,14 @@ class Node {
       perMessageDeflate: false
     })
 
-    const handlers = this._boundHandlers
-    this.ws.once('open', handlers.onOpen)
-    this.ws.once('error', handlers.onError)
-    this.ws.on('message', handlers.onMessage)
-    this.ws.once('close', handlers.onClose)
+    this.ws.once('open', this._handleOpen)
+    this.ws.once('error', this._handleError)
+    this.ws.on('message', this._handleMessage)
+    this.ws.once('close', this._handleClose)
   }
 
   _cleanup() {
-    if (!this.ws) return;
+    if (!this.ws) return
 
     this.ws.removeAllListeners()
 
@@ -275,13 +287,13 @@ class Node {
   }
 
   async getStats() {
-    if (this.connected && this.stats) {
+    if (this.connected) {
       return this.stats
     }
 
     try {
       const newStats = await this.rest.getStats()
-      if (newStats && this.stats) {
+      if (newStats) {
         this._mergeStats(newStats)
       }
       return this.stats
@@ -313,26 +325,16 @@ class Node {
   }
 
   _updateStats(payload) {
-    if (!payload) return;
+    if (!payload) return
 
     this.stats.players = payload.players
     this.stats.playingPlayers = payload.playingPlayers
     this.stats.uptime = payload.uptime
     this.stats.ping = payload.ping
 
-    if (payload.memory) {
-      Object.assign(this.stats.memory, payload.memory)
-      this._calcMemoryPercentages()
-    }
-
-    if (payload.cpu) {
-      Object.assign(this.stats.cpu, payload.cpu)
-      this._calcCpuPercentages()
-    }
-
-    if (payload.frameStats) {
-      Object.assign(this.stats.frameStats, payload.frameStats)
-    }
+    if (payload.memory) Object.assign(this.stats.memory, payload.memory)
+    if (payload.cpu) Object.assign(this.stats.cpu, payload.cpu)
+    if (payload.frameStats) Object.assign(this.stats.frameStats, payload.frameStats)
   }
 
   _calcMemoryPercentages() {
@@ -354,12 +356,13 @@ class Node {
   _handleReady(payload) {
     if (!payload.sessionId) {
       this._emitError('Ready payload missing sessionId')
-      return;
+      return
     }
 
     this.sessionId = payload.sessionId
     this.rest.setSessionId(payload.sessionId)
-    this._headers = this._buildHeaders()
+    this._headers['Session-Id'] = payload.sessionId
+
     this.aqua.emit('nodeConnect', this)
   }
 
@@ -367,7 +370,7 @@ class Node {
     try {
       await this.rest.makeRequest('PATCH', `/v4/sessions/${this.sessionId}`, {
         resuming: true,
-        timeout: 60000
+        timeout: this.resumeTimeout
       })
       await this.aqua.loadPlayers()
       this._emitDebug('Session resumed successfully')