ziplayer 0.3.10 → 0.3.12-dev.0

package/src/structures/PreloadManager.ts

@@ -24,6 +24,7 @@ export class PreloadManager {
 		resource: null,
 		track: null,
 		streamId: null,
+		processedStreamId: null,
 		abortController: null,
 		isValid: false,
 		isLoading: false,
@@ -239,17 +240,20 @@ export class PreloadManager {
 			this.debugLog(`[Preload] Track changed after stream fetch`);
 			throw new Error("PRELOAD_CANCELLED");
 		}
-		if (!streamInfo?.stream) {
+		if (!streamInfo?.stream && !streamInfo?.url) {
 			throw new Error(`No stream available`);
 		}
 
-		const streamId = this.streamManager.registerStream(streamInfo.stream, track, {
-			source: track.source || "preload",
-			isPreload: true,
-			priority: 5,
-		});
+		const streamId =
+			streamInfo.stream ?
+				this.streamManager.registerStream(streamInfo.stream, track, {
+					source: track.source || "preload",
+					isPreload: true,
+					priority: 5,
+				})
+			:	null;
 
-		const resource = createAudioResource(streamInfo.stream, {
+		const resource = createAudioResource(streamInfo.stream || streamInfo.url!, {
 			inlineVolume: true,
 			metadata: { ...track, preloaded: true },
 		});
@@ -277,7 +281,7 @@ export class PreloadManager {
 				signal.removeEventListener("abort", handler);
 				reject(new Error("PRELOAD_CANCELLED"));
 			};
-			signal.addEventListener("abort", handler);
+			signal.addEventListener("abort", handler, { once: true });
 		});
 
 		const existingStream = this.streamManager.getStreamByTrack(track.id || track.title);

package/src/structures/Queue.ts

@@ -231,9 +231,9 @@ export class Queue {
 			this.current = this.tracks.shift() || null;
 		}
 
-		// Skip bypassed track loop but no other track exists → restore current from history
+		// Skip bypassed track loop but no other track exists → trigger queue end
 		if (!this.current && this._loop === "track" && ignoreLoop && this.history.length > 0) {
-			this.current = this.history.pop() || null;
+			return null;
 		}
 
 		return this.current;

package/src/types/index.ts

@@ -124,8 +124,9 @@ export interface SearchScore {
  * };
  */
 export interface StreamInfo {
-	stream: Readable;
-	type: "webm/opus" | "ogg/opus" | "arbitrary" | string;
+	stream?: Readable;
+	url?: string;
+	type: "webm/opus" | "ogg/opus" | "arbitrary" | "url" | string;
 	metadata?: Record<string, any>;
 	position?: number;
 	recreate?: (position: number) => Promise<Readable>;
@@ -419,6 +420,7 @@ export interface SaveOptions {
 	/** Seek position in milliseconds to start saving from */
 	seek?: number;
 }
+
 export interface PlayerSession {
 	guildId: string;
 	queue: Track[];
@@ -470,6 +472,7 @@ export interface StreamSlot {
 	resource: AudioResource | null;
 	track: Track | null;
 	streamId: string | null;
+	processedStreamId: string | null;
 	abortController: AbortController | null;
 	isValid: boolean;
 	isLoading: boolean;

package/src/utils/timeout.ts

@@ -6,5 +6,12 @@
  * @returns Promise that rejects if timeout is reached
  */
 export function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string): Promise<T> {
-	return Promise.race([promise, new Promise<never>((_, reject) => setTimeout(() => reject(new Error(message)), timeoutMs))]);
+	let timeoutId: NodeJS.Timeout;
+	const timeoutPromise = new Promise<never>((_, reject) => {
+		timeoutId = setTimeout(() => reject(new Error(message)), timeoutMs);
+	});
+
+	return Promise.race([promise, timeoutPromise]).finally(() => {
+		if (timeoutId) clearTimeout(timeoutId);
+	});
 }