streamify-audio 2.1.13 → 2.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamify-audio",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "description": "Dual-mode audio library: HTTP streaming proxy + Discord player (Lavalink alternative). Supports YouTube, Spotify, SoundCloud with audio filters.",
   "main": "index.js",
   "types": "index.d.ts",

package/src/discord/Player.js

@@ -47,6 +47,7 @@ class Player extends EventEmitter {
         this._prefetchedTrack = null;
         this._prefetching = false;
         this._changingStream = false;
+        this._manualSkip = false;
 
         this.autoLeave = {
             enabled: options.autoLeave?.enabled ?? true,
@@ -197,15 +198,17 @@ class Player extends EventEmitter {
 
             this.emit('trackEnd', track, 'finished');
 
-            const next = this.queue.shift();
-            if (next) {
-                this._playTrack(next);
-            } else {
-                if (this.autoplay.enabled && track) {
-                    await this._handleAutoplay(track);
+            if (!this._manualSkip) {
+                const next = this.queue.shift();
+                if (next) {
+                    this._playTrack(next);
                 } else {
-                    this.emit('queueEnd');
-                    this._resetInactivityTimeout();
+                    if (this.autoplay.enabled && track) {
+                        await this._handleAutoplay(track);
+                    } else {
+                        this.emit('queueEnd');
+                        this._resetInactivityTimeout();
+                    }
                 }
             }
         });
@@ -481,8 +484,23 @@ class Player extends EventEmitter {
             this.stream = null;
         }
 
+        this._manualSkip = true;
+        const next = this.queue.shift();
         this.audioPlayer.stop();
-        return this.queue.current;
+
+        if (next) {
+            await this._playTrack(next);
+
+            await new Promise(resolve => setTimeout(resolve, 250));
+
+            if (this.queue.current && this.queue.current.id !== next.id) {
+                this._manualSkip = false;
+                return this.queue.current;
+            }
+        }
+
+        this._manualSkip = false;
+        return this.queue.current || next;
     }
 
     async previous() {
@@ -495,8 +513,19 @@ class Player extends EventEmitter {
             this.stream = null;
         }
 
+        this._manualSkip = true;
         this.audioPlayer.stop();
-        return this._playTrack(prev);
+        await this._playTrack(prev);
+
+        await new Promise(resolve => setTimeout(resolve, 250));
+
+        if (this.queue.current && this.queue.current.id !== prev.id) {
+            this._manualSkip = false;
+            return this.queue.current;
+        }
+
+        this._manualSkip = false;
+        return this.queue.current || prev;
     }
 
     stop() {