magmastream 2.10.2-dev.1 → 2.10.2-dev.3

package/dist/structures/Rest.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rest = void 0;
-const tslib_1 = require("tslib");
-const axios_1 = tslib_1.__importDefault(require("axios"));
+const undici_1 = require("undici");
 const Enums_1 = require("./Enums");
 const Utils_1 = require("./Utils");
 const MagmastreamError_1 = require("./MagmastreamError");
@@ -105,43 +104,43 @@ class Rest {
      */
     async request(method, endpoint, body) {
         this.manager.emit(Enums_1.ManagerEventTypes.Debug, `[REST] ${method} request to ${endpoint} with body: ${Utils_1.JSONUtils.safe(body, 2)}`);
-        const config = {
-            method,
-            url: this.url + endpoint,
-            headers: {
-                "Content-Type": "application/json",
-                Authorization: this.password,
-            },
-            data: body,
-            timeout: this.node.options.apiRequestTimeoutMs,
-            validateStatus: () => true,
-        };
+        const controller = new AbortController();
+        const timeoutHandle = setTimeout(() => controller.abort(), this.node.options.apiRequestTimeoutMs);
         let response = null;
         try {
-            response = await (0, axios_1.default)(config);
+            response = await (0, undici_1.fetch)(this.url + endpoint, {
+                method,
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: this.password,
+                },
+                body: body !== undefined ? JSON.stringify(body) : undefined,
+                signal: controller.signal,
+            });
         }
         catch (e) {
-            const isTimeout = axios_1.default.isAxiosError(e) && e.code === "ECONNABORTED";
+            const isTimeout = e instanceof Error && e.name === "AbortError";
             const message = e instanceof Error ? e.message : "Unknown error";
             const error = new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED,
                 message: `${isTimeout ? "Timeout" : "Network error"} on ${method} ${endpoint}: ${message}`,
             });
-            // Emit so the node manager can react (e.g. trigger reconnection logic)
             this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this.node, error);
             return null;
         }
