stormcloud-video-player 0.2.20 → 0.2.21

package/lib/player/StormcloudVideoPlayer.cjs

@@ -324,11 +324,12 @@ function createImaController(video, options) {
           container.style.top = "0";
           container.style.right = "0";
           container.style.bottom = "0";
-          container.style.display = "flex";
+          container.style.display = "none";
           container.style.alignItems = "center";
           container.style.justifyContent = "center";
           container.style.pointerEvents = "none";
-          container.style.zIndex = "2";
+          container.style.zIndex = "10";
+          container.style.backgroundColor = "#000";
           (_a = video.parentElement) == null ? void 0 : _a.appendChild(container);
           adContainerEl = container;
           adDisplayContainer = new google.ima.AdDisplayContainer(
@@ -398,7 +399,8 @@ function createImaController(video, options) {
           container.style.alignItems = "center";
           container.style.justifyContent = "center";
           container.style.pointerEvents = "none";
-          container.style.zIndex = "2";
+          container.style.zIndex = "10";
+          container.style.backgroundColor = "#000";
           if (!video.parentElement) {
             throw new Error("Video element has no parent for ad container");
           }
@@ -529,63 +531,12 @@ function createImaController(video, options) {
                     adPlaying = false;
                     setAdPlayingFlag(false);
                     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, () => {
-                  console.log("[IMA] All ads completed");
+                  console.log("[IMA] All ads completed - notifying parent");
                   adPlaying = false;
-                  video.muted = originalMutedState;
                   setAdPlayingFlag(false);
-                  if (adContainerEl) {
-                    adContainerEl.style.pointerEvents = "none";
-                    adContainerEl.style.display = "none";
-                    console.log(
-                      "[IMA] Ad container hidden after all ads completed"
-                    );
-                  }
-                  if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
-                    video.play().catch(() => {
-                    });
-                    console.log(
-                      "[IMA] Video resumed after all ads completed (VOD mode)"
-                    );
-                  } else {
-                    console.log(
-                      "[IMA] Video unmuted after all ads completed (Live mode)"
-                    );
-                  }
                   emit("all_ads_completed");
                 });
                 console.log("[IMA] Ads manager event listeners attached");
@@ -708,8 +659,8 @@ function createImaController(video, options) {
     },
     async stop() {
       var _a;
+      console.log("[IMA] Stopping ad playback");
       adPlaying = false;
-      video.muted = originalMutedState;
       setAdPlayingFlag(false);
       if (adContainerEl) {
         adContainerEl.style.pointerEvents = "none";
@@ -721,13 +672,6 @@ function createImaController(video, options) {
       } catch {
       }
       destroyAdsManager();
-      if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
-        video.play().catch(() => {
-        });
-        console.log("[IMA] Video resumed after stop (VOD mode)");
-      } else {
-        console.log("[IMA] Video unmuted after stop (Live mode)");
-      }
     },
     destroy() {
       var _a;
@@ -1136,37 +1080,6 @@ function createHlsAdPlayer(contentVideo, options) {
     adPlaying = false;
     setAdPlayingFlag(false);
     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");
@@ -1204,7 +1117,7 @@ function createHlsAdPlayer(contentVideo, options) {
         container.style.alignItems = "center";
         container.style.justifyContent = "center";
         container.style.pointerEvents = "none";
-        container.style.zIndex = "2";
+        container.style.zIndex = "10";
         container.style.backgroundColor = "#000";
         (_a = contentVideo.parentElement) == null ? void 0 : _a.appendChild(container);
         adContainerEl = container;
@@ -1342,7 +1255,6 @@ function createHlsAdPlayer(contentVideo, options) {
       console.log("[HlsAdPlayer] Stopping ad");
       adPlaying = false;
       setAdPlayingFlag(false);
-      contentVideo.muted = originalMutedState;
       if (adContainerEl) {
         adContainerEl.style.display = "none";
         adContainerEl.style.pointerEvents = "none";
@@ -1355,10 +1267,6 @@ function createHlsAdPlayer(contentVideo, options) {
         adVideoElement.pause();
         adVideoElement.src = "";
       }
-      if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
-        contentVideo.play().catch(() => {
-        });
-      }
       currentAd = void 0;
     },
     destroy() {
@@ -1904,7 +1812,6 @@ var StormcloudVideoPlayer = class {
     this.bufferedSegmentsCount = 0;
     this.shouldAutoplayAfterBuffering = false;
     this.hasInitialBufferCompleted = false;
-    this.isTransitioningBetweenAds = false;
     initializePolyfills();
     const browserOverrides = getBrowserConfigOverrides();
     this.config = { ...config, ...browserOverrides };
@@ -2168,9 +2075,12 @@ var StormcloudVideoPlayer = class {
     this.ima.on("all_ads_completed", () => {
       if (this.config.debugAdTiming) {
         console.log(
-          "[StormcloudVideoPlayer] IMA all_ads_completed event received"
+          "[StormcloudVideoPlayer] IMA all_ads_completed event received - ending ad break"
         );
       }
+      if (this.inAdBreak) {
+        this.handleAdPodComplete();
+      }
     });
     this.ima.on("ad_error", () => {
       if (this.config.debugAdTiming) {
@@ -2209,57 +2119,43 @@ var StormcloudVideoPlayer = class {
           "[StormcloudVideoPlayer] IMA content_resume event received",
           {
             inAdBreak: this.inAdBreak,
-            isTransitioningBetweenAds: this.isTransitioningBetweenAds,
             pendingAds: this.adPodQueue.length
           }
         );
       }
       this.clearAdFailsafeTimer();
-      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"
+            "[StormcloudVideoPlayer] Not in ad break - this shouldn't happen during pod"
           );
         }
         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}) - keeping content muted/paused`
+            `[StormcloudVideoPlayer] Playing next ad in pod (${this.currentAdIndex}/${this.totalAdsInBreak}) - main video stays muted, ad layer stays visible`
           );
         }
         this.playSingleAd(next).catch(() => {
-        }).finally(() => {
-          this.isTransitioningBetweenAds = false;
+          if (this.config.debugAdTiming) {
+            console.error(
+              "[StormcloudVideoPlayer] Failed to play next ad in pod"
+            );
+          }
+          this.handleAdPodComplete();
         });
       } else {
         if (this.config.debugAdTiming) {
-          console.log("[StormcloudVideoPlayer] Ad pod completed");
+          console.log(
+            "[StormcloudVideoPlayer] No more ads in pod - completing ad break"
+          );
         }
-        this.inAdBreak = false;
-        this.expectedAdBreakDurationMs = void 0;
-        this.currentAdBreakStartWallClockMs = void 0;
-        this.currentAdIndex = 0;
-        this.totalAdsInBreak = 0;
-        this.showAds = false;
-        this.clearAdStopTimer();
+        this.handleAdPodComplete();
       }
     });
     this.video.addEventListener("timeupdate", () => {
@@ -2977,23 +2873,11 @@ var StormcloudVideoPlayer = class {
         maxExtensionMs
       });
     }
-    this.inAdBreak = false;
-    this.expectedAdBreakDurationMs = void 0;
-    this.currentAdBreakStartWallClockMs = void 0;
-    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;
     }
+    this.handleAdPodComplete();
   }
   scheduleAdStartIn(delayMs) {
     this.clearAdStartTimer();
@@ -3080,17 +2964,11 @@ var StormcloudVideoPlayer = class {
       this.handleAdFailure();
     }
   }
-  handleAdFailure() {
+  handleAdPodComplete() {
     var _a;
     if (this.config.debugAdTiming) {
       console.log(
-        "[StormcloudVideoPlayer] Handling ad failure - resuming content",
-        {
-          inAdBreak: this.inAdBreak,
-          showAds: this.showAds,
-          videoPaused: this.video.paused,
-          adPlaying: this.ima.isAdPlaying()
-        }
+        "[StormcloudVideoPlayer] Handling ad pod completion - resuming content"
       );
     }
     this.inAdBreak = false;
@@ -3103,34 +2981,41 @@ var StormcloudVideoPlayer = class {
     this.showAds = false;
     this.currentAdIndex = 0;
     this.totalAdsInBreak = 0;
-    const currentMutedState = this.video.muted;
     const originalMutedState = this.ima.getOriginalMutedState();
     this.video.muted = originalMutedState;
     if (this.config.debugAdTiming) {
       console.log(
-        `[StormcloudVideoPlayer] Restored mute state: ${currentMutedState} -> ${originalMutedState}`
+        `[StormcloudVideoPlayer] Restored main video mute state to: ${originalMutedState}`
       );
     }
-    if (this.video.paused) {
+    if (!this.shouldContinueLiveStreamDuringAds() && this.video.paused) {
       if (this.config.debugAdTiming) {
         console.log("[StormcloudVideoPlayer] Resuming paused video");
       }
       (_a = this.video.play()) == null ? void 0 : _a.catch((error) => {
         if (this.config.debugAdTiming) {
           console.error(
-            "[StormcloudVideoPlayer] Failed to resume video after ad failure:",
+            "[StormcloudVideoPlayer] Failed to resume video:",
             error
           );
         }
       });
-    } else {
-      if (this.config.debugAdTiming) {
-        console.log(
-          "[StormcloudVideoPlayer] Video is already playing, no resume needed"
-        );
-      }
     }
   }
+  handleAdFailure() {
+    if (this.config.debugAdTiming) {
+      console.log(
+        "[StormcloudVideoPlayer] Handling ad failure - resuming content",
+        {
+          inAdBreak: this.inAdBreak,
+          showAds: this.showAds,
+          videoPaused: this.video.paused,
+          adPlaying: this.ima.isAdPlaying()
+        }
+      );
+    }
+    this.handleAdPodComplete();
+  }
   startAdFailsafeTimer() {
     var _a;
     this.clearAdFailsafeTimer();