magmastream 2.9.0-dev.1 → 2.9.0-dev.11

package/dist/structures/Player.js

@@ -9,6 +9,7 @@ const Queue_1 = require("./Queue");
 const Utils_1 = require("./Utils");
 const _ = tslib_1.__importStar(require("lodash"));
 const playerCheck_1 = tslib_1.__importDefault(require("../utils/playerCheck"));
+const RedisQueue_1 = require("./RedisQueue");
 class Player {
     options;
     /** The Queue for the Player. */
@@ -50,7 +51,7 @@ class Player {
     /** The autoplay state of the player. */
     isAutoplay = false;
     /** The number of times to try autoplay before emitting queueEnd. */
-    autoplayTries = null;
+    autoplayTries = 3;
     static _manager;
     data = {};
     dynamicLoopInterval = null;
@@ -67,10 +68,6 @@ class Player {
             this.manager = Utils_1.Structure.get("Player")._manager;
         if (!this.manager)
             throw new RangeError("Manager has not been initiated.");
-        // If a player with the same guild ID already exists, return it.
-        if (this.manager.players.has(options.guildId)) {
-            return this.manager.players.get(options.guildId);
-        }
         // Check the player options for errors.
         (0, playerCheck_1.default)(options);
         // Set the guild ID and voice state.
@@ -91,8 +88,15 @@ class Player {
         if (!this.node)
             throw new RangeError("No available nodes.");
         // Initialize the queue with the guild ID and manager.
-        this.queue = new Queue_1.Queue(this.guildId, this.manager);
-        this.queue.previous = new Array();
+        if (this.manager.options.stateStorage.type === Manager_1.StateStorageType.Redis) {
+            this.queue = new RedisQueue_1.RedisQueue(this.guildId, this.manager);
+        }
+        else {
+            this.queue = new Queue_1.Queue(this.guildId, this.manager);
+        }
+        if (this.queue instanceof Queue_1.Queue) {
+            this.queue.previous = [];
+        }
         // Add the player to the manager's player collection.
         this.manager.players.set(options.guildId, this);
         // Set the initial volume.
@@ -225,7 +229,7 @@ class Player {
             await this.disconnect();
         }
         await this.node.rest.destroyPlayer(this.guildId);
-        this.queue.clear();
+        await this.queue.clear();
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, null, {
             changeType: Manager_1.PlayerStateEventTypes.PlayerDestroy,
         });
@@ -307,9 +311,9 @@ class Player {
     }
     async play(optionsOrTrack, playOptions) {
         if (typeof optionsOrTrack !== "undefined" && Utils_1.TrackUtils.validate(optionsOrTrack)) {
-            this.queue.current = optionsOrTrack;
+            await this.queue.setCurrent(optionsOrTrack);
         }
-        if (!this.queue.current)
+        if (!(await this.queue.getCurrent()))
             throw new RangeError("No current track.");
         const finalOptions = playOptions
             ? playOptions
@@ -319,7 +323,7 @@ class Player {
         await this.node.rest.updatePlayer({
             guildId: this.guildId,
             data: {
-                encodedTrack: this.queue.current?.track,
+                encodedTrack: (await this.queue.getCurrent()).track,
                 ...finalOptions,
             },
         });
@@ -375,7 +379,7 @@ class Player {
      * @returns {Promise<Track[]>} - Array of recommended tracks.
      */
     async getRecommendedTracks(track) {
-        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(this, track);
+        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(track);
         return tracks;
     }
     /**
@@ -509,13 +513,13 @@ class Player {
      * @throws {TypeError} If the repeat parameter is not a boolean.
      * @throws {RangeError} If the queue size is less than or equal to 1.
      */
-    setDynamicRepeat(repeat, ms) {
+    async setDynamicRepeat(repeat, ms) {
         // Validate the repeat parameter
         if (typeof repeat !== "boolean") {
             throw new TypeError('Repeat can only be "true" or "false".');
         }
         // Ensure the queue has more than one track for dynamic repeat
-        if (this.queue.size <= 1) {
+        if ((await this.queue.size()) <= 1) {
             throw new RangeError("The queue size must be greater than 1.");
         }
         // Clone the current player state for comparison
@@ -526,15 +530,14 @@ class Player {
             this.queueRepeat = false;
             this.dynamicRepeat = true;
             // Set an interval to shuffle the queue periodically
-            this.dynamicLoopInterval = setInterval(() => {
+            this.dynamicLoopInterval = setInterval(async () => {
                 if (!this.dynamicRepeat)
                     return;
                 // Shuffle the queue and replace it with the shuffled tracks
-                const shuffled = _.shuffle(this.queue);
-                this.queue.clear();
-                shuffled.forEach((track) => {
-                    this.queue.add(track);
-                });
+                const tracks = await this.queue.getTracks();
+                const shuffled = _.shuffle(tracks);
+                await this.queue.clear();
+                await this.queue.add(shuffled);
             }, ms);
             // Store the ms value
             this.dynamicRepeatIntervalMs = ms;
@@ -565,9 +568,9 @@ class Player {
      */
     async restart() {
         // Check if there is a current track in the queue
-        if (!this.queue.current?.track) {
+        if (!(await this.queue.getCurrent())?.track) {
             // If the queue has tracks, play the next one
-            if (this.queue.length)
+            if (await this.queue.size())
                 await this.play();
             return this;
         }
@@ -576,7 +579,7 @@ class Player {
             guildId: this.guildId,
             data: {
                 position: 0,
-                encodedTrack: this.queue.current?.track,
+                encodedTrack: (await this.queue.getCurrent())?.track,
             },
         });
         return this;
@@ -591,10 +594,10 @@ class Player {
         const oldPlayer = { ...this };
         let removedTracks = [];
         if (typeof amount === "number" && amount > 1) {
-            if (amount > this.queue.length)
+            if (amount > (await this.queue.size()))
                 throw new RangeError("Cannot skip more than the queue length.");
-            removedTracks = this.queue.slice(0, amount - 1);
-            this.queue.splice(0, amount - 1);
+            removedTracks = await this.queue.getSlice(0, amount - 1);
+            await this.queue.modifyAt(0, amount - 1);
         }
         this.node.rest.updatePlayer({
             guildId: this.guildId,
@@ -654,7 +657,7 @@ class Player {
      */
     async previous() {
         // Check if there are previous tracks in the queue.
-        if (!this.queue.previous.length) {
+        if (!(await this.queue.getPrevious()).length) {
             throw new Error("No previous track available.");
         }
         // Capture the current state of the player before making changes.
@@ -662,7 +665,7 @@ class Player {
         // Store the current track before changing it.
         // let currentTrackBeforeChange: Track | null = this.queue.current ? (this.queue.current as Track) : null;
         // Get the last played track and remove it from the history
-        const lastTrack = this.queue.previous.pop();
+        const lastTrack = (await this.queue.getPrevious()).pop();
         // Set the skip flag to true to prevent the onTrackEnd event from playing the next track.
         this.set("skipFlag", true);
         await this.play(lastTrack);
@@ -688,7 +691,7 @@ class Player {
      * @emits {PlayerStateUpdate} - With {@link PlayerStateEventTypes.TrackChange} as the change type.
      */
     async seek(position) {
-        if (!this.queue.current)
+        if (!(await this.queue.getCurrent()))
             return undefined;
         position = Number(position);
         // Check if the position is valid.
@@ -698,8 +701,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 > this.queue.current.duration) {
-            position = Math.max(Math.min(position, this.queue.current.duration), 0);
+        if (position < 0 || position > (await this.queue.getCurrent()).duration) {
+            position = Math.max(Math.min(position, (await this.queue.getCurrent()).duration), 0);
         }
         // Update the player's position.
         this.position = position;
@@ -764,7 +767,7 @@ class Player {
         try {
             const playerPosition = this.position;
             const { sessionId, event: { token, endpoint }, } = this.voiceState;
-            const currentTrack = this.queue.current ? this.queue.current : null;
+            const currentTrack = (await this.queue.getCurrent()) ? await this.queue.getCurrent() : null;
             await this.node.rest.destroyPlayer(this.guildId).catch(() => { });
             this.manager.players.delete(this.guildId);
             this.node = node;
@@ -795,7 +798,7 @@ class Player {
         if (!newOptions.textChannelId)
             throw new Error("Text channel ID is required");
         // Check if a player already exists for the new guild
-        let newPlayer = this.manager.players.get(newOptions.guildId);
+        let newPlayer = await this.manager.getPlayer(newOptions.guildId);
         // If the player already exists and force is false, return the existing player
         if (newPlayer && !force)
             return newPlayer;
@@ -806,9 +809,9 @@ class Player {
             volume: this.volume,
             position: this.position,
             queue: {
-                current: this.queue.current,
-                tracks: [...this.queue],
-                previous: [...this.queue.previous],
+                current: await this.queue.getCurrent(),
+                tracks: [...(await this.queue.getTracks())],
+                previous: [...(await this.queue.getPrevious())],
             },
             trackRepeat: this.trackRepeat,
             queueRepeat: this.queueRepeat,
@@ -828,7 +831,7 @@ class Player {
         newOptions.selfMute = newOptions.selfMute ?? oldPlayerProperties.selfMute;
         newOptions.volume = newOptions.volume ?? oldPlayerProperties.volume;
         // Deep clone the current player
-        const clonedPlayer = this.manager.create(newOptions);
+        const clonedPlayer = await this.manager.create(newOptions);
         // Connect the cloned player to the new voice channel
         clonedPlayer.connect();
         // Update the player's state on the Lavalink node
@@ -841,9 +844,9 @@ class Player {
                 encodedTrack: oldPlayerProperties.queue.current?.track,
             },
         });
-        clonedPlayer.queue.current = oldPlayerProperties.queue.current;
-        clonedPlayer.queue.previous = oldPlayerProperties.queue.previous;
-        clonedPlayer.queue.add(oldPlayerProperties.queue.tracks);
+        await clonedPlayer.queue.setCurrent(oldPlayerProperties.queue.current);
+        await clonedPlayer.queue.addPrevious(oldPlayerProperties.queue.previous);
+        await clonedPlayer.queue.add(oldPlayerProperties.queue.tracks);
         clonedPlayer.filters = oldPlayerProperties.filters;
         clonedPlayer.isAutoplay = oldPlayerProperties.isAutoplay;
         clonedPlayer.nowPlayingMessage = oldPlayerProperties.nowPlayingMessage;
@@ -858,7 +861,7 @@ class Player {
         // Debug information
         const debugInfo = {
             success: true,
-            message: `Transferred ${clonedPlayer.queue.length} tracks successfully to <#${newOptions.voiceChannelId}> bound to <#${newOptions.textChannelId}>.`,
+            message: `Transferred ${await clonedPlayer.queue.size()} tracks successfully to <#${newOptions.voiceChannelId}> bound to <#${newOptions.textChannelId}>.`,
             player: {
                 guildId: clonedPlayer.guildId,
                 voiceChannelId: clonedPlayer.voiceChannelId,
@@ -885,7 +888,7 @@ class Player {
             throw new RangeError(`There is no lavalyrics-plugin available in the Lavalink node: ${this.node.options.identifier}`);
         }
         // Fetch the lyrics for the current track from the Lavalink node
-        let result = (await this.node.getLyrics(this.queue.current, skipTrackSource));
+        let result = (await this.node.getLyrics(await this.queue.getCurrent(), skipTrackSource));
         // If no lyrics are found, return a default empty lyrics object
         if (!result) {
             result = {