ziplayer 0.0.7 → 0.0.9

package/src/structures/Queue.ts

@@ -1,147 +1,160 @@
-import { Track, LoopMode } from "../types";
-
-export class Queue {
-	private tracks: Track[] = [];
-	private current: Track | null = null;
-	private history: Track[] = [];
-	private related: Track[] = [];
-	private _autoPlay = false;
-	private _loop: LoopMode = "off";
-	private willnext: Track | null = null;
-
-	add(track: Track): void {
-		this.tracks.push(track);
-	}
-
-	addMultiple(tracks: Track[]): void {
-		this.tracks.push(...tracks);
-	}
-
-	/** Insert a track at a specific upcoming position (0 = next) */
-	insert(track: Track, index: number): void {
-		if (!Number.isFinite(index)) {
-			this.tracks.push(track);
-			return;
-		}
-		const i = Math.max(0, Math.min(Math.floor(index), this.tracks.length));
-		if (i === this.tracks.length) {
-			this.tracks.push(track);
-			return;
-		}
-		if (i <= 0) {
-			this.tracks.unshift(track);
-			return;
-		}
-		this.tracks.splice(i, 0, track);
-	}
-
-	/** Insert multiple tracks at a specific upcoming position, preserving order */
-	insertMultiple(tracks: Track[], index: number): void {
-		if (!Array.isArray(tracks) || tracks.length === 0) return;
-		if (!Number.isFinite(index)) {
-			this.tracks.push(...tracks);
-			return;
-		}
-		const i = Math.max(0, Math.min(Math.floor(index), this.tracks.length));
-		if (i === 0) {
-			this.tracks = [...tracks, ...this.tracks];
-			return;
-		}
-		if (i === this.tracks.length) {
-			this.tracks.push(...tracks);
-			return;
-		}
-		this.tracks.splice(i, 0, ...tracks);
-	}
-
-	remove(index: number): Track | null {
-		if (index < 0 || index >= this.tracks.length) return null;
-		return this.tracks.splice(index, 1)[0];
-	}
-
-	next(ignoreLoop = false): Track | null {
-		if (this.current) {
-			if (this._loop === "track" && !ignoreLoop) {
-				return this.current;
-			}
-			this.history.push(this.current);
-			if (this.history.length > 200) {
-				this.history.shift();
-			}
-		}
-		this.current = this.tracks.shift() || null;
-		if (!this.current && this._loop === "queue" && this.history.length > 0 && !ignoreLoop) {
-			this.tracks = [...this.history];
-			this.history = [];
-			this.current = this.tracks.shift() || null;
-		}
-		return this.current;
-	}
-
-	clear(): void {
-		this.tracks = [];
-	}
-
-	autoPlay(value?: boolean): boolean {
-		if (typeof value !== "undefined") {
-			this._autoPlay = value;
-		}
-		return this._autoPlay;
-	}
-
-	loop(mode?: LoopMode): LoopMode {
-		if (mode) {
-			this._loop = mode;
-		}
-		return this._loop;
-	}
-
-	shuffle(): void {
-		for (let i = this.tracks.length - 1; i > 0; i--) {
-			const j = Math.floor(Math.random() * (i + 1));
-			[this.tracks[i], this.tracks[j]] = [this.tracks[j], this.tracks[i]];
-		}
-	}
-
-	get size(): number {
-		return this.tracks.length;
-	}
-
-	get isEmpty(): boolean {
-		return this.tracks.length === 0;
-	}
-
-	get currentTrack(): Track | null {
-		return this.current;
-	}
-
-	get previousTracks(): Track[] {
-		return [...this.history];
-	}
-
-	get nextTrack(): Track | null {
-		return this.tracks[0] || null;
-	}
-
-	willNextTrack(track?: Track): Track | null {
-		if (track) {
-			this.willnext = track;
-		}
-		return this.willnext;
-	}
-
-	relatedTracks(track?: Track[]): Track[] | null {
-		if (track) {
-			this.related = track;
-		}
-		return this.related;
-	}
-
-	getTracks(): Track[] {
-		return [...this.tracks];
-	}
-
-	getTrack(index: number): Track | null {
-		return this.tracks[index] || null;
-	}
-}
+import { Track, LoopMode } from "../types";
+
+export class Queue {
+	private tracks: Track[] = [];
+	private current: Track | null = null;
+	private history: Track[] = [];
+	private related: Track[] = [];
+	private _autoPlay = false;
+	private _loop: LoopMode = "off";
+	private willnext: Track | null = null;
+
+	add(track: Track): void {
+		this.tracks.push(track);
+	}
+
+	addMultiple(tracks: Track[]): void {
+		this.tracks.push(...tracks);
+	}
+
+	/** Insert a track at a specific upcoming position (0 = next) */
+	insert(track: Track, index: number): void {
+		if (!Number.isFinite(index)) {
+			this.tracks.push(track);
+			return;
+		}
+		const i = Math.max(0, Math.min(Math.floor(index), this.tracks.length));
+		if (i === this.tracks.length) {
+			this.tracks.push(track);
+			return;
+		}
+		if (i <= 0) {
+			this.tracks.unshift(track);
+			return;
+		}
+		this.tracks.splice(i, 0, track);
+	}
+
+	/** Insert multiple tracks at a specific upcoming position, preserving order */
+	insertMultiple(tracks: Track[], index: number): void {
+		if (!Array.isArray(tracks) || tracks.length === 0) return;
+		if (!Number.isFinite(index)) {
+			this.tracks.push(...tracks);
+			return;
+		}
+		const i = Math.max(0, Math.min(Math.floor(index), this.tracks.length));
+		if (i === 0) {
+			this.tracks = [...tracks, ...this.tracks];
+			return;
+		}
+		if (i === this.tracks.length) {
+			this.tracks.push(...tracks);
+			return;
+		}
+		this.tracks.splice(i, 0, ...tracks);
+	}
+
+	remove(index: number): Track | null {
+		if (index < 0 || index >= this.tracks.length) return null;
+		return this.tracks.splice(index, 1)[0];
+	}
+
+	next(ignoreLoop = false): Track | null {
+		if (this.current) {
+			if (this._loop === "track" && !ignoreLoop) {
+				return this.current;
+			}
+			this.history.push(this.current);
+			if (this.history.length > 200) {
+				this.history.shift();
+			}
+		}
+		this.current = this.tracks.shift() || null;
+		if (!this.current && this._loop === "queue" && this.history.length > 0 && !ignoreLoop) {
+			this.tracks = [...this.history];
+			this.history = [];
+			this.current = this.tracks.shift() || null;
+		}
+		return this.current;
+	}
+
+	clear(): void {
+		this.tracks = [];
+	}
+
+	autoPlay(value?: boolean): boolean {
+		if (typeof value !== "undefined") {
+			this._autoPlay = value;
+		}
+		return this._autoPlay;
+	}
+
+	loop(mode?: LoopMode): LoopMode {
+		if (mode) {
+			this._loop = mode;
+		}
+		return this._loop;
+	}
+
+	shuffle(): void {
+		for (let i = this.tracks.length - 1; i > 0; i--) {
+			const j = Math.floor(Math.random() * (i + 1));
+			[this.tracks[i], this.tracks[j]] = [this.tracks[j], this.tracks[i]];
+		}
+	}
+
+	get size(): number {
+		return this.tracks.length;
+	}
+
+	get isEmpty(): boolean {
+		return this.tracks.length === 0;
+	}
+
+	get currentTrack(): Track | null {
+		return this.current;
+	}
+
+	get previousTracks(): Track[] {
+		return [...this.history];
+	}
+
+	get nextTrack(): Track | null {
+		return this.tracks[0] || null;
+	}
+
+	/**
+	 * Move back to the previously played track.
+	 * Makes the current track the next upcoming track, then sets previous as current.
+	 */
+	previous(): Track | null {
+		if (this.history.length === 0) return null;
+		if (this.current) {
+			this.tracks.unshift(this.current);
+		}
+		this.current = this.history.pop() || null;
+		return this.current;
+	}
+
+	willNextTrack(track?: Track): Track | null {
+		if (track) {
+			this.willnext = track;
+		}
+		return this.willnext;
+	}
+
+	relatedTracks(track?: Track[]): Track[] | null {
+		if (track) {
+			this.related = track;
+		}
+		return this.related;
+	}
+
+	getTracks(): Track[] {
+		return [...this.tracks];
+	}
+
+	getTrack(index: number): Track | null {
+		return this.tracks[index] || null;
+	}
+}

