stormcloud-video-player 0.6.3 → 0.6.5

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -979,6 +979,7 @@ function createVastAdLayer(contentVideo, options) {
     var destroyed = false;
     var tornDown = false;
     var trackingFired = createEmptyTrackingState();
+    var adStallTimerId;
     var currentAdEventHandlers;
     var preloadSlots = /* @__PURE__ */ new Map();
     function emit(event, payload) {
@@ -1052,6 +1053,14 @@ function createVastAdLayer(contentVideo, options) {
             } else if (debug) {
                 console.warn("".concat(LOG, " forceMP4Ads: no MP4 files available, falling back to all media files"));
             }
+        } else {
+            var mp4Only1 = candidates.filter(function(f) {
+                return !isHlsMediaFile(f);
+            });
+            if (mp4Only1.length > 0) {
+                candidates = mp4Only1;
+                if (debug) console.log("".concat(LOG, " Preferring ").concat(mp4Only1.length, " MP4 file(s) over HLS (mp4-first)"));
+            }
         }
         var firstFile = candidates[0];
         if (candidates.length === 1) return firstFile;
@@ -1094,7 +1103,14 @@ function createVastAdLayer(contentVideo, options) {
         video.volume = 1;
         return video;
     }
+    function clearAdStallTimer() {
+        if (adStallTimerId != null) {
+            clearTimeout(adStallTimerId);
+            adStallTimerId = void 0;
+        }
+    }
     function removeAdEventListeners() {
+        clearAdStallTimer();
         if (!currentAdEventHandlers || !adVideoElement) return;
         var el = adVideoElement;
         el.removeEventListener("timeupdate", currentAdEventHandlers.timeupdate);
@@ -1104,6 +1120,7 @@ function createVastAdLayer(contentVideo, options) {
         el.removeEventListener("volumechange", currentAdEventHandlers.volumechange);
         el.removeEventListener("pause", currentAdEventHandlers.pause);
         el.removeEventListener("play", currentAdEventHandlers.play);
+        el.removeEventListener("waiting", currentAdEventHandlers.waiting);
         currentAdEventHandlers = void 0;
     }
     function setupAdEventListeners() {
@@ -1128,6 +1145,7 @@ function createVastAdLayer(contentVideo, options) {
                 }
             },
             playing: function playing() {
+                clearAdStallTimer();
                 var ad = currentAd;
                 if (!ad || trackingFired.start) return;
                 trackingFired.start = true;
@@ -1164,6 +1182,16 @@ function createVastAdLayer(contentVideo, options) {
                 if (currentAd && adVideoElement && adVideoElement.currentTime > 0) {
                     fireTrackingPixels2(currentAd.trackingUrls.resume);
                 }
+            },
+            waiting: function waiting() {
+                clearAdStallTimer();
+                adStallTimerId = setTimeout(function() {
+                    adStallTimerId = void 0;
+                    if (adPlaying) {
+                        if (debug) console.warn("".concat(LOG, " Ad video stalled for too long, treating as error"));
+                        handleAdError();
+                    }
+                }, 8e3);
             }
         };
         adVideoElement.addEventListener("timeupdate", handlers.timeupdate);
@@ -1173,6 +1201,7 @@ function createVastAdLayer(contentVideo, options) {
         adVideoElement.addEventListener("volumechange", handlers.volumechange);
         adVideoElement.addEventListener("pause", handlers.pause);
         adVideoElement.addEventListener("play", handlers.play);
+        adVideoElement.addEventListener("waiting", handlers.waiting);
         currentAdEventHandlers = handlers;
     }
     function setAdPlayingFlag(isPlaying) {
@@ -1184,6 +1213,7 @@ function createVastAdLayer(contentVideo, options) {
     }
     function handleAdComplete() {
         if (tornDown) return;
+        clearAdStallTimer();
         if (debug) console.log("".concat(LOG, " Handling ad completion"));
         adPlaying = false;
         setAdPlayingFlag(false);
@@ -1197,6 +1227,7 @@ function createVastAdLayer(contentVideo, options) {
     function handleAdError() {
         if (tornDown) return;
         if (!adPlaying) return;
+        clearAdStallTimer();
         if (debug) console.log("".concat(LOG, " Handling ad error"));
         adPlaying = false;
         setAdPlayingFlag(false);
@@ -1247,6 +1278,7 @@ function createVastAdLayer(contentVideo, options) {
             adHls.loadSource(mediaFile.url);
             adHls.attachMedia(adVideoElement);
             adHls.on(import_hls.default.Events.MANIFEST_PARSED, function() {
+                if (!adPlaying) return;
                 adVideoElement.play().catch(function(error) {
                     console.error("".concat(LOG, " Error starting HLS ad playback:"), error);
                     handleAdError();
@@ -1880,6 +1912,7 @@ function createVastAdLayer(contentVideo, options) {
             return 1;
         },
         showPlaceholder: function showPlaceholder() {
+            if (singleElementMode) return;
             contentVideo.style.opacity = "0";
             contentVideo.style.visibility = "hidden";
             if (!adContainerEl) {
@@ -3576,7 +3609,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             }
                             _this.adLayer.cancelPreload(token);
                         } else {
-                            _this.showPlaceholderLayer();
+                            if (!_this.config.singlePipelineMode) {
+                                _this.showPlaceholderLayer();
+                            }
                             _this.adLayer.showPlaceholder();
                             _this.isInAdTransition = true;
                             setTimeout(function() {
@@ -3600,7 +3635,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 console.log("[StormcloudVideoPlayer] content_resume: skip pending bids, only", remainingNow1, "ms left");
                             }
                         } else {
-                            _this.showPlaceholderLayer();
+                            if (!_this.config.singlePipelineMode) {
+                                _this.showPlaceholderLayer();
+                            }
                             _this.adLayer.showPlaceholder();
                             _this.isInAdTransition = true;
                             setTimeout(function() {
@@ -3959,12 +3996,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;
                     }
@@ -4045,9 +4087,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.adLayer.isAdPlaying() && this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0) {
                         var bids = this.pendingNextAdBids;
@@ -4968,7 +5010,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (!this.config.disableFiller) this.showAds = true;
                                 if (adBreakDurationMs != null) {
                                     this.startFillerBreakTimer(adBreakDurationMs);
-                                } else if (!this.config.disableFiller) {
+                                } else if (!this.config.disableFiller && this.preloadedTokens.length === 0) {
                                     this.showPlaceholderLayer();
                                 }
                                 if (!this.config.disableFiller) this.adLayer.showPlaceholder();