stormcloud-video-player 0.8.34 → 0.8.36

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -1,4 +1,4 @@
-import { a as StormcloudVideoPlayerConfig } from '../types-CSHvCbhZ.cjs';
+import { a as StormcloudVideoPlayerConfig } from '../types-cTqIKw_D.cjs';
 
 declare class StormcloudVideoPlayer {
     private readonly video;

package/lib/player/playerTypes.d.cts

@@ -1,4 +1,4 @@
-import { S as Scte35Marker } from '../types-CSHvCbhZ.cjs';
+import { S as Scte35Marker } from '../types-cTqIKw_D.cjs';
 
 type Scte35CueSource = "manifest" | "id3" | "ts";
 type Scte35CueReadiness = "early" | "playback";

package/lib/players/HlsPlayer.cjs

@@ -419,6 +419,11 @@ function createHlsAdPlayer(contentVideo, options) {
     var preloadingAds = /* @__PURE__ */ new Map();
     var destroyed = false;
     var pendingTimeouts = [];
+    var STALL_TIMEOUT_MS = 4e3;
+    var STALL_CHECK_INTERVAL_MS = 1e3;
+    var stallWatchdogId;
+    var lastAdProgressTime = 0;
+    var lastAdProgressPosition = 0;
     var trackingFired = {
         impression: false,
         start: false,
@@ -1051,6 +1056,7 @@ function createHlsAdPlayer(contentVideo, options) {
         if (!adVideoElement || !currentAd) return;
         adVideoElement.addEventListener("timeupdate", function() {
             if (!currentAd || !adVideoElement) return;
+            noteAdProgress();
             var progress = adVideoElement.currentTime / currentAd.duration;
             if (progress >= 0.25 && !trackingFired.firstQuartile) {
                 trackingFired.firstQuartile = true;
@@ -1066,6 +1072,7 @@ function createHlsAdPlayer(contentVideo, options) {
             }
         });
         adVideoElement.addEventListener("playing", function() {
+            startStallWatchdog();
             if (!currentAd || trackingFired.start) return;
             trackingFired.start = true;
             fireTrackingPixels(currentAd.trackingUrls.start);
@@ -1206,8 +1213,52 @@ function createHlsAdPlayer(contentVideo, options) {
             return false;
         }
     }
+    function clearStallWatchdog() {
+        if (stallWatchdogId != null) {
+            clearInterval(stallWatchdogId);
+            stallWatchdogId = void 0;
+        }
+    }
+    function noteAdProgress() {
+        lastAdProgressTime = Date.now();
+        if (adVideoElement) {
+            lastAdProgressPosition = adVideoElement.currentTime;
+        }
+    }
+    function handleAdStall() {
+        console.warn("[HlsAdPlayer] Ad playback stalled (no progress) - recovering to avoid a blank frame");
+        clearStallWatchdog();
+        if (currentAd) {
+            fireTrackingPixels(currentAd.trackingUrls.error);
+        }
+        if (podIndex < podAds.length - 1 && advanceToNextPodAd()) {
+            return;
+        }
+        handleAdError();
+    }
+    function startStallWatchdog() {
+        clearStallWatchdog();
+        noteAdProgress();
+        stallWatchdogId = window.setInterval(function() {
+            if (!adPlaying || !adVideoElement) {
+                return;
+            }
+            if (adVideoElement.currentTime > lastAdProgressPosition + 0.05) {
+                noteAdProgress();
+                return;
+            }
+            if (adVideoElement.paused) {
+                noteAdProgress();
+                return;
+            }
+            if (Date.now() - lastAdProgressTime >= STALL_TIMEOUT_MS) {
+                handleAdStall();
+            }
+        }, STALL_CHECK_INTERVAL_MS);
+    }
     function handleAdComplete() {
         console.log("[HlsAdPlayer] Handling ad completion");
+        clearStallWatchdog();
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
@@ -1215,6 +1266,10 @@ function createHlsAdPlayer(contentVideo, options) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
         }
+        if (!(options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds)) {
+            contentVideo.style.visibility = "visible";
+            contentVideo.style.opacity = "1";
+        }
         if (options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds) {
             if (contentVideo.paused) {
                 console.log("[HlsAdPlayer] Content video paused in live mode, resuming playback");
@@ -1227,6 +1282,7 @@ function createHlsAdPlayer(contentVideo, options) {
     }
     function handleAdError() {
         console.log("[HlsAdPlayer] Handling ad error");
+        clearStallWatchdog();
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
@@ -1234,6 +1290,10 @@ function createHlsAdPlayer(contentVideo, options) {
             adContainerEl.style.display = "none";
             adContainerEl.style.pointerEvents = "none";
         }
+        if (!(options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds)) {
+            contentVideo.style.visibility = "visible";
+            contentVideo.style.opacity = "1";
+        }
         emit("ad_error");
     }
     return {
@@ -1431,6 +1491,7 @@ function createHlsAdPlayer(contentVideo, options) {
                 var previousMutedState;
                 return _ts_generator(this, function(_state) {
                     console.log("[HlsAdPlayer] Stopping ad");
+                    clearStallWatchdog();
                     adPlaying = false;
                     setAdPlayingFlag(false);
                     previousMutedState = contentVideo.muted;
@@ -1469,6 +1530,7 @@ function createHlsAdPlayer(contentVideo, options) {
         destroy: function destroy() {
             console.log("[HlsAdPlayer] Destroying");
             destroyed = true;
+            clearStallWatchdog();
             var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
             try {
                 for(var _iterator = pendingTimeouts[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -1844,6 +1906,9 @@ var DEFAULT_MQTT_CONFIG = {
     qos: 1
 };
 var mqttConfig = _object_spread({}, DEFAULT_MQTT_CONFIG);
+function applyMQTTConfig(overrides) {
+    Object.assign(mqttConfig, overrides);
+}
 function isMQTTEnabled() {
     return mqttConfig.enabled;
 }
@@ -3860,6 +3925,7 @@ function getBrowserConfigOverrides() {
     var overrides = {};
     if (browser.isSmartTV) {
         overrides.allowNativeHls = true;
+        overrides.pauseContentDuringAds = true;
     }
     return overrides;
 }
@@ -5014,6 +5080,7 @@ var AdConfigManager = /*#__PURE__*/ function() {
                                 ];
                             case 4:
                                 data = _state.sent();
+                                this.applyMqttConfigFromResponse(data);
                                 imaPayload = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : (_data_response_ima = _data_response.ima) === null || _data_response_ima === void 0 ? void 0 : (_data_response_ima_publisherdeskima = _data_response_ima["publisherdesk.ima"]) === null || _data_response_ima_publisherdeskima === void 0 ? void 0 : _data_response_ima_publisherdeskima.payload;
                                 if (imaPayload) {
                                     decodedPayload = imaPayload;
@@ -5047,6 +5114,20 @@ var AdConfigManager = /*#__PURE__*/ function() {
                 }).call(this);
             }
         },
+        {
+            key: "applyMqttConfigFromResponse",
+            value: function applyMqttConfigFromResponse(data) {
+                var _data_response;
+                var mqttConfig2 = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : _data_response.mqtt_config;
+                if (!mqttConfig2 || (typeof mqttConfig2 === "undefined" ? "undefined" : _type_of(mqttConfig2)) !== "object") {
+                    return;
+                }
+                applyMQTTConfig(mqttConfig2);
+                if (this.debug) {
+                    console.log("[StormcloudVideoPlayer] Applied MQTT config from /ads/web:", mqttConfig2);
+                }
+            }
+        },
         {
             key: "fetchAndParseVmap",
             value: function fetchAndParseVmap(vmapUrl) {
@@ -6742,12 +6823,7 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
             // ───────────────────────────────────────────────────────────────
             //  IMA event listeners
             // ───────────────────────────────────────────────────────────────
-            /**
-   * Produces the next pod ad-request URL for the current break. Every request
-   * (initial and continuous-fetch top-up) carries pod macros (pmad/pmnd/pmxd,
-   * no ppos); pmxd tracks the remaining break time so top-up pods only ask for
-   * what still fits.
-   */ key: "nextAdRequestUrl",
+            key: "nextAdRequestUrl",
             value: function nextAdRequestUrl(baseVastUrl) {
                 var remaining = Math.min(this.timing.getWallClockRemainingAdMs(), this.timing.getDurationBudgetRemainingMs());
                 var breakDurationMs = remaining > 0 ? remaining : void 0;
@@ -7876,7 +7952,9 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                 if (Math.abs(this.host.video.volume - restoredVolume) > 0.01) {
                     this.host.video.volume = restoredVolume;
                 }
-                if (this.host.shouldContinueLiveStreamDuringAds()) {
+                this.host.video.style.visibility = "visible";
+                this.host.video.style.opacity = "1";
+                if (this.host.isLiveStream()) {
                     var liveSyncPos = this.host.getLiveSyncPosition();
                     if (liveSyncPos != null && liveSyncPos > this.host.video.currentTime) {
                         if (this.debug) {
@@ -7884,16 +7962,39 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                         }
                         this.host.video.currentTime = liveSyncPos;
                     }
-                    if (this.host.video.paused) {
-                        var _this_host_video_play;
-                        if (this.debug) console.log("[StormcloudVideoPlayer] Content video paused in live mode after ads, resuming playback");
-                        (_this_host_video_play = this.host.video.play()) === null || _this_host_video_play === void 0 ? void 0 : _this_host_video_play.catch(function() {});
-                    } else {
-                        if (this.debug) console.log("[StormcloudVideoPlayer] Content video already playing in live mode after ads");
+                }
+                this.resumeContentPlayback();
+            }
+        },
+        {
+            key: "resumeContentPlayback",
+            value: function resumeContentPlayback() {
+                var _this = this;
+                var attempt = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
+                var maxAttempts = 3;
+                if (!this.host.video.paused) {
+                    if (this.debug && attempt === 0) {
+                        console.log("[StormcloudVideoPlayer] Content video already playing after ads");
                     }
-                } else if (this.host.video.paused) {
-                    var _this_host_video_play1;
-                    (_this_host_video_play1 = this.host.video.play()) === null || _this_host_video_play1 === void 0 ? void 0 : _this_host_video_play1.catch(function() {});
+                    return;
+                }
+                if (this.debug) {
+                    console.log("[StormcloudVideoPlayer] Resuming content playback after ads (attempt ".concat(attempt + 1, "/").concat(maxAttempts, ")"));
+                }
+                var playResult = this.host.video.play();
+                if (playResult && typeof playResult.catch === "function") {
+                    playResult.catch(function(error) {
+                        if (attempt + 1 >= maxAttempts) {
+                            if (_this.debug) {
+                                console.warn("[StormcloudVideoPlayer] Failed to resume content playback after ads:", error);
+                            }
+                            return;
+                        }
+                        var backoffMs = 250 * (attempt + 1);
+                        window.setTimeout(function() {
+                            _this.resumeContentPlayback(attempt + 1);
+                        }, backoffMs);
+                    });
                 }
             }
         },
@@ -8007,6 +8108,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             shouldContinueLiveStreamDuringAds: function shouldContinueLiveStreamDuringAds() {
                 return _this.shouldContinueLiveStreamDuringAds();
             },
+            isLiveStream: function isLiveStream() {
+                return _this.hlsEngine.isLiveStream;
+            },
             getLiveSyncPosition: function getLiveSyncPosition() {
                 return _this.hlsEngine.getLiveSyncPosition();
             },
@@ -8229,6 +8333,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "shouldContinueLiveStreamDuringAds",
             value: function shouldContinueLiveStreamDuringAds() {
+                if (this.config.pauseContentDuringAds) {
+                    return false;
+                }
                 if (this.hlsEngine.isLiveStream) {
                     return true;
                 }