unified-video-framework 1.4.252 → 1.4.254

package/packages/web/src/WebPlayer.ts

@@ -1280,6 +1280,12 @@ export class WebPlayer extends BasePlayer {
         this.state.isPaused = false;
         this.state.isBuffering = false;
         this.updateYouTubeUI('playing');
+        
+        // Extract qualities when video starts playing
+        setTimeout(() => {
+          this.extractYouTubeAvailableQualities();
+        }, 1000);
+        
         this.emit('onPlay');
         break;
         
@@ -1294,6 +1300,12 @@ export class WebPlayer extends BasePlayer {
       case window.YT.PlayerState.BUFFERING:
         this.state.isBuffering = true;
         this.updateYouTubeUI('buffering');
+        
+        // Try to extract qualities during buffering as well
+        setTimeout(() => {
+          this.extractYouTubeAvailableQualities();
+        }, 500);
+        
         this.emit('onBuffering', true);
         break;
         
@@ -1425,17 +1437,33 @@ export class WebPlayer extends BasePlayer {
   private youtubeCurrentQuality: any = null;
 
   /**
-   * Extract available YouTube video qualities
+   * Extract available YouTube video qualities with retry logic
    */
-  private extractYouTubeAvailableQualities(): void {
-    if (!this.youtubePlayer) return;
+  private extractYouTubeAvailableQualities(retryCount: number = 0): void {
+    if (!this.youtubePlayer || !this.youtubePlayerReady) {
+      this.debugLog('YouTube player not ready for quality extraction');
+      return;
+    }
     
     try {
       const availableQualityLevels = this.youtubePlayer.getAvailableQualityLevels();
-      this.debugLog('YouTube available quality levels:', availableQualityLevels);
+      this.debugLog('🔍 YouTube quality detection attempt', retryCount + 1, '- Found levels:', availableQualityLevels);
+      this.debugLog('🔍 YouTube player state:', this.youtubePlayer.getPlayerState());
+      this.debugLog('🔍 Current YouTube quality:', this.youtubePlayer.getPlaybackQuality());
+      
+      // If no qualities detected and we haven't retried too much, retry after a delay
+      if ((!availableQualityLevels || availableQualityLevels.length === 0 || (availableQualityLevels.length === 1 && availableQualityLevels[0] === 'auto')) && retryCount < 5) {
+        this.debugLog('No meaningful qualities detected, retrying in', (retryCount + 1) * 1000, 'ms...');
+        setTimeout(() => {
+          this.extractYouTubeAvailableQualities(retryCount + 1);
+        }, (retryCount + 1) * 1000);
+        return;
+      }
       
       // Map YouTube quality levels to standard labels
       const qualityMap: Record<string, any> = {
+        'hd2160': { label: '4K', value: 'hd2160', height: 2160 },
+        'hd1440': { label: '1440p', value: 'hd1440', height: 1440 },
         'hd1080': { label: '1080p', value: 'hd1080', height: 1080 },
         'hd720': { label: '720p', value: 'hd720', height: 720 },
         'large': { label: '480p', value: 'large', height: 480 },
@@ -1446,18 +1474,25 @@ export class WebPlayer extends BasePlayer {
       };
       
       this.youtubeAvailableQualities = [];
-      availableQualityLevels.forEach((qualityLevel: string) => {
-        // Skip 'auto' from YouTube API - we'll add it explicitly
-        if (qualityLevel === 'auto') return;
-        if (qualityMap[qualityLevel]) {
-          this.youtubeAvailableQualities.push(qualityMap[qualityLevel]);
-        }
-      });
       
-      // Always add auto quality option as the first item (exactly once)
-      this.youtubeAvailableQualities.unshift({ label: 'Auto', value: 'auto', height: 0 });
+      // Always add auto quality option first
+      this.youtubeAvailableQualities.push({ label: 'Auto', value: 'auto', height: 0 });
       
-      this.debugLog('Mapped YouTube qualities:', this.youtubeAvailableQualities);
+      // Add detected qualities, filtering out 'auto' since we already added it
+      if (availableQualityLevels && availableQualityLevels.length > 0) {
+        availableQualityLevels.forEach((qualityLevel: string) => {
+          if (qualityLevel !== 'auto' && qualityMap[qualityLevel]) {
+            this.youtubeAvailableQualities.push(qualityMap[qualityLevel]);
+          }
+        });
+        
+        // Sort qualities by height (descending, excluding auto)
+        const autoQuality = this.youtubeAvailableQualities.shift(); // Remove auto temporarily
+        this.youtubeAvailableQualities.sort((a, b) => (b.height || 0) - (a.height || 0));
+        if (autoQuality) this.youtubeAvailableQualities.unshift(autoQuality); // Add auto back at beginning
+      }
+      
+      this.debugLog('✅ Successfully mapped YouTube qualities:', this.youtubeAvailableQualities);
       
       // Get current quality
       try {
@@ -1469,14 +1504,28 @@ export class WebPlayer extends BasePlayer {
         this.youtubeCurrentQuality = qualityMap['auto'];
       }
       
+      // Update detected qualities to include YouTube qualities
+      this.detectAvailableQualities();
+      
+      this.debugLog('🚀 YouTube qualities successfully detected! Available qualities now:', this.availableQualities.length);
+      
       // Update quality badge with current YouTube quality
       this.updateQualityBadge();
       
-      // Update settings menu to show YouTube qualities
-      this.updateSettingsMenu();
+      // Force settings menu refresh with new qualities
+      setTimeout(() => {
+        this.debugLog('🔄 Force refreshing settings menu with YouTube qualities');
+        this.updateSettingsMenu();
+      }, 100);
       
     } catch (error) {
       this.debugWarn('Could not extract YouTube qualities:', error);
+      // Retry if we haven't tried too many times
+      if (retryCount < 3) {
+        setTimeout(() => {
+          this.extractYouTubeAvailableQualities(retryCount + 1);
+        }, 2000);
+      }
     }
   }
   
@@ -1488,6 +1537,8 @@ export class WebPlayer extends BasePlayer {
     
     try {
       const qualityMap: Record<string, any> = {
+        'hd2160': { label: '4K', value: 'hd2160', height: 2160 },
+        'hd1440': { label: '1440p', value: 'hd1440', height: 1440 },
         'hd1080': { label: '1080p', value: 'hd1080', height: 1080 },
         'hd720': { label: '720p', value: 'hd720', height: 720 },
         'large': { label: '480p', value: 'large', height: 480 },
@@ -1563,6 +1614,8 @@ export class WebPlayer extends BasePlayer {
       clearInterval(this.youtubeTimeTrackingInterval);
     }
     
+    let qualityCheckCounter = 0;
+    
     this.youtubeTimeTrackingInterval = setInterval(() => {
       if (this.youtubePlayer && this.youtubePlayerReady) {
         try {
@@ -1574,6 +1627,14 @@ export class WebPlayer extends BasePlayer {
           this.state.duration = duration || 0;
           this.state.bufferedPercentage = buffered || 0;
           
+          // Check for qualities periodically (every 10 seconds) if we don't have them yet
+          qualityCheckCounter++;
+          if (qualityCheckCounter >= 40 && this.youtubeAvailableQualities.length <= 1) { // 40 * 250ms = 10s
+            this.debugLog('Periodic YouTube quality check triggered');
+            this.extractYouTubeAvailableQualities();
+            qualityCheckCounter = 0; // Reset counter
+          }
+          
           // Update UI progress bar
           this.updateYouTubeProgressBar(currentTime, duration, buffered);
           
@@ -9648,6 +9709,8 @@ export class WebPlayer extends BasePlayer {
 
     // Quality Accordion Section (only if enabled in config and qualities detected)
     if (this.settingsConfig.quality && this.availableQualities.length > 0) {
+      this.debugLog('🎛️ Building quality menu with', this.availableQualities.length, 'qualities:', this.availableQualities.map(q => q.label));
+      
       // For YouTube, use youtubeCurrentQuality; otherwise use currentQuality
       const qualityForDisplay = this.youtubePlayer && this.youtubePlayerReady && this.youtubeCurrentQuality
         ? this.youtubeCurrentQuality.value
@@ -9655,6 +9718,8 @@ export class WebPlayer extends BasePlayer {
       const currentQuality = this.availableQualities.find(q => q.value === qualityForDisplay);
       const currentQualityLabel = currentQuality ? currentQuality.label : 'Auto';
       
+      this.debugLog('🎛️ Current quality for display:', qualityForDisplay, '(', currentQualityLabel, ')');
+      
       menuHTML += `
         <div class="uvf-accordion-item">
           <div class="uvf-accordion-header" data-section="quality">