aqualink 2.17.1 → 2.17.2

package/README.md

@@ -180,16 +180,18 @@ const aqua = new Aqua(client, nodes, {
 
 client.aqua = aqua;
 
-client.once(Events.Ready, () => {
+client.once(Events.ClientReady, () => {
     client.aqua.init(client.user.id);
     console.log(`Logged in as ${client.user.tag}`);
 });
 
-client.on(Events.Raw, (d) => {
-    if (![Events.VoiceStateUpdate, Events.VoiceServerUpdate].includes(d.t)) return;
-    client.aqua.updateVoiceState(d);
+client.on(Events.Raw, (d, t) => {
+    if (d.t === "VOICE_SERVER_UPDATE" || d.t === "VOICE_STATE_UPDATE") {
+        return client.aqua.updateVoiceState(d, t);
+    }
 });
 
+
 client.on(Events.MessageCreate, async (message) => {
     if (message.author.bot || !message.content.startsWith("!play")) return;
 
@@ -446,4 +448,4 @@ Join our thriving community of developers and bot creators!
 
 <sub>Built with 💙 by the Aqualink Team</sub>
 
-</div>
+</div>

package/build/index.d.ts

@@ -38,8 +38,7 @@ declare module "aqualink" {
         _rebuildLocks: Set<string>;
         _leastUsedNodesCache: Node[] | null;
         _leastUsedNodesCacheTime: number;
-        _nodeLoadCache: Map<string, number>;
-        _nodeLoadCacheTime: Map<string, number>;
+        _nodeLoadCache: Map<string, {load: number; time: number}>;
         _cleanupTimer: NodeJS.Timer | null;
         _onNodeConnect?: (node: Node) => void;
         _onNodeDisconnect?: (node: Node) => void;
@@ -126,6 +125,7 @@ declare module "aqualink" {
         infiniteReconnects: boolean;
         connected: boolean;
         info: NodeInfo | null;
+        isNodelink: boolean;
         ws: any | null; // WebSocket
         reconnectAttempted: number;
         reconnectTimeoutId: NodeJS.Timeout | null;
@@ -198,6 +198,8 @@ declare module "aqualink" {
         mute: boolean;
         autoplayRetries: number;
         reconnectionRetries: number;
+        _resuming: boolean;
+        _reconnecting: boolean;
         previousIdentifiers: Set<string>;
         self_deaf: boolean;
         self_mute: boolean;
@@ -242,6 +244,11 @@ declare module "aqualink" {
         setAutoplay(enabled: boolean): Player;
         updatePlayer(data: any): Promise<any>;
         cleanup(): Promise<void>;
+        getActiveMixer(guildId: string): Promise<any[]>;
+        updateMixerVolume(guildId: string, mix: string, volume: number): Promise<any>;
+        removeMixer(guildId: string, mix: string): Promise<any>;
+        addMixer(guildId: string, options: MixerOptions): Promise<any>;
+        getLoadLyrics(encodedTrack: string): Promise<LyricsResponse | null>;
 
         // Data Methods
         set(key: string, value: any): void;
@@ -276,7 +283,7 @@ declare module "aqualink" {
     }
 
     export class Track {
-        constructor(data?: TrackData, requester?: any, nodes?: Node);
+        constructor(data?: TrackData, requester?: any, node?: Node);
 
         // Properties
         identifier: string;
@@ -326,6 +333,7 @@ declare module "aqualink" {
         baseUrl: string;
         defaultHeaders: Record<string, string>;
         agent: any; // HTTP/HTTPS Agent
+        useHttp2: boolean;
 
         // Core Methods
         setSessionId(sessionId: string): void;
@@ -347,6 +355,11 @@ declare module "aqualink" {
         getRoutePlannerStatus(): Promise<any>;
         freeRoutePlannerAddress(address: string): Promise<any>;
         freeAllRoutePlannerAddresses(): Promise<any>;
+        addMixer(guildId: string, options: MixerOptions): Promise<any>;
+        getActiveMixer(guildId: string): Promise<any[]>;
+        updateMixerVolume(guildId: string, mix: string, volume: number): Promise<any>;
+        removeMixer(guildId: string, mix: string): Promise<any>;
+        getLoadLyrics(encodedTrack: string): Promise<LyricsResponse>;
         destroy(): void;
     }
 
@@ -452,7 +465,7 @@ declare module "aqualink" {
         updateSequence(seq: number): void;
         destroy(): void;
         attemptResume(): Promise<boolean>;
-        resendVoiceUpdate(options?: { resume?: boolean }): void;
+        resendVoiceUpdate(): boolean;
 
         // Internal Methods
         _extractRegion(endpoint: string): string | null;
@@ -736,6 +749,13 @@ declare module "aqualink" {
         smoothing?: number;
     }
 
+    export interface MixerOptions {
+        identifier?: string;
+        encoded?: string;
+        userData?: any;
+        volume?: number;
+    }
+
     // Voice Update Interfaces
     export interface VoiceStateUpdate {
         d: {

package/build/structures/AqualinkEvents.js

@@ -37,7 +37,9 @@ const AqualinkEvents = {
   PlayerConnected: 'playerConnected',
   PlayerDestroyed: 'playerDestroy',
   PlayerMigrated: 'playerMigrated',
-  PauseEvent: 'pauseEvent'
+  PauseEvent: 'pauseEvent',
+  MixStarted: 'mixStarted',
+  MixEnded: 'mixEnded'
 };
 
-module.exports = { AqualinkEvents };
+module.exports = { AqualinkEvents };

package/build/structures/Player.js

@@ -22,10 +22,12 @@ const EVENT_HANDLERS = Object.freeze({
   FiltersChangedEvent: 'filtersChanged',
   SeekEvent: 'seekEvent',
   PlayerCreatedEvent: 'playerCreated',
-  pauseEvent: 'PauseEvent',
+  PauseEvent: 'pauseEvent',
   PlayerConnectedEvent: 'playerConnected',
   PlayerDestroyedEvent: 'playerDestroyed',
-  LyricsNotFoundEvent: 'lyricsNotFound'
+  LyricsNotFoundEvent: 'lyricsNotFound',
+  MixStartedEvent: 'mixStarted',
+  MixEndedEvent: 'mixEnded'
 })
 
 const WATCHDOG_INTERVAL = 15000
@@ -460,11 +462,54 @@ class Player extends EventEmitter {
     return this
   }
 
+  async getActiveMixer(guildId) {
+    if (this.destroyed) return null
+    return await this.nodes.rest.getActiveMixer(guildId)
+  }
+
+  async updateMixerVolume(guildId, mix, volume) {
+    if (this.destroyed) return null
+    return await this.nodes.rest.updateMixerVolume(guildId, mix, volume)
+  }
+
+  async removeMixer(guildId, mix) {
+    if (this.destroyed) return null
+    return await this.nodes.rest.removeMixer(guildId, mix)
+  }
+
+  async addMixer(guildId, options) {
+    if (this.destroyed) return null
+
+    if (options.identifier && !options.encoded) {
+      try {
+        const resolved = await this.aqua.resolve({
+          query: options.identifier,
+          requester: options.requester || this.current?.requester
+        })
+
+        if (resolved?.tracks?.[0]) {
+          const track = resolved.tracks[0]
+          options = {
+            ...options,
+            encoded: track.track || track.encoded,
+            userData: options.userData
+          }
+        } else {
+          throw new Error('Failed to resolve track identifier')
+        }
+      } catch (error) {
+        throw new Error(`Failed to resolve track: ${error.message}`)
+      }
+    }
+
+    return await this.nodes.rest.addMixer(guildId, options)
+  }
+
   stop() {
     if (this.destroyed || !this.playing) return this
     this.playing = this.paused = false
     this.position = 0
-    this.batchUpdatePlayer({ guildId: this.guildId, track: { encoded: null } }, true).catch(() => { })
+    this.batchUpdatePlayer({ guildId: this.guildId, track: { encoded: null, paused: this.paused } }, true).catch(() => { })
     return this
   }
 
@@ -684,7 +729,9 @@ class Player extends EventEmitter {
   playerCreated(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.PlayerCreated, payload) }
   playerConnected(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.PlayerConnected, payload) }
   playerDestroyed(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.PlayerDestroyed, payload) }
-  PauseEvent(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.PauseEvent, payload) }
+  pauseEvent(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.PauseEvent, payload) }
+  mixStarted(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.MixStarted, t, payload) }
+  mixEnded(p, t, payload) { _functions.emitIfActive(this, AqualinkEvents.MixEnded, t, payload) }
 
   async _attemptVoiceResume() {
     if (!this.connection?.sessionId) throw new Error('No session')
@@ -845,4 +892,4 @@ class Player extends EventEmitter {
   }
 }
 
-module.exports = Player
+module.exports = Player

package/build/structures/Rest.js

@@ -317,7 +317,7 @@ class Rest {
 
   _closeH2() {
     if (this._h2Timer) { clearTimeout(this._h2Timer); this._h2Timer = null }
-    if (this._h2) { try { this._h2.close() } catch {} this._h2 = null }
+    if (this._h2) { try { this._h2.close() } catch { } this._h2 = null }
   }
 
   _h2Request(method, path, headers, payload) {
@@ -480,14 +480,14 @@ class Rest {
       try {
         const lyrics = await this.makeRequest('GET', `${this._getSessionPath()}/players/${guildId}/track/lyrics?skipTrackSource=${skip}`)
         if (this._validLyrics(lyrics)) return lyrics
-      } catch {}
+      } catch { }
     }
 
     if (hasEncoded) {
       try {
         const lyrics = await this.makeRequest('GET', `${this._endpoints.lyrics}?track=${encodeURIComponent(encoded)}&skipTrackSource=${skip}`)
         if (this._validLyrics(lyrics)) return lyrics
-      } catch {}
+      } catch { }
     }
 
     if (title) {
@@ -495,7 +495,7 @@ class Rest {
       try {
         const lyrics = await this.makeRequest('GET', `${this._endpoints.lyrics}/search?query=${encodeURIComponent(query)}`)
         if (this._validLyrics(lyrics)) return lyrics
-      } catch {}
+      } catch { }
     }
 
     return null
@@ -524,6 +524,44 @@ class Rest {
     }
   }
 
+  async addMixer(guildId, options) {
+    if (!this.node.isNodelink) throw new Error('Mixer endpoints are only available on Nodelink nodes')
+    if (!options?.encoded && !options?.identifier) throw new Error('You must provide either encoded or identifier')
+
+    const track = {}
+    if (options.encoded) track.encoded = options.encoded
+    if (options.identifier) track.identifier = options.identifier
+    if (options.userData) track.userData = options.userData
+
+    const payload = {
+      track,
+      volume: options.volume !== undefined ? options.volume : 0.8
+    }
+
+    return await this.makeRequest("POST", `/v4/sessions/${this.sessionId}/players/${guildId}/mix`, payload)
+  }
+
+  async getActiveMixer(guildId) {
+    if (!this.node.isNodelink) throw new Error('Mixer endpoints are only available on Nodelink nodes')
+    const response = await this.makeRequest("GET", `/v4/sessions/${this.sessionId}/players/${guildId}/mix`)
+    return response?.mixes || []
+  }
+
+  async updateMixerVolume(guildId, mix, volume) {
+    if (!this.node.isNodelink) throw new Error('Mixer endpoints are only available on Nodelink nodes')
+    if (!guildId || !mix || typeof volume !== 'number') throw new Error('You forget to set the guild_id, mix or volume options')
+
+    return await this.makeRequest("PATCH", `/v4/sessions/${this.sessionId}/players/${guildId}/mix/${mix}`, { volume })
+  }
+
+  async removeMixer(guildId, mix) {
+    if (!this.node.isNodelink) throw new Error('Mixer endpoints are only available on Nodelink nodes')
+    if (!guildId || !mix) throw new Error('You forget to set the guild_id and/or mix options')
+
+    return await this.makeRequest("DELETE", `/v4/sessions/${this.sessionId}/players/${guildId}/mix/${mix}`)
+  }
+
+
   destroy() {
     if (this.agent) { this.agent.destroy(); this.agent = null }
     this._closeH2()
@@ -532,4 +570,4 @@ class Rest {
   }
 }
 
-module.exports = Rest
+module.exports = Rest

package/package.json

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