yukimu 1.2.0 → 2.0.0

package/dist/Resolver.js

@@ -1,51 +1,176 @@
 "use strict";
+/** Yukimu v2.0.0 — Track Resolver with Retry, Caching & Fallback */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Resolver = void 0;
 const Constants_1 = require("./Constants");
+/**
+ * Resolves search queries and URLs into playable tracks.
+ *
+ * Improvements from v1:
+ * - Accepts optional `node` parameter (loads on the correct node for a player)
+ * - Search retry with fallback sources
+ * - Search result caching
+ * - Spotify playlist/album resolution
+ * - Spotify token refresh with retry and timeout
+ * - Rate limit handling for Spotify API
+ */
 class Resolver {
+    manager;
+    spotifyToken = null;
+    spotifyExpiry = 0;
+    spotifyRefreshing = false;
     constructor(manager) {
-        this.spotifyToken = null;
-        this.spotifyExpiry = 0;
         this.manager = manager;
     }
-    async resolve(query, source, requester) {
-        const node = this.manager.getBestNode();
+    /**
+     * Resolve a query (URL or search term) into tracks.
+     *
+     * @param query - A URL or search query string
+     * @param source - The search source to use (ignored for URLs)
+     * @param requester - Optional requester metadata to attach to tracks
+     * @param node - Optional specific node to use for loading
+     */
+    async resolve(query, source, requester, node) {
+        const targetNode = node ?? this.getLoadNode();
         const isUrl = /^https?:\/\//.test(query);
-        const identifier = isUrl ? query : `${Constants_1.SOURCE_PREFIXES[source] ?? "ytsearch"}:${query}`;
-        const result = await node.loadTracks(identifier);
+        const prefix = Constants_1.SOURCE_PREFIXES[source];
+        const identifier = isUrl ? query : `${prefix ?? "ytsearch"}:${query}`;
+        // Check search cache first
+        const cached = this.manager.trackCache.getSearch(identifier);
+        if (cached) {
+            this.manager.logger.debug(`Search cache hit for: ${identifier.slice(0, 80)}`);
+            // Clone and attach requester
+            const result = { ...cached, tracks: [...cached.tracks] };
+            if (requester)
+                this.attachRequester(result.tracks, requester);
+            return result;
+        }
+        // Try loading tracks with retry
+        let result = null;
+        let lastError = null;
+        for (let attempt = 0; attempt <= Constants_1.DEFAULTS.MAX_SEARCH_RETRIES; attempt++) {
+            try {
+                result = await targetNode.loadTracks(identifier);
+                if (result && result.loadType !== "error")
+                    break;
+                lastError = result?.exception;
+            }
+            catch (err) {
+                lastError = err;
+                this.manager.logger.debug(`loadTracks attempt ${attempt + 1} failed for "${identifier.slice(0, 80)}": ${err}`);
+            }
+        }
+        if (!result) {
+            this.manager.logger.warn(`All loadTracks attempts failed for: ${identifier.slice(0, 80)}`);
+            return { loadType: "error", tracks: [], exception: { severity: "common", cause: String(lastError), message: String(lastError) } };
+        }
+        if (!result.tracks)
+            result.tracks = [];
         // Attach requester
-        if (requester)
-            result.tracks.forEach(t => { t.requester = requester; });
-        // Spotify fallback — if LavaSrc not installed
+        if (requester && result.tracks.length > 0) {
+            this.attachRequester(result.tracks, requester);
+        }
+        // Spotify fallback — if LavaSrc is not installed, try to resolve via metadata
         if ((result.loadType === "error" || result.loadType === "empty") && isUrl) {
-            const spotifyMatch = query.match(/spotify\.com\/track\/([a-zA-Z0-9]+)/);
-            if (spotifyMatch) {
-                const meta = await this.resolveSpotifyMeta(spotifyMatch[1]);
-                if (meta)
-                    return this.resolve(`${meta.title} ${meta.artist}`, "youtube", requester);
-            }
+            const spotifyFallback = await this.trySpotifyFallback(query, source, requester);
+            if (spotifyFallback)
+                return spotifyFallback;
         }
-        // Cache all returned tracks
-        for (const track of result.tracks) {
-            if (track.encoded)
-                this.manager.trackCache.set(track.encoded, track);
+        // Cache successful results
+        if (result.tracks.length > 0) {
+            this.manager.trackCache.setSearch(identifier, result);
+            // Also cache individual tracks
+            for (const track of result.tracks) {
+                if (track?.encoded) {
+                    this.manager.trackCache.set(track.encoded, track);
+                }
+            }
         }
         return result;
     }
+    /**
+     * Detect the source platform from a URL.
+     */
     detectSource(url) {
         for (const [source, patterns] of Object.entries(Constants_1.URL_PATTERNS)) {
-            if (patterns.some(p => p.test(url)))
+            if (patterns.some((p) => p.test(url)))
                 return source;
         }
         return null;
     }
+    // ─── Spotify Fallback ─────────────────────────────────────────────────
+    async trySpotifyFallback(query, _source, requester) {
+        // Single track
+        const trackMatch = query.match(/spotify\.com\/track\/([a-zA-Z0-9]+)/);
+        if (trackMatch?.[1]) {
+            const meta = await this.resolveSpotifyMeta(trackMatch[1]);
+            if (meta) {
+                return this.resolve(`${meta.title} ${meta.artist}`, "youtube", requester);
+            }
+        }
+        // Playlist
+        const playlistMatch = query.match(/spotify\.com\/playlist\/([a-zA-Z0-9]+)/);
+        if (playlistMatch?.[1]) {
+            const tracks = await this.resolveSpotifyPlaylist(playlistMatch[1]);
+            if (tracks.length > 0) {
+                // Resolve first 50 tracks via YouTube search
+                const resolved = [];
+                for (const meta of tracks.slice(0, 50)) {
+                    try {
+                        const result = await this.resolve(`${meta.title} ${meta.artist}`, "youtube", requester);
+                        if (result.tracks[0])
+                            resolved.push(result.tracks[0]);
+                    }
+                    catch {
+                        // Skip failed tracks
+                    }
+                }
+                if (resolved.length > 0) {
+                    return { loadType: "playlist", tracks: resolved, playlistInfo: { name: "Spotify Playlist", selectedTrack: 0 } };
+                }
+            }
+        }
+        // Album
+        const albumMatch = query.match(/spotify\.com\/album\/([a-zA-Z0-9]+)/);
+        if (albumMatch?.[1]) {
+            const tracks = await this.resolveSpotifyAlbum(albumMatch[1]);
+            if (tracks.length > 0) {
+                const resolved = [];
+                for (const meta of tracks.slice(0, 50)) {
+                    try {
+                        const result = await this.resolve(`${meta.title} ${meta.artist}`, "youtube", requester);
+                        if (result.tracks[0])
+                            resolved.push(result.tracks[0]);
+                    }
+                    catch {
+                        // Skip failed tracks
+                    }
+                }
+                if (resolved.length > 0) {
+                    return { loadType: "playlist", tracks: resolved, playlistInfo: { name: "Spotify Album", selectedTrack: 0 } };
+                }
+            }
+        }
+        return null;
+    }
+    // ─── Spotify API ──────────────────────────────────────────────────────
     async getSpotifyToken() {
         const opts = this.manager.options.spotify;
         if (!opts)
             return null;
-        if (this.spotifyToken && Date.now() < this.spotifyExpiry)
+        // Return cached token if still valid
+        if (this.spotifyToken && Date.now() < this.spotifyExpiry) {
             return this.spotifyToken;
+        }
+        // Prevent concurrent refresh
+        if (this.spotifyRefreshing) {
+            await this.sleep(1000);
+            return this.spotifyToken;
+        }
+        this.spotifyRefreshing = true;
         try {
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 10_000);
             const res = await fetch("https://accounts.spotify.com/api/token", {
                 method: "POST",
                 headers: {
@@ -53,31 +178,112 @@ class Resolver {
                     Authorization: `Basic ${Buffer.from(`${opts.clientId}:${opts.clientSecret}`).toString("base64")}`,
                 },
                 body: "grant_type=client_credentials",
+                signal: controller.signal,
             });
-            const data = await res.json();
+            clearTimeout(timeout);
+            if (!res.ok) {
+                this.manager.logger.warn(`Spotify token request failed: ${res.status}`);
+                return null;
+            }
+            const data = (await res.json());
             this.spotifyToken = data.access_token;
-            this.spotifyExpiry = Date.now() + data.expires_in * 1000 - 5000;
+            this.spotifyExpiry = Date.now() + data.expires_in * 1000 - Constants_1.DEFAULTS.SPOTIFY_TOKEN_REFRESH_BUFFER;
             return this.spotifyToken;
         }
-        catch {
+        catch (err) {
+            this.manager.logger.warn(`Spotify token refresh failed: ${err}`);
             return null;
         }
+        finally {
+            this.spotifyRefreshing = false;
+        }
     }
     async resolveSpotifyMeta(trackId) {
         const token = await this.getSpotifyToken();
         if (!token)
             return null;
         try {
-            const res = await fetch(`https://api.spotify.com/v1/tracks/${trackId}`, {
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 10_000);
+            const res = await fetch(`https://api.spotify.com/v1/tracks/${encodeURIComponent(trackId)}`, {
                 headers: { Authorization: `Bearer ${token}` },
+                signal: controller.signal,
             });
-            const data = await res.json();
-            return { title: data.name, artist: data.artists[0]?.name ?? "Unknown" };
+            clearTimeout(timeout);
+            if (!res.ok)
+                return null;
+            const data = (await res.json());
+            return {
+                title: data.name,
+                artist: data.artists?.[0]?.name ?? "Unknown",
+            };
         }
         catch {
             return null;
         }
     }
+    async resolveSpotifyPlaylist(playlistId) {
+        const token = await this.getSpotifyToken();
+        if (!token)
+            return [];
+        try {
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 15_000);
+            const res = await fetch(`https://api.spotify.com/v1/playlists/${encodeURIComponent(playlistId)}/tracks?limit=50`, {
+                headers: { Authorization: `Bearer ${token}` },
+                signal: controller.signal,
+            });
+            clearTimeout(timeout);
+            if (!res.ok)
+                return [];
+            const data = (await res.json());
+            return data.items
+                .filter((item) => item.track)
+                .map((item) => ({
+                title: item.track.name,
+                artist: item.track.artists?.[0]?.name ?? "Unknown",
+            }));
+        }
+        catch {
+            return [];
+        }
+    }
+    async resolveSpotifyAlbum(albumId) {
+        const token = await this.getSpotifyToken();
+        if (!token)
+            return [];
+        try {
+            const controller = new AbortController();
+            const timeout = setTimeout(() => controller.abort(), 15_000);
+            const res = await fetch(`https://api.spotify.com/v1/albums/${encodeURIComponent(albumId)}/tracks?limit=50`, {
+                headers: { Authorization: `Bearer ${token}` },
+                signal: controller.signal,
+            });
+            clearTimeout(timeout);
+            if (!res.ok)
+                return [];
+            const data = (await res.json());
+            return data.items.map((item) => ({
+                title: item.name,
+                artist: item.artists?.[0]?.name ?? "Unknown",
+            }));
+        }
+        catch {
+            return [];
+        }
+    }
+    // ─── Helpers ──────────────────────────────────────────────────────────
+    getLoadNode() {
+        return this.manager.getBestNode();
+    }
+    attachRequester(tracks, requester) {
+        for (const t of tracks) {
+            t["requester"] = requester;
+        }
+    }
+    sleep(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
 }
 exports.Resolver = Resolver;
 //# sourceMappingURL=Resolver.js.map

package/dist/Resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":";;;AAAA,2CAA4D;AAI5D,MAAa,QAAQ;IAKnB,YAAY,OAAe;QAHnB,iBAAY,GAAkB,IAAI,CAAC;QACnC,kBAAa,GAAW,CAAC,CAAC;QAGhC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,KAAa,EAAE,MAAoB,EAAE,SAAmB;QAC3E,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,2BAAe,CAAC,MAAM,CAAC,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;QAEvF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAEjD,mBAAmB;QACnB,IAAI,SAAS;YAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAI,CAAoC,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAE5G,8CAA8C;QAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,IAAI,KAAK,EAAE,CAAC;YAC1E,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACxE,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,IAAI,IAAI;oBAAE,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;QAED,4BAA4B;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,OAAO;gBAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,YAAY,CAAC,GAAW;QAC7B,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,wBAAY,CAAC,EAAE,CAAC;YAC9D,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAAE,OAAO,MAAsB,CAAC;QACrE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1C,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,IAAI,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,aAAa;YAAE,OAAO,IAAI,CAAC,YAAY,CAAC;QACnF,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,wCAAwC,EAAE;gBAChE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,cAAc,EAAE,mCAAmC;oBACnD,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;iBAClG;gBACD,IAAI,EAAE,+BAA+B;aACtC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAkD,CAAC;YAC9E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACtC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,IAAI,CAAC;YAChE,OAAO,IAAI,CAAC,YAAY,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,OAAe;QAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QACxB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,qCAAqC,OAAO,EAAE,EAAE;gBACtE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;aAC9C,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAmD,CAAC;YAC/E,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,SAAS,EAAE,CAAC;QAC1E,CAAC;QAAC,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;IAC1B,CAAC;CACF;AA1ED,4BA0EC"}
+{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":"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"}

package/dist/Rest.d.ts

@@ -1,24 +1,46 @@
+/** Yukimu v2.0.0 — REST Client with Retry, Rate Limiting & Circuit Breaker */
 import type { Node } from "./Node";
 import type { SearchResult, Track, NodeStats, NodeInfo } from "./types";
+/**
+ * REST client for communicating with a Lavalink node's HTTP API.
+ *
+ * Improvements from v1:
+ * - Automatic retry with exponential backoff for 429/5xx errors
+ * - Rate limit tracking (respects Retry-After headers)
+ * - Request timeout with proper AbortController cleanup
+ * - Uses VERSION constant for Client-Name header
+ * - Fixed v4.2+ data normalization bug (single track vs array)
+ * - Per-path rate limit awareness
+ * - Circuit breaker: after N consecutive failures, stop sending requests temporarily
+ */
 export declare class Rest {
-    private node;
+    private readonly node;
+    private rateLimit;
+    private consecutiveFailures;
+    private circuitOpenUntil;
+    private static readonly MAX_CONSECUTIVE_FAILURES;
+    private static readonly CIRCUIT_OPEN_DURATION;
     constructor(node: Node);
     get baseUrl(): string;
     get prefix(): string;
     get headers(): Record<string, string>;
-    request<T = unknown>(method: string, path: string, body?: unknown): Promise<T>;
+    request<T = unknown>(method: string, path: string, body?: unknown, retries?: number): Promise<T>;
     loadTracks(identifier: string): Promise<SearchResult>;
     decodeTrack(encoded: string): Promise<Track>;
     decodeTracks(encoded: string[]): Promise<Track[]>;
     getInfo(): Promise<NodeInfo>;
     getStats(): Promise<NodeStats>;
-    getVersion(): Promise<string>;
     updatePlayer(guildId: string, body: unknown, noReplace?: boolean): Promise<unknown>;
     destroyPlayer(guildId: string): Promise<void>;
     updateSession(body: {
         resuming?: boolean;
         timeout?: number;
     }): Promise<unknown>;
+    private normalizeV4;
     private normalizeV3;
+    private updateRateLimit;
+    private parseRetryAfter;
+    private getRetryDelay;
+    private sleep;
 }
 //# sourceMappingURL=Rest.d.ts.map

package/dist/Rest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Rest.d.ts","sourceRoot":"","sources":["../src/Rest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIxE,qBAAa,IAAI;IACf,OAAO,CAAC,IAAI,CAAO;gBAEP,IAAI,EAAE,IAAI;IAItB,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQpC;IAEY,OAAO,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IA6B9E,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAKrD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAI5C,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIjD,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI5B,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC;IAI9B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7B,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjF,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,aAAa,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5F,OAAO,CAAC,WAAW;CAcpB"}
+{"version":3,"file":"Rest.d.ts","sourceRoot":"","sources":["../src/Rest.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAI9E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAY,MAAM,SAAS,CAAC;AASlF;;;;;;;;;;;GAWG;AACH,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAO;IAC5B,OAAO,CAAC,SAAS,CAA+B;IAChD,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,gBAAgB,CAAK;IAE7B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAK;IACrD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAU;gBAE3C,IAAI,EAAE,IAAI;IAItB,IAAI,OAAO,IAAI,MAAM,CAGpB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQpC;IAIY,OAAO,CAAC,CAAC,GAAG,OAAO,EAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,OAAO,GAAE,MAAkC,GAC1C,OAAO,CAAC,CAAC,CAAC;IA4GA,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAUrD,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAI5C,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIjD,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI5B,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC;IAI9B,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjF,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,aAAa,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAO5F,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,WAAW;IAyCnB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,aAAa;IASrB,OAAO,CAAC,KAAK;CAGd"}

package/dist/Rest.js

@@ -1,9 +1,28 @@
 "use strict";
+/** Yukimu v2.0.0 — REST Client with Retry, Rate Limiting & Circuit Breaker */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rest = void 0;
 const YukimuError_1 = require("./errors/YukimuError");
-const TIMEOUT_MS = 15000;
+const Constants_1 = require("./Constants");
+/**
+ * REST client for communicating with a Lavalink node's HTTP API.
+ *
+ * Improvements from v1:
+ * - Automatic retry with exponential backoff for 429/5xx errors
+ * - Rate limit tracking (respects Retry-After headers)
+ * - Request timeout with proper AbortController cleanup
+ * - Uses VERSION constant for Client-Name header
+ * - Fixed v4.2+ data normalization bug (single track vs array)
+ * - Per-path rate limit awareness
+ * - Circuit breaker: after N consecutive failures, stop sending requests temporarily
+ */
 class Rest {
+    node;
+    rateLimit = null;
+    consecutiveFailures = 0;
+    circuitOpenUntil = 0;
+    static MAX_CONSECUTIVE_FAILURES = 5;
+    static CIRCUIT_OPEN_DURATION = 30_000;
     constructor(node) {
         this.node = node;
     }
@@ -18,41 +37,107 @@ class Rest {
         return {
             Authorization: this.node.options.password,
             "User-Id": this.node.manager.options.clientId,
-            "Client-Name": "Yukimu/1.2.0",
+            "Client-Name": Constants_1.CLIENT_NAME,
             "Content-Type": "application/json",
             ...(this.node.version === 3 ? { "Num-Shards": "1" } : {}),
         };
     }
-    async request(method, path, body) {
+    // ─── Core Request ───────────────────────────────────────────────────────
+    async request(method, path, body, retries = Constants_1.DEFAULTS.REST_MAX_RETRIES) {
+        // Circuit breaker check
+        if (Date.now() < this.circuitOpenUntil) {
+            throw new YukimuError_1.RestError(`Circuit breaker open for node "${this.node.options.name}" — too many consecutive failures`, 503, path);
+        }
+        // Rate limit check
+        if (this.rateLimit && this.rateLimit.remaining <= 0 && Date.now() < this.rateLimit.resetAt) {
+            const waitMs = this.rateLimit.resetAt - Date.now();
+            this.node.manager.logger.debug(`Rate limited on ${path}, waiting ${waitMs}ms`);
+            await this.sleep(waitMs);
+        }
         const url = `${this.baseUrl}${this.prefix}${path}`;
         const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), TIMEOUT_MS);
+        const timeout = setTimeout(() => controller.abort(), Constants_1.DEFAULTS.REST_TIMEOUT);
         try {
-            const res = await globalThis.fetch(url, {
+            const res = await fetch(url, {
                 method,
                 headers: this.headers,
-                body: body ? JSON.stringify(body) : undefined,
+                body: body !== undefined ? JSON.stringify(body) : undefined,
                 signal: controller.signal,
             });
             clearTimeout(timeout);
+            // Track rate limit headers
+            this.updateRateLimit(res);
+            // Handle rate limiting with retry
+            if (res.status === 429) {
+                const retryAfter = this.parseRetryAfter(res);
+                if (retries > 0) {
+                    this.node.manager.logger.warn(`Rate limited on ${method} ${path}, retrying in ${retryAfter}ms`);
+                    await this.sleep(retryAfter);
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                    return this.request(method, path, body, (retries - 1));
+                }
+                throw new YukimuError_1.RestError(`Rate limited on ${method} ${path}`, 429, path, retryAfter);
+            }
+            // Handle server errors with retry
+            if (res.status >= 500 && retries > 0) {
+                const delay = this.getRetryDelay(Constants_1.DEFAULTS.REST_MAX_RETRIES - retries);
+                this.node.manager.logger.warn(`Server error ${res.status} on ${method} ${path}, retrying in ${delay}ms`);
+                await this.sleep(delay);
+                return this.request(method, path, body, (retries - 1));
+            }
             if (!res.ok) {
                 const text = await res.text().catch(() => "Unknown error");
                 throw new YukimuError_1.RestError(`REST ${res.status} on ${method} ${path}: ${text}`, res.status, path);
             }
+            // Reset circuit breaker on success
+            this.consecutiveFailures = 0;
             if (res.status === 204)
                 return undefined;
-            return res.json();
+            const text = await res.text();
+            if (!text)
+                return null;
+            let parsed;
+            try {
+                parsed = JSON.parse(text);
+            }
+            catch {
+                return null;
+            }
+            // Normalize Lavalink v4.2+ response — uses "data" instead of "tracks"
+            if (parsed && "data" in parsed && !("tracks" in parsed)) {
+                const data = parsed["data"];
+                if (Array.isArray(data)) {
+                    parsed["tracks"] = data;
+                }
+                else if (data && typeof data === "object") {
+                    // Single track response — wrap in array
+                    parsed["tracks"] = [data];
+                }
+            }
+            return parsed;
         }
         catch (err) {
             clearTimeout(timeout);
-            if (err.name === "AbortError")
+            // Increment circuit breaker
+            this.consecutiveFailures++;
+            if (this.consecutiveFailures >= Rest.MAX_CONSECUTIVE_FAILURES) {
+                this.circuitOpenUntil = Date.now() + Rest.CIRCUIT_OPEN_DURATION;
+                this.node.manager.logger.error(`Circuit breaker opened for node "${this.node.options.name}" after ${this.consecutiveFailures} failures`);
+            }
+            if (err instanceof YukimuError_1.RestError)
+                throw err;
+            if (err instanceof Error && err.name === "AbortError") {
                 throw new YukimuError_1.RestError(`REST timeout on ${method} ${path}`, 408, path);
+            }
             throw err;
         }
     }
+    // ─── API Methods ────────────────────────────────────────────────────────
     async loadTracks(identifier) {
         const raw = await this.request("GET", `/loadtracks?identifier=${encodeURIComponent(identifier)}`);
-        return this.node.version === 3 ? this.normalizeV3(raw) : raw;
+        if (!raw)
+            return { loadType: "empty", tracks: [] };
+        return this.node.version === 3 ? this.normalizeV3(raw) : this.normalizeV4(raw);
     }
     async decodeTrack(encoded) {
         return this.request("GET", `/decodetrack?encodedTrack=${encodeURIComponent(encoded)}`);
@@ -66,10 +151,6 @@ class Rest {
     async getStats() {
         return this.request("GET", "/stats");
     }
-    async getVersion() {
-        const res = await globalThis.fetch(`${this.baseUrl}/version`, { headers: this.headers });
-        return res.text();
-    }
     async updatePlayer(guildId, body, noReplace = false) {
         const path = this.node.version === 4
             ? `/sessions/${this.node.sessionId}/players/${guildId}?noReplace=${noReplace}`
@@ -80,25 +161,86 @@ class Rest {
         const path = this.node.version === 4
             ? `/sessions/${this.node.sessionId}/players/${guildId}`
             : `/players/${guildId}`;
-        await this.request("DELETE", path);
+        await this.request("DELETE", path).catch(() => { });
     }
     async updateSession(body) {
-        if (this.node.version !== 4)
+        if (this.node.version !== 4 || !this.node.sessionId)
             return;
         return this.request("PATCH", `/sessions/${this.node.sessionId}`, body);
     }
+    // ─── Normalization ──────────────────────────────────────────────────────
+    normalizeV4(raw) {
+        const result = raw;
+        if (!result.tracks)
+            result.tracks = [];
+        return result;
+    }
     normalizeV3(raw) {
-        const loadType = (raw.loadType ?? "").toLowerCase();
-        const norm = (tracks) => (tracks ?? []).map((t) => ({ encoded: t.track ?? t.encoded, info: t.info, pluginInfo: t.pluginInfo ?? {} }));
+        const loadType = String(raw["loadType"] ?? "").toLowerCase();
+        const rawTracks = raw["tracks"];
+        const tracks = Array.isArray(rawTracks) ? rawTracks : [];
+        const norm = (items) => items.map((t) => {
+            const track = t;
+            return {
+                encoded: (track["track"] ?? track["encoded"]),
+                info: track["info"],
+                pluginInfo: (track["pluginInfo"] ?? {}),
+            };
+        });
         switch (loadType) {
-            case "track_loaded": return { loadType: "track", tracks: norm(raw.tracks) };
-            case "playlist_loaded": return { loadType: "playlist", tracks: norm(raw.tracks), playlistInfo: raw.playlistInfo };
-            case "search_result": return { loadType: "search", tracks: norm(raw.tracks) };
-            case "no_matches": return { loadType: "empty", tracks: [] };
-            case "load_failed": return { loadType: "error", tracks: [], exception: raw.exception };
-            default: return { loadType: "empty", tracks: [] };
+            case "track_loaded":
+                return { loadType: "track", tracks: norm(tracks) };
+            case "playlist_loaded":
+                return {
+                    loadType: "playlist",
+                    tracks: norm(tracks),
+                    playlistInfo: raw["playlistInfo"],
+                };
+            case "search_result":
+                return { loadType: "search", tracks: norm(tracks) };
+            case "no_matches":
+                return { loadType: "empty", tracks: [] };
+            case "load_failed":
+                return {
+                    loadType: "error",
+                    tracks: [],
+                    exception: raw["exception"],
+                };
+            default:
+                return { loadType: "empty", tracks: [] };
+        }
+    }
+    // ─── Helpers ────────────────────────────────────────────────────────────
+    updateRateLimit(res) {
+        const remaining = res.headers.get("x-ratelimit-remaining");
+        const reset = res.headers.get("x-ratelimit-reset");
+        if (remaining !== null && reset !== null) {
+            this.rateLimit = {
+                remaining: parseInt(remaining, 10),
+                resetAt: parseInt(reset, 10) * 1000,
+            };
         }
     }
+    parseRetryAfter(res) {
+        const retryAfter = res.headers.get("retry-after");
+        if (retryAfter) {
+            const seconds = parseFloat(retryAfter);
+            if (!isNaN(seconds))
+                return Math.ceil(seconds * 1000);
+        }
+        return 5000; // Default 5s
+    }
+    getRetryDelay(attempt) {
+        const base = Constants_1.DEFAULTS.REST_RETRY_BASE_DELAY;
+        const max = Constants_1.DEFAULTS.REST_RETRY_MAX_DELAY;
+        const delay = Math.min(base * Math.pow(2, attempt), max);
+        // Add jitter ±25%
+        const jitter = delay * 0.25 * (Math.random() * 2 - 1);
+        return Math.round(delay + jitter);
+    }
+    sleep(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
 }
 exports.Rest = Rest;
 //# sourceMappingURL=Rest.js.map