stormcloud-video-player 0.8.33 → 0.8.35

package/lib/players/HlsPlayer.d.cts

@@ -1,5 +1,5 @@
 import { Component } from 'react';
-import { a as StormcloudVideoPlayerConfig } from '../types-CSHvCbhZ.cjs';
+import { a as StormcloudVideoPlayerConfig } from '../types-cTqIKw_D.cjs';
 
 interface HlsPlayerProps extends StormcloudVideoPlayerConfig {
     onMount?: (player: any) => void;

package/lib/players/index.cjs

@@ -455,6 +455,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,
@@ -1087,6 +1092,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;
@@ -1102,6 +1108,7 @@ function createHlsAdPlayer(contentVideo, options) {
             }
         });
         adVideoElement.addEventListener("playing", function() {
+            startStallWatchdog();
             if (!currentAd || trackingFired.start) return;
             trackingFired.start = true;
             fireTrackingPixels(currentAd.trackingUrls.start);
@@ -1242,8 +1249,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;
@@ -1251,6 +1302,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");
@@ -1263,6 +1318,7 @@ function createHlsAdPlayer(contentVideo, options) {
     }
     function handleAdError() {
         console.log("[HlsAdPlayer] Handling ad error");
+        clearStallWatchdog();
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
@@ -1270,6 +1326,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 {
@@ -1467,6 +1527,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;
@@ -1505,6 +1566,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){
@@ -1649,6 +1711,41 @@ function createHlsAdPlayer(contentVideo, options) {
         }
     };
 }
+// src/utils/devUrl.ts
+var PRIVATE_HOST_PATTERNS = [
+    /^localhost$/i,
+    /^127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/,
+    /^0\.0\.0\.0$/,
+    /^::1$/,
+    /^10\.\d{1,3}\.\d{1,3}\.\d{1,3}$/,
+    /^192\.168\.\d{1,3}\.\d{1,3}$/,
+    /^172\.(1[6-9]|2\d|3[0-1])\.\d{1,3}\.\d{1,3}$/
+];
+function isLocalDevHost(hostname) {
+    var host = hostname.replace(/^\[/, "").replace(/\]$/, "").toLowerCase();
+    if (!host) return false;
+    if (host.endsWith(".local") || host.endsWith(".localhost")) return true;
+    return PRIVATE_HOST_PATTERNS.some(function(pattern) {
+        return pattern.test(host);
+    });
+}
+function toDevSafeUrl(rawUrl) {
+    if (!rawUrl) return rawUrl !== null && rawUrl !== void 0 ? rawUrl : "";
+    var url;
+    try {
+        url = new URL(rawUrl);
+    } catch (unused) {
+        return rawUrl;
+    }
+    if (url.protocol !== "http:" && url.protocol !== "https:") {
+        return rawUrl;
+    }
+    if (!isLocalDevHost(url.hostname)) {
+        return rawUrl;
+    }
+    var cleanPath = url.pathname.replace(/\/{2,}/g, "/") || "/index.html";
+    return "file://".concat(cleanPath);
+}
 // src/sdk/pal.ts
 var PAL_SDK_URL = "https://imasdk.googleapis.com/pal/sdkloader/pal.js";
 var _nonceLoader;
@@ -1735,12 +1832,12 @@ function createPalNonceManager() {
                             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.descriptionUrl = toDevSafeUrl(options.descriptionUrl || (typeof window !== "undefined" ? window.location.href : ""));
                             request.iconsSupported = true;
                             request.playerType = "StormcloudVideoPlayer";
                             request.playerVersion = "1.0";
                             request.supportedApiFrameworks = "2,7,9";
-                            request.url = options.descriptionUrl || (typeof window !== "undefined" ? window.location.href : "");
+                            request.url = toDevSafeUrl(options.descriptionUrl || (typeof window !== "undefined" ? window.location.href : ""));
                             request.videoWidth = options.videoWidth || 640;
                             request.videoHeight = options.videoHeight || 480;
                             if (options.ppid) request.ppid = options.ppid;
@@ -3861,6 +3958,7 @@ function getBrowserConfigOverrides() {
     var overrides = {};
     if (browser.isSmartTV) {
         overrides.allowNativeHls = true;
+        overrides.pauseContentDuringAds = true;
     }
     return overrides;
 }
@@ -5359,7 +5457,7 @@ var AdConfigManager = /*#__PURE__*/ function() {
                     podMaxDurationMs: podParams.maxDurationMs,
                     isCtv: envSignals.isCtv,
                     contentUrl: envSignals.contentUrl,
-                    pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? window.location.href : void 0,
+                    pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? toDevSafeUrl(window.location.href) : void 0,
                     adWillPlayMuted: adWillPlayMuted,
                     adWillAutoPlay: !!this.config.autoplay,
                     appId: envSignals.appId,
@@ -6743,12 +6841,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;
@@ -7877,7 +7970,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) {
@@ -7885,16 +7980,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);
+                    });
                 }
             }
         },
@@ -8008,6 +8126,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();
             },
@@ -8230,6 +8351,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "shouldContinueLiveStreamDuringAds",
             value: function shouldContinueLiveStreamDuringAds() {
+                if (this.config.pauseContentDuringAds) {
+                    return false;
+                }
                 if (this.hlsEngine.isLiveStream) {
                     return true;
                 }