stormcloud-video-player 0.8.7 → 0.8.9

package/lib/index.d.cts

@@ -217,6 +217,7 @@ declare class StormcloudVideoPlayer {
     private preloadPoolActive;
     private preloadPoolLoopRunning;
     private adDetectSentForCurrentBreak;
+    private adBreakEpoch;
     private palNonce;
     private palPlaybackStarted;
     private readonly streamCorrelator;
@@ -343,6 +344,7 @@ declare class StormcloudVideoPlayer {
     setMuted(muted: boolean): void;
     setVolume(volume: number): void;
     getVolume(): number;
+    private getAdAudioVolume;
     isFullscreen(): boolean;
     isLive(): boolean;
     get videoElement(): HTMLVideoElement;

package/lib/index.d.ts

@@ -217,6 +217,7 @@ declare class StormcloudVideoPlayer {
     private preloadPoolActive;
     private preloadPoolLoopRunning;
     private adDetectSentForCurrentBreak;
+    private adBreakEpoch;
     private palNonce;
     private palPlaybackStarted;
     private readonly streamCorrelator;
@@ -343,6 +344,7 @@ declare class StormcloudVideoPlayer {
     setMuted(muted: boolean): void;
     setVolume(volume: number): void;
     getVolume(): number;
+    private getAdAudioVolume;
     isFullscreen(): boolean;
     isLive(): boolean;
     get videoElement(): HTMLVideoElement;

package/lib/index.js

@@ -836,7 +836,6 @@ function createHlsAdPlayer(contentVideo, options) {
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
-        contentVideo.volume = 0;
         if (adContainerEl) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
@@ -856,7 +855,6 @@ function createHlsAdPlayer(contentVideo, options) {
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
-        contentVideo.volume = 0;
         if (adContainerEl) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
@@ -961,7 +959,7 @@ function createHlsAdPlayer(contentVideo, options) {
         },
         play: function play() {
             return _async_to_generator(function() {
-                var contentVolume, adVolume, mediaFile, isHlsAd;
+                var contentVolume, mediaFile, isHlsAd;
                 return _ts_generator(this, function(_state) {
                     if (!currentAd) {
                         console.warn("[HlsAdPlayer] Cannot play: No ad loaded (no ads available)");
@@ -995,13 +993,11 @@ function createHlsAdPlayer(contentVideo, options) {
                         }
                         console.log("[HlsAdPlayer] FORCE MUTING main video");
                         contentVideo.muted = true;
-                        contentVideo.volume = 0;
                         adPlaying = true;
                         setAdPlayingFlag(true);
                         if (adVideoElement) {
-                            adVolume = originalMutedState ? 0 : originalVolume;
-                            adVideoElement.volume = Math.max(0, Math.min(1, adVolume));
-                            adVideoElement.muted = false;
+                            adVideoElement.volume = Math.max(0, Math.min(1, originalVolume));
+                            adVideoElement.muted = originalMutedState;
                             console.log("[HlsAdPlayer] Set ad video volume to ".concat(adVideoElement.volume, ", muted: ").concat(adVideoElement.muted, ", originalMutedState: ").concat(originalMutedState, ", contentVolume: ").concat(contentVolume));
                         }
                         if (adContainerEl) {
@@ -1109,8 +1105,8 @@ function createHlsAdPlayer(contentVideo, options) {
                     setAdPlayingFlag(false);
                     previousMutedState = contentVideo.muted;
                     contentVideo.muted = originalMutedState;
-                    contentVideo.volume = originalMutedState ? 0 : originalVolume;
-                    console.log("[HlsAdPlayer] Restored mute state on stop: ".concat(previousMutedState, " -> ").concat(originalMutedState));
+                    contentVideo.volume = Math.max(0, Math.min(1, originalVolume));
+                    console.log("[HlsAdPlayer] Restored mute state on stop: ".concat(previousMutedState, " -> ").concat(originalMutedState, ", volume: ").concat(contentVideo.volume));
                     if (adContainerEl) {
                         adContainerEl.style.display = "none";
                         adContainerEl.style.pointerEvents = "none";
@@ -1165,7 +1161,7 @@ function createHlsAdPlayer(contentVideo, options) {
             adPlaying = false;
             setAdPlayingFlag(false);
             contentVideo.muted = originalMutedState;
-            contentVideo.volume = originalMutedState ? 0 : originalVolume;
+            contentVideo.volume = Math.max(0, Math.min(1, originalVolume));
             if (adHls) {
                 adHls.destroy();
                 adHls = void 0;
@@ -1221,7 +1217,9 @@ function createHlsAdPlayer(contentVideo, options) {
         },
         setAdVolume: function setAdVolume(volume) {
             if (adVideoElement && adPlaying) {
-                adVideoElement.volume = Math.max(0, Math.min(1, volume));
+                var clamped = Math.max(0, Math.min(1, volume));
+                adVideoElement.volume = clamped;
+                adVideoElement.muted = clamped === 0;
             }
         },
         getAdVolume: function getAdVolume() {
@@ -2724,6 +2722,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.preloadPoolActive = false;
         this.preloadPoolLoopRunning = false;
         this.adDetectSentForCurrentBreak = false;
+        this.adBreakEpoch = 0;
         this.palPlaybackStarted = false;
         this.streamCorrelator = generateCorrelator();
         this.consentSignals = {};
@@ -3266,10 +3265,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
                         }
                     }
-                    var currentMuted = _this.video.muted;
-                    var currentVolume = _this.video.volume;
-                    var adVolume = currentMuted ? 0 : currentVolume;
-                    _this.adPlayer.setAdVolume(adVolume);
+                    _this.adPlayer.setAdVolume(_this.getAdAudioVolume());
                     if (_this.isShowingPlaceholder) {
                         if (_this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Hiding placeholder - new ads starting");
@@ -3286,7 +3282,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }).catch(function() {});
                     if (!_this.video.muted) {
                         _this.video.muted = true;
-                        _this.video.volume = 0;
                         if (_this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Muted video on content_resume (ad ended, gap between ads)");
                         }
@@ -3334,7 +3329,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     try {
                         this.adPlayer.destroy();
                         this.video.muted = true;
-                        this.video.volume = 0;
                     } catch (error) {
                         if (this.config.debugAdTiming) {
                             console.warn("[StormcloudVideoPlayer] Error destroying old AdController:", error);
@@ -3393,7 +3387,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 if (!this.video.muted) {
                     this.video.muted = true;
-                    this.video.volume = 0;
                     if (this.config.debugAdTiming) {
                         console.log("[StormcloudVideoPlayer] Muted video when showing placeholder");
                     }
@@ -4015,7 +4008,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (marker.type === "end") {
                     if (!this.video.muted) {
                         this.video.muted = true;
-                        this.video.volume = 0;
                         if (this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Muted video on SCTE end marker");
                         }
@@ -4053,13 +4045,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "startScte35AdBreak",
             value: function startScte35AdBreak(marker, cueKey, durationMs) {
-                if (!this.video.muted) {
-                    this.video.muted = true;
-                    this.video.volume = 0;
-                    if (this.config.debugAdTiming) {
-                        console.log("[StormcloudVideoPlayer] Muted video on SCTE start marker");
-                    }
-                }
                 this.inAdBreak = true;
                 this.activeScte35BreakKey = cueKey !== null && cueKey !== void 0 ? cueKey : this.pendingScte35CueKey;
                 this.scheduledScte35BreakKey = void 0;
@@ -5285,7 +5270,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "preloadAdIntoPool",
             value: function preloadAdIntoPool(vastUrl) {
                 return _async_to_generator(function() {
-                    var _this, loadPromise;
+                    var _this, epoch, loadPromise;
                     return _ts_generator(this, function(_state) {
                         _this = this;
                         if (this.isGamInCooldown()) {
@@ -5311,6 +5296,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         if (this.config.debugAdTiming) {
                             console.log("[PRELOAD-POOL] \uD83D\uDCE5 Preloading ad into pool: ".concat(vastUrl));
                         }
+                        epoch = this.adBreakEpoch;
                         loadPromise = function() {
                             return _async_to_generator(function() {
                                 var _this, hasAdError, adErrorPayload, errorListenerCleanup, continueLiveStreamDuringAds, preloadAd, errorListener, isNoFill, poolEntry, lateErrorListener, error;
@@ -5388,6 +5374,20 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                     2
                                                 ];
                                             }
+                                            if (!this.preloadPoolActive || epoch !== this.adBreakEpoch) {
+                                                if (this.config.debugAdTiming) {
+                                                    console.log("[PRELOAD-POOL] \uD83D\uDEAB Discarding preloaded ad - break ended during fetch");
+                                                }
+                                                if (errorListenerCleanup) {
+                                                    errorListenerCleanup();
+                                                }
+                                                try {
+                                                    preloadAd.destroy();
+                                                } catch (unused) {}
+                                                return [
+                                                    2
+                                                ];
+                                            }
                                             poolEntry = {
                                                 vastUrl: vastUrl,
                                                 adController: preloadAd,
@@ -5459,7 +5459,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "preloadPoolLoop",
             value: function preloadPoolLoop(baseVastUrl) {
                 return _async_to_generator(function() {
-                    var remaining, newUrls, newUrl;
+                    var epoch, remaining, newUrls, newUrl;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5469,12 +5469,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     ];
                                 }
                                 this.preloadPoolLoopRunning = true;
+                                epoch = this.adBreakEpoch;
                                 if (this.config.debugAdTiming) {
                                     console.log("[PRELOAD-POOL] \uD83D\uDD04 Starting continuous preload loop");
                                 }
                                 _state.label = 1;
                             case 1:
-                                if (!this.preloadPoolActive) return [
+                                if (!(this.preloadPoolActive && epoch === this.adBreakEpoch)) return [
                                     3,
                                     10
                                 ];
@@ -5519,7 +5520,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     3,
                                     8
                                 ];
-                                if (!this.preloadPoolActive || this.isGamInCooldown()) {
+                                if (!this.preloadPoolActive || epoch !== this.adBreakEpoch || this.isGamInCooldown()) {
                                     return [
                                         3,
                                         8
@@ -5646,7 +5647,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "handleAdStart",
             value: function handleAdStart(_marker) {
                 return _async_to_generator(function() {
-                    var scheduled, tags, baseVastUrl, adBreakDurationMs, mode, currentMuted, currentVolume, firstAdUrl, usePreloadedAd, preloadedController, preloaded, firstAdUrlArray, adVolume, adVolume1, error, fallbackPreloaded, adVolume2, fallbackError;
+                    var scheduled, tags, baseVastUrl, adBreakDurationMs, mode, currentMuted, currentVolume, firstAdUrl, usePreloadedAd, preloadedController, preloaded, firstAdUrlArray, preservedMuted, preservedVolume, adVolume, adVolume1, error, fallbackPreloaded, preservedMuted1, preservedVolume1, adVolume2, fallbackError;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5686,7 +5687,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.adPlayer.updateOriginalMutedState(currentMuted, currentVolume);
                                 if (!this.video.muted) {
                                     this.video.muted = true;
-                                    this.video.volume = 0;
                                     if (this.config.debugAdTiming) {
                                         console.log("[StormcloudVideoPlayer] Muted video in handleAdStart");
                                     }
@@ -5756,10 +5756,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     3,
                                     3
                                 ];
+                                preservedMuted = this.adPlayer.getOriginalMutedState();
+                                preservedVolume = this.adPlayer.getOriginalVolume();
                                 this.adPlayer.destroy();
                                 this.video.muted = true;
-                                this.video.volume = 0;
                                 this.adPlayer = preloadedController;
+                                this.adPlayer.updateOriginalMutedState(preservedMuted, preservedVolume);
                                 this.attachImaEventListeners();
                                 if (this.config.debugAdTiming) {
                                     console.log("[CONTINUOUS-FETCH] \u2705 Using preloaded ad, resuming and starting playback immediately (no request delay!)");
@@ -5857,11 +5859,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     ,
                                     12
                                 ]);
+                                preservedMuted1 = this.adPlayer.getOriginalMutedState();
+                                preservedVolume1 = this.adPlayer.getOriginalVolume();
                                 this.adPlayer.destroy();
                                 this.video.muted = true;
-                                this.video.volume = 0;
                                 this.adPlayer = fallbackPreloaded.adController;
                                 this.attachImaEventListeners();
+                                this.adPlayer.updateOriginalMutedState(preservedMuted1, preservedVolume1);
                                 this.adPlayer.resume();
                                 this.consecutiveFailures = 0;
                                 this.currentAdIndex++;
@@ -5949,7 +5953,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "continuousFetchLoop",
             value: function continuousFetchLoop(baseVastUrl) {
                 return _async_to_generator(function() {
-                    var _this, _loop, _ret;
+                    var _this, _loop, epoch, _ret;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -6059,9 +6063,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         }
                                     });
                                 };
+                                epoch = this.adBreakEpoch;
                                 _state.label = 1;
                             case 1:
-                                if (!(this.continuousFetchingActive && this.inAdBreak)) return [
+                                if (!(this.continuousFetchingActive && this.inAdBreak && epoch === this.adBreakEpoch)) return [
                                     3,
                                     3
                                 ];
@@ -6110,10 +6115,16 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "tryNextAvailableAdWithRateLimit",
             value: function tryNextAvailableAdWithRateLimit() {
                 return _async_to_generator(function() {
-                    var backoffMultiplier, backoffDelay, effectiveMinInterval, timeSinceLastRequest, waitTime;
+                    var epoch, backoffMultiplier, backoffDelay, effectiveMinInterval, timeSinceLastRequest, waitTime;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                if (!this.inAdBreak) {
+                                    return [
+                                        2
+                                    ];
+                                }
+                                epoch = this.adBreakEpoch;
                                 if (this.consecutiveFailures >= this.maxConsecutiveFailures) {
                                     if (this.config.debugAdTiming) {
                                         console.log("[CONTINUOUS-FETCH] \uD83D\uDED1 Too many consecutive failures (".concat(this.consecutiveFailures, "), ending ad break gracefully"));
@@ -6145,6 +6156,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 _state.label = 2;
                             case 2:
+                                if (!this.inAdBreak || epoch !== this.adBreakEpoch) {
+                                    return [
+                                        2
+                                    ];
+                                }
                                 return [
                                     2,
                                     this.tryNextAvailableAd(0)
@@ -6159,10 +6175,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             value: function tryNextAvailableAd() {
                 var retryCount = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
                 return _async_to_generator(function() {
-                    var remaining, preloaded, currentMuted, currentVolume, adVolume, error, nextAdUrl, currentMuted1, currentVolume1, error1, errorMessage, maxRetries;
+                    var remaining, preloaded, preservedMuted, preservedVolume, error, nextAdUrl, error1, errorMessage, maxRetries;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                if (!this.inAdBreak) {
+                                    return [
+                                        2
+                                    ];
+                                }
                                 remaining = this.getRemainingAdMs();
                                 if (remaining <= 500) {
                                     if (this.config.debugAdTiming) {
@@ -6213,11 +6234,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     ,
                                     4
                                 ]);
+                                preservedMuted = this.adPlayer.getOriginalMutedState();
+                                preservedVolume = this.adPlayer.getOriginalVolume();
                                 this.adPlayer.destroy();
                                 this.video.muted = true;
-                                this.video.volume = 0;
                                 this.adPlayer = preloaded.adController;
                                 this.attachImaEventListeners();
+                                this.adPlayer.updateOriginalMutedState(preservedMuted, preservedVolume);
                                 this.adPlayer.resume();
                                 this.currentAdIndex++;
                                 this.totalAdRequestsInBreak++;
@@ -6231,10 +6254,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                adVolume = currentMuted ? 0 : currentVolume;
-                                this.adPlayer.setAdVolume(adVolume);
+                                this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 this.consecutiveFailures = 0;
                                 return [
                                     2
@@ -6281,9 +6301,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.config.debugAdTiming) {
                                     console.log("[CONTINUOUS-FETCH] \uD83C\uDFAC Requesting next ad via HLS ad player (".concat(this.currentAdIndex + 1, "/").concat(this.totalAdsInBreak, ", ").concat(this.adRequestQueue.length, " remaining in queue)"));
                                 }
-                                currentMuted1 = this.video.muted;
-                                currentVolume1 = this.video.volume;
-                                this.adPlayer.updateOriginalMutedState(currentMuted1, currentVolume1);
                                 this.currentAdIndex++;
                                 this.totalAdRequestsInBreak++;
                                 this.lastAdRequestTime = Date.now();
@@ -6376,7 +6393,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "showPlaceholderAndWaitForAds",
             value: function showPlaceholderAndWaitForAds() {
                 return _async_to_generator(function() {
-                    var remaining, waitTime, checkInterval, maxChecks, i, nextAdUrl, currentMuted, currentVolume, error, errorMessage;
+                    var remaining, waitTime, checkInterval, maxChecks, i, nextAdUrl, error, errorMessage;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -6472,9 +6489,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 }
                                 this.isShowingPlaceholder = false;
                                 this.adPlayer.hidePlaceholder();
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                this.adPlayer.updateOriginalMutedState(currentMuted, currentVolume);
                                 this.currentAdIndex++;
                                 this.totalAdRequestsInBreak++;
                                 this.lastAdRequestTime = Date.now();
@@ -6924,7 +6938,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "playSingleAd",
             value: function playSingleAd(vastTagUrl) {
                 return _async_to_generator(function() {
-                    var requestToken, currentMuted, currentVolume, adVolume, playError, preloadedFallback, currentMuted1, currentVolume1, adVolume1, fallbackError, error, errorMessage, preloadedFallback1, currentMuted2, currentVolume2, adVolume2, fallbackError1;
+                    var requestToken, playError, preloadedFallback, preservedMuted, preservedVolume, fallbackError, error, errorMessage, preloadedFallback1, preservedMuted1, preservedVolume1, fallbackError1;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -7011,10 +7025,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                adVolume = currentMuted ? 0 : currentVolume;
-                                this.adPlayer.setAdVolume(adVolume);
+                                this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 this.consecutiveFailures = 0;
                                 this.temporaryFailureUrls.delete(vastTagUrl);
                                 return [
@@ -7043,11 +7054,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     10
                                 ]);
                                 this.clearAdFailsafeTimer();
+                                preservedMuted = this.adPlayer.getOriginalMutedState();
+                                preservedVolume = this.adPlayer.getOriginalVolume();
                                 this.adPlayer.destroy();
                                 this.video.muted = true;
-                                this.video.volume = 0;
                                 this.adPlayer = preloadedFallback.adController;
                                 this.attachImaEventListeners();
+                                this.adPlayer.updateOriginalMutedState(preservedMuted, preservedVolume);
                                 this.adPlayer.resume();
                                 this.consecutiveFailures = 0;
                                 this.currentAdIndex++;
@@ -7061,10 +7074,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
-                                currentMuted1 = this.video.muted;
-                                currentVolume1 = this.video.volume;
-                                adVolume1 = currentMuted1 ? 0 : currentVolume1;
-                                this.adPlayer.setAdVolume(adVolume1);
+                                this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 return [
                                     2
                                 ];
@@ -7123,11 +7133,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ]);
                                 this.clearAdRequestWatchdog();
                                 this.clearAdFailsafeTimer();
+                                preservedMuted1 = this.adPlayer.getOriginalMutedState();
+                                preservedVolume1 = this.adPlayer.getOriginalVolume();
                                 this.adPlayer.destroy();
                                 this.video.muted = true;
-                                this.video.volume = 0;
                                 this.adPlayer = preloadedFallback1.adController;
                                 this.attachImaEventListeners();
+                                this.adPlayer.updateOriginalMutedState(preservedMuted1, preservedVolume1);
                                 this.adPlayer.resume();
                                 this.consecutiveFailures = 0;
                                 this.currentAdIndex++;
@@ -7138,10 +7150,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 14:
                                 _state.sent();
-                                currentMuted2 = this.video.muted;
-                                currentVolume2 = this.video.volume;
-                                adVolume2 = currentMuted2 ? 0 : currentVolume2;
-                                this.adPlayer.setAdVolume(adVolume2);
+                                this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 return [
                                     2
                                 ];
@@ -7187,6 +7196,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] \uD83C\uDFC1 Ad pod complete - cleaning up");
                 }
+                this.adBreakEpoch++;
                 this.clearAdRequestWatchdog();
                 this.clearAdFailsafeTimer();
                 this.activeAdRequestToken = null;
@@ -7443,10 +7453,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "toggleMute",
             value: function toggleMute() {
                 if (this.adPlayer.isAdPlaying()) {
-                    var currentPerceptualState = this.isMuted();
-                    var newMutedState = !currentPerceptualState;
+                    var newMutedState = !this.adPlayer.getOriginalMutedState();
+                    var restoreVolume = this.adPlayer.getOriginalVolume() || 1;
                     this.adPlayer.updateOriginalMutedState(newMutedState, this.video.volume);
-                    this.adPlayer.setAdVolume(newMutedState ? 0 : 1);
+                    this.adPlayer.setAdVolume(newMutedState ? 0 : restoreVolume);
                     if (this.config.debugAdTiming) {
                         console.log("[StormcloudVideoPlayer] Mute toggle during ad - immediately applied:", newMutedState);
                     }
@@ -7501,10 +7511,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "isMuted",
             value: function isMuted() {
                 if (this.adPlayer.isAdPlaying()) {
-                    if (this.config.debugAdTiming) {
-                        console.log("[StormcloudVideoPlayer] isMuted() override during ad playback -> false");
-                    }
-                    return false;
+                    return this.adPlayer.getOriginalMutedState();
                 }
                 return this.video.muted;
             }
@@ -7571,6 +7578,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return this.video.volume;
             }
         },
+        {
+            key: "getAdAudioVolume",
+            value: function getAdAudioVolume() {
+                return this.adPlayer.getOriginalMutedState() ? 0 : this.adPlayer.getOriginalVolume();
+            }
+        },
         {
             key: "isFullscreen",
             value: function isFullscreen() {