stormcloud-video-player 0.8.6 → 0.8.8

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -202,6 +202,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/players/HlsPlayer.cjs

@@ -866,7 +866,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";
@@ -886,7 +885,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";
@@ -991,7 +989,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)");
@@ -1025,13 +1023,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) {
@@ -1139,8 +1135,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";
@@ -1195,7 +1191,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;
@@ -1251,7 +1247,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() {
@@ -1356,7 +1354,7 @@ function createPalNonceManager() {
     return {
         generateNonce: function generateNonce() {
             return _async_to_generator(function() {
-                var options, _options_adWillAutoPlay, _options_adWillPlayMuted, _options_continuousPlayback, loader, goog, request, manager, error;
+                var options, _options_adWillAutoPlay, _options_adWillPlayMuted, _options_playerVolume, _options_continuousPlayback, loader, goog, request, manager, error;
                 var _arguments = arguments;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
@@ -1381,6 +1379,7 @@ function createPalNonceManager() {
                             request = new goog.pal.NonceRequest();
                             request.adWillAutoPlay = (_options_adWillAutoPlay = options.adWillAutoPlay) !== null && _options_adWillAutoPlay !== void 0 ? _options_adWillAutoPlay : true;
                             request.adWillPlayMuted = (_options_adWillPlayMuted = options.adWillPlayMuted) !== null && _options_adWillPlayMuted !== void 0 ? _options_adWillPlayMuted : false;
+                            request.playerVolume = (_options_playerVolume = options.playerVolume) !== null && _options_playerVolume !== void 0 ? _options_playerVolume : request.adWillPlayMuted ? 0 : 1;
                             request.continuousPlayback = (_options_continuousPlayback = options.continuousPlayback) !== null && _options_continuousPlayback !== void 0 ? _options_continuousPlayback : true;
                             request.descriptionUrl = options.descriptionUrl || (typeof window !== "undefined" ? window.location.href : "");
                             request.iconsSupported = true;
@@ -2778,7 +2777,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     videoWidth: this.video.offsetWidth || this.video.clientWidth || 640,
                                     videoHeight: this.video.offsetHeight || this.video.clientHeight || 480,
                                     adWillAutoPlay: !!this.config.autoplay,
-                                    adWillPlayMuted: !!this.config.muted,
+                                    adWillPlayMuted: true,
+                                    playerVolume: 0,
                                     continuousPlayback: (_this_config_lowLatencyMode = this.config.lowLatencyMode) !== null && _this_config_lowLatencyMode !== void 0 ? _this_config_lowLatencyMode : false
                                 }).catch(function() {});
                                 fetchConsentSignals().then(function(signals) {
@@ -3244,10 +3244,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");
@@ -3264,7 +3261,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)");
                         }
@@ -3312,7 +3308,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);
@@ -3371,7 +3366,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");
                     }
@@ -3993,7 +3987,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");
                         }
@@ -4031,13 +4024,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;
@@ -5624,7 +5610,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:
@@ -5664,7 +5650,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");
                                     }
@@ -5734,10 +5719,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!)");
@@ -5835,11 +5822,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++;
@@ -6137,7 +6126,7 @@ 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:
@@ -6191,11 +6180,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++;
@@ -6209,10 +6200,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
@@ -6259,9 +6247,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();
@@ -6354,7 +6339,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:
@@ -6450,9 +6435,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();
@@ -6902,7 +6884,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:
@@ -6989,10 +6971,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 [
@@ -7021,11 +7000,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++;
@@ -7039,10 +7020,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
                                 ];
@@ -7101,11 +7079,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++;
@@ -7116,10 +7096,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
                                 ];
@@ -7421,10 +7398,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);
                     }
@@ -7479,10 +7456,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;
             }
@@ -7549,6 +7523,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() {