stormcloud-video-player 0.8.44 → 0.8.46

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -1242,16 +1242,34 @@ function createHlsAdPlayer(contentVideo, options) {
             }
         }, STALL_CHECK_INTERVAL_MS);
     }
+    function releaseAdDecoder() {
+        if (adHls) {
+            adHls.destroy();
+            adHls = void 0;
+        }
+        if (adVideoElement) {
+            adVideoElement.pause();
+            adVideoElement.removeAttribute("src");
+            try {
+                adVideoElement.load();
+            } catch (error) {
+                console.warn("[HlsAdPlayer] adVideoElement.load() threw after src removal:", error);
+            }
+            adVideoElement.remove();
+            adVideoElement = void 0;
+        }
+        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";
@@ -1259,7 +1277,9 @@ function createHlsAdPlayer(contentVideo, options) {
         if (options === null || options === void 0 ? void 0 : options.continueLiveStreamDuringAds) {
             if (contentVideo.paused) {
                 console.log("[HlsAdPlayer] Content video paused in live mode, resuming playback");
-                contentVideo.play().catch(function() {});
+                contentVideo.play().catch(function(error) {
+                    console.error("[HlsAdPlayer] Error resuming content playback in live mode:", error);
+                });
             } else {
                 console.log("[HlsAdPlayer] Content video already playing in live mode");
             }
@@ -1272,10 +1292,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";
@@ -1484,29 +1501,17 @@ 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) {
                         if (contentVideo.paused) {
                             console.log("[HlsAdPlayer] Content video paused in live mode, resuming playback on stop");
-                            contentVideo.play().catch(function() {});
+                            contentVideo.play().catch(function(error) {
+                                console.error("[HlsAdPlayer] Error resuming content playback in live mode on stop:", error);
+                            });
                         }
                     }
-                    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;
@@ -1545,19 +1550,7 @@ 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;
-            }
+            releaseAdDecoder();
             if (adContainerEl === null || adContainerEl === void 0 ? void 0 : adContainerEl.parentElement) {
                 adContainerEl.parentElement.removeChild(adContainerEl);
             }
@@ -6717,6 +6710,21 @@ 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() {
@@ -6734,7 +6742,9 @@ var HlsEngine = /*#__PURE__*/ function() {
                     try {
                         this.video.removeAttribute("src");
                         this.video.load();
-                    } catch (unused) {}
+                    } catch (error) {
+                        console.warn("[StormcloudVideoPlayer] video.load() threw after src removal:", error);
+                    }
                     hls.attachMedia(this.video);
                 } catch (error) {
                     this.reloadingLiveStream = false;
@@ -8118,8 +8128,8 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                 var pollIntervalMs = 1e3;
                 var graceMs = 5e3;
                 var recoveryCooldownMs = 5e3;
-                var maxRecoveries = 2;
-                var maxMonitorMs = 3e4;
+                var maxRecoveries = 3;
+                var maxMonitorMs = 45e3;
                 var startTime = Date.now();
                 var baseline = resumeBaseline;
                 var recoveries = 0;
@@ -8231,8 +8241,12 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                     if (canRecover) {
                         recoveries++;
                         lastRecoveryAt = Date.now();
-                        var isFinalAttempt = recoveries >= maxRecoveries;
-                        if (!isFinalAttempt) {
+                        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) {
@@ -8264,17 +8278,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) {
@@ -8413,6 +8451,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             reloadLiveStream: function reloadLiveStream() {
                 return _this.hlsEngine.reloadLiveStream();
             },
+            recoverMediaError: function recoverMediaError() {
+                return _this.hlsEngine.recoverMediaError();
+            },
             generatePodVastUrl: function generatePodVastUrl(base, breakDurationMs) {
                 return _this.generatePodVastUrl(base, breakDurationMs);
             }