stormcloud-video-player 0.3.11 → 0.3.13

package/lib/players/HlsPlayer.cjs

@@ -1254,15 +1254,10 @@ function createHlsAdPlayer(contentVideo, options) {
     setAdPlayingFlag(false);
     emit("content_resume");
     setTimeout(() => {
-      const stillInPod = contentVideo.dataset.stormcloudAdPlaying === "true";
-      if (stillInPod) {
-        console.log(
-          "[HlsAdPlayer] Still in ad pod - keeping ad container visible (black screen)"
-        );
-        if (adContainerEl) {
-          adContainerEl.style.display = "flex";
-          adContainerEl.style.pointerEvents = "auto";
-        }
+      if (!adPlaying && adContainerEl) {
+        adContainerEl.style.display = "none";
+        adContainerEl.style.pointerEvents = "none";
+        console.log("[HlsAdPlayer] Ad container hidden after completion (waiting for next ad)");
       }
     }, 50);
   }
@@ -3118,7 +3113,7 @@ var StormcloudVideoPlayer = class {
         continue;
       }
       if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch ad (${this.successfulAdRequests.length + this.adRequestQueue.length + 1} total)...`);
+        console.log(`[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch ad #${this.successfulAdRequests.length + this.adRequestQueue.length + 1} (queue: ${this.adRequestQueue.length}, remaining: ${Math.round(remaining / 1e3)}s)...`);
       }
       try {
         const response = await fetch(newAdUrl, { mode: "cors" });
@@ -3134,7 +3129,8 @@ var StormcloudVideoPlayer = class {
             console.log("[CONTINUOUS-FETCH] \u26A0\uFE0F VAST response has no media files, skipping");
           }
           this.failedVastUrls.add(newAdUrl);
-          await new Promise((resolve) => setTimeout(resolve, 1e3));
+          const retryDelay = this.adRequestQueue.length > 0 ? 1e3 : 500;
+          await new Promise((resolve) => setTimeout(resolve, retryDelay));
           continue;
         }
         if (this.config.debugAdTiming) {
@@ -3142,17 +3138,19 @@ var StormcloudVideoPlayer = class {
         }
         this.adRequestQueue.push(newAdUrl);
         this.totalAdsInBreak++;
-        await new Promise((resolve) => setTimeout(resolve, 500));
+        const successDelay = this.adRequestQueue.length <= 1 ? 300 : 500;
+        await new Promise((resolve) => setTimeout(resolve, successDelay));
       } 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, 2e3));