package/src/types/index.ts

@@ -1,126 +1,131 @@
-import { VoiceConnection } from "@discordjs/voice";
-import { Readable } from "stream";
-import { Player } from "../structures/Player";
-
-export interface Track {
-	id: string;
-	title: string;
-	url: string;
-	duration: number;
-	thumbnail?: string;
-	requestedBy: string;
-	source: string;
-	metadata?: Record<string, any>;
-}
-
-export interface SearchResult {
-	tracks: Track[];
-	playlist?: {
-		name: string;
-		url: string;
-		thumbnail?: string;
-	};
-}
-
-export interface StreamInfo {
-	stream: Readable;
-	type: "webm/opus" | "ogg/opus" | "arbitrary";
-	metadata?: Record<string, any>;
-}
-
-export interface PlayerOptions {
-	leaveOnEnd?: boolean;
-	leaveOnEmpty?: boolean;
-	leaveTimeout?: number;
-	volume?: number;
-	quality?: "high" | "low";
-	selfDeaf?: boolean;
-	selfMute?: boolean;
-	/**
-	 * Timeout in milliseconds for plugin operations (search, streaming, etc.)
-	 * to prevent long-running tasks from blocking the player.
-	 */
-	extractorTimeout?: number;
-	userdata?: Record<string, any>;
-	/**
-	 * Text-to-Speech settings. When enabled, the player can create a
-	 * dedicated AudioPlayer to play TTS while pausing the music player
-	 * then resume the music after TTS finishes.
-	 */
-	tts?: {
-		/** Create a dedicated tts AudioPlayer at construction time */
-		createPlayer?: boolean;
-		/** Pause music and swap subscription to play TTS */
-		interrupt?: boolean;
-		/** Default TTS volume multiplier 1 => 100% */
-		volume?: number;
-		/** Max time tts playback Duration */
-		Max_Time_TTS?: number;
-	};
-	/**
-	 * Optional per-player extension selection. When provided, only these
-	 * extensions will be activated for the created player.
-	 * - Provide instances or constructors to use them explicitly
-	 * - Or provide names (string) to select from manager-registered extensions
-	 */
-	extensions?: any[] | string[];
-}
-
-export type SourcePluginCtor<T extends SourcePlugin = SourcePlugin> = new (...args: any[]) => T;
-export type SourcePluginLike = SourcePlugin | SourcePluginCtor;
-
-export interface PlayerManagerOptions {
-	plugins?: SourcePluginLike[];
-	extensions?: any[];
-}
-
-export interface ProgressBarOptions {
-	size?: number;
-	barChar?: string;
-	progressChar?: string;
-}
-
-export type LoopMode = "off" | "track" | "queue";
-
-export interface PlayerEvents {
-	debug: [message: string, ...args: any[]];
-	willPlay: [track: Track, upcomingTracks: Track[]];
-	trackStart: [track: Track];
-	trackEnd: [track: Track];
-	queueEnd: [];
-	playerError: [error: Error, track?: Track];
-	connectionError: [error: Error];
-	volumeChange: [oldVolume: number, newVolume: number];
-	queueAdd: [track: Track];
-	queueAddList: [tracks: Track[]];
-	queueRemove: [track: Track, index: number];
-	playerPause: [track: Track];
-	playerResume: [track: Track];
-	playerStop: [];
-	playerDestroy: [];
-	/** Emitted when TTS starts playing (interruption mode) */
-	ttsStart: [payload: { text?: string; track?: Track }];
-	/** Emitted when TTS finished (interruption mode) */
-	ttsEnd: [];
-}
-
-// Plugin interfaces
-export interface SourcePlugin {
-	name: string;
-	version: string;
-	canHandle(query: string): boolean;
-	search(query: string, requestedBy: string): Promise<SearchResult>;
-	getStream(track: Track): Promise<StreamInfo>;
-	getRelatedTracks?(track: string | number, opts?: { limit?: number; offset?: number }): Promise<Track[]>;
-	validate?(url: string): boolean;
-	extractPlaylist?(url: string, requestedBy: string): Promise<Track[]>;
-}
-
-// Extension interfaces
-export interface SourceExtension {
-	name: string;
-	version: string;
-	connection?: VoiceConnection;
-	player: Player | null;
-	active(alas: any): boolean;
-}
+import { VoiceConnection } from "@discordjs/voice";
+import { Readable } from "stream";
+import { Player } from "../structures/Player";
+
+export interface Track {
+	id: string;
+	title: string;
+	url: string;
+	duration: number;
+	thumbnail?: string;
+	requestedBy: string;
+	source: string;
+	metadata?: Record<string, any>;
+}
+
+export interface SearchResult {
+	tracks: Track[];
+	playlist?: {
+		name: string;
+		url: string;
+		thumbnail?: string;
+	};
+}
+
+export interface StreamInfo {
+	stream: Readable;
+	type: "webm/opus" | "ogg/opus" | "arbitrary";
+	metadata?: Record<string, any>;
+}
+
+export interface PlayerOptions {
+	leaveOnEnd?: boolean;
+	leaveOnEmpty?: boolean;
+	leaveTimeout?: number;
+	volume?: number;
+	quality?: "high" | "low";
+	selfDeaf?: boolean;
+	selfMute?: boolean;
+	/**
+	 * Timeout in milliseconds for plugin operations (search, streaming, etc.)
+	 * to prevent long-running tasks from blocking the player.
+	 */
+	extractorTimeout?: number;
+	userdata?: Record<string, any>;
+	/**
+	 * Text-to-Speech settings. When enabled, the player can create a
+	 * dedicated AudioPlayer to play TTS while pausing the music player
+	 * then resume the music after TTS finishes.
+	 */
+	tts?: {
+		/** Create a dedicated tts AudioPlayer at construction time */
+		createPlayer?: boolean;
+		/** Pause music and swap subscription to play TTS */
+		interrupt?: boolean;
+		/** Default TTS volume multiplier 1 => 100% */
+		volume?: number;
+		/** Max time tts playback Duration */
+		Max_Time_TTS?: number;
+	};
+	/**
+	 * Optional per-player extension selection. When provided, only these
+	 * extensions will be activated for the created player.
+	 * - Provide instances or constructors to use them explicitly
+	 * - Or provide names (string) to select from manager-registered extensions
+	 */
+	extensions?: any[] | string[];
+}
+
+export type SourcePluginCtor<T extends SourcePlugin = SourcePlugin> = new (...args: any[]) => T;
+export type SourcePluginLike = SourcePlugin | SourcePluginCtor;
+
+export interface PlayerManagerOptions {
+	plugins?: SourcePluginLike[];
+	extensions?: any[];
+	/**
+	 * Timeout in milliseconds for manager-level operations (e.g. search)
+	 * when running without a Player instance.
+	 */
+	extractorTimeout?: number;
+}
+
+export interface ProgressBarOptions {
+	size?: number;
+	barChar?: string;
+	progressChar?: string;
+}
+
+export type LoopMode = "off" | "track" | "queue";
+
+export interface PlayerEvents {
+	debug: [message: string, ...args: any[]];
+	willPlay: [track: Track, upcomingTracks: Track[]];
+	trackStart: [track: Track];
+	trackEnd: [track: Track];
+	queueEnd: [];
+	playerError: [error: Error, track?: Track];
+	connectionError: [error: Error];
+	volumeChange: [oldVolume: number, newVolume: number];
+	queueAdd: [track: Track];
+	queueAddList: [tracks: Track[]];
+	queueRemove: [track: Track, index: number];
+	playerPause: [track: Track];
+	playerResume: [track: Track];
+	playerStop: [];
+	playerDestroy: [];
+	/** Emitted when TTS starts playing (interruption mode) */
+	ttsStart: [payload: { text?: string; track?: Track }];
+	/** Emitted when TTS finished (interruption mode) */
+	ttsEnd: [];
+}
+
+// Plugin interfaces
+export interface SourcePlugin {
+	name: string;
+	version: string;
+	canHandle(query: string): boolean;
+	search(query: string, requestedBy: string): Promise<SearchResult>;
+	getStream(track: Track): Promise<StreamInfo>;
+	getRelatedTracks?(track: string | number, opts?: { limit?: number; offset?: number }): Promise<Track[]>;
+	validate?(url: string): boolean;
+	extractPlaylist?(url: string, requestedBy: string): Promise<Track[]>;
+}
+
+// Extension interfaces
+export interface SourceExtension {
+	name: string;
+	version: string;
+	connection?: VoiceConnection;
+	player: Player | null;
+	active(alas: any): boolean;
+}