-        const { status, data } = response;
+        finally {
+            clearTimeout(timeoutHandle);
+        }
+        const { status } = response;
+        const data = status !== 204 ? await response.json() : null;
         if (status >= 200 && status < 300) {
             return data;
         }
         if (status === 404) {
             if (data?.message === "Guild not found") {
-                // Lavalink sometimes returns "Guild not found" for inactive players
                 return [];
             }
             if (data?.message === "Session not found") {
-                // Session expired — trigger reconnection instead of crashing
                 this.manager.emit(Enums_1.ManagerEventTypes.NodeError, this.node, new MagmastreamError_1.MagmaStreamError({ code: Enums_1.MagmaStreamErrorCode.REST_REQUEST_FAILED, message: "Session not found" }));
                 return [];
             }

package/dist/structures/Types.d.ts

@@ -1237,6 +1237,32 @@ export interface ReverbOptions {
     roomSize?: number;
     damping?: number;
 }
+export interface LastFmResponse {
+    error?: number;
+    toptracks?: {
+        track: Array<{
+            name: string;
+            artist: {
+                name: string;
+            };
+        }>;
+    };
+    similartracks?: {
+        track: Array<{
+            name: string;
+            artist: {
+                name: string;
+            };
+        }>;
+    };
+    results?: {
+        trackmatches?: {
+            track: Array<{
+                artist: string;
+            }>;
+        };
+    };
+}
 /**
  * Queue interface
  */

package/dist/structures/Utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONUtils = exports.Structure = exports.PlayerUtils = exports.AutoPlayUtils = exports.TrackUtils = void 0;
 const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/no-require-imports */
-const axios_1 = require("axios");
+const undici_1 = require("undici");
 const jsdom_1 = require("jsdom");
 const Enums_1 = require("./Enums");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -250,11 +250,12 @@ class AutoPlayUtils {
             if (!title) {
                 // No title provided, search for the artist's top tracks
                 const noTitleUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-                const response = await (0, axios_1.get)(noTitleUrl);
-                if (response.data.error || !response.data.toptracks?.track?.length) {
+                const response = await (0, undici_1.fetch)(noTitleUrl);
+                const data = (await response.json());
+                if (data.error || !data.toptracks?.track?.length) {
                     return [];
                 }
-                const randomTrack = response.data.toptracks.track[Math.floor(Math.random() * response.data.toptracks.track.length)];
+                const randomTrack = data.toptracks.track[Math.floor(Math.random() * data.toptracks.track.length)];
                 const resolvedTracks = await this.resolveTracksFromQuery(`${randomTrack.artist.name} - ${randomTrack.name}`, this.manager.options.defaultSearchPlatform, track.requester);
                 if (!resolvedTracks.length)
                     return [];
@@ -263,8 +264,9 @@ class AutoPlayUtils {
             if (!artist) {
                 // No artist provided, search for the track title
                 const noArtistUrl = `https://ws.audioscrobbler.com/2.0/?method=track.search&track=${title}&api_key=${apiKey}&format=json`;
-                const response = await (0, axios_1.get)(noArtistUrl);
-                artist = response.data.results.trackmatches?.track?.[0]?.artist;
+                const response = await (0, undici_1.fetch)(noArtistUrl);
+                const noArtistData = (await response.json());
+                artist = noArtistData.results?.trackmatches?.track?.[0]?.artist;
                 if (!artist) {
                     return [];
                 }
@@ -272,22 +274,24 @@ class AutoPlayUtils {
         }
         // Search for similar tracks to the current track
         const url = `https://ws.audioscrobbler.com/2.0/?method=track.getSimilar&artist=${artist}&track=${title}&limit=10&autocorrect=1&api_key=${apiKey}&format=json`;
-        let response;
+        let similarData;
         try {
-            response = await (0, axios_1.get)(url);
+            const response = await (0, undici_1.fetch)(url);
+            similarData = (await response.json());
         }
         catch (error) {
             console.error("[AutoPlay] Error fetching similar tracks from Last.fm:", error);
             return [];
         }
-        if (response.data.error || !response.data.similartracks?.track?.length) {
+        if (similarData.error || !similarData.similartracks?.track?.length) {
             // Retry the request if the first attempt fails
             const retryUrl = `https://ws.audioscrobbler.com/2.0/?method=artist.getTopTracks&artist=${artist}&autocorrect=1&api_key=${apiKey}&format=json`;
-            const retryResponse = await (0, axios_1.get)(retryUrl);
-            if (retryResponse.data.error || !retryResponse.data.toptracks?.track?.length) {
+            const retryResponse = await (0, undici_1.fetch)(retryUrl);
+            const retryData = (await retryResponse.json());
+            if (retryData.error || !retryData.toptracks?.track?.length) {
                 return [];
             }
-            const randomTrack = retryResponse.data.toptracks.track[Math.floor(Math.random() * retryResponse.data.toptracks.track.length)];
+            const randomTrack = retryData.toptracks.track[Math.floor(Math.random() * retryData.toptracks.track.length)];
             const resolvedTracks = await this.resolveTracksFromQuery(`${randomTrack.artist.name} - ${randomTrack.name}`, this.manager.options.defaultSearchPlatform, track.requester);
             if (!resolvedTracks.length)
                 return [];
@@ -297,7 +301,7 @@ class AutoPlayUtils {
             }
             return filteredTracks;
         }
-        const randomTrack = response.data.similartracks.track.sort(() => Math.random() - 0.5).shift();
+        const randomTrack = similarData.similartracks.track.sort(() => Math.random() - 0.5).shift();
         if (!randomTrack) {
             return [];
         }
@@ -356,15 +360,21 @@ class AutoPlayUtils {
                         return [];
                     track = resolvedTrack;
                 }
+                let html;
                 try {
-                    const recommendedRes = await (0, axios_1.get)(`${track.uri}/recommended`).catch((err) => {
-                        console.error(`[AutoPlay] Failed to fetch SoundCloud recommendations. Status: ${err.response?.status || "Unknown"}`, err.message);
-                        return null;
-                    });
-                    if (!recommendedRes) {
+                    let recommendedRes = null;
+                    try {
+                        recommendedRes = await (0, undici_1.fetch)(`${track.uri}/recommended`);
+                    }
+                    catch (err) {
+                        console.error(`[AutoPlay] Failed to fetch SoundCloud recommendations.`, err);
+                        return [];
+                    }
+                    if (!recommendedRes.ok) {
+                        console.error(`[AutoPlay] Failed to fetch SoundCloud recommendations. Status: ${recommendedRes.status}`);
                         return [];
                     }
-                    const html = recommendedRes.data;
+                    html = await recommendedRes.text();
                     const dom = new jsdom_1.JSDOM(html);
                     const window = dom.window;
                     // Narrow the element types using instanceof

package/dist/wrappers/discord.js.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DiscordJSManager = void 0;
 const Manager_1 = require("../structures/Manager");
+const module_1 = require("module");
 const MagmastreamError_1 = require("../structures/MagmastreamError");
 const Enums_1 = require("../structures/Enums");
 const GUILD_VOICE_STATES_INTENT = 128;
+const moduleRequire = (0, module_1.createRequire)(__filename);
 /**
  * Discord.js wrapper for Magmastream.
  */
@@ -13,6 +15,8 @@ class DiscordJSManager extends Manager_1.Manager {
     constructor(client, options) {
         super(options, true);
         this.client = client;
+        const { version: djsVersion } = moduleRequire("discord.js/package.json");
+        const [major, minor] = djsVersion.split(".").map(Number);
         if (!this.client.options.intents.has(GUILD_VOICE_STATES_INTENT)) {
             throw new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.INTENT_MISSING,
@@ -28,8 +32,12 @@ class DiscordJSManager extends Manager_1.Manager {
                 if (!this.options.clientId)
                     this.options.clientId = this.client.user.id;
             };
-            this.client.once("clientReady", handler);
-            this.client.once("ready", handler);
+            if (major > 14 || (major === 14 && minor >= 22)) {
+                this.client.once("clientReady", handler);
+            }
+            else {
+                this.client.once("ready", handler);
+            }
         };
         attachReadyHandler();
         client.on("raw", async (data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.2-dev.1",
+    "version": "2.10.2-dev.3",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -36,13 +36,13 @@
     },
     "dependencies": {
         "@discordjs/collection": "^2.1.1",
-        "axios": "^1.13.6",
         "events": "^3.3.0",
         "ioredis": "^5.10.0",
         "jsdom": "^28.1.0",
         "lodash": "^4.17.23",
         "safe-stable-stringify": "^2.5.0",
         "tslib": "^2.8.1",
+        "undici": "7.24.6",
         "ws": "^8.19.0"
     },
     "optionalDependencies": {
@@ -53,9 +53,6 @@
         "oceanic.js": "1.14.x",
         "seyfert": "4.x"
     },
-    "overrides": {
-        "undici": "^7.0.0"
-    },
     "engines": {
         "node": ">=20.19.0"
     },