stormcloud-video-player 0.3.10 → 0.3.12

package/lib/players/HlsPlayer.cjs

@@ -3104,9 +3104,10 @@ var StormcloudVideoPlayer = class {
         }
         break;
       }
-      if (this.adRequestQueue.length > 0) {
+      const maxQueueSize = 3;
+      if (this.adRequestQueue.length >= maxQueueSize) {
         if (this.config.debugAdTiming) {
-          console.log(`[CONTINUOUS-FETCH] \u23F3 Already have ${this.adRequestQueue.length} ads queued, waiting...`);
+          console.log(`[CONTINUOUS-FETCH] \u23F8\uFE0F Queue full (${this.adRequestQueue.length}), pausing fetching...`);
         }
         await new Promise((resolve) => setTimeout(resolve, 2e3));
         continue;
@@ -3117,7 +3118,7 @@ var StormcloudVideoPlayer = class {
         continue;
       }
       if (this.config.debugAdTiming) {
-        console.log("[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch additional ad...");
+        console.log(`[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch ad (${this.successfulAdRequests.length + this.adRequestQueue.length + 1} total)...`);
       }
       try {
         const response = await fetch(newAdUrl, { mode: "cors" });
@@ -3137,17 +3138,17 @@ var StormcloudVideoPlayer = class {
           continue;
         }
         if (this.config.debugAdTiming) {
-          console.log("[CONTINUOUS-FETCH] \u2705 Successfully fetched new ad, adding to queue");
+          console.log(`[CONTINUOUS-FETCH] \u2705 Successfully fetched ad, adding to queue (queue size: ${this.adRequestQueue.length + 1})`);
         }
         this.adRequestQueue.push(newAdUrl);
         this.totalAdsInBreak++;
-        await new Promise((resolve) => setTimeout(resolve, 2e3));
+        await new Promise((resolve) => setTimeout(resolve, 500));
       } catch (error) {
         if (this.config.debugAdTiming) {
           console.log("[CONTINUOUS-FETCH] \u274C Ad fetch failed:", error.message);
         }
         this.failedVastUrls.add(newAdUrl);
-        await new Promise((resolve) => setTimeout(resolve, 3e3));
+        await new Promise((resolve) => setTimeout(resolve, 2e3));
       }
     }
     if (this.config.debugAdTiming) {
@@ -3160,7 +3161,7 @@ var StormcloudVideoPlayer = class {
       console.log("[CONTINUOUS-FETCH] \u{1F6D1} Stopping continuous ad fetching");
     }
   }
-  async tryNextAvailableAd() {
+  async tryNextAvailableAd(retryCount = 0) {
     const remaining = this.getRemainingAdMs();
     if (remaining <= 500) {
       if (this.config.debugAdTiming) {
@@ -3173,15 +3174,31 @@ var StormcloudVideoPlayer = class {
       const nextAdUrl = this.adRequestQueue.shift();
       if (nextAdUrl) {
         if (this.config.debugAdTiming) {
-          console.log("[CONTINUOUS-FETCH] \u{1F3AC} Playing next queued ad");
+          console.log(`[CONTINUOUS-FETCH] \u{1F3AC} Playing next queued ad (${this.currentAdIndex + 1}/${this.totalAdsInBreak}, ${this.adRequestQueue.length} remaining in queue)`);
+        }
+        const currentMuted = this.video.muted;
+        const currentVolume = this.video.volume;
+        this.ima.updateOriginalMutedState(currentMuted, currentVolume);
+        if (this.config.debugAdTiming) {
+          console.log(`[CONTINUOUS-FETCH] \u{1F50A} Updated ad audio state: muted=${currentMuted}, volume=${currentVolume}`);
         }
         this.currentAdIndex++;
+        this.successfulAdRequests.push(nextAdUrl);
         await this.playSingleAd(nextAdUrl).catch(() => {
-          this.tryNextAvailableAd();
+          this.tryNextAvailableAd(0);
         });
         return;
       }
     }
+    const maxRetries = 5;
+    if (this.continuousFetchingActive && retryCount < maxRetries && remaining > 2e3) {
+      if (this.config.debugAdTiming) {
+        console.log(`[CONTINUOUS-FETCH] \u23F3 Queue empty but fetching active, waiting... (retry ${retryCount + 1}/${maxRetries})`);
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
+      await this.tryNextAvailableAd(retryCount + 1);
+      return;
+    }
     if (!this.isShowingPlaceholder && remaining > 1e3) {
       this.showPlaceholderAndWaitForAds();
     } else {
@@ -3218,9 +3235,13 @@ var StormcloudVideoPlayer = class {
         this.isShowingPlaceholder = false;
         this.placeholderStartTimeMs = null;
         this.ima.hidePlaceholder();
+        const currentMuted = this.video.muted;
+        const currentVolume = this.video.volume;
+        this.ima.updateOriginalMutedState(currentMuted, currentVolume);
         const nextAdUrl = this.adRequestQueue.shift();
         if (nextAdUrl) {
           this.currentAdIndex++;
+          this.successfulAdRequests.push(nextAdUrl);
           await this.playSingleAd(nextAdUrl).catch(() => {
             this.tryNextAvailableAd();
           });