magmastream 2.9.0-dev.20 → 2.9.0-dev.22

package/dist/index.d.ts

@@ -594,6 +594,7 @@ declare class Queue extends Array<Track> implements IQueue {
     getPrevious(): Promise<Track[]>;
     addPrevious(track: Track | Track[]): Promise<void>;
     setPrevious(tracks: Track[]): Promise<void>;
+    popPrevious(): Promise<Track | null>;
     clearPrevious(): Promise<void>;
     /**
      * The total duration of the queue in milliseconds.
@@ -921,6 +922,8 @@ interface IQueue {
     getPrevious(): Promise<Track[]>;
     addPrevious(track: Track | Track[]): Promise<void>;
     setPrevious(track: Track | Track[]): Promise<void>;
+    /** Get newest track (index 0) */
+    popPrevious(): Promise<Track | null>;
     clearPrevious(): Promise<void>;
     size(): Promise<number>;
     totalSize(): Promise<number>;

package/dist/structures/Node.js

@@ -546,6 +546,7 @@ class Node {
                 await player.queue.setPrevious(trimmed);
             }
         }
+        player.set("skipFlag", false);
         const oldPlayer = player;
         // Handle track end events
         switch (reason) {

package/dist/structures/Player.js

@@ -663,25 +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 (!(await this.queue.getPrevious()).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 previousTracks = await this.queue.getPrevious();
-        const lastTrack = previousTracks.pop();
-        await this.queue.clearPrevious();
-        await this.queue.addPrevious(previousTracks);
-        // 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: {
@@ -689,8 +681,6 @@ class Player {
                 track: lastTrack,
             },
         });
-        // Reset the skip flag.
-        this.set("skipFlag", false);
         return this;
     }
     /**

package/dist/structures/Queue.js

@@ -46,6 +46,9 @@ class Queue extends Array {
     async setPrevious(tracks) {
         this.previous = [...tracks];
     }
+    async popPrevious() {
+        return this.previous.shift() || null; // get newest track
+    }
     async clearPrevious() {
         this.previous = [];
     }

package/dist/structures/RedisQueue.js

@@ -63,6 +63,10 @@ class RedisQueue {
         await this.redis.del(this.previousKey);
         await this.redis.rpush(this.previousKey, ...tracks.map(this.serialize));
     }
+    async popPrevious() {
+        const raw = await this.redis.lpop(this.previousKey); // get newest track (index 0)
+        return raw ? this.deserialize(raw) : null;
+    }
     async clearPrevious() {
         await this.redis.del(this.previousKey);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "magmastream",
-	"version": "2.9.0-dev.20",
+	"version": "2.9.0-dev.22",
 	"description": "A user-friendly Lavalink client designed for NodeJS.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",