magmastream 2.10.2-alpha.7 → 2.10.2-alpha.9

package/dist/structures/Enums.d.ts

@@ -16,6 +16,7 @@ export declare enum AutoPlayPlatform {
     Tidal = "tidal",
     VKMusic = "vkmusic",
     Qobuz = "qobuz",
+    Yandex = "yandex",
     YouTube = "youtube"
 }
 /**
@@ -55,6 +56,7 @@ export declare enum LoadTypes {
  */
 export declare enum SearchPlatform {
     AppleMusic = "amsearch",
+    Yandex = "ymsearch",
     Audius = "audsearch",
     Bandcamp = "bcsearch",
     Deezer = "dzsearch",
@@ -103,6 +105,7 @@ export declare enum TrackSourceTypes {
     TikTok = "TikTok",
     Flowertts = "Flowertts",
     Ocremix = "Ocremix",
+    Yandex = "Yandex",
     Mixcloud = "Mixcloud",
     Soundgasm = "Soundgasm",
     Reddit = "Reddit",

package/dist/structures/Enums.js

@@ -21,6 +21,7 @@ var AutoPlayPlatform;
     AutoPlayPlatform["Tidal"] = "tidal";
     AutoPlayPlatform["VKMusic"] = "vkmusic";
     AutoPlayPlatform["Qobuz"] = "qobuz";
+    AutoPlayPlatform["Yandex"] = "yandex";
     AutoPlayPlatform["YouTube"] = "youtube";
 })(AutoPlayPlatform || (exports.AutoPlayPlatform = AutoPlayPlatform = {}));
 /**
@@ -63,6 +64,7 @@ var LoadTypes;
 var SearchPlatform;
 (function (SearchPlatform) {
     SearchPlatform["AppleMusic"] = "amsearch";
+    SearchPlatform["Yandex"] = "ymsearch";
     SearchPlatform["Audius"] = "audsearch";
     SearchPlatform["Bandcamp"] = "bcsearch";
     SearchPlatform["Deezer"] = "dzsearch";
@@ -113,6 +115,7 @@ var TrackSourceTypes;
     TrackSourceTypes["TikTok"] = "TikTok";
     TrackSourceTypes["Flowertts"] = "Flowertts";
     TrackSourceTypes["Ocremix"] = "Ocremix";
+    TrackSourceTypes["Yandex"] = "Yandex";
     TrackSourceTypes["Mixcloud"] = "Mixcloud";
     TrackSourceTypes["Soundgasm"] = "Soundgasm";
     TrackSourceTypes["Reddit"] = "Reddit";

package/dist/structures/Player.js

@@ -372,7 +372,8 @@ class Player {
         if (typeof optionsOrTrack !== "undefined" && Utils_1.TrackUtils.validate(optionsOrTrack)) {
             await this.queue.setCurrent(optionsOrTrack);
         }
-        if (!(await this.queue.getCurrent())) {
+        const currentTrack = await this.queue.getCurrent();
+        if (!currentTrack) {
             const error = new MagmastreamError_1.MagmaStreamError({
                 code: Enums_1.MagmaStreamErrorCode.PLAYER_QUEUE_EMPTY,
                 message: "The queue is empty.",
@@ -384,16 +385,17 @@ class Player {
         const finalOptions = playOptions ? playOptions : isPlayOptions(optionsOrTrack) ? optionsOrTrack : {};
         await this.node.rest.updatePlayer({
             guildId: this.guildId,
+            noReplace: finalOptions.noReplace,
             data: {
                 track: {
-                    encoded: (await this.queue.getCurrent()).track,
+                    encoded: currentTrack.track,
                 },
-                ...finalOptions,
-                position: finalOptions.startTime || 0,
+                ...(typeof finalOptions.startTime === "number" && { position: finalOptions.startTime }),
+                ...(typeof finalOptions.endTime === "number" && finalOptions.endTime > 0 && { endTime: finalOptions.endTime }),
             },
         });
         this.playing = true;
-        this.position = finalOptions.startTime || 0;
+        this.position = finalOptions.startTime ?? 0;
         return this;
     }
     /**
@@ -683,7 +685,8 @@ class Player {
      */
     async restart() {
         // Check if there is a current track in the queue
-        if (!(await this.queue.getCurrent())?.track) {
+        const currentTrack = await this.queue.getCurrent();
+        if (!currentTrack?.track) {
             // If the queue has tracks, play the next one
             if (await this.queue.size())
                 await this.play();
@@ -695,8 +698,8 @@ class Player {
             data: {
                 position: 0,
                 track: {
-                    encoded: (await this.queue.getCurrent())?.track,
-                    userData: (await this.queue.getCurrent())?.requester,
+                    encoded: currentTrack.track,
+                    userData: currentTrack.requester,
                 },
             },
         });
@@ -837,7 +840,8 @@ class Player {
      * @emits {PlayerStateUpdate} - With {@link PlayerStateEventTypes.TrackChange} as the change type.
      */
     async seek(position) {
-        if (!(await this.queue.getCurrent()))
+        const currentTrack = await this.queue.getCurrent();
+        if (!currentTrack)
             return undefined;
         position = Number(position);
         // Check if the position is valid.
@@ -850,8 +854,8 @@ class Player {
         // Get the old player state.
         const oldPlayer = this ? { ...this } : null;
         // Clamp the position to ensure it is within the valid range.
-        if (position < 0 || position > (await this.queue.getCurrent()).duration) {
-            position = Math.max(Math.min(position, (await this.queue.getCurrent()).duration), 0);
+        if (position < 0 || position > currentTrack.duration) {
+            position = Math.max(Math.min(position, currentTrack.duration), 0);
         }
         // Update the player's position.
         this.position = position;
@@ -925,7 +929,7 @@ class Player {
         }
         try {
             const playerPosition = this.position;
-            const currentTrack = (await this.queue.getCurrent()) ? await this.queue.getCurrent() : null;
+            const currentTrack = await this.queue.getCurrent();
             // Safely get voice state properties with null checks
             const sessionId = this.voiceState?.sessionId;
             const token = this.voiceState?.event?.token;

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 = tslib_1.__importDefault(require("axios"));
+const axios_1 = require("axios");
 const jsdom_1 = require("jsdom");
 const Enums_1 = require("./Enums");
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -250,7 +250,7 @@ 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 axios_1.default.get(noTitleUrl);
+                const response = await (0, axios_1.get)(noTitleUrl);
                 if (response.data.error || !response.data.toptracks?.track?.length) {
                     return [];
                 }
@@ -263,7 +263,7 @@ 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 axios_1.default.get(noArtistUrl);
+                const response = await (0, axios_1.get)(noArtistUrl);
                 artist = response.data.results.trackmatches?.track?.[0]?.artist;
                 if (!artist) {
                     return [];
@@ -274,7 +274,7 @@ class AutoPlayUtils {
         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;
         try {
-            response = await axios_1.default.get(url);
+            response = await (0, axios_1.get)(url);
         }
         catch (error) {
             console.error("[AutoPlay] Error fetching similar tracks from Last.fm:", error);
@@ -283,7 +283,7 @@ class AutoPlayUtils {
         if (response.data.error || !response.data.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 axios_1.default.get(retryUrl);
+            const retryResponse = await (0, axios_1.get)(retryUrl);
             if (retryResponse.data.error || !retryResponse.data.toptracks?.track?.length) {
                 return [];
             }
@@ -357,7 +357,7 @@ class AutoPlayUtils {
                     track = resolvedTrack;
                 }
                 try {
-                    const recommendedRes = await axios_1.default.get(`${track.uri}/recommended`).catch((err) => {
+                    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;
                     });
@@ -465,6 +465,19 @@ class AutoPlayUtils {
                 const tracks = this.buildTracksFromResponse(recommendedResult, requester);
                 return tracks;
             }
+            case Enums_1.AutoPlayPlatform.Yandex: {
+                const allowedYandexHosts = ["music.yandex.ru", "yandex.ru", "www.yandex.ru"];
+                if (!allowedYandexHosts.includes(parsedURL.host)) {
+                    const resolvedTrack = await this.resolveFirstTrackFromQuery(`${track.author} - ${track.title}`, Enums_1.SearchPlatform.Yandex, requester);
+                    if (!resolvedTrack)
+                        return [];
+                    track = resolvedTrack;
+                }
+                const identifier = `ymrec:${track.identifier}`;
+                const recommendedResult = (await this.manager.useableNode.rest.get(`/v4/loadtracks?identifier=${encodeURIComponent(identifier)}`));
+                const tracks = this.buildTracksFromResponse(recommendedResult, requester);
+                return tracks;
+            }
             default:
                 return [];
         }

package/dist/utils/nodeCheck.js

@@ -16,7 +16,7 @@ function nodeCheck(options) {
         });
     }
     const { host, identifier, password, port, enableSessionResumeOption, sessionTimeoutSeconds, maxRetryAttempts, retryDelayMs, useSSL, nodePriority } = options;
-    if (typeof host !== "string" || !/.+/.test(host)) {
+    if (!host || typeof host !== "string") {
         throw new MagmastreamError_1.MagmaStreamError({
             code: Enums_1.MagmaStreamErrorCode.NODE_INVALID_CONFIG,
             message: 'Node option "host" must be present and be a non-empty string.',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "magmastream",
-    "version": "2.10.2-alpha.7",
+    "version": "2.10.2-alpha.9",
     "description": "A user-friendly Lavalink client designed for NodeJS.",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",