aqualink 2.6.3 → 2.6.4

package/README.md

@@ -306,6 +306,15 @@ For detailed usage, API references, and examples, check out our official documen
         <a href="#code-ToddyTheNoobDud" title="Code">💻</a>
         <a href="#doc-ToddyTheNoobDud" title="Documentation">📖</a>
       </td>
+      <td align="center" valign="top" width="80%">
+        <a href="https://github.com/SoulDevs">
+          <img src="https://avatars.githubusercontent.com/u/114820381?v=4" width="100px;" alt="SoulDevs"/>
+          <br />
+          <sub><b>SoulDevs</b></sub>
+        </a>
+        <br />
+        <a href="#code-SoulDevs title="Code">💻</a>
+      </td>
     </tr>
   </tbody>
 </table>

package/build/structures/Node.js

@@ -127,6 +127,18 @@ class Node {
             case "ready":
                 this._handleReadyOp(payload);
                 break;
+            case "LyricsLineEvent": {
+                const player = payload.guildId ? this.aqua.players.get(payload.guildId) : null;
+                const track = payload.track || null;
+                this.aqua.emit("LyricsLineEvent", player, track, payload);
+                break;
+            }
+            case "LyricsFoundEvent": {
+                const player = payload.guildId ? this.aqua.players.get(payload.guildId) : null;
+                const track = payload.track || null;
+                this.aqua.emit("LyricsFoundEvent", player, track, payload);
+                break;
+            }
             default:
                 if (payload.guildId) {
                     const player = this.aqua.players.get(payload.guildId);

package/build/structures/Player.js

@@ -17,8 +17,11 @@ const EVENT_HANDLERS = Object.freeze({
     TrackStuckEvent: "trackStuck",
     TrackChangeEvent: "trackChange",
     WebSocketClosedEvent: "socketClosed",
+    LyricsLineEvent: "lyricsLine",
+    LyricsFoundEvent: "lyricsFound" // <-- add this line
 });
 
+
 const VALID_MODES = new Set(Object.values(LOOP_MODES));
 const FAILURE_REASONS = new Set(["LOAD_FAILED", "CLEANUP"]);
 const RECONNECT_CODES = new Set([4015, 4009]);
@@ -286,11 +289,41 @@ class Player extends EventEmitter {
 
     async getLyrics(options = {}) {
         const { query = null, useCurrentTrack = true, skipTrackSource = false } = options;
-        if (query) return this.nodes.rest.getLyrics({ track: { info: { title: query }, search: true }, skipTrackSource }) || null;
-        if (useCurrentTrack && this.playing) return this.nodes.rest.getLyrics({ track: { encoded: this.current.track, guild_id: this.guildId }, skipTrackSource }) || null;
+
+        if (query) {
+            this.aqua.emit("debug", `[Aqua/Player] Searching lyrics for query: "${query}"`);
+            return this.nodes.rest.getLyrics({
+                track: {
+                    info: { title: query }
+                },
+                skipTrackSource
+            });
+        }
+
+        if (useCurrentTrack && this.playing && this.current?.info) {
+            this.aqua.emit("debug", `[Aqua/Player] Getting lyrics for current track: "${this.current.info.title}"`);
+            return this.nodes.rest.getLyrics({
+                track: {
+                    info: this.current.info,
+                    identifier: this.current.info.identifier,
+                    guild_id: this.guildId,
+                },
+                skipTrackSource
+            });
+        }
+
+        this.aqua.emit("debug", `[Aqua/Player] getLyrics called but no query was provided and no track is playing.`);
         return null;
     }
 
+    async subscribeLiveLyrics() {
+        return this.nodes.rest.subscribeLiveLyrics(this.guildId, false);
+    }
+
+    async unsubscribeLiveLyrics() {
+        return this.nodes.rest.unsubscribeLiveLyrics(this.guildId);
+    }
+
     seek(position) {
         if (!this.playing) return this;
         this.position += position;
@@ -479,6 +512,14 @@ class Player extends EventEmitter {
         this.aqua.emit("debug", this.guildId, "Player paused due to socket closure.");
     }
 
+    async lyricsLine(player, track, payload) {
+        this.aqua.emit("lyricsLine", player, track, payload);
+    }
+
+    async lyricsFound(player, track, payload) {
+        this.aqua.emit("lyricsFound", player, track, payload);
+    }
+
     send(data) {
         this.aqua.send({ op: 4, d: data });
     }

package/build/structures/Rest.js

@@ -34,7 +34,7 @@ class Rest {
         }
     }
 
- async makeRequest(method, endpoint, body = null) {
+    async makeRequest(method, endpoint, body = null) {
         const url = `${this.baseUrl}${endpoint}`;
 
         if (!this.agent) {
@@ -58,7 +58,7 @@ class Rest {
         return new Promise((resolve, reject) => {
             const client = this.secure ? https : http;
             const req = client.request(url, options, (res) => {
-                if (res.statusCode === 204) return;
+                if (res.statusCode === 204) return resolve(null);
 
                 const chunks = [];
                 let totalLength = 0;
@@ -159,37 +159,115 @@ class Rest {
         const endpoint = `/${this.version}/routeplanner/free/address`;
         return this.makeRequest("POST", endpoint, { address });
     }
-    async getLyrics({ track }) {
-        if (!track) return null;
 
+    async getLyrics({ track, skipTrackSource = false }) {
+        if (!track || (!track.identifier && !track.info?.title && !track.guild_id)) {
+            this.aqua.emit("error", "[Aqua/Lyrics] Invalid or insufficient track object provided for lyrics search.");
+            return null;
+        }
 
-        try {
-            if (track.search) {
-                const query = encodeURIComponent(track.info.title);
-                try {
-                    const res = await this.makeRequest(
+        // --- Attempt 1: Get lyrics via the Player endpoint ---
+        if (track.guild_id) {
+            try {
+                this.validateSessionId();
+                const playerLyrics = await this.makeRequest(
+                    "GET",
+                    `/${this.version}/sessions/${this.sessionId}/players/${track.guild_id}/lyrics?skipTrackSource=${skipTrackSource}`
+                ).catch(() => {
+                     this.aqua.emit("debug", `[Aqua/Lyrics] First player endpoint failed, trying fallback path for Guild ${track.guild_id}`);
+                     return this.makeRequest(
                         "GET",
-                        `/${this.version}/lyrics/search?query=${query}&source=genius`
-                    );
+                        `/${this.version}/sessions/${this.sessionId}/players/${track.guild_id}/track/lyrics?skipTrackSource=${skipTrackSource}`
+                     );
+                });
 
-                    if (res) return res;
-                } catch (_) {
+                if (playerLyrics && !playerLyrics.error) {
+                    this.aqua.emit("debug", `[Aqua/Lyrics] Fetched lyrics using Player endpoint for Guild: ${track.guild_id}`);
+                    return playerLyrics;
+                } else if (playerLyrics && playerLyrics.error) {
+                    this.aqua.emit("debug", `[Aqua/Lyrics] Player endpoint returned error for Guild ${track.guild_id}: ${playerLyrics.message || playerLyrics.error}`);
                 }
-            } else {
-                this.validateSessionId();
-                const res = await this.makeRequest(
+            } catch (error) {
+                this.aqua.emit("debug", `[Aqua/Lyrics] Player endpoint failed for Guild ${track.guild_id}: ${error.message}`);
+            }
+        }
+
+        // --- Attempt 2: Get lyrics using the track's direct identifier ---
+        if (track.identifier) {
+            try {
+                const identifierLyrics = await this.makeRequest(
                     "GET",
-                    `/${this.version}/sessions/${this.sessionId}/players/${track.guild_id}/lyrics`
+                    `/${this.version}/lyrics/${encodeURIComponent(track.identifier)}`
                 );
-                console.log(res);
-                return res;
+                if (
+                    identifierLyrics &&
+                    !(identifierLyrics.status === 404 && identifierLyrics.error === 'Not Found') &&
+                    !(identifierLyrics.status === 500 && identifierLyrics.error === 'Internal Server Error')
+                ) {
+                    this.aqua.emit("debug", `[Aqua/Lyrics] Fetched lyrics using Identifier: ${track.identifier}`);
+                    return identifierLyrics;
+                } else if (
+                    identifierLyrics &&
+                    (
+                        (identifierLyrics.status === 404 && identifierLyrics.error === 'Not Found') ||
+                        (identifierLyrics.status === 500 && identifierLyrics.error === 'Internal Server Error')
+                    )
+                ) {
+                    this.aqua.emit("debug", `[Aqua/Lyrics] No lyrics found for Identifier: ${track.identifier}`);
+                }
+            } catch (error) {
+                this.aqua.emit("debug", `[Aqua/Lyrics] Identifier endpoint failed for ${track.identifier}: ${error.message}`);
+            }
+        }
+
+        
+        // --- Attempt 3: Fallback to searching with track metadata ---
+        if (track.info?.title) {
+            try {
+                const title = track.info.title;
+                const author = track.info.author;
+
+                const searchLyrics = await this.makeRequest(
+                    "GET",
+                    `/${this.version}/lyrics/search?query=${title}&source=genius`
+                );
+
+                if (searchLyrics) {
+                    this.aqua.emit("debug", `[Aqua/Lyrics] Fetched lyrics using Search Query: "${author ? `${title} ${author}` : title}"`);
+                    return searchLyrics;
+                }
+            } catch (error) {
+                this.aqua.emit("debug", `[Aqua/Lyrics] Search endpoint failed: ${error.message}`);
             }
-        } catch (error) {
-            console.error("Failed to fetch lyrics:", error.message);
-            return null;
         }
+
+        this.aqua.emit("debug", "[Aqua/Lyrics] All lyric fetch attempts failed for the track.");
         return null;
     }
+
+    async subscribeLiveLyrics(guildId, skipTrackSource = false) {
+        this.validateSessionId();
+        const endpoint = `/${this.version}/sessions/${this.sessionId}/players/${guildId}/lyrics/subscribe?skipTrackSource=${skipTrackSource}`;
+        try {
+            const res = await this.makeRequest("POST", endpoint);
+            return res === null;
+        } catch (error) {
+            this.aqua.emit("debug", `[Aqua/Lyrics] Failed to subscribe to live lyrics for Guild ${guildId}: ${error.message}`);
+            return false;
+        }
+    }
+
+    async unsubscribeLiveLyrics(guildId) {
+        this.validateSessionId();
+        const endpoint = `/${this.version}/sessions/${this.sessionId}/players/${guildId}/lyrics/subscribe`;
+        try {
+            const res = await this.makeRequest("DELETE", endpoint);
+            return res === null;
+        } catch (error) {
+            this.aqua.emit("debug", `[Aqua/Lyrics] Failed to unsubscribe from live lyrics for Guild ${guildId}: ${error.message}`);
+            return false;
+        }
+    }
 }
 
 module.exports = Rest;

package/package.json

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