stormcloud-video-player 0.8.45 → 0.8.47

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;
@@ -1003,7 +1007,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 +1024,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 +1041,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 +1052,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) {
@@ -1205,16 +1285,32 @@ function createHlsAdPlayer(contentVideo, options) {
             }
         }, STALL_CHECK_INTERVAL_MS);
     }
+    function releaseAdDecoder() {
+        if (adHls) {
+            adHls.destroy();
+            adHls = void 0;
+        }
+        if (adVideoElement) {
+            try {
+                adVideoElement.pause();
+                adVideoElement.removeAttribute("src");
+                adVideoElement.load();
+            } catch (error) {
+                console.warn("[HlsAdPlayer] Error releasing ad decoder:", error);
+            }
+        }
+        if (adContainerEl) {
+            adContainerEl.style.display = "none";
+            adContainerEl.style.pointerEvents = "none";
+        }
+    }
     function handleAdComplete() {
         console.log("[HlsAdPlayer] Handling ad completion");
         clearStallWatchdog();
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
-        if (adContainerEl) {
-            adContainerEl.style.display = "none";
-            adContainerEl.style.pointerEvents = "none";
-        }
+        releaseAdDecoder();
         if (!(options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds)) {
             contentVideo.style.visibility = "visible";
             contentVideo.style.opacity = "1";
@@ -1237,10 +1333,7 @@ function createHlsAdPlayer(contentVideo, options) {
         adPlaying = false;
         setAdPlayingFlag(false);
         contentVideo.muted = true;
-        if (adContainerEl) {
-            adContainerEl.style.display = "none";
-            adContainerEl.style.pointerEvents = "none";
-        }
+        releaseAdDecoder();
         if (!(options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds)) {
             contentVideo.style.visibility = "visible";
             contentVideo.style.opacity = "1";
@@ -1267,6 +1360,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() {
@@ -1369,8 +1463,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));
@@ -1449,10 +1544,7 @@ function createHlsAdPlayer(contentVideo, options) {
                     contentVideo.muted = originalMutedState;
                     contentVideo.volume = Math.max(0, Math.min(1, originalVolume));
                     console.log("[HlsAdPlayer] Restored mute state on stop: ".concat(previousMutedState, " -> ").concat(originalMutedState, ", volume: ").concat(contentVideo.volume));
-                    if (adContainerEl) {
-                        adContainerEl.style.display = "none";
-                        adContainerEl.style.pointerEvents = "none";
-                    }
+                    releaseAdDecoder();
                     contentVideo.style.visibility = "visible";
                     contentVideo.style.opacity = "1";
                     if (options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds) {
@@ -1463,17 +1555,6 @@ function createHlsAdPlayer(contentVideo, options) {
                             });
                         }
                     }
-                    if (adHls) {
-                        adHls.destroy();
-                        adHls = void 0;
-                    }
-                    if (adVideoElement) {
-                        adVideoElement.pause();
-                        adVideoElement.removeAttribute("src");
-                        try {
-                            adVideoElement.load();
-                        } catch (unused) {}
-                    }
                     currentAd = void 0;
                     podAds = [];
                     podIndex = 0;
@@ -1512,23 +1593,8 @@ function createHlsAdPlayer(contentVideo, options) {
             setAdPlayingFlag(false);
             contentVideo.muted = originalMutedState;
             contentVideo.volume = Math.max(0, Math.min(1, originalVolume));
-            if (adHls) {
-                adHls.destroy();
-                adHls = void 0;
-            }
-            if (adVideoElement) {
-                adVideoElement.pause();
-                adVideoElement.removeAttribute("src");
-                try {
-                    adVideoElement.load();
-                } catch (unused) {}
-                adVideoElement.remove();
-                adVideoElement = void 0;
-            }
-            if (adContainerEl === null || adContainerEl === void 0 ? void 0 : adContainerEl.parentElement) {
-                adContainerEl.parentElement.removeChild(adContainerEl);
-            }
-            adContainerEl = void 0;
+            teardownAdEventListeners();
+            releaseAdDecoder();
             currentAd = void 0;
             podAds = [];
             podIndex = 0;
@@ -3941,6 +4007,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 = {};
@@ -6684,31 +6755,67 @@ var HlsEngine = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "recoverMediaError",
+            value: function recoverMediaError() {
+                if (!this.hls) {
+                    return;
+                }
+                try {
+                    this.hls.recoverMediaError();
+                } catch (error) {
+                    if (this.debug) {
+                        console.warn("[StormcloudVideoPlayer] recoverMediaError() failed:", error);
+                    }
+                }
+            }
+        },
         {
             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 (unused) {}
-                    hls.attachMedia(this.video);
+                    } catch (error) {
+                        console.warn("[StormcloudVideoPlayer] video.load() threw after src removal:", error);
+                    }
                 } 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);
             }
         },
         {
@@ -8021,6 +8128,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) {
@@ -8082,11 +8197,12 @@ 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 maxRecoveries = 2;
-                var maxMonitorMs = 3e4;
+                var graceMs = needsReset ? 8e3 : 5e3;
+                var recoveryCooldownMs = needsReset ? 7e3 : 5e3;
+                var maxRecoveries = 3;
+                var maxMonitorMs = 45e3;
                 var startTime = Date.now();
                 var baseline = resumeBaseline;
                 var recoveries = 0;
@@ -8198,8 +8314,17 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                     if (canRecover) {
                         recoveries++;
                         lastRecoveryAt = Date.now();
-                        var isFinalAttempt = recoveries >= maxRecoveries;
-                        if (!isFinalAttempt) {
+                        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()));
+                            }
+                            _this.host.recoverMediaError();
+                        } else if (recoveries === 2) {
                             var liveSyncPos = _this.host.getLiveSyncPosition();
                             var reloadPos = liveSyncPos != null && liveSyncPos > currentTime ? liveSyncPos : currentTime;
                             if (_this.debug) {
@@ -8231,17 +8356,41 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
             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) {
+                var maxAttempts = 5;
+                var video = this.host.video;
+                if (!video.paused) {
                     if (this.debug && attempt === 0) {
                         console.log("[StormcloudVideoPlayer] Content video already playing after ads");
                     }
                     return;
                 }
                 if (this.debug) {
-                    console.log("[StormcloudVideoPlayer] Resuming content playback after ads (attempt ".concat(attempt + 1, "/").concat(maxAttempts, ")"));
+                    console.log("[StormcloudVideoPlayer] Resuming content playback after ads (attempt ".concat(attempt + 1, "/").concat(maxAttempts, ", readyState=").concat(video.readyState, ")"));
                 }
-                var playResult = this.host.video.play();
+                if (video.readyState < 3) {
+                    if (attempt + 1 >= maxAttempts) {
+                        var _video_play;
+                        if (this.debug) {
+                            console.warn("[StormcloudVideoPlayer] readyState never reached HAVE_FUTURE_DATA, forcing play()");
+                        }
+                        (_video_play = video.play()) === null || _video_play === void 0 ? void 0 : _video_play.catch(function() {});
+                        return;
+                    }
+                    var onReady = function onReady1() {
+                        video.removeEventListener("canplay", onReady);
+                        _this.resumeContentPlayback(attempt + 1);
+                    };
+                    video.addEventListener("canplay", onReady);
+                    var backoffMs = 500 * (attempt + 1);
+                    window.setTimeout(function() {
+                        video.removeEventListener("canplay", onReady);
+                        if (video.paused) {
+                            _this.resumeContentPlayback(attempt + 1);
+                        }
+                    }, backoffMs);
+                    return;
+                }
+                var playResult = video.play();
                 if (playResult && typeof playResult.catch === "function") {
                     playResult.catch(function(error) {
                         if (attempt + 1 >= maxAttempts) {
@@ -8380,6 +8529,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             reloadLiveStream: function reloadLiveStream() {
                 return _this.hlsEngine.reloadLiveStream();
             },
+            recoverMediaError: function recoverMediaError() {
+                return _this.hlsEngine.recoverMediaError();
+            },
+            requiresMediaPipelineResetAfterAds: function requiresMediaPipelineResetAfterAds1() {
+                return requiresMediaPipelineResetAfterAds();
+            },
             generatePodVastUrl: function generatePodVastUrl(base, breakDurationMs) {
                 return _this.generatePodVastUrl(base, breakDurationMs);
             }