stormcloud-video-player 0.3.56 → 0.3.57

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -96,6 +96,7 @@ declare class StormcloudVideoPlayer {
     private resolveBreakStartMs;
     getCurrentAdIndex(): number;
     getTotalAdsInBreak(): number;
+    getAdRemainingMs(): number;
     private generateVastUrlsWithCorrelators;
     isAdPlaying(): boolean;
     isShowingAds(): boolean;

package/lib/players/HlsPlayer.cjs

@@ -706,7 +706,7 @@ function createImaController(video, options) {
         adVideo.style.height = "100%";
         adVideo.style.objectFit = "contain";
         adVideo.style.backgroundColor = "transparent";
-        adVideo.style.zIndex = "15";
+        adVideo.style.zIndex = "2";
         adVideo.playsInline = true;
         adVideo.volume = originalVolume;
         adVideo.muted = originalMutedState;
@@ -999,7 +999,7 @@ function createImaController(video, options) {
         container.style.alignItems = "center";
         container.style.justifyContent = "center";
         container.style.pointerEvents = "none";
-        container.style.zIndex = "10";
+        container.style.zIndex = "30";
         container.style.backgroundColor = "#000";
         container.style.transition = "opacity 0.3s ease-in-out";
         container.style.opacity = "0";
@@ -1114,7 +1114,7 @@ function createImaController(video, options) {
                                 container.style.alignItems = "center";
                                 container.style.justifyContent = "center";
                                 container.style.pointerEvents = "none";
-                                container.style.zIndex = "10";
+                                container.style.zIndex = "30";
                                 container.style.backgroundColor = "transparent";
                                 container.style.transition = "opacity 0.3s ease-in-out, background-color 0.3s ease-in-out";
                                 container.style.opacity = "0";
@@ -2029,7 +2029,7 @@ function createHlsAdPlayer(contentVideo, options) {
                 container.style.alignItems = "center";
                 container.style.justifyContent = "center";
                 container.style.pointerEvents = "none";
-                container.style.zIndex = "10";
+                container.style.zIndex = "30";
                 container.style.backgroundColor = "#000";
                 (_contentVideo_parentElement = contentVideo.parentElement) === null || _contentVideo_parentElement === void 0 ? void 0 : _contentVideo_parentElement.appendChild(container);
                 adContainerEl = container;
@@ -3809,13 +3809,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     _this.activeAdRequestToken = null;
                     _this.showAds = true;
                     _this.resetGamNoFillCounter();
-                    if (_this.inAdBreak && _this.expectedAdBreakDurationMs != null) {
-                        if (_this.adStopTimerId == null) {
-                            _this.currentAdBreakStartWallClockMs = Date.now();
-                            _this.scheduleAdStopCountdown(_this.expectedAdBreakDurationMs);
-                            if (_this.config.debugAdTiming) {
-                                console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
-                            }
+                    if (_this.inAdBreak && _this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
+                        _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                        if (_this.config.debugAdTiming) {
+                            console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
                         }
                     }
                     var currentMuted = _this.video.muted;
@@ -3878,6 +3875,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.ima.showPlaceholder();
                     this.isShowingPlaceholder = true;
                 }
+                var preservedMutedState = this.ima.getOriginalMutedState();
+                var preservedVolumeState = this.ima.getOriginalVolume();
                 if (this.ima) {
                     try {
                         this.ima.destroy();
@@ -3892,7 +3891,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 var continueLiveStreamDuringAds = this.shouldContinueLiveStreamDuringAds();
                 this.ima = this.createAdPlayer(continueLiveStreamDuringAds);
                 this.ima.initialize();
-                this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
+                this.ima.updateOriginalMutedState(preservedMutedState, preservedVolumeState);
                 this.attachImaEventListeners();
                 if (shouldShowPlaceholder) {
                     this.showPlaceholderLayer();
@@ -4208,12 +4207,17 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }
                     }
                     if (this.inAdBreak) {
-                        if (this.expectedAdBreakDurationMs == null && marker.durationSeconds != null) {
-                            this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
-                            if (this.config.debugAdTiming) {
-                                console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(this.expectedAdBreakDurationMs, "ms"));
+                        if (marker.durationSeconds != null) {
+                            var newDurationMs = marker.durationSeconds * 1e3;
+                            if (this.expectedAdBreakDurationMs == null || newDurationMs > this.expectedAdBreakDurationMs) {
+                                this.expectedAdBreakDurationMs = newDurationMs;
+                                var elapsedMs = this.currentAdBreakStartWallClockMs != null ? Date.now() - this.currentAdBreakStartWallClockMs : 0;
+                                var remainingMs = Math.max(0, newDurationMs - elapsedMs);
+                                this.scheduleAdStopCountdown(remainingMs);
+                                if (this.config.debugAdTiming) {
+                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(remainingMs, "ms"));
+                                }
                             }
-                            this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
                         }
                         return;
                     }
@@ -4289,9 +4293,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
                     }
                     if (this.expectedAdBreakDurationMs != null && this.currentAdBreakStartWallClockMs != null) {
-                        var elapsedMs = Date.now() - this.currentAdBreakStartWallClockMs;
-                        var remainingMs = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs);
-                        this.scheduleAdStopCountdown(remainingMs);
+                        var elapsedMs1 = Date.now() - this.currentAdBreakStartWallClockMs;
+                        var remainingMs1 = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs1);
+                        this.scheduleAdStopCountdown(remainingMs1);
                     }
                     if (!this.ima.isAdPlaying() && this.activeAdRequestToken === null && this.adRequestQueue.length > 0) {
                         this.tryNextAvailableAdWithRateLimit();
@@ -4859,6 +4863,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return this.totalAdsInBreak;
             }
         },
+        {
+            key: "getAdRemainingMs",
+            value: function getAdRemainingMs() {
+                return this.getRemainingAdMs();
+            }
+        },
         {
             key: "generateVastUrlsWithCorrelators",
             value: function generateVastUrlsWithCorrelators(baseUrl, count) {
@@ -5511,9 +5521,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 2:
                                 _state.sent();
-                                if (this.expectedAdBreakDurationMs != null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 adVolume = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume);
@@ -5554,9 +5563,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 6:
                                 _state.sent();
-                                if (this.expectedAdBreakDurationMs != null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 adVolume1 = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume1);
@@ -5610,9 +5618,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 10:
                                 _state.sent();
-                                if (this.expectedAdBreakDurationMs != null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 adVolume2 = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume2);
@@ -5963,8 +5970,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 2:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
@@ -6717,8 +6723,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 5:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
@@ -6768,8 +6773,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 8:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.currentAdBreakStartWallClockMs = Date.now();
-                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
                                 }
                                 currentMuted1 = this.video.muted;
                                 currentVolume1 = this.video.volume;