magmastream 2.9.0-dev.2 → 2.9.0-dev.21

package/dist/structures/Node.js

@@ -235,11 +235,11 @@ class Node {
             identifier: this.options.identifier,
             address: this.address,
             sessionId: this.sessionId,
-            playerCount: this.manager.players.filter((p) => p.node == this).size,
+            playerCount: (await this.manager.players.filter((p) => p.node == this)).size,
         };
         this.manager.emit(Manager_1.ManagerEventTypes.Debug, `[NODE] Destroying node: ${JSON.stringify(debugInfo)}`);
         // Automove all players connected to that node
-        const players = this.manager.players.filter((p) => p.node == this);
+        const players = await this.manager.players.filter((p) => p.node == this);
         if (players.size) {
             players.forEach(async (player) => {
                 await player.autoMoveNode();
@@ -405,7 +405,7 @@ class Node {
                 this.stats = { ...payload };
                 break;
             case "playerUpdate":
-                player = this.manager.players.get(payload.guildId);
+                player = await this.manager.players.get(payload.guildId);
                 if (player && player.node.options.identifier !== this.options.identifier) {
                     return;
                 }
@@ -413,7 +413,7 @@ class Node {
                     player.position = payload.state.position || 0;
                 break;
             case "event":
-                player = this.manager.players.get(payload.guildId);
+                player = await this.manager.players.get(payload.guildId);
                 if (player && player.node.options.identifier !== this.options.identifier) {
                     return;
                 }
@@ -452,10 +452,10 @@ class Node {
     async handleEvent(payload) {
         if (!payload.guildId)
             return;
-        const player = this.manager.players.get(payload.guildId);
+        const player = await this.manager.players.get(payload.guildId);
         if (!player)
             return;
-        const track = player.queue.current;
+        const track = await player.queue.getCurrent();
         const type = payload.type;
         let error;
         switch (type) {
@@ -478,16 +478,16 @@ class Node {
                 this.socketClosed(player, payload);
                 break;
             case "SegmentsLoaded":
-                this.sponsorBlockSegmentLoaded(player, player.queue.current, payload);
+                this.sponsorBlockSegmentLoaded(player, track, payload);
                 break;
             case "SegmentSkipped":
-                this.sponsorBlockSegmentSkipped(player, player.queue.current, payload);
+                this.sponsorBlockSegmentSkipped(player, track, payload);
                 break;
             case "ChaptersLoaded":
-                this.sponsorBlockChaptersLoaded(player, player.queue.current, payload);
+                this.sponsorBlockChaptersLoaded(player, track, payload);
                 break;
             case "ChapterStarted":
-                this.sponsorBlockChapterStarted(player, player.queue.current, payload);
+                this.sponsorBlockChapterStarted(player, track, payload);
                 break;
             default:
                 error = new Error(`Node#event unknown event '${type}'.`);
@@ -536,12 +536,14 @@ class Node {
     async trackEnd(player, track, payload) {
         const { reason } = payload;
         const skipFlag = player.get("skipFlag");
-        if (!skipFlag && (player.queue.previous.length === 0 || (player.queue.previous[0] && player.queue.previous[0].track !== player.queue.current?.track))) {
-            // Store the current track in the previous tracks queue
-            player.queue.previous.push(player.queue.current);
-            // Limit the previous tracks queue to maxPreviousTracks
-            if (player.queue.previous.length > this.manager.options.maxPreviousTracks) {
-                player.queue.previous.shift();
+        const previous = await player.queue.getPrevious();
+        const current = await player.queue.getCurrent();
+        if (!skipFlag && (previous.length === 0 || (previous[0] && previous[0].track !== current?.track))) {
+            await player.queue.addPrevious(current);
+            const updated = await player.queue.getPrevious();
+            if (updated.length > this.manager.options.maxPreviousTracks) {
+                const trimmed = updated.slice(0, this.manager.options.maxPreviousTracks);
+                await player.queue.setPrevious(trimmed);
             }
         }
         const oldPlayer = player;
@@ -557,7 +559,7 @@ class Node {
                 break;
             case Utils_1.TrackEndReasonTypes.Stopped:
                 // If the track was forcibly replaced
-                if (player.queue.length) {
+                if (await player.queue.size()) {
                     await this.playNextTrack(player, track, payload);
                 }
                 else {
@@ -571,7 +573,7 @@ class Node {
                     break;
                 }
                 // If there's another track in the queue
-                if (player.queue.length) {
+                if (await player.queue.size()) {
                     await this.playNextTrack(player, track, payload);
                 }
                 else {
@@ -602,13 +604,16 @@ class Node {
      */
     async handleAutoplay(player, attempt = 0) {
         // If autoplay is not enabled or all attempts have failed, early exit
-        if (!player.isAutoplay || attempt === player.autoplayTries || !player.queue.previous.length)
+        if (!player.isAutoplay || attempt > player.autoplayTries || !(await player.queue.getPrevious()).length)
             return false;
-        const lastTrack = player.queue.previous[player.queue.previous.length - 1];
+        const PreviousQueue = await player.queue.getPrevious();
+        const lastTrack = PreviousQueue?.at(-1);
         lastTrack.requester = player.get("Internal_BotUser");
-        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(player, lastTrack, attempt);
+        if (!lastTrack)
+            return false;
+        const tracks = await Utils_1.AutoPlayUtils.getRecommendedTracks(lastTrack);
         if (tracks.length) {
-            player.queue.add(tracks[0]);
+            await player.queue.add(tracks[0]);
             await player.play();
             return true;
         }
@@ -629,8 +634,8 @@ class Node {
      * @private
      */
     async handleFailedTrack(player, track, payload) {
-        player.queue.current = player.queue.shift();
-        if (!player.queue.current) {
+        await player.queue.setCurrent(await player.queue.dequeue());
+        if (!(await player.queue.getCurrent())) {
             await this.queueEnd(player, track, payload);
             return;
         }
@@ -655,24 +660,28 @@ class Node {
         const { playNextOnEnd } = this.manager.options;
         if (trackRepeat) {
             // Prevent duplicate repeat insertion
-            if (queue[0] !== queue.current) {
-                queue.unshift(queue.current);
+            if (queue[0] !== (await queue.getCurrent())) {
+                await queue.enqueueFront(await queue.getCurrent());
             }
         }
         else if (queueRepeat) {
             // Prevent duplicate queue insertion
-            if (queue[queue.length - 1] !== queue.current) {
-                queue.add(queue.current);
+            if (queue[(await queue.size()) - 1] !== (await queue.getCurrent())) {
+                await queue.add(await queue.getCurrent());
             }
         }
         // Move to the next track
-        queue.current = queue.shift();
+        await queue.setCurrent(await queue.dequeue());
         // Emit track end event
         this.manager.emit(Manager_1.ManagerEventTypes.TrackEnd, player, track, payload);
         // If the track was stopped manually and no more tracks exist, end the queue
-        if (payload.reason === Utils_1.TrackEndReasonTypes.Stopped && !(queue.current = queue.shift())) {
-            await this.queueEnd(player, track, payload);
-            return;
+        if (payload.reason === Utils_1.TrackEndReasonTypes.Stopped) {
+            const next = await queue.dequeue();
+            await queue.setCurrent(next ?? null);
+            if (!next) {
+                await this.queueEnd(player, track, payload);
+                return;
+            }
         }
         // If autoplay is enabled, play the next track
         if (playNextOnEnd)
@@ -691,7 +700,7 @@ class Node {
      */
     async playNextTrack(player, track, payload) {
         // Shift the queue to set the next track as current
-        player.queue.current = player.queue.shift();
+        await player.queue.setCurrent(await player.queue.dequeue());
         // Emit the track end event
         this.manager.emit(Manager_1.ManagerEventTypes.TrackEnd, player, track, payload);
         // If autoplay is enabled, play the next track
@@ -708,19 +717,19 @@ class Node {
      * @returns {Promise<void>} A promise that resolves when the queue end processing is complete.
      */
     async queueEnd(player, track, payload) {
-        player.queue.current = null;
+        await player.queue.setCurrent(null);
         if (!player.isAutoplay) {
             player.playing = false;
             this.manager.emit(Manager_1.ManagerEventTypes.QueueEnd, player, track, payload);
             return;
         }
-        let attempts = 1;
+        let attempt = 1;
         let success = false;
-        while (attempts <= player.autoplayTries) {
-            success = await this.handleAutoplay(player, attempts);
+        while (attempt <= player.autoplayTries) {
+            success = await this.handleAutoplay(player, attempt);
             if (success)
                 return;
-            attempts++;
+            attempt++;
         }
         // If all attempts fail, reset the player state and emit queueEnd
         player.playing = false;

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.
@@ -220,20 +224,27 @@ class Player {
      */
     async destroy(disconnect = true) {
         const oldPlayer = this ? { ...this } : null;
+        if (this.state === Utils_1.StateTypes.Destroying || this.state === Utils_1.StateTypes.Disconnected) {
+            console.debug(`[Player#destroy] Already destroying/destroyed for ${this.guildId}`);
+            return false;
+        }
         this.state = Utils_1.StateTypes.Destroying;
         if (disconnect) {
-            await this.disconnect();
+            await this.disconnect().catch((err) => {
+                console.warn(`[Player#destroy] Failed to disconnect player ${this.guildId}:`, err);
+            });
         }
-        await this.node.rest.destroyPlayer(this.guildId);
-        this.queue.clear();
+        await this.node.rest.destroyPlayer(this.guildId).catch((err) => {
+            console.warn(`[Player#destroy] REST failed to destroy player ${this.guildId}:`, err);
+        });
+        await this.queue.clear();
+        await this.queue.clearPrevious();
+        await this.queue.setCurrent(null);
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, null, {
             changeType: Manager_1.PlayerStateEventTypes.PlayerDestroy,
         });
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerDestroy, this);
         const deleted = this.manager.players.delete(this.guildId);
-        if (!deleted) {
-            console.warn(`Failed to delete player with guildId: ${this.guildId}`);
-        }
         return deleted;
     }
     /**
@@ -307,9 +318,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 +330,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 +386,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 +520,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 +537,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 +575,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 +586,7 @@ class Player {
             guildId: this.guildId,
             data: {
                 position: 0,
-                encodedTrack: this.queue.current?.track,
+                encodedTrack: (await this.queue.getCurrent())?.track,
             },
         });
         return this;
@@ -591,10 +601,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,
@@ -653,22 +663,17 @@ class Player {
      * @emits {PlayerStateUpdate} - With {@link PlayerStateEventTypes.TrackChange} as the change type.
      */
     async previous() {
-        // Check if there are previous tracks in the queue.
-        if (!this.queue.previous.length) {
+        // Get and remove the most recent previous track
+        const lastTrack = await this.queue.popPrevious();
+        if (!lastTrack) {
             throw new Error("No previous track available.");
         }
         // Capture the current state of the player before making changes.
         const oldPlayer = { ...this };
-        // 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();
-        // Set the skip flag to true to prevent the onTrackEnd event from playing the next track.
+        // Set skip flag so trackEnd doesn't add current to previous
         this.set("skipFlag", true);
         await this.play(lastTrack);
-        // Add the current track back to the end of the previous queue
-        // if (currentTrackBeforeChange) this.queue.push(currentTrackBeforeChange);
-        // Emit a player state update event indicating the track change to previous.
+        // Emit state update
         this.manager.emit(Manager_1.ManagerEventTypes.PlayerStateUpdate, oldPlayer, this, {
             changeType: Manager_1.PlayerStateEventTypes.TrackChange,
             details: {
@@ -676,7 +681,6 @@ class Player {
                 track: lastTrack,
             },
         });
-        // Reset the skip flag.
         this.set("skipFlag", false);
         return this;
     }
@@ -688,7 +692,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 +702,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 +768,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 +799,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 = 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 +810,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,
@@ -841,9 +845,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 +862,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 +889,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 = {