@ziplayer/ytexecplug 0.0.2 → 0.0.3

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { Readable } from "stream";
 /**
  * Converts a Web ReadableStream to a Node.js Readable stream
  */
-export declare function webStreamToNodeStream(webStream: ReadableStream): Readable;
+export declare function webStreamToNodeStream(webStream: ReadableStream, highWaterMark?: number, seekBytes?: number): Promise<Readable>;
 export declare class YTexec extends BasePlugin {
     name: string;
     version: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,CA8BzE;AA0CD,qBAAa,MAAO,SAAQ,UAAU;IACrC,IAAI,SAAY;IAChB,OAAO,SAAW;IAElB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAe3B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIjE,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;CAqBlD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC;;GAEG;AACH,wBAAsB,qBAAqB,CAC1C,SAAS,EAAE,cAAc,EACzB,aAAa,GAAE,MAAkB,EACjC,SAAS,GAAE,MAAU,GACnB,OAAO,CAAC,QAAQ,CAAC,CAoEnB;AA0CD,qBAAa,MAAO,SAAQ,UAAU;IACrC,IAAI,SAAY;IAChB,OAAO,SAAW;IAElB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAe3B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAIjE,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC;CAqBlD"}

package/dist/index.js

@@ -11,32 +11,67 @@ const youtube_dl_exec_1 = __importDefault(require("youtube-dl-exec"));
 /**
  * Converts a Web ReadableStream to a Node.js Readable stream
  */
-function webStreamToNodeStream(webStream) {
-    const nodeStream = new stream_1.Readable({
-        read() {
-            // This will be handled by the Web Stream reader
-        },
-    });
-    // Create a reader from the Web Stream
+async function webStreamToNodeStream(webStream, highWaterMark = 64 * 1024, seekBytes = 0) {
     const reader = webStream.getReader();
-    // Read chunks and push to Node.js stream
-    const pump = async () => {
-        try {
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) {
-                    nodeStream.push(null); // End the stream
-                    break;
+    let bytesSkipped = 0;
+    let streamEnded = false;
+    const nodeStream = new stream_1.Readable({
+        highWaterMark,
+        async read() {
+            if (streamEnded) {
+                this.push(null);
+                return;
+            }
+            try {
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) {
+                        streamEnded = true;
+                        this.push(null);
+                        break;
+                    }
+                    if (!value)
+                        continue;
+                    // Handle seek
+                    if (seekBytes > 0 && bytesSkipped < seekBytes) {
+                        const remaining = seekBytes - bytesSkipped;
+                        if (value.length <= remaining) {
+                            bytesSkipped += value.length;
+                            continue;
+                        }
+                        else {
+                            const partial = value.subarray(remaining);
+                            bytesSkipped = seekBytes;
+                            const buffer = Buffer.from(partial);
+                            if (!this.push(buffer)) {
+                                // Backpressure
+                                break;
+                            }
+                            return;
+                        }
+                    }
+                    const buffer = Buffer.from(value);
+                    if (!this.push(buffer)) {
+                        // Backpressure
+                        break;
+                    }
+                    return;
                 }
-                nodeStream.push(Buffer.from(value));
             }
-        }
-        catch (error) {
-            nodeStream.destroy(error);
-        }
-    };
-    // Start pumping data
-    pump();
+            catch (err) {
+                console.error("Stream read error:", err);
+                streamEnded = true;
+                this.destroy(err);
+            }
+        },
+    });
+    // Cleanup handlers
+    nodeStream.on("close", () => {
+        reader.releaseLock();
+    });
+    nodeStream.on("error", () => {
+        reader.releaseLock();
+    });
     return nodeStream;
 }
 function extractVideoId(input) {
@@ -80,11 +115,8 @@ async function getYoutubeStream(url) {
     return videourl;
 }
 class YTexec extends ziplayer_1.BasePlugin {
-    constructor() {
-        super(...arguments);
-        this.name = "YTexec";
-        this.version = "1.0.0";
-    }
+    name = "YTexec";
+    version = "1.0.0";
     canHandle(query) {
         const q = (query || "").trim().toLowerCase();
         const isUrl = q.startsWith("http://") || q.startsWith("https://");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,38 +1,38 @@
-{
-	"name": "@ziplayer/ytexecplug",
-	"version": "0.0.2",
-	"description": "A modular Discord voice player with plugin system",
-	"keywords": [
-		"ZiPlayer",
-		"@ziplayer/plugin",
-		"discord",
-		"music",
-		"player",
-		"voice"
-	],
-	"homepage": "https://player.ziji.world",
-	"bugs": {
-		"url": "https://github.com/ZiProject/ZiPlayer/issues"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/ZiProject/ZiPlayer.git"
-	},
-	"license": "MIT",
-	"author": "Ziji",
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"scripts": {
-		"build": "tsc",
-		"dev": "tsc --watch",
-		"prepare": "npm run build"
-	},
-	"dependencies": {
-		"youtube-dl-exec": "^3.1.1",
-		"ziplayer": "^0.2.1"
-	},
-	"devDependencies": {
-		"@types/node": "^20.0.0",
-		"typescript": "^5.0.0"
-	}
-}
+{
+	"name": "@ziplayer/ytexecplug",
+	"version": "0.0.3",
+	"description": "A modular Discord voice player with plugin system",
+	"keywords": [
+		"ZiPlayer",
+		"@ziplayer/plugin",
+		"discord",
+		"music",
+		"player",
+		"voice"
+	],
+	"homepage": "https://player.ziji.best",
+	"bugs": {
+		"url": "https://github.com/ZiProject/ZiPlayer/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/ZiProject/ZiPlayer.git"
+	},
+	"license": "MIT",
+	"author": "Ziji",
+	"main": "dist/index.js",
+	"types": "dist/index.d.ts",
+	"scripts": {
+		"build": "tsc",
+		"dev": "tsc --watch",
+		"prepare": "npm run build"
+	},
+	"dependencies": {
+		"youtube-dl-exec": "^3.1.1",
+		"ziplayer": "^0.2.1"
+	},
+	"devDependencies": {
+		"@types/node": "^20.0.0",
+		"typescript": "^5.0.0"
+	}
+}

package/src/index.ts

@@ -6,34 +6,76 @@ import youtubedl from "youtube-dl-exec";
 /**
  * Converts a Web ReadableStream to a Node.js Readable stream
  */
-export function webStreamToNodeStream(webStream: ReadableStream): Readable {
+export async function webStreamToNodeStream(
+	webStream: ReadableStream,
+	highWaterMark: number = 64 * 1024,
+	seekBytes: number = 0,
+): Promise<Readable> {
+	const reader = webStream.getReader();
+	let bytesSkipped = 0;
+	let streamEnded = false;
+
 	const nodeStream = new Readable({
-		read() {
-			// This will be handled by the Web Stream reader
-		},
-	});
+		highWaterMark,
+		async read() {
+			if (streamEnded) {
+				this.push(null);
+				return;
+			}
 
-	// Create a reader from the Web Stream
-	const reader = webStream.getReader();
+			try {
+				while (true) {
+					const { done, value } = await reader.read();
 
-	// Read chunks and push to Node.js stream
-	const pump = async () => {
-		try {
-			while (true) {
-				const { done, value } = await reader.read();
-				if (done) {
-					nodeStream.push(null); // End the stream
-					break;
+					if (done) {
+						streamEnded = true;
+						this.push(null);
+						break;
+					}
+
+					if (!value) continue;
+
+					// Handle seek
+					if (seekBytes > 0 && bytesSkipped < seekBytes) {
+						const remaining = seekBytes - bytesSkipped;
+						if (value.length <= remaining) {
+							bytesSkipped += value.length;
+							continue;
+						} else {
+							const partial = value.subarray(remaining);
+							bytesSkipped = seekBytes;
+							const buffer = Buffer.from(partial);
+							if (!this.push(buffer)) {
+								// Backpressure
+								break;
+							}
+							return;
+						}
+					}
+
+					const buffer = Buffer.from(value);
+					if (!this.push(buffer)) {
+						// Backpressure
+						break;
+					}
+					return;
 				}
-				nodeStream.push(Buffer.from(value));
+			} catch (err) {
+				console.error("Stream read error:", err);
+				streamEnded = true;
+				this.destroy(err as Error);
 			}
-		} catch (error) {
-			nodeStream.destroy(error as Error);
-		}
-	};
+		},
+	});
+
+	// Cleanup handlers
+	nodeStream.on("close", () => {
+		reader.releaseLock();
+	});
 
-	// Start pumping data
-	pump();
+	nodeStream.on("error", () => {
+		reader.releaseLock();
+	});
 
 	return nodeStream;
 }

package/tsconfig.json

@@ -1,23 +1,27 @@
-{
-	"compilerOptions": {
-		"target": "ES2020",
-		"module": "commonjs",
-		"lib": ["ES2020"],
-		"outDir": "./dist",
-		"rootDir": "./src",
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"declaration": true,
-		"declarationMap": true,
-		"sourceMap": true,
-		"moduleResolution": "node",
-		"allowSyntheticDefaultImports": true,
-		"experimentalDecorators": true,
-		"emitDecoratorMetadata": true,
-		"resolveJsonModule": true
-	},
-	"include": ["src/*", "src/types/*"],
-	"exclude": ["node_modules", "dist", "examples"]
-}
+{
+	"compilerOptions": {
+		"target": "ES2022",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
+		"lib": ["ES2022", "DOM"],
+		"outDir": "./dist",
+		"rootDir": "./src",
+		"strict": true,
+		"esModuleInterop": true,
+		"skipLibCheck": true,
+		"forceConsistentCasingInFileNames": true,
+		"declaration": true,
+		"declarationMap": true,
+		"sourceMap": true,
+		"allowSyntheticDefaultImports": true,
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": true,
+		"resolveJsonModule": true,
+		"paths": {
+			"googlevideo/sabr-stream": ["./node_modules/googlevideo/dist/src/exports/sabr-stream"],
+			"googlevideo/utils": ["./node_modules/googlevideo/dist/src/exports/utils"]
+		}
+	},
+	"include": ["src/*"],
+	"exclude": ["node_modules", "dist", "examples"]
+}

package/dist/YouTubePlugin.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=YouTubePlugin.d.ts.map

package/dist/YouTubePlugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"YouTubePlugin.d.ts","sourceRoot":"","sources":["../src/YouTubePlugin.ts"],"names":[],"mappings":""}

package/dist/YouTubePlugin.js

@@ -1,343 +0,0 @@
-"use strict";
-// import { BasePlugin, Track, SearchResult, StreamInfo, Player } from "ziplayer";
-// export interface PluginOptions {
-// 	player: Player;
-// 	debug?: boolean;
-// }
-// /**
-//  * A plugin for handling YouTube audio content including videos, playlists, and search functionality.
-//  *
-//  * This plugin provides comprehensive support for:
-//  * - YouTube video URLs (youtube.com, youtu.be, music.youtube.com)
-//  * - YouTube playlist URLs and dynamic mixes
-//  * - YouTube search queries
-//  * - Audio stream extraction from YouTube videos
-//  * - Related track recommendations
-//  *
-//  * @example
-//  * const youtubePlugin = new YouTubePlugin();
-//  *
-//  * // Add to PlayerManager
-//  * const manager = new PlayerManager({
-//  *   plugins: [youtubePlugin]
-//  * });
-//  *
-//  * // Search for videos
-//  * const result = await youtubePlugin.search("Never Gonna Give You Up", "user123");
-//  *
-//  * // Get audio stream
-//  * const stream = await youtubePlugin.getStream(result.tracks[0]);
-//  *
-//  * @since 1.0.0
-//  */
-// export class YouTubePlugin extends BasePlugin {
-// 	name = "youtube";
-// 	version = "1.0.0";
-// 	private ready: Promise<void>;
-// 	private player: Player | undefined;
-// 	private options: PluginOptions;
-// 	/**
-// 	 * Creates a new YouTubePlugin instance.
-// 	 *
-// 	 * The plugin will automatically initialize YouTube clients for both video playback
-// 	 * and search functionality. Initialization is asynchronous and handled internally.
-// 	 *
-// 	 * @example
-// 	 * const plugin = new YouTubePlugin();
-// 	 * // Plugin is ready to use after initialization completes
-// 	 */
-// 	constructor(options: PluginOptions) {
-// 		super();
-// 		this.player = options?.player ?? undefined;
-// 		this.options = options ?? {};
-// 		this.ready = this.init();
-// 	}
-// 	private async init(): Promise<void> {}
-// 	private debug(message?: any, ...optionalParams: any[]): void {
-// 		if (this.options?.debug && this?.player && this.player?.listenerCount("debug") > 0) {
-// 			this.player.emit("debug", `[YouTubePlugin] ${message}`, ...optionalParams);
-// 		}
-// 	}
-// 	// Build a Track from various YouTube object shapes (search item, playlist item, watch_next feed, basic_info, info)
-// 	private buildTrack(raw: any, requestedBy: string, extra?: { playlist?: string }): Track {
-// 		const pickFirst = (...vals: any[]) => vals.find((v) => v !== undefined && v !== null && v !== "");
-// 		// Try to resolve from multiple common shapes
-// 		const id = pickFirst(
-// 			raw?.id,
-// 			raw?.video_id,
-// 			raw?.videoId,
-// 			raw?.content_id,
-// 			raw?.identifier,
-// 			raw?.basic_info?.id,
-// 			raw?.basic_info?.video_id,
-// 			raw?.basic_info?.videoId,
-// 			raw?.basic_info?.content_id,
-// 		);
-// 		const title = pickFirst(
-// 			raw?.metadata?.title?.text,
-// 			raw?.title?.text,
-// 			raw?.title,
-// 			raw?.headline,
-// 			raw?.basic_info?.title,
-// 			"Unknown title",
-// 		);
-// 		const durationValue = pickFirst(
-// 			raw?.length_seconds,
-// 			raw?.duration?.seconds,
-// 			raw?.duration?.text,
-// 			raw?.duration,
-// 			raw?.length_text,
-// 			raw?.basic_info?.duration,
-// 		);
-// 		const duration = Number(toSeconds(durationValue)) || 0;
-// 		const thumb = pickFirst(
-// 			raw?.thumbnails?.[0]?.url,
-// 			raw?.thumbnail?.[0]?.url,
-// 			raw?.thumbnail?.url,
-// 			raw?.thumbnail?.thumbnails?.[0]?.url,
-// 			raw?.content_image?.image?.[0]?.url,
-// 			raw?.basic_info?.thumbnail?.[0]?.url,
-// 			raw?.basic_info?.thumbnail?.[raw?.basic_info?.thumbnail?.length - 1]?.url,
-// 			raw?.thumbnails?.[raw?.thumbnails?.length - 1]?.url,
-// 		);
-// 		const author = pickFirst(raw?.author?.name, raw?.author, raw?.channel?.name, raw?.owner?.name, raw?.basic_info?.author);
-// 		const views = pickFirst(
-// 			raw?.view_count,
-// 			raw?.views,
-// 			raw?.short_view_count,
-// 			raw?.stats?.view_count,
-// 			raw?.basic_info?.view_count,
-// 		);
-// 		const url = pickFirst(raw?.url, id ? `https://www.youtube.com/watch?v=${id}` : undefined);
-// 		this.debug("Track build:", {
-// 			id: String(id),
-// 			title: String(title),
-// 			url: String(url),
-// 			duration,
-// 			thumbnail: thumb,
-// 			requestedBy,
-// 			source: this.name,
-// 		});
-// 		return {
-// 			id: String(id),
-// 			title: String(title),
-// 			url: String(url),
-// 			duration,
-// 			thumbnail: thumb,
-// 			requestedBy,
-// 			source: this.name,
-// 			metadata: {
-// 				author,
-// 				views,
-// 				...(extra?.playlist ? { playlist: extra.playlist } : {}),
-// 			},
-// 		} as Track;
-// 	}
-// 	/**
-// 	 * Determines if this plugin can handle the given query.
-// 	 *
-// 	 * @param query - The search query or URL to check
-// 	 * @returns `true` if the plugin can handle the query, `false` otherwise
-// 	 *
-// 	 * @example
-// 	 * plugin.canHandle("https://www.youtube.com/watch?v=dQw4w9WgXcQ"); // true
-// 	 * plugin.canHandle("Never Gonna Give You Up"); // true
-// 	 * plugin.canHandle("spotify:track:123"); // false
-// 	 */
-// 	canHandle(query: string): boolean {
-// 		const q = (query || "").trim().toLowerCase();
-// 		const isUrl = q.startsWith("http://") || q.startsWith("https://");
-// 		if (isUrl) {
-// 			try {
-// 				const parsed = new URL(query);
-// 				const allowedHosts = ["youtube.com", "www.youtube.com", "music.youtube.com", "youtu.be", "www.youtu.be"];
-// 				return allowedHosts.includes(parsed.hostname.toLowerCase());
-// 			} catch (e) {
-// 				return false;
-// 			}
-// 		}
-// 		// Avoid intercepting explicit patterns for other extractors
-// 		if (q.startsWith("tts:") || q.startsWith("say ")) return false;
-// 		if (q.startsWith("spotify:") || q.includes("open.spotify.com")) return false;
-// 		if (q.includes("soundcloud")) return false;
-// 		// Treat remaining non-URL free text as YouTube-searchable
-// 		return true;
-// 	}
-// 	/**
-// 	 * Validates if a URL is a valid YouTube URL.
-// 	 *
-// 	 * @param url - The URL to validate
-// 	 * @returns `true` if the URL is a valid YouTube URL, `false` otherwise
-// 	 *
-// 	 * @example
-// 	 * plugin.validate("https://www.youtube.com/watch?v=dQw4w9WgXcQ"); // true
-// 	 * plugin.validate("https://youtu.be/dQw4w9WgXcQ"); // true
-// 	 * plugin.validate("https://spotify.com/track/123"); // false
-// 	 */
-// 	validate(url: string): boolean {
-// 		try {
-// 			const parsed = new URL(url);
-// 			const allowedHosts = ["youtube.com", "www.youtube.com", "music.youtube.com", "youtu.be", "www.youtu.be", "m.youtube.com"];
-// 			return allowedHosts.includes(parsed.hostname.toLowerCase());
-// 		} catch (e) {
-// 			return false;
-// 		}
-// 	}
-// 	/**
-// 	 * Retrieves the audio stream for a YouTube track using sabr download.
-// 	 *
-// 	 * This method extracts the audio stream from a YouTube video using the sabr download
-// 	 * method which provides better quality and more reliable streaming.
-// 	 *
-// 	 * @param track - The Track object to get the stream for
-// 	 * @returns A StreamInfo object containing the audio stream and metadata
-// 	 * @throws {Error} If the track ID is invalid or stream extraction fails
-// 	 *
-// 	 * @example
-// 	 * const track = { id: "dQw4w9WgXcQ", title: "Never Gonna Give You Up", ... };
-// 	 * const streamInfo = await plugin.getStream(track);
-// 	 * console.log(streamInfo.type); // "arbitrary"
-// 	 * console.log(streamInfo.stream); // Readable stream
-// 	 */
-// 	async getStream(track: Track): Promise<StreamInfo> {
-// 		await this.ready;
-// 		const id = this.extractVideoId(track.url) || track.id;
-// 		if (!id) throw new Error("Invalid track id");
-// 		try {
-// 			this.debug("🚀 Attempting sabr download for video ID:", id);
-// 			// Use sabr download for better quality and reliability
-// 			const { streamResults } = await createSabrStream(id, DEFAULT_SABR_OPTIONS);
-// 			const { audioStream, selectedFormats, videoTitle } = streamResults;
-// 			this.debug("✅ Sabr download successful, converting Web Stream to Node.js Stream");
-// 			// Convert Web Stream to Node.js Readable Stream
-// 			const nodeStream = webStreamToNodeStream(audioStream);
-// 			this.debug("✅ Stream conversion complete, returning Node.js stream");
-// 			// Return the converted Node.js stream
-// 			return {
-// 				stream: nodeStream,
-// 				type: "arbitrary",
-// 				metadata: {
-// 					...track.metadata,
-// 					itag: selectedFormats.audioFormat.itag,
-// 					mime: selectedFormats.audioFormat.mimeType,
-// 				},
-// 			};
-// 		} catch (e: any) {
-// 			this.debug("⚠️ Sabr download failed, falling back to youtubei.js:", e.message);
-// 			// Fallback to original youtubei.js method if sabr download fails
-// 			try {
-// 				const stream: any = await (this.client as any).download(id, {
-// 					type: "audio",
-// 					quality: "best",
-// 				});
-// 				// Check if it's a Web Stream and convert it
-// 				this.debug("🔍 Checking stream type:", typeof stream, stream?.constructor?.name);
-// 				if (stream && typeof stream.getReader === "function") {
-// 					this.debug("🔄 Converting Web Stream to Node.js Stream");
-// 					const nodeStream = webStreamToNodeStream(stream);
-// 					this.debug("✅ Stream converted successfully");
-// 					return {
-// 						stream: nodeStream,
-// 						type: "arbitrary",
-// 						metadata: track.metadata,
-// 					};
-// 				} else {
-// 					this.debug("⚠️ Stream is not a Web Stream or is null");
-// 				}
-// 				return {
-// 					stream,
-// 					type: "arbitrary",
-// 					metadata: track.metadata,
-// 				};
-// 			} catch (fallbackError: any) {
-// 				try {
-// 					const info: any = await (this.client as any).getBasicInfo(id);
-// 					// Prefer m4a audio-only formats first
-// 					let format: any = info?.chooseFormat?.({
-// 						type: "audio",
-// 						quality: "best",
-// 					});
-// 					if (!format && info?.formats?.length) {
-// 						const audioOnly = info.formats.filter((f: any) => f.mime_type?.includes("audio"));
-// 						audioOnly.sort((a: any, b: any) => (b.bitrate || 0) - (a.bitrate || 0));
-// 						format = audioOnly[0];
-// 					}
-// 					if (!format) throw new Error("No audio format available");
-// 					let url: string | undefined = undefined;
-// 					if (typeof format.decipher === "function") {
-// 						url = format.decipher((this.client as any).session.player);
-// 					}
-// 					if (!url) url = format.url;
-// 					if (!url) throw new Error("No valid URL to decipher");
-// 					const res = await fetch(url);
-// 					if (!res.ok || !res.body) {
-// 						throw new Error(`HTTP ${res.status}`);
-// 					}
-// 					// Convert Web Stream to Node.js Stream
-// 					this.debug("🔄 Converting fetch response Web Stream to Node.js Stream");
-// 					const nodeStream = webStreamToNodeStream(res.body);
-// 					return {
-// 						stream: nodeStream,
-// 						type: "arbitrary",
-// 						metadata: {
-// 							...track.metadata,
-// 							itag: format.itag,
-// 							mime: format.mime_type,
-// 						},
-// 					};
-// 				} catch (inner: any) {
-// 					throw new Error(`Failed to get YouTube stream: ${inner?.message || inner}`);
-// 				}
-// 			}
-// 		}
-// 	}
-// 	async getFallback(track: Track): Promise<StreamInfo> {
-// 		try {
-// 			const result = await this.search(track.title, track.requestedBy);
-// 			const first = result.tracks[0];
-// 			this.debug("Fallback track:", first);
-// 			if (!first) throw new Error("No fallback track found");
-// 			return await this.getStream(first);
-// 		} catch (e: any) {
-// 			throw new Error(`YouTube fallback search failed: ${e?.message || e}`);
-// 		}
-// 	}
-// 	private extractVideoId(input: string): string | null {
-// 		try {
-// 			const u = new URL(input);
-// 			const allowedShortHosts = ["youtu.be"];
-// 			const allowedLongHosts = ["youtube.com", "www.youtube.com", "music.youtube.com", "m.youtube.com"];
-// 			if (allowedShortHosts.includes(u.hostname)) {
-// 				return u.pathname.split("/").filter(Boolean)[0] || null;
-// 			}
-// 			if (allowedLongHosts.includes(u.hostname)) {
-// 				// watch?v=, shorts/, embed/
-// 				if (u.searchParams.get("v")) return u.searchParams.get("v");
-// 				const path = u.pathname;
-// 				if (path.startsWith("/shorts/")) return path.replace("/shorts/", "");
-// 				if (path.startsWith("/embed/")) return path.replace("/embed/", "");
-// 			}
-// 			return null;
-// 		} catch {
-// 			return null;
-// 		}
-// 	}
-// }
-// function toSeconds(d: any): number | undefined {
-// 	if (typeof d === "number") return d;
-// 	if (typeof d === "string") {
-// 		// mm:ss or hh:mm:ss
-// 		const parts = d.split(":").map(Number);
-// 		if (parts.some((n) => Number.isNaN(n))) return undefined;
-// 		if (parts.length === 3) return parts[0] * 3600 + parts[1] * 60 + parts[2];
-// 		if (parts.length === 2) return parts[0] * 60 + parts[1];
-// 		const asNum = Number(d);
-// 		return Number.isFinite(asNum) ? asNum : undefined;
-// 	}
-// 	if (d && typeof d === "object") {
-// 		if (typeof (d as any).seconds === "number") return (d as any).seconds;
-// 		if (typeof (d as any).milliseconds === "number") return Math.floor((d as any).milliseconds / 1000);
-// 	}
-// 	return undefined;
-// }
-//# sourceMappingURL=YouTubePlugin.js.map

package/dist/YouTubePlugin.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"YouTubePlugin.js","sourceRoot":"","sources":["../src/YouTubePlugin.ts"],"names":[],"mappings":"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"}