+        const retryDelay = this.adRequestQueue.length > 0 ? 2e3 : 1e3;
+        await new Promise((resolve) => setTimeout(resolve, retryDelay));
       }
     }
     if (this.config.debugAdTiming) {
-      console.log("[CONTINUOUS-FETCH] \u{1F6D1} Continuous fetch loop ended");
+      console.log(`[CONTINUOUS-FETCH] \u{1F6D1} Continuous fetch loop ended (fetched ${this.successfulAdRequests.length} ads, ${this.adRequestQueue.length} in queue)`);
     }
   }
   stopContinuousFetching() {
@@ -3176,6 +3174,12 @@ var StormcloudVideoPlayer = class {
         if (this.config.debugAdTiming) {
           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(() => {
@@ -3184,20 +3188,27 @@ var StormcloudVideoPlayer = class {
         return;
       }
     }
-    const maxRetries = 5;
-    if (this.continuousFetchingActive && retryCount < maxRetries && remaining > 2e3) {
+    const hasPlayedAtLeastOneAd = this.successfulAdRequests.length > 0;
+    const maxRetries = hasPlayedAtLeastOneAd ? 10 : 5;
+    const retryDelayMs = hasPlayedAtLeastOneAd ? 500 : 1e3;
+    const minRemainingForRetry = 1e3;
+    if (this.continuousFetchingActive && retryCount < maxRetries && remaining > minRemainingForRetry) {
       if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u23F3 Queue empty but fetching active, waiting... (retry ${retryCount + 1}/${maxRetries})`);
+        console.log(`[CONTINUOUS-FETCH] \u23F3 Queue empty but fetching active, waiting ${retryDelayMs}ms... (retry ${retryCount + 1}/${maxRetries}, remaining: ${remaining}ms)`);
       }
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
+      await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
       await this.tryNextAvailableAd(retryCount + 1);
       return;
     }
-    if (!this.isShowingPlaceholder && remaining > 1e3) {
+    const minTimeForPlaceholder = 3e3;
+    if (!this.isShowingPlaceholder && remaining >= minTimeForPlaceholder && this.continuousFetchingActive) {
+      if (this.config.debugAdTiming) {
+        console.log(`[CONTINUOUS-FETCH] \u2B1B Last resort: showing placeholder (${remaining}ms remaining)`);
+      }
       this.showPlaceholderAndWaitForAds();
     } else {
       if (this.config.debugAdTiming) {
-        console.log("[CONTINUOUS-FETCH] \u23F9\uFE0F No more ads available, ending ad break");
+        console.log(`[CONTINUOUS-FETCH] \u23F9\uFE0F No more ads available or insufficient time remaining (${remaining}ms), ending ad break`);
       }
       this.handleAdPodComplete();
     }
@@ -3205,33 +3216,47 @@ var StormcloudVideoPlayer = class {
   async showPlaceholderAndWaitForAds() {
     const remaining = this.getRemainingAdMs();
     const waitTime = Math.min(this.maxPlaceholderDurationMs, remaining);
-    if (waitTime < 1e3) {
+    if (waitTime < 3e3) {
+      if (this.config.debugAdTiming) {
+        console.log(`[CONTINUOUS-FETCH] \u23F9\uFE0F Insufficient time for placeholder (${waitTime}ms), ending ad break`);
+      }
       this.handleAdPodComplete();
       return;
     }
     if (this.config.debugAdTiming) {
-      console.log(`[CONTINUOUS-FETCH] \u2B1B Showing black placeholder for ${waitTime}ms while waiting for ads`);
+      console.log(`[CONTINUOUS-FETCH] \u2B1B Showing black placeholder for up to ${waitTime}ms while waiting for ads (last resort)`);
     }
     this.isShowingPlaceholder = true;
     this.placeholderStartTimeMs = Date.now();
     this.ima.showPlaceholder();
-    const checkInterval = 500;
+    const checkInterval = 300;
     const maxChecks = Math.floor(waitTime / checkInterval);
     for (let i = 0; i < maxChecks; i++) {
       await new Promise((resolve) => setTimeout(resolve, checkInterval));
       if (!this.inAdBreak) {
+        if (this.config.debugAdTiming) {
+          console.log("[CONTINUOUS-FETCH] \u2139\uFE0F Ad break ended during placeholder wait");
+        }
+        this.isShowingPlaceholder = false;
+        this.placeholderStartTimeMs = null;
+        this.ima.hidePlaceholder();
         return;
       }
       if (this.adRequestQueue.length > 0) {
+        const elapsedInPlaceholder = Date.now() - (this.placeholderStartTimeMs || Date.now());
         if (this.config.debugAdTiming) {
-          console.log("[CONTINUOUS-FETCH] \u2705 New ad became available during placeholder");
+          console.log(`[CONTINUOUS-FETCH] \u2705 New ad became available during placeholder (after ${elapsedInPlaceholder}ms)`);
         }
         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();
           });
@@ -3239,8 +3264,9 @@ var StormcloudVideoPlayer = class {
         return;
       }
     }
+    const totalPlaceholderTime = Date.now() - (this.placeholderStartTimeMs || Date.now());
     if (this.config.debugAdTiming) {
-      console.log("[CONTINUOUS-FETCH] \u23F0 Placeholder timeout reached, no ads fetched");
+      console.log(`[CONTINUOUS-FETCH] \u23F0 Placeholder timeout reached after ${totalPlaceholderTime}ms, no ads fetched`);
     }
     this.isShowingPlaceholder = false;
     this.placeholderStartTimeMs = null;