ziplayer 0.3.8 → 0.3.10

package/dist/structures/Player.js

@@ -48,70 +48,86 @@ const PreloadManager_1 = require("./PreloadManager");
  *
  */
 class Player extends events_1.EventEmitter {
+    guildId;
+    connection = null;
+    audioPlayer;
+    queue;
+    volume = 100;
+    options;
+    userdata;
+    _lastActivity = Date.now();
+    _remotePaused = false;
+    currentResource = null;
+    destroyed = false;
+    manager;
+    pluginManager;
+    extensionManager;
+    streamManager;
+    preloadManager;
+    filter;
+    playbackMode = types_1.PlaybackMode.NATIVE;
+    forwardFollowers = new Set();
+    forwardLeader = null;
+    leaveTimeout = null;
+    volumeInterval = null;
+    stuckTimer = null;
+    skipLoop = false;
+    refreshLock = false;
+    seekInProgress = false;
+    remoteHandle;
+    currentSlot = {
+        resource: null,
+        track: null,
+        streamId: null,
+        abortController: null,
+        isValid: false,
+        isLoading: false,
+        loadPromise: null,
+    };
+    preloadEnabled = true;
+    crossfadeEnabled = true;
+    crossfadeDurationMs = 500;
+    lowPerformanceMode = false;
+    crossfadeTransitionLock = false;
+    smartTransitionEnabled = true;
+    smartTransitionGenreAware = true;
+    smartTransitionBeatAlign = true;
+    smartTransitionBaseMs = 800;
+    smartTransitionMinMs = 120;
+    smartTransitionMaxMs = 8000;
+    smartTransitionGenreDurations = {
+        chill: 700,
+        ambient: 750,
+        lofi: 650,
+        pop: 450,
+        rock: 350,
+        edm: 220,
+        house: 250,
+        techno: 200,
+    };
+    smartTransitionBeatAlignMaxWaitMs = 180;
+    antiStuckEnabled = true;
+    antiStuckMaxRetries = 2;
+    antiStuckRetryDelayMs = 900;
+    antiStuckReusePreloadFirst = true;
+    antiStuckReduceQualityOnRetry = true;
+    antiStuckControlledSkipThreshold = 3;
+    antiStuckConsecutiveFailures = 0;
+    loudnessNormalizationEnabled = false;
+    loudnessTargetLUFS = -14;
+    loudnessMaxBoostDb = 8;
+    loudnessMaxCutDb = 10;
+    loudnessLimiterCeiling = 0.95;
+    trackMiddlewareChain;
+    // Cache for search results to avoid duplicate calls
+    searchCache;
+    SEARCH_CACHE_TTL = 2 * 60 * 1000; // 2 minutes
+    ttsPlayer = null;
+    lastDuration = 0;
+    seekOffset = 0;
+    recoveryInProgress = false;
     constructor(guildId, options = {}, manager) {
         super();
-        this.connection = null;
-        this.volume = 100;
-        this._lastActivity = Date.now();
-        this._remotePaused = false;
-        this.currentResource = null;
-        this.destroyed = false;
-        this.playbackMode = types_1.PlaybackMode.NATIVE;
-        this.forwardFollowers = new Set();
-        this.forwardLeader = null;
-        this.leaveTimeout = null;
-        this.volumeInterval = null;
-        this.stuckTimer = null;
-        this.skipLoop = false;
-        this.refreshLock = false;
-        this.seekInProgress = false;
-        this.currentSlot = {
-            resource: null,
-            track: null,
-            streamId: null,
-            abortController: null,
-            isValid: false,
-            isLoading: false,
-            loadPromise: null,
-        };
-        this.preloadEnabled = true;
-        this.crossfadeEnabled = true;
-        this.crossfadeDurationMs = 500;
-        this.lowPerformanceMode = false;
-        this.crossfadeTransitionLock = false;
-        this.smartTransitionEnabled = true;
-        this.smartTransitionGenreAware = true;
-        this.smartTransitionBeatAlign = true;
-        this.smartTransitionBaseMs = 800;
-        this.smartTransitionMinMs = 120;
-        this.smartTransitionMaxMs = 8000;
-        this.smartTransitionGenreDurations = {
-            chill: 700,
-            ambient: 750,
-            lofi: 650,
-            pop: 450,
-            rock: 350,
-            edm: 220,
-            house: 250,
-            techno: 200,
-        };
-        this.smartTransitionBeatAlignMaxWaitMs = 180;
-        this.antiStuckEnabled = true;
-        this.antiStuckMaxRetries = 2;
-        this.antiStuckRetryDelayMs = 900;
-        this.antiStuckReusePreloadFirst = true;
-        this.antiStuckReduceQualityOnRetry = true;
-        this.antiStuckControlledSkipThreshold = 3;
-        this.antiStuckConsecutiveFailures = 0;
-        this.loudnessNormalizationEnabled = false;
-        this.loudnessTargetLUFS = -14;
-        this.loudnessMaxBoostDb = 8;
-        this.loudnessMaxCutDb = 10;
-        this.loudnessLimiterCeiling = 0.95;
-        this.SEARCH_CACHE_TTL = 2 * 60 * 1000; // 2 minutes
-        this.ttsPlayer = null;
-        this.lastDuration = 0;
-        this.seekOffset = 0;
         this.debug(`[Player] Constructor called for guildId: ${guildId}`);
         this.guildId = guildId;
         this.queue = new Queue_1.Queue();
@@ -193,7 +209,7 @@ class Player extends events_1.EventEmitter {
             extractorTimeout: this.options.extractorTimeout,
         });
         this.streamManager = new StreamManager_1.StreamManager({
-            maxConcurrentStreams: 4,
+            maxConcurrentStreams: this.options?.maxStreamStore ?? 4,
             streamTimeout: 5 * 60 * 1000,
             maxListenersPerStream: 15,
             enableMetrics: true,
@@ -659,6 +675,7 @@ class Player extends events_1.EventEmitter {
     async attemptTrackRecovery(track, reason) {
         if (!this.antiStuckEnabled)
             return false;
+        this.recoveryInProgress = true;
         this.debug(`[AntiStuck] Recovery started for: ${track.title}`, reason);
         const originalQuality = this.options.quality;
         let attempted = 0;
@@ -676,6 +693,7 @@ class Player extends events_1.EventEmitter {
                     if (startedFromPreload) {
                         this.antiStuckConsecutiveFailures = 0;
                         this.options.quality = originalQuality;
+                        this.recoveryInProgress = false;
                         return true;
                     }
                 }
@@ -683,6 +701,7 @@ class Player extends events_1.EventEmitter {
                 if (started) {
                     this.antiStuckConsecutiveFailures = 0;
                     this.options.quality = originalQuality;
+                    this.recoveryInProgress = false;
                     return true;
                 }
             }
@@ -694,8 +713,10 @@ class Player extends events_1.EventEmitter {
         this.antiStuckConsecutiveFailures++;
         if (this.antiStuckConsecutiveFailures >= this.antiStuckControlledSkipThreshold) {
             this.debug(`[AntiStuck] Controlled skip threshold reached for ${track.title}`);
+            this.recoveryInProgress = false;
             return false;
         }
+        this.recoveryInProgress = false;
         // Avoid hard skip storm by leaving track for next natural retry window.
         this.debug(`[AntiStuck] Keeping track for controlled retry window: ${track.title}`);
         return false;
@@ -754,14 +775,15 @@ class Player extends events_1.EventEmitter {
         this.filter.setSourceStreamType(streamInfo.type);
         const seekArg = position > 0 ? position : -1;
         if (filterString || position > 0) {
-            const processedStream = await this.filter.applyFiltersAndSeek(streamInfo.stream, seekArg);
-            // rawStream. Always use Arbitrary so discordjs/voice doesn't re-encode.
-            const resource = (0, voice_1.createAudioResource)(processedStream, {
+            const processedStream = await this.filter.applyFiltersAndSeek(streamInfo, seekArg);
+            const resource = (0, voice_1.createAudioResource)(processedStream.stream, {
                 metadata: track,
-                inputType: voice_1.StreamType.Arbitrary,
+                inputType: processedStream.wasRecreated && !filterString ? voice_1.StreamType.Arbitrary
+                    : position > 0 ? voice_1.StreamType.Raw
+                        : voice_1.StreamType.Arbitrary,
                 inlineVolume: true,
             });
-            return { resource, processedStream };
+            return { resource, processedStream: processedStream.stream };
         }
         const resource = (0, voice_1.createAudioResource)(streamInfo.stream, {
             metadata: track,
@@ -907,6 +929,7 @@ class Player extends events_1.EventEmitter {
         const currentResource = this.currentSlot.resource;
         if (!currentResource)
             return false;
+        // Ensure seekOffset is always an integer (milliseconds)
         this.seekOffset = 0;
         const targetVolume = this.getTrackTargetVolume(track);
         if (currentResource.volume) {
@@ -1490,6 +1513,7 @@ class Player extends events_1.EventEmitter {
             this.debug("[Player] Cannot stop while subscribed to another player");
             return false;
         }
+        this.recoveryInProgress = false;
         this.debug(`[Player] stop called`);
         if (this.playbackMode === types_1.PlaybackMode.REMOTE) {
             this.cancelPreload();
@@ -1573,6 +1597,7 @@ class Player extends events_1.EventEmitter {
             return false;
         }
         this.debug(`[Player] skip called with index: ${index}`);
+        this.recoveryInProgress = false;
         if (this.playbackMode === types_1.PlaybackMode.REMOTE) {
             if (typeof index === "number" && index >= 0) {
                 for (let i = 0; i < index; i++)
@@ -1686,7 +1711,7 @@ class Player extends events_1.EventEmitter {
                 this.debug(`[Player] Save options - filename: ${saveOptions.filename}, quality: ${saveOptions.quality || "default"}`);
             }
             // Apply filters if any are active
-            let finalStream = streamInfo.stream;
+            let finalStream = streamInfo;
             if (saveOptions.filter || saveOptions.seek) {
                 try {
                     this.filter.clearAll();
@@ -1696,13 +1721,13 @@ class Player extends events_1.EventEmitter {
                     this.debug(`[Player] Error applying save filters:`, err);
                 }
                 this.debug(`[Player] Applying filters to save stream: ${this.filter.getFilterString() || "none"}`);
-                finalStream = await this.filter.applyFiltersAndSeek(streamInfo.stream, saveOptions.seek || 0).catch((err) => {
+                finalStream = await this.filter.applyFiltersAndSeek(streamInfo, saveOptions.seek || 0).catch((err) => {
                     this.debug(`[Player] Error applying filters to save stream:`, err);
-                    return streamInfo.stream; // Fallback to original stream
+                    return streamInfo; // Fallback to original stream
                 });
             }
             // Return the stream directly - caller can pipe it to fs.createWriteStream()
-            return finalStream;
+            return finalStream.stream;
         }
         catch (error) {
             this.debug(`[Player] save error:`, error);
@@ -1980,27 +2005,33 @@ class Player extends events_1.EventEmitter {
      * @returns Formatted time string with leading zeros
      */
     formatTime(ms) {
-        const totalSeconds = Math.floor(ms / 1000);
-        const hours = Math.floor(totalSeconds / 3600);
-        const minutes = Math.floor((totalSeconds % 3600) / 60);
-        const seconds = totalSeconds % 60;
+        // Ensure ms is an integer and convert to seconds
+        const totalSeconds = Math.floor(ms / 1000) | 0;
+        const hours = Math.floor(totalSeconds / 3600) | 0;
+        const minutes = Math.floor((totalSeconds % 3600) / 60) | 0;
+        const seconds = (totalSeconds % 60) | 0;
         const parts = [];
-        if (hours > 0)
-            parts.push(String(hours).padStart(2, "0"));
-        parts.push(String(minutes).padStart(2, "0"));
+        if (hours > 0) {
+            parts.push(String(hours)); // Giờ không padStart (ví dụ: 1:05:00)
+            parts.push(String(minutes).padStart(2, "0"));
+        }
+        else {
+            parts.push(String(minutes)); // Phút không padStart nếu là số đầu tiên (ví dụ: 0:30 thay vì 00:30)
+        }
         parts.push(String(seconds).padStart(2, "0"));
         return parts.join(":");
     }
     /**
      * Format time without leading zeros for hours (1:22:12 or 3:45)
-     * @param ms - Time in milliseconds
+     * @param ms - Time in milliseconds (must be integer)
      * @returns Compact formatted time string
      */
     formatTimeCompact(ms) {
-        const totalSeconds = Math.floor(ms / 1000);
-        const hours = Math.floor(totalSeconds / 3600);
-        const minutes = Math.floor((totalSeconds % 3600) / 60);
-        const seconds = totalSeconds % 60;
+        // Ensure ms is an integer and convert to seconds
+        const totalSeconds = Math.floor(ms / 1000) | 0;
+        const hours = Math.floor(totalSeconds / 3600) | 0;
+        const minutes = Math.floor((totalSeconds % 3600) / 60) | 0;
+        const seconds = (totalSeconds % 60) | 0;
         if (hours > 0) {
             return `${hours}:${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
         }
@@ -2039,8 +2070,9 @@ class Player extends events_1.EventEmitter {
                 },
             };
         }
-        const total = track.duration > 1000 ? track.duration : track.duration * 1000;
-        const current = resource.playbackDuration + this.seekOffset;
+        // Ensure all time values are integers (milliseconds)
+        const total = Math.floor(track.duration > 1000 ? track.duration : track.duration * 1000) | 0;
+        const current = Math.floor(resource.playbackDuration + this.seekOffset) | 0;
         return {
             current: current,
             total: total,
@@ -2151,18 +2183,19 @@ class Player extends events_1.EventEmitter {
         try {
             const track = this.queue.currentTrack;
             this.debug(`[Player] Refreshing player resource for track: ${track.title}`);
-            const currentPosition = position >= 0 ? position : (this.currentResource?.playbackDuration ?? 0);
-            this.seekOffset = currentPosition;
+            // Ensure all time values are integers (milliseconds)
+            const currentPosition = (position >= 0 ? position : (this.currentResource?.playbackDuration ?? 0) + this.seekOffset) | 0;
+            this.seekOffset = currentPosition | 0;
             const wasPaused = this.isPaused;
-            const playbackDuration = this.currentResource?.playbackDuration ?? 0;
+            const playbackDuration = (this.currentResource?.playbackDuration ?? 0) | 0;
             const isForwardSeek = position < 0 || position >= playbackDuration;
             const currentStreamId = this.currentSlot.streamId;
-            // Try to grab the raw source stream for reuse (forward seeks only)
+            // Try to grab the raw source stream for reuse (only when not seeking, i.e. just applying filters)
             let reuseStream = null;
-            if (isForwardSeek && currentStreamId) {
+            if (position < 0 && isForwardSeek && currentStreamId) {
                 reuseStream = this.streamManager.getRawStream(currentStreamId);
                 if (reuseStream) {
-                    this.debug(`[Player] Will reuse source stream for seek (pos: ${currentPosition}ms)`);
+                    this.debug(`[Player] Will reuse source stream for filter application`);
                 }
             }
             if (reuseStream) {
@@ -2301,6 +2334,10 @@ class Player extends events_1.EventEmitter {
                     this.debug(`[Player] AudioPlayer went idle during resource refresh — skipping trackEnd/playNext`);
                     return;
                 }
+                if (this.recoveryInProgress) {
+                    this.debug(`[Player] AudioPlayer went idle during recovery — skipping playNext`);
+                    return;
+                }
                 // Track ended
                 const track = this.queue.currentTrack;
                 if (track) {
@@ -2397,6 +2434,8 @@ class Player extends events_1.EventEmitter {
         this.audioPlayer.on("error", (error) => {
             if (this.destroyed)
                 return;
+            if (this.recoveryInProgress)
+                return;
             this.debug(`[Player] AudioPlayer error:`, error);
             this.emit("playerError", error, this.queue.currentTrack || undefined);
             const track = this.queue.currentTrack;