stormcloud-video-player 0.2.35 → 0.2.36

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -80,10 +80,7 @@ declare class StormcloudVideoPlayer {
     private startAdFailsafeTimer;
     private clearAdFailsafeTimer;
     private selectVastTagsForBreak;
-    private logQueuedAdUrls;
     private logAdState;
-    private enforceAdHoldState;
-    private releaseAdHoldState;
     private fetchAndParseVastXml;
     private extractMediaUrlsFromVast;
     private preloadMediaFile;

package/lib/players/HlsPlayer.cjs

@@ -631,19 +631,10 @@ function createImaController(video, options) {
                 adsManager.addEventListener(
                   AdEvent.CONTENT_PAUSE_REQUESTED,
                   () => {
-                    console.log("[DEBUG-FLOW] \u{1F3AF} CONTENT_PAUSE_REQUESTED - Ad starting");
+                    console.log("[DEBUG-FLOW] \u{1F3AF} CONTENT_PAUSE_REQUESTED - Ad request accepted");
                     if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
                       video.pause();
                     }
-                    hideContentVideo();
-                    if (adContainerEl) {
-                      adContainerEl.style.pointerEvents = "auto";
-                      adContainerEl.style.display = "flex";
-                      adContainerEl.style.backgroundColor = "#000";
-                      adContainerEl.offsetHeight;
-                      adContainerEl.style.opacity = "1";
-                      console.log("[DEBUG-LAYER] \u{1F7E1} Ad container VISIBLE");
-                    }
                     adPlaying = true;
                     setAdPlayingFlag(true);
                     emit("content_pause");
@@ -2476,7 +2467,7 @@ var StormcloudVideoPlayer = class {
       this.clearAdRequestWatchdog();
       this.activeAdRequestToken = null;
       this.showAds = true;
-      this.enforceAdHoldState();
+      console.log("[DEBUG-LAYER] \u{1F3AC} Layers: Main=hidden, Ad=visible, Placeholder=no");
     });
     this.ima.on("content_resume", () => {
       console.log(`[DEBUG-POD] \u23F8\uFE0F content_resume | ad ${this.currentAdIndex}/${this.totalAdsInBreak}, queue=${this.adPodQueue.length}, remaining=${this.getRemainingAdMs()}ms`);
@@ -2656,6 +2647,12 @@ var StormcloudVideoPlayer = class {
       });
     }
     if (marker.type === "start") {
+      if (this.inAdBreak) {
+        console.log(
+          `[DEBUG-POD] \u26A0\uFE0F SCTE-35 start marker ignored - already in ad break (currentTime: ${this.video.currentTime})`
+        );
+        return;
+      }
       this.inAdBreak = true;
       const durationMs = marker.durationSeconds != null ? marker.durationSeconds * 1e3 : void 0;
       this.expectedAdBreakDurationMs = durationMs;
@@ -2722,6 +2719,9 @@ var StormcloudVideoPlayer = class {
       return;
     }
     if (marker.type === "progress" && this.inAdBreak) {
+      console.log(
+        `[DEBUG-POD] \u{1F4CA} SCTE-35 progress marker (currentTime: ${this.video.currentTime})`
+      );
       if (marker.durationSeconds != null) {
         this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
       }
@@ -2733,7 +2733,8 @@ var StormcloudVideoPlayer = class {
         );
         this.scheduleAdStopCountdown(remainingMs);
       }
-      if (!this.ima.isAdPlaying()) {
+      if (!this.ima.isAdPlaying() && this.activeAdRequestToken === null) {
+        console.log("[DEBUG-POD] \u{1F4CA} Progress marker: no ad playing, attempting to start");
         const scheduled = this.findCurrentOrNextBreak(
           this.video.currentTime * 1e3
         );
@@ -2742,25 +2743,31 @@ var StormcloudVideoPlayer = class {
           const first = tags[0];
           const rest = tags.slice(1);
           this.adPodQueue = rest;
-          if (!this.showAds) {
-            this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
-          }
           this.playSingleAd(first).catch(() => {
           });
         }
+      } else {
+        console.log(
+          `[DEBUG-POD] \u{1F4CA} Progress marker: ad playing or request active (playing=${this.ima.isAdPlaying()}, token=${this.activeAdRequestToken})`
+        );
       }
       return;
     }
     if (marker.type === "end") {
+      console.log(
+        `[DEBUG-POD] \u{1F3C1} SCTE-35 end marker received (currentTime: ${this.video.currentTime})`
+      );
       this.inAdBreak = false;
       this.expectedAdBreakDurationMs = void 0;
       this.currentAdBreakStartWallClockMs = void 0;
       this.clearAdStartTimer();
       this.clearAdStopTimer();
       if (this.ima.isAdPlaying()) {
+        console.log("[DEBUG-POD] \u{1F6D1} Stopping ad due to SCTE-35 end marker");
         this.ima.stop().catch(() => {
         });
       }
+      this.handleAdPodComplete();
       return;
     }
   }
@@ -3091,10 +3098,12 @@ var StormcloudVideoPlayer = class {
       this.vastToMediaUrlMap.clear();
       this.preloadedMediaUrls.clear();
       this.preloadingMediaUrls.clear();
+      const currentMuted = this.video.muted;
+      const currentVolume = this.video.volume;
       console.log(
-        `[DEBUG-AUDIO] \u{1F4BE} Capturing original state | muted=${this.video.muted}, volume=${this.video.volume}`
+        `[DEBUG-AUDIO] \u{1F4BE} Capturing ORIGINAL state (once) | muted=${currentMuted}, volume=${currentVolume}`
       );
-      this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
+      this.ima.updateOriginalMutedState(currentMuted, currentVolume);
       this.inAdBreak = true;
       this.currentAdIndex = 0;
       this.totalAdsInBreak = vastTagUrls.length;
@@ -3308,7 +3317,6 @@ var StormcloudVideoPlayer = class {
     this.clearAdRequestWatchdog();
     this.clearAdFailsafeTimer();
     this.activeAdRequestToken = null;
-    this.releaseAdHoldState();
     this.preloadingAdUrls.clear();
     this.vastToMediaUrlMap.clear();
     this.preloadedMediaUrls.clear();
@@ -3325,13 +3333,18 @@ var StormcloudVideoPlayer = class {
     this.totalAdsInBreak = 0;
     this.ima.stop().catch(() => {
     });
-    const originalMutedState = this.ima.getOriginalMutedState();
-    const originalVolume = typeof this.ima.getOriginalVolume === "function" ? this.ima.getOriginalVolume() : this.video.volume;
-    this.video.muted = originalMutedState;
-    this.video.volume = originalVolume;
+    const restoredMuted = this.ima.getOriginalMutedState();
+    const restoredVolume = this.ima.getOriginalVolume();
     console.log(
-      `[DEBUG-AUDIO] \u{1F50A} Main video restored | muted=${originalMutedState}, volume=${originalVolume}`
+      `[DEBUG-AUDIO] \u{1F50A} Audio restored by IMA | muted=${restoredMuted}, volume=${restoredVolume}`
     );
+    console.log("[DEBUG-LAYER] \u{1F3AC} Layers: Main=visible, Ad=hidden, Placeholder=no");
+    if (this.video.muted !== restoredMuted) {
+      this.video.muted = restoredMuted;
+    }
+    if (Math.abs(this.video.volume - restoredVolume) > 0.01) {
+      this.video.volume = restoredVolume;
+    }
     if (!this.shouldContinueLiveStreamDuringAds() && this.video.paused) {
       console.log("[DEBUG-FLOW] \u25B6\uFE0F Resuming main video playback");
       (_a = this.video.play()) == null ? void 0 : _a.catch((error) => {
@@ -3340,20 +3353,20 @@ var StormcloudVideoPlayer = class {
     }
   }
   handleAdFailure() {
+    console.log("[DEBUG-POD] \u274C handleAdFailure - skipping to next ad or ending break");
     const remaining = this.getRemainingAdMs();
-    console.log(
-      `[DEBUG-POD] \u274C handleAdFailure | inBreak=${this.inAdBreak}, showAds=${this.showAds}, remaining=${remaining}ms`
-    );
-    if (remaining > 500 && this.inAdBreak) {
-      console.log(
-        `[DEBUG-POD] \u23F3 Ad failed but ${remaining}ms remaining - showing placeholder until duration expires`
-      );
-      this.showAds = true;
-      this.ima.showPlaceholder();
-      this.enforceAdHoldState();
-      return;
+    if (remaining > 500 && this.adPodQueue.length > 0) {
+      const nextPreloaded = this.findNextPreloadedAd();
+      if (nextPreloaded) {
+        this.currentAdIndex++;
+        console.log(`[DEBUG-POD] \u27A1\uFE0F Trying next ad after failure (${this.currentAdIndex}/${this.totalAdsInBreak})`);
+        this.playSingleAd(nextPreloaded).catch(() => {
+          this.handleAdPodComplete();
+        });
+        return;
+      }
     }
-    console.log("[DEBUG-POD] \u23F9\uFE0F No remaining time - ending ad break now");
+    console.log("[DEBUG-POD] \u23F9\uFE0F Ending ad break after failure");
     this.handleAdPodComplete();
   }
   startAdRequestWatchdog(token) {
@@ -3426,12 +3439,6 @@ var StormcloudVideoPlayer = class {
     }
     return [b.vastTagUrl];
   }
-  logQueuedAdUrls(urls) {
-    if (!this.config.debugAdTiming) {
-      return;
-    }
-    console.log("[StormcloudVideoPlayer] ALL ad URLs queued:", urls);
-  }
   logAdState(event, extra = {}) {
     if (!this.config.debugAdTiming) {
       return;
@@ -3446,22 +3453,6 @@ var StormcloudVideoPlayer = class {
       ...extra
     });
   }
-  enforceAdHoldState() {
-    this.video.dataset.stormcloudAdPlaying = "true";
-    this.video.muted = true;
-    this.video.volume = 0;
-    console.log("[DEBUG-LAYER] \u{1F512} Enforced ad hold state (main video muted)");
-    if (typeof this.ima.showPlaceholder === "function") {
-      this.ima.showPlaceholder();
-    }
-  }
-  releaseAdHoldState() {
-    delete this.video.dataset.stormcloudAdPlaying;
-    console.log("[DEBUG-LAYER] \u{1F513} Released ad hold state");
-    if (typeof this.ima.hidePlaceholder === "function") {
-      this.ima.hidePlaceholder();
-    }
-  }
   async fetchAndParseVastXml(vastTagUrl) {
     try {
       const response = await fetch(vastTagUrl, { mode: "cors" });
@@ -3826,7 +3817,6 @@ var StormcloudVideoPlayer = class {
     }
     (_a = this.hls) == null ? void 0 : _a.destroy();
     (_b = this.ima) == null ? void 0 : _b.destroy();
-    this.releaseAdHoldState();
     this.preloadingAdUrls.clear();
     this.vastToMediaUrlMap.clear();
     this.preloadedMediaUrls.clear();