ziplayer 0.3.8 → 0.3.10

package/src/structures/Player.ts

@@ -173,6 +173,7 @@ export class Player extends EventEmitter {
 	private ttsPlayer: DiscordAudioPlayer | null = null;
 	private lastDuration: number = 0;
 	private seekOffset: number = 0;
+	private recoveryInProgress = false;
 
 	constructor(guildId: string, options: PlayerOptions = {}, manager: PlayerManager) {
 		super();
@@ -269,7 +270,7 @@ export class Player extends EventEmitter {
 			extractorTimeout: this.options.extractorTimeout,
 		});
 		this.streamManager = new StreamManager({
-			maxConcurrentStreams: 4,
+			maxConcurrentStreams: this.options?.maxStreamStore ?? 4,
 			streamTimeout: 5 * 60 * 1000,
 			maxListenersPerStream: 15,
 			enableMetrics: true,
@@ -787,6 +788,7 @@ export class Player extends EventEmitter {
 
 	private async attemptTrackRecovery(track: Track, reason: unknown): Promise<boolean> {
 		if (!this.antiStuckEnabled) return false;
+		this.recoveryInProgress = true;
 		this.debug(`[AntiStuck] Recovery started for: ${track.title}`, reason);
 
 		const originalQuality = this.options.quality;
@@ -808,6 +810,7 @@ export class Player extends EventEmitter {
 					if (startedFromPreload) {
 						this.antiStuckConsecutiveFailures = 0;
 						this.options.quality = originalQuality;
+						this.recoveryInProgress = false;
 						return true;
 					}
 				}
@@ -816,6 +819,7 @@ export class Player extends EventEmitter {
 				if (started) {
 					this.antiStuckConsecutiveFailures = 0;
 					this.options.quality = originalQuality;
+					this.recoveryInProgress = false;
 					return true;
 				}
 			} catch (error) {
@@ -827,9 +831,10 @@ export class Player extends 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;
@@ -900,16 +905,18 @@ export class Player extends EventEmitter {
 		const seekArg = position > 0 ? position : -1;
 
 		if (filterString || position > 0) {
-			const processedStream = await this.filter.applyFiltersAndSeek(streamInfo.stream, seekArg);
+			const processedStream = await this.filter.applyFiltersAndSeek(streamInfo, seekArg);
 
-			// rawStream. Always use Arbitrary so discordjs/voice doesn't re-encode.
-			const resource = createAudioResource(processedStream, {
+			const resource = createAudioResource(processedStream.stream, {
 				metadata: track,
-				inputType: StreamType.Arbitrary,
+				inputType:
+					processedStream.wasRecreated && !filterString ? StreamType.Arbitrary
+					: position > 0 ? StreamType.Raw
+					: StreamType.Arbitrary,
 				inlineVolume: true,
 			});
 
-			return { resource, processedStream };
+			return { resource, processedStream: processedStream.stream };
 		}
 
 		const resource = createAudioResource(streamInfo.stream, {
@@ -1077,6 +1084,7 @@ export class Player extends 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);
 
@@ -1740,6 +1748,7 @@ export class Player extends EventEmitter {
 			this.debug("[Player] Cannot stop while subscribed to another player");
 			return false;
 		}
+		this.recoveryInProgress = false;
 		this.debug(`[Player] stop called`);
 		if (this.playbackMode === PlaybackMode.REMOTE) {
 			this.cancelPreload();
@@ -1831,7 +1840,7 @@ export class Player extends EventEmitter {
 			return false;
 		}
 		this.debug(`[Player] skip called with index: ${index}`);
-
+		this.recoveryInProgress = false;
 		if (this.playbackMode === PlaybackMode.REMOTE) {
 			if (typeof index === "number" && index >= 0) {
 				for (let i = 0; i < index; i++) this.queue.remove(0);
@@ -1953,7 +1962,7 @@ export class Player extends EventEmitter {
 			}
 
 			// Apply filters if any are active
-			let finalStream = streamInfo.stream;
+			let finalStream = streamInfo;
 
 			if (saveOptions.filter || saveOptions.seek) {
 				try {
@@ -1964,14 +1973,14 @@ export class Player extends EventEmitter {
 				}
 
 				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);
 			this.emit("playerError", error as Error, track);
@@ -2272,27 +2281,36 @@ export class Player extends EventEmitter {
 	 * @returns Formatted time string with leading zeros
 	 */
 	formatTime(ms: number): string {
-		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: string[] = [];
-		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: number): string {
-		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")}`;
@@ -2335,8 +2353,9 @@ export class Player extends 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,
@@ -2465,20 +2484,22 @@ export class Player extends EventEmitter {
 			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: import("stream").Readable | null = 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`);
 				}
 			}
 
@@ -2636,6 +2657,10 @@ export class Player extends 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) {
@@ -2731,6 +2756,7 @@ export class Player extends 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;