stormcloud-video-player 0.8.46 → 0.8.48

package/lib/player/StormcloudVideoPlayer.cjs

@@ -351,15 +351,19 @@ module.exports = __toCommonJS(StormcloudVideoPlayer_exports);
 var import_hls = __toESM(require("hls.js"), 1);
 var MAX_VAST_WRAPPER_DEPTH = 5;
 function createHlsAdPlayer(contentVideo, options) {
+    var _contentVideo_AD_VIDEO_PROP, _contentVideo_AD_CONTAINER_PROP;
     var adPlaying = false;
     var originalMutedState = false;
     var originalVolume = Math.max(0, Math.min(1, contentVideo.volume || 1));
     var listeners = /* @__PURE__ */ new Map();
     var licenseKey = options === null || options === void 0 ? void 0 : options.licenseKey;
     var mainHlsInstance = options === null || options === void 0 ? void 0 : options.mainHlsInstance;
-    var adVideoElement;
+    var AD_CONTAINER_PROP = "__stormcloudAdContainer";
+    var AD_VIDEO_PROP = "__stormcloudAdVideo";
+    var adVideoElement = (_contentVideo_AD_VIDEO_PROP = contentVideo[AD_VIDEO_PROP]) !== null && _contentVideo_AD_VIDEO_PROP !== void 0 ? _contentVideo_AD_VIDEO_PROP : void 0;
     var adHls;
-    var adContainerEl;
+    var adContainerEl = (_contentVideo_AD_CONTAINER_PROP = contentVideo[AD_CONTAINER_PROP]) !== null && _contentVideo_AD_CONTAINER_PROP !== void 0 ? _contentVideo_AD_CONTAINER_PROP : void 0;
+    var adEventHandlers = [];
     var currentAd;
     var podAds = [];
     var podIndex = 0;
@@ -514,6 +518,56 @@ function createHlsAdPlayer(contentVideo, options) {
         var url = mediaFile.url.toLowerCase();
         return type.startsWith("video/") || url.endsWith(".mp4") || url.includes(".mp4?");
     }
+    function isAudioMediaFile(mediaFile) {
+        var type = mediaFile.type.toLowerCase();
+        var url = (mediaFile.url.toLowerCase().split("?")[0] || "").trim();
+        return type.startsWith("audio/") || url.endsWith(".mp3") || url.endsWith(".aac") || url.endsWith(".m4a") || url.endsWith(".ogg") || url.endsWith(".oga") || url.endsWith(".opus") || url.endsWith(".wav") || url.endsWith(".weba");
+    }
+    function collectVideoMediaFiles(scope, verbose) {
+        var mediaFileElements = scope.querySelectorAll("MediaFile");
+        var mediaFiles = [];
+        if (verbose) {
+            console.log("[HlsAdPlayer] Found ".concat(mediaFileElements.length, " MediaFile element(s) in VAST XML"));
+        }
+        mediaFileElements.forEach(function(mf, index) {
+            var _mf_textContent;
+            var type = mf.getAttribute("type") || "";
+            var url = ((_mf_textContent = mf.textContent) === null || _mf_textContent === void 0 ? void 0 : _mf_textContent.trim()) || "";
+            var width = mf.getAttribute("width") || "";
+            var height = mf.getAttribute("height") || "";
+            if (verbose) {
+                console.log("[HlsAdPlayer] MediaFile ".concat(index, ': type="').concat(type, '", url="').concat(url, '", width="').concat(width, '", height="').concat(height, '"'));
+            }
+            if (!url) {
+                if (verbose) {
+                    console.warn("[HlsAdPlayer] MediaFile ".concat(index, " has empty URL"));
+                }
+                return;
+            }
+            var bitrateAttr = mf.getAttribute("bitrate");
+            var bitrateValue = bitrateAttr ? parseInt(bitrateAttr, 10) : void 0;
+            var mediaFile = {
+                url: url,
+                type: type,
+                width: parseInt(width || "1920", 10),
+                height: parseInt(height || "1080", 10),
+                bitrate: bitrateValue && bitrateValue > 0 ? bitrateValue : void 0
+            };
+            if (isAudioMediaFile(mediaFile)) {
+                console.warn("[HlsAdPlayer] MediaFile ".concat(index, ' skipped (audio-only, type="').concat(type, '") — audio ads are not played to avoid a black screen'));
+                return;
+            }
+            if (isHlsMediaFile(mediaFile) || isProgressiveMediaFile(mediaFile)) {
+                mediaFiles.push(mediaFile);
+                if (verbose) {
+                    console.log("[HlsAdPlayer] Added ".concat(isHlsMediaFile(mediaFile) ? "HLS" : "progressive", " MediaFile: ").concat(url));
+                }
+            } else if (verbose) {
+                console.log("[HlsAdPlayer] MediaFile ".concat(index, ' ignored (type="').concat(type, '" is not supported)'));
+            }
+        });
+        return mediaFiles;
+    }
     function createEmptyTrackingUrls() {
         return {
             impression: [],
@@ -601,37 +655,7 @@ function createHlsAdPlayer(contentVideo, options) {
             var durationText = ((_xmlDoc_querySelector3 = xmlDoc.querySelector("Duration")) === null || _xmlDoc_querySelector3 === void 0 ? void 0 : _xmlDoc_querySelector3.textContent) || "00:00:30";
             var durationParts = durationText.split(":");
             var duration = parseInt(durationParts[0] || "0", 10) * 3600 + parseInt(durationParts[1] || "0", 10) * 60 + parseInt(durationParts[2] || "0", 10);
-            var mediaFileElements = xmlDoc.querySelectorAll("MediaFile");
-            var mediaFiles = [];
-            console.log("[HlsAdPlayer] Found ".concat(mediaFileElements.length, " MediaFile element(s) in VAST XML"));
-            mediaFileElements.forEach(function(mf, index) {
-                var _mf_textContent;
-                var type = mf.getAttribute("type") || "";
-                var url = ((_mf_textContent = mf.textContent) === null || _mf_textContent === void 0 ? void 0 : _mf_textContent.trim()) || "";
-                var width = mf.getAttribute("width") || "";
-                var height = mf.getAttribute("height") || "";
-                console.log("[HlsAdPlayer] MediaFile ".concat(index, ': type="').concat(type, '", url="').concat(url, '", width="').concat(width, '", height="').concat(height, '"'));
-                var mediaFile = {
-                    url: url,
-                    type: type,
-                    width: parseInt(width || "1920", 10),
-                    height: parseInt(height || "1080", 10),
-                    bitrate: void 0
-                };
-                if (!url) {
-                    console.warn("[HlsAdPlayer] MediaFile ".concat(index, " has empty URL"));
-                    return;
-                }
-                var bitrateAttr = mf.getAttribute("bitrate");
-                var bitrateValue = bitrateAttr ? parseInt(bitrateAttr, 10) : void 0;
-                mediaFile.bitrate = bitrateValue && bitrateValue > 0 ? bitrateValue : void 0;
-                if (isHlsMediaFile(mediaFile) || isProgressiveMediaFile(mediaFile)) {
-                    mediaFiles.push(mediaFile);
-                    console.log("[HlsAdPlayer] Added ".concat(isHlsMediaFile(mediaFile) ? "HLS" : "progressive", " MediaFile: ").concat(url));
-                } else {
-                    console.log("[HlsAdPlayer] MediaFile ".concat(index, ' ignored (type="').concat(type, '" is not supported)'));
-                }
-            });
+            var mediaFiles = collectVideoMediaFiles(xmlDoc, true);
             if (mediaFiles.length === 0) {
                 if (isNoAdAvailable) {
                     console.warn("[HlsAdPlayer] No ads available (VAST response indicates no ads)");
@@ -679,28 +703,7 @@ function createHlsAdPlayer(contentVideo, options) {
             var durationText = ((_adElement_querySelector3 = adElement.querySelector("Duration")) === null || _adElement_querySelector3 === void 0 ? void 0 : _adElement_querySelector3.textContent) || "00:00:30";
             var durationParts = durationText.split(":");
             var duration = parseInt(durationParts[0] || "0", 10) * 3600 + parseInt(durationParts[1] || "0", 10) * 60 + parseInt(durationParts[2] || "0", 10);
-            var mediaFileElements = adElement.querySelectorAll("MediaFile");
-            var mediaFiles = [];
-            mediaFileElements.forEach(function(mf) {
-                var _mf_textContent;
-                var type = mf.getAttribute("type") || "";
-                var url = ((_mf_textContent = mf.textContent) === null || _mf_textContent === void 0 ? void 0 : _mf_textContent.trim()) || "";
-                var width = mf.getAttribute("width") || "";
-                var height = mf.getAttribute("height") || "";
-                if (!url) return;
-                var bitrateAttr = mf.getAttribute("bitrate");
-                var bitrateValue = bitrateAttr ? parseInt(bitrateAttr, 10) : void 0;
-                var mediaFile = {
-                    url: url,
-                    type: type,
-                    width: parseInt(width || "1920", 10),
-                    height: parseInt(height || "1080", 10),
-                    bitrate: bitrateValue && bitrateValue > 0 ? bitrateValue : void 0
-                };
-                if (isHlsMediaFile(mediaFile) || isProgressiveMediaFile(mediaFile)) {
-                    mediaFiles.push(mediaFile);
-                }
-            });
+            var mediaFiles = collectVideoMediaFiles(adElement, false);
             if (mediaFiles.length === 0) {
                 if (isNoAdAvailable) {
                     console.warn("[HlsAdPlayer] Pod <Ad> indicates no ad available");
@@ -1003,7 +1006,8 @@ function createHlsAdPlayer(contentVideo, options) {
     }
     function setupAdEventListeners() {
         if (!adVideoElement || !currentAd) return;
-        adVideoElement.addEventListener("timeupdate", function() {
+        if (adEventHandlers.length > 0) return;
+        var onTimeUpdate = function onTimeUpdate() {
             if (!currentAd || !adVideoElement) return;
             noteAdProgress();
             var progress = adVideoElement.currentTime / currentAd.duration;
@@ -1019,15 +1023,15 @@ function createHlsAdPlayer(contentVideo, options) {
                 trackingFired.thirdQuartile = true;
                 fireTrackingPixels(currentAd.trackingUrls.thirdQuartile);
             }
-        });
-        adVideoElement.addEventListener("playing", function() {
+        };
+        var onPlaying = function onPlaying() {
             startStallWatchdog();
             if (!currentAd || trackingFired.start) return;
             trackingFired.start = true;
             fireTrackingPixels(currentAd.trackingUrls.start);
             console.log("[HlsAdPlayer] Ad started playing");
-        });
-        adVideoElement.addEventListener("ended", function() {
+        };
+        var onEnded = function onEnded() {
             if (!currentAd || trackingFired.complete) return;
             trackingFired.complete = true;
             fireTrackingPixels(currentAd.trackingUrls.complete);
@@ -1036,8 +1040,8 @@ function createHlsAdPlayer(contentVideo, options) {
                 return;
             }
             handleAdComplete();
-        });
-        adVideoElement.addEventListener("error", function(e) {
+        };
+        var onError = function onError(e) {
             if (!adPlaying) return;
             console.error("[HlsAdPlayer] Ad video error:", e);
             if (currentAd) {
@@ -1047,25 +1051,100 @@ function createHlsAdPlayer(contentVideo, options) {
                 return;
             }
             handleAdError();
-        });
-        adVideoElement.addEventListener("volumechange", function() {
-            if (!currentAd) return;
+        };
+        var onVolumeChange = function onVolumeChange() {
+            if (!currentAd || !adVideoElement) return;
             if (adVideoElement.muted) {
                 fireTrackingPixels(currentAd.trackingUrls.mute);
             } else {
                 fireTrackingPixels(currentAd.trackingUrls.unmute);
             }
-        });
-        adVideoElement.addEventListener("pause", function() {
-            if (currentAd && !adVideoElement.ended) {
+        };
+        var onPause = function onPause() {
+            if (currentAd && adVideoElement && !adVideoElement.ended) {
                 fireTrackingPixels(currentAd.trackingUrls.pause);
             }
-        });
-        adVideoElement.addEventListener("play", function() {
-            if (currentAd && adVideoElement.currentTime > 0) {
+        };
+        var onPlay = function onPlay() {
+            if (currentAd && adVideoElement && adVideoElement.currentTime > 0) {
                 fireTrackingPixels(currentAd.trackingUrls.resume);
             }
-        });
+        };
+        adEventHandlers = [
+            {
+                type: "timeupdate",
+                handler: onTimeUpdate
+            },
+            {
+                type: "playing",
+                handler: onPlaying
+            },
+            {
+                type: "ended",
+                handler: onEnded
+            },
+            {
+                type: "error",
+                handler: onError
+            },
+            {
+                type: "volumechange",
+                handler: onVolumeChange
+            },
+            {
+                type: "pause",
+                handler: onPause
+            },
+            {
+                type: "play",
+                handler: onPlay
+            }
+        ];
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = adEventHandlers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var _step_value = _step.value, type = _step_value.type, handler = _step_value.handler;
+                adVideoElement.addEventListener(type, handler);
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+    function teardownAdEventListeners() {
+        if (adVideoElement) {
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                for(var _iterator = adEventHandlers[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var _step_value = _step.value, type = _step_value.type, handler = _step_value.handler;
+                    adVideoElement.removeEventListener(type, handler);
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
+        }
+        adEventHandlers = [];
     }
     function setAdPlayingFlag(isPlaying) {
         if (isPlaying) {
@@ -1211,15 +1290,13 @@ function createHlsAdPlayer(contentVideo, options) {
             adHls = void 0;
         }
         if (adVideoElement) {
-            adVideoElement.pause();
-            adVideoElement.removeAttribute("src");
             try {
+                adVideoElement.pause();
+                adVideoElement.removeAttribute("src");
                 adVideoElement.load();
             } catch (error) {
-                console.warn("[HlsAdPlayer] adVideoElement.load() threw after src removal:", error);
+                console.warn("[HlsAdPlayer] Error releasing ad decoder:", error);
             }
-            adVideoElement.remove();
-            adVideoElement = void 0;
         }
         if (adContainerEl) {
             adContainerEl.style.display = "none";
@@ -1282,6 +1359,7 @@ function createHlsAdPlayer(contentVideo, options) {
                 (_contentVideo_parentElement = contentVideo.parentElement) === null || _contentVideo_parentElement === void 0 ? void 0 : _contentVideo_parentElement.appendChild(container);
                 adContainerEl = container;
             }
+            contentVideo[AD_CONTAINER_PROP] = adContainerEl;
         },
         requestAds: function requestAds(vastTagUrl) {
             return _async_to_generator(function() {
@@ -1384,8 +1462,9 @@ function createHlsAdPlayer(contentVideo, options) {
                         if (!adVideoElement) {
                             adVideoElement = createAdVideoElement();
                             adContainerEl === null || adContainerEl === void 0 ? void 0 : adContainerEl.appendChild(adVideoElement);
-                            setupAdEventListeners();
+                            contentVideo[AD_VIDEO_PROP] = adVideoElement;
                         }
+                        setupAdEventListeners();
                         resetQuartileTracking(true);
                         contentVolume = contentVideo.volume;
                         originalVolume = Math.max(0, Math.min(1, contentVolume || originalVolume));
@@ -1513,11 +1592,8 @@ function createHlsAdPlayer(contentVideo, options) {
             setAdPlayingFlag(false);
             contentVideo.muted = originalMutedState;
             contentVideo.volume = Math.max(0, Math.min(1, originalVolume));
+            teardownAdEventListeners();
             releaseAdDecoder();
-            if (adContainerEl === null || adContainerEl === void 0 ? void 0 : adContainerEl.parentElement) {
-                adContainerEl.parentElement.removeChild(adContainerEl);
-            }
-            adContainerEl = void 0;
             currentAd = void 0;
             podAds = [];
             podIndex = 0;
@@ -3930,6 +4006,11 @@ function detectBrowser() {
         chromeVersion: chromeVersionNum
     };
 }
+function requiresMediaPipelineResetAfterAds() {
+    var _browser_tizenVersion;
+    var browser = detectBrowser();
+    return browser.name === "Samsung Tizen" && ((_browser_tizenVersion = browser.tizenVersion) !== null && _browser_tizenVersion !== void 0 ? _browser_tizenVersion : 0) >= 5;
+}
 function getBrowserConfigOverrides() {
     var browser = detectBrowser();
     var overrides = {};
@@ -6691,30 +6772,49 @@ var HlsEngine = /*#__PURE__*/ function() {
         {
             key: "reloadLiveStream",
             value: function reloadLiveStream() {
+                var _this = this;
                 var hls = this.hls;
                 if (!hls) {
                     return;
                 }
                 if (this.debug) {
-                    console.log("[StormcloudVideoPlayer] Hard-reloading live stream (detach \u2192 reset video \u2192 re-attach)");
+                    console.log("[StormcloudVideoPlayer] Hard-reloading live stream (destroy hls \u2192 reset video \u2192 fresh setupHls)");
                 }
                 try {
                     this.reloadingLiveStream = true;
                     hls.stopLoad();
                     hls.detachMedia();
+                    hls.destroy();
+                    this.hls = void 0;
                     try {
                         this.video.removeAttribute("src");
                         this.video.load();
                     } catch (error) {
                         console.warn("[StormcloudVideoPlayer] video.load() threw after src removal:", error);
                     }
-                    hls.attachMedia(this.video);
                 } catch (error) {
                     this.reloadingLiveStream = false;
+                    this.hls = void 0;
                     if (this.debug) {
-                        console.warn("[StormcloudVideoPlayer] Failed to hard-reload live stream:", error);
+                        console.warn("[StormcloudVideoPlayer] Failed to tear down during hard-reload:", error);
                     }
+                    return;
                 }
+                var recreateDelayMs = 600;
+                window.setTimeout(function() {
+                    if (_this.hls) {
+                        _this.reloadingLiveStream = false;
+                        return;
+                    }
+                    try {
+                        _this.setupHls();
+                    } catch (error) {
+                        _this.reloadingLiveStream = false;
+                        if (_this.debug) {
+                            console.warn("[StormcloudVideoPlayer] Failed to rebuild pipeline during hard-reload:", error);
+                        }
+                    }
+                }, recreateDelayMs);
             }
         },
         {
@@ -8027,6 +8127,14 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                 this.host.video.style.visibility = "visible";
                 this.host.video.style.opacity = "1";
                 if (this.host.isLiveStream()) {
+                    if (this.host.requiresMediaPipelineResetAfterAds()) {
+                        if (this.debug) {
+                            console.log("[StormcloudVideoPlayer] Live break end \u2014 hard-reloading stream to reacquire decoder (single-decoder platform)");
+                        }
+                        this.host.reloadLiveStream();
+                        this.monitorLiveResumeStall(this.host.video.currentTime);
+                        return;
+                    }
                     var liveSyncPos = this.host.getLiveSyncPosition();
                     if (liveSyncPos != null && liveSyncPos > this.host.video.currentTime) {
                         if (this.debug) {
@@ -8088,9 +8196,10 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
             key: "monitorLiveResumeStall",
             value: function monitorLiveResumeStall(resumeBaseline) {
                 var _this = this;
+                var needsReset = this.host.requiresMediaPipelineResetAfterAds();
                 var pollIntervalMs = 1e3;
-                var graceMs = 5e3;
-                var recoveryCooldownMs = 5e3;
+                var graceMs = needsReset ? 8e3 : 5e3;
+                var recoveryCooldownMs = needsReset ? 7e3 : 5e3;
                 var maxRecoveries = 3;
                 var maxMonitorMs = 45e3;
                 var startTime = Date.now();
@@ -8204,7 +8313,12 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                     if (canRecover) {
                         recoveries++;
                         lastRecoveryAt = Date.now();
-                        if (recoveries === 1) {
+                        if (needsReset) {
+                            if (_this.debug) {
+                                console.warn("[StormcloudVideoPlayer] Content still wedged after ad break — hard-reloading live stream (recovery ".concat(recoveries, "/").concat(maxRecoveries, ") — ").concat(_this.describeVideoState()));
+                            }
+                            _this.host.reloadLiveStream();
+                        } else if (recoveries === 1) {
                             if (_this.debug) {
                                 console.warn("[StormcloudVideoPlayer] Content wedged after ad break — calling recoverMediaError() (recovery ".concat(recoveries, "/").concat(maxRecoveries, ") — ").concat(_this.describeVideoState()));
                             }
@@ -8417,6 +8531,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             recoverMediaError: function recoverMediaError() {
                 return _this.hlsEngine.recoverMediaError();
             },
+            requiresMediaPipelineResetAfterAds: function requiresMediaPipelineResetAfterAds1() {
+                return requiresMediaPipelineResetAfterAds();
+            },
             generatePodVastUrl: function generatePodVastUrl(base, breakDurationMs) {
                 return _this.generatePodVastUrl(base, breakDurationMs);
             }