stormcloud-video-player 0.2.18 → 0.2.20

package/lib/index.cjs

@@ -592,28 +592,42 @@ function createImaController(video, options) {
                 adsManager.addEventListener(
                   AdEvent.CONTENT_RESUME_REQUESTED,
                   () => {
-                    var _a;
                     console.log("[IMA] Content resume requested");
                     adPlaying = false;
-                    video.muted = originalMutedState;
                     setAdPlayingFlag(false);
-                    if (adContainerEl) {
-                      adContainerEl.style.pointerEvents = "none";
-                      adContainerEl.style.display = "none";
-                      console.log(
-                        "[IMA] Ad container hidden - pointer events disabled"
-                      );
-                    }
-                    if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
-                      (_a = video.play()) == null ? void 0 : _a.catch(() => {
-                      });
-                      console.log("[IMA] Video resumed (VOD mode)");
-                    } else {
-                      console.log(
-                        "[IMA] Video unmuted (Live mode - was never paused)"
-                      );
-                    }
                     emit("content_resume");
+                    setTimeout(() => {
+                      var _a;
+                      const stillInAdPod = video.dataset.stormcloudAdPlaying === "true";
+                      if (stillInAdPod) {
+                        console.log(
+                          "[IMA] Next ad started - keeping content muted/paused and ad container visible"
+                        );
+                        if (adContainerEl) {
+                          adContainerEl.style.display = "flex";
+                          adContainerEl.style.pointerEvents = "auto";
+                        }
+                        return;
+                      }
+                      console.log("[IMA] No next ad - resuming content");
+                      video.muted = originalMutedState;
+                      if (adContainerEl) {
+                        adContainerEl.style.pointerEvents = "none";
+                        adContainerEl.style.display = "none";
+                        console.log(
+                          "[IMA] Ad container hidden - pointer events disabled"
+                        );
+                      }
+                      if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
+                        (_a = video.play()) == null ? void 0 : _a.catch(() => {
+                        });
+                        console.log("[IMA] Video resumed (VOD mode)");
+                      } else {
+                        console.log(
+                          "[IMA] Video unmuted (Live mode - was never paused)"
+                        );
+                      }
+                    }, 100);
                   }
                 );
                 adsManager.addEventListener(AdEvent.ALL_ADS_COMPLETED, () => {
@@ -1188,24 +1202,38 @@ function createHlsAdPlayer(contentVideo, options) {
     console.log("[HlsAdPlayer] Handling ad completion");
     adPlaying = false;
     setAdPlayingFlag(false);
-    const previousMutedState = contentVideo.muted;
-    contentVideo.muted = originalMutedState;
-    console.log(
-      `[HlsAdPlayer] Restored mute state: ${previousMutedState} -> ${originalMutedState}`
-    );
-    if (adContainerEl) {
-      adContainerEl.style.display = "none";
-      adContainerEl.style.pointerEvents = "none";
-    }
-    if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
-      contentVideo.play().catch(() => {
-      });
-      console.log("[HlsAdPlayer] Content resumed (VOD mode)");
-    } else {
-      console.log("[HlsAdPlayer] Content unmuted (Live mode)");
-    }
     emit("content_resume");
     emit("all_ads_completed");
+    setTimeout(() => {
+      const stillInAdPod = contentVideo.dataset.stormcloudAdPlaying === "true";
+      if (stillInAdPod) {
+        console.log(
+          "[HlsAdPlayer] Next ad started - keeping content muted/paused and ad container visible"
+        );
+        if (adContainerEl) {
+          adContainerEl.style.display = "flex";
+          adContainerEl.style.pointerEvents = "auto";
+        }
+        return;
+      }
+      console.log("[HlsAdPlayer] No next ad - resuming content");
+      const previousMutedState = contentVideo.muted;
+      contentVideo.muted = originalMutedState;
+      console.log(
+        `[HlsAdPlayer] Restored mute state: ${previousMutedState} -> ${originalMutedState}`
+      );
+      if (adContainerEl) {
+        adContainerEl.style.display = "none";
+        adContainerEl.style.pointerEvents = "none";
+      }
+      if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
+        contentVideo.play().catch(() => {
+        });
+        console.log("[HlsAdPlayer] Content resumed (VOD mode)");
+      } else {
+        console.log("[HlsAdPlayer] Content unmuted (Live mode)");
+      }
+    }, 100);
   }
   function handleAdError() {
     console.log("[HlsAdPlayer] Handling ad error");
@@ -1943,6 +1971,7 @@ var StormcloudVideoPlayer = class {
     this.bufferedSegmentsCount = 0;
     this.shouldAutoplayAfterBuffering = false;
     this.hasInitialBufferCompleted = false;
+    this.isTransitioningBetweenAds = false;
     initializePolyfills();
     const browserOverrides = getBrowserConfigOverrides();
     this.config = { ...config, ...browserOverrides };
@@ -2244,29 +2273,60 @@ var StormcloudVideoPlayer = class {
     this.ima.on("content_resume", () => {
       if (this.config.debugAdTiming) {
         console.log(
-          "[StormcloudVideoPlayer] IMA content_resume event received"
+          "[StormcloudVideoPlayer] IMA content_resume event received",
+          {
+            inAdBreak: this.inAdBreak,
+            isTransitioningBetweenAds: this.isTransitioningBetweenAds,
+            pendingAds: this.adPodQueue.length
+          }
         );
       }
       this.clearAdFailsafeTimer();
-      if (!this.inAdBreak) return;
+      if (this.isTransitioningBetweenAds) {
+        if (this.config.debugAdTiming) {
+          console.log(
+            "[StormcloudVideoPlayer] Transitioning between ads - keeping content muted/paused"
+          );
+        }
+        return;
+      }
+      if (!this.inAdBreak) {
+        if (this.config.debugAdTiming) {
+          console.log(
+            "[StormcloudVideoPlayer] Not in ad break, allowing normal content resume"
+          );
+        }
+        return;
+      }
       const remaining = this.getRemainingAdMs();
       if (remaining > 500 && this.adPodQueue.length > 0) {
+        this.isTransitioningBetweenAds = true;
+        this.video.muted = true;
+        if (!this.shouldContinueLiveStreamDuringAds()) {
+          this.video.pause();
+        }
         const next = this.adPodQueue.shift();
         this.currentAdIndex++;
         if (this.config.debugAdTiming) {
           console.log(
-            `[StormcloudVideoPlayer] Playing next ad in pod (${this.currentAdIndex}/${this.totalAdsInBreak})`
+            `[StormcloudVideoPlayer] Playing next ad in pod (${this.currentAdIndex}/${this.totalAdsInBreak}) - keeping content muted/paused`
           );
         }
         this.playSingleAd(next).catch(() => {
+        }).finally(() => {
+          this.isTransitioningBetweenAds = false;
         });
       } else {
         if (this.config.debugAdTiming) {
           console.log("[StormcloudVideoPlayer] Ad pod completed");
         }
+        this.inAdBreak = false;
+        this.expectedAdBreakDurationMs = void 0;
+        this.currentAdBreakStartWallClockMs = void 0;
         this.currentAdIndex = 0;
         this.totalAdsInBreak = 0;
         this.showAds = false;
+        this.clearAdStopTimer();
       }
     });
     this.video.addEventListener("timeupdate", () => {
@@ -2940,14 +3000,66 @@ var StormcloudVideoPlayer = class {
     }
   }
   ensureAdStoppedByTimer() {
+    var _a, _b;
     if (!this.inAdBreak) return;
+    this.adStopTimerId = void 0;
+    const adPlaying = this.ima.isAdPlaying();
+    const pendingAds = this.adPodQueue.length > 0;
+    const checkIntervalMs = Math.max(
+      250,
+      Math.floor((_a = this.config.adBreakCheckIntervalMs) != null ? _a : 1e3)
+    );
+    const maxExtensionMsConfig = this.config.maxAdBreakExtensionMs;
+    const maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 6e4;
+    let elapsedSinceStartMs = 0;
+    if (this.currentAdBreakStartWallClockMs != null) {
+      elapsedSinceStartMs = Date.now() - this.currentAdBreakStartWallClockMs;
+    }
+    const expectedDurationMs = (_b = this.expectedAdBreakDurationMs) != null ? _b : 0;
+    const overrunMs = Math.max(0, elapsedSinceStartMs - expectedDurationMs);
+    const shouldExtendAdBreak = (adPlaying || pendingAds || this.showAds) && overrunMs < maxExtensionMs;
+    if (shouldExtendAdBreak) {
+      if (this.config.debugAdTiming) {
+        console.log(
+          "[StormcloudVideoPlayer] Extending ad break beyond scheduled duration",
+          {
+            adPlaying,
+            pendingAds,
+            showAds: this.showAds,
+            overrunMs,
+            checkIntervalMs,
+            maxExtensionMs
+          }
+        );
+      }
+      this.scheduleAdStopCountdown(checkIntervalMs);
+      return;
+    }
+    if (this.config.debugAdTiming) {
+      console.log("[StormcloudVideoPlayer] Ending ad break via timer", {
+        adPlaying,
+        pendingAds,
+        showAds: this.showAds,
+        overrunMs,
+        maxExtensionMs
+      });
+    }
     this.inAdBreak = false;
     this.expectedAdBreakDurationMs = void 0;
     this.currentAdBreakStartWallClockMs = void 0;
-    this.adStopTimerId = void 0;
-    if (this.ima.isAdPlaying()) {
+    this.showAds = false;
+    this.adPodQueue = [];
+    this.currentAdIndex = 0;
+    this.totalAdsInBreak = 0;
+    this.clearAdFailsafeTimer();
+    if (adPlaying) {
       this.ima.stop().catch(() => {
       });
+      return;
+    }
+    const originalMutedState = this.ima.getOriginalMutedState();
+    if (this.video.muted !== originalMutedState) {
+      this.video.muted = originalMutedState;
     }
   }
   scheduleAdStartIn(delayMs) {