flux-dl 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flux-dl",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Leistungsstarke Video-Downloader Library für YouTube, Vimeo und Dailymotion - komplett in JavaScript, keine externen Binaries",
   "main": "src/index.js",
   "scripts": {

package/src/VideoDownloader.js

@@ -166,8 +166,17 @@ class VideoDownloader {
     // Nutze Browser Emulation mit Cookies
     const referer = `https://www.youtube.com/watch?v=${info.videoId}`;
     
+    // Wrap onProgress to catch errors
+    const safeOnProgress = onProgress ? (percent, downloaded, total) => {
+      try {
+        onProgress(percent, downloaded, total);
+      } catch (error) {
+        // Silently ignore progress callback errors
+      }
+    } : null;
+    
     try {
-      const rawStream = await this.browser.downloadStream(info.videoUrl, referer, onProgress);
+      const rawStream = await this.browser.downloadStream(info.videoUrl, referer, safeOnProgress);
       
       // Create ULTRA-RESILIENT wrapper stream
       const { PassThrough } = require('stream');

package/src/platforms/youtube.js

@@ -18,7 +18,7 @@ module.exports = {
         throw new Error('Invalid YouTube URL');
       }
 
-      console.log(`\n=== Extracting YouTube Video: ${videoId} ===`);
+      // console.log(`\n=== Extracting YouTube Video: ${videoId} ===`);
 
       // Starte Browser-Session (wie echter User)
       await this.browser.startSession();
@@ -26,9 +26,12 @@ module.exports = {
       // Methode 1: InnerTube API mit verschiedenen Clients
       const clientPriority = ['android', 'ios', 'tvEmbedded', 'web'];
       
+      // Get target quality from options
+      const targetQuality = options?.quality || null;
+      
       for (const clientType of clientPriority) {
         try {
-          console.log(`[InnerTube] Trying ${clientType} client...`);
+          // console.log(`[InnerTube] Trying ${clientType} client...`);
           const data = await this.innerTube.getVideoInfo(videoId, clientType);
 
           if (data.videoDetails && data.streamingData) {
@@ -41,7 +44,12 @@ module.exports = {
             if (formatsWithUrl.length > 0) {
               console.log(`✓ ${clientType} client success! ${formatsWithUrl.length} formats available`);
               
-              const bestFormat = this.selectBestFormat(formatsWithUrl);
+              // Select format with target quality
+              const bestFormat = this.selectBestFormat(formatsWithUrl, targetQuality);
+              
+              // Get actual bitrate for quality label
+              const actualBitrate = this.getBitrate(bestFormat);
+              const qualityLabel = `${actualBitrate}kbps`;
               
               // Get highest quality thumbnail (last one in array)
               const thumbnails = data.videoDetails.thumbnail.thumbnails;
@@ -58,7 +66,8 @@ module.exports = {
                 likeCount: parseInt(data.videoDetails.likeCount || 0),
                 uploadDate: data.videoDetails.uploadDate || data.videoDetails.publishDate || null,
                 videoUrl: bestFormat.url,
-                quality: bestFormat.qualityLabel || bestFormat.quality || 'unknown',
+                quality: qualityLabel,
+                bitrate: actualBitrate,
                 format: bestFormat,
                 allFormats: formatsWithUrl,
                 platform: this.name,
@@ -128,8 +137,14 @@ module.exports = {
         throw new Error('No valid formats found');
       }
 
-      const bestFormat = this.selectBestFormat(validFormats);
-      console.log(`Selected: ${bestFormat.qualityLabel || 'unknown'} quality\n`);
+      // Select format with target quality (already declared above)
+      const bestFormat = this.selectBestFormat(validFormats, targetQuality);
+      
+      // Get actual bitrate for quality label
+      const actualBitrate = this.getBitrate(bestFormat);
+      const qualityLabel = `${actualBitrate}kbps`;
+      
+      console.log(`Selected: ${qualityLabel} quality\n`);
 
       // Get highest quality thumbnail (last one in array)
       const thumbnails = videoDetails.thumbnail.thumbnails;
@@ -146,7 +161,8 @@ module.exports = {
         likeCount: parseInt(videoDetails.likeCount || 0),
         uploadDate: videoDetails.uploadDate || videoDetails.publishDate || null,
         videoUrl: bestFormat.url,
-        quality: bestFormat.qualityLabel || 'unknown',
+        quality: qualityLabel,
+        bitrate: actualBitrate,
         format: bestFormat,
         allFormats: validFormats,
         platform: this.name,
@@ -429,17 +445,49 @@ module.exports = {
     return res.data;
   },
 
-  selectBestFormat(formats) {
-    // Mit Audio + Video
+  selectBestFormat(formats, targetQuality = null) {
+    // WICHTIG: Nutze IMMER Video+Audio Formate (keine 403 Errors!)
+    // Audio-only Formate geben oft 403 Forbidden
+    
     const withBoth = formats.filter(f => 
       f.url && f.mimeType && f.mimeType.includes('video') && f.audioQuality
     );
+    
     if (withBoth.length > 0) {
+      // Wenn targetQuality angegeben, wähle Format mit passender Audio-Bitrate
+      if (targetQuality) {
+        // Sortiere nach Audio-Bitrate-Nähe zur Ziel-Qualität
+        withBoth.sort((a, b) => {
+          const bitrateA = this.getBitrate(a);
+          const bitrateB = this.getBitrate(b);
+          
+          // Bevorzuge Formate unter oder gleich der Ziel-Qualität
+          const diffA = Math.abs(bitrateA - targetQuality);
+          const diffB = Math.abs(bitrateB - targetQuality);
+          
+          // Wenn beide über Ziel, nehme kleineres
+          if (bitrateA > targetQuality && bitrateB > targetQuality) {
+            return bitrateA - bitrateB;
+          }
+          
+          // Wenn beide unter Ziel, nehme größeres
+          if (bitrateA <= targetQuality && bitrateB <= targetQuality) {
+            return bitrateB - bitrateA;
+          }
+          
+          // Sonst nehme das nähere
+          return diffA - diffB;
+        });
+        
+        return withBoth[0];
+      }
+      
+      // Ohne targetQuality: Nehme höchste Video-Qualität
       withBoth.sort((a, b) => (b.height || 0) - (a.height || 0));
       return withBoth[0];
     }
 
-    // Nur Video
+    // Fallback: Nur Video (sollte nicht passieren)
     const videoOnly = formats.filter(f => 
       f.url && f.mimeType && f.mimeType.includes('video')
     );
@@ -451,6 +499,31 @@ module.exports = {
     return formats[0];
   },
 
+  getBitrate(format) {
+    if (format.bitrate) {
+      return Math.round(format.bitrate / 1000); // Bits zu kbps
+    }
+    
+    if (format.audioBitrate) {
+      return format.audioBitrate;
+    }
+
+    if (format.averageBitrate) {
+      return Math.round(format.averageBitrate / 1000);
+    }
+
+    // Fallback: Schätze aus Quality-Label
+    if (format.qualityLabel) {
+      const match = format.qualityLabel.match(/(\d+)kbps/i);
+      if (match) {
+        return parseInt(match[1]);
+      }
+    }
+
+    // Default: Mittel
+    return 192;
+  },
+
   extractVideoId(url) {
     let m = url.match(/[?&]v=([^&]+)/);
     if (m) return m[1];

package/src/utils/browserEmulation.js

@@ -280,8 +280,7 @@ class BrowserEmulation {
                 onProgress(percent, downloadedLength, totalLength);
               }
             } catch (err) {
-              // Even progress callback errors won't crash us
-              console.warn('⚠️ Progress callback error (handled)');
+              // Silently ignore progress callback errors
             }
           });
         }