stormcloud-video-player 0.8.40 → 0.8.42

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -1502,7 +1502,10 @@ function createHlsAdPlayer(contentVideo, options) {
                     }
                     if (adVideoElement) {
                         adVideoElement.pause();
-                        adVideoElement.src = "";
+                        adVideoElement.removeAttribute("src");
+                        try {
+                            adVideoElement.load();
+                        } catch (unused) {}
                     }
                     currentAd = void 0;
                     podAds = [];
@@ -1548,7 +1551,10 @@ function createHlsAdPlayer(contentVideo, options) {
             }
             if (adVideoElement) {
                 adVideoElement.pause();
-                adVideoElement.src = "";
+                adVideoElement.removeAttribute("src");
+                try {
+                    adVideoElement.load();
+                } catch (unused) {}
                 adVideoElement.remove();
                 adVideoElement = void 0;
             }
@@ -8028,51 +8034,88 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                         this.host.restartHlsLoad(liveSyncPos);
                     }
                     this.resumeContentPlayback();
-                    this.monitorLiveResumeStall(0, this.host.video.currentTime);
+                    this.monitorLiveResumeStall(this.host.video.currentTime);
                     return;
                 }
                 this.resumeContentPlayback();
             }
         },
+        {
+            key: "getBufferedAhead",
+            value: function getBufferedAhead() {
+                var video = this.host.video;
+                var t = video.currentTime;
+                var ranges = video.buffered;
+                for(var i = 0; i < ranges.length; i++){
+                    if (t >= ranges.start(i) - 0.5 && t <= ranges.end(i)) {
+                        return ranges.end(i) - t;
+                    }
+                }
+                return 0;
+            }
+        },
         {
             key: "monitorLiveResumeStall",
-            value: function monitorLiveResumeStall(attempt, lastTime) {
+            value: function monitorLiveResumeStall(resumeBaseline) {
                 var _this = this;
-                var maxAttempts = 3;
-                var checkDelayMs = 2500;
-                window.setTimeout(function() {
+                var pollIntervalMs = 1e3;
+                var graceMs = 5e3;
+                var reloadCooldownMs = 5e3;
+                var maxHardReloads = 2;
+                var maxMonitorMs = 25e3;
+                var startTime = Date.now();
+                var baseline = resumeBaseline;
+                var hardReloads = 0;
+                var lastReloadAt = 0;
+                var poll = function poll1() {
                     if (_this.inAdBreak) {
                         return;
                     }
-                    var currentTime = _this.host.video.currentTime;
-                    var advanced = currentTime > lastTime + 0.25;
-                    if (advanced && !_this.host.video.paused) {
+                    var video = _this.host.video;
+                    var currentTime = video.currentTime;
+                    var advanced = currentTime > baseline + 0.5;
+                    var playing = !video.paused && video.readyState >= 3;
+                    if (advanced && playing) {
                         if (_this.debug) {
                             console.log("[StormcloudVideoPlayer] Live stream resumed successfully after ad break");
                         }
                         return;
                     }
-                    if (attempt >= maxAttempts) {
-                        if (_this.debug) {
-                            console.warn("[StormcloudVideoPlayer] Live stream failed to resume after ".concat(maxAttempts, " recovery attempts (t=").concat(currentTime.toFixed(2), "s)"));
+                    if (video.paused) {
+                        var _video_play;
+                        (_video_play = video.play()) === null || _video_play === void 0 ? void 0 : _video_play.catch(function() {});
+                    }
+                    var elapsed = Date.now() - startTime;
+                    var bufferedAhead = _this.getBufferedAhead();
+                    var wedged = bufferedAhead < 0.5 && !advanced;
+                    if (elapsed >= maxMonitorMs) {
+                        if (_this.debug && !advanced) {
+                            console.warn("[StormcloudVideoPlayer] Live stream failed to resume after ".concat((maxMonitorMs / 1e3).toFixed(0), "s (t=").concat(currentTime.toFixed(2), "s, buffered=").concat(bufferedAhead.toFixed(2), "s)"));
                         }
                         return;
                     }
-                    if (_this.debug) {
-                        console.warn("[StormcloudVideoPlayer] Content stalled after ad break (t=".concat(currentTime.toFixed(2), "s) — forcing HLS reload at live edge (attempt ").concat(attempt + 1, "/").concat(maxAttempts, ")"));
-                    }
-                    var liveSyncPos = _this.host.getLiveSyncPosition();
-                    var reloadPos = liveSyncPos != null && liveSyncPos > currentTime ? liveSyncPos : currentTime;
-                    if (liveSyncPos != null && liveSyncPos > currentTime) {
-                        _this.host.video.currentTime = liveSyncPos;
-                    }
-                    _this.host.restartHlsLoad(reloadPos);
-                    if (_this.host.video.paused) {
-                        var _this_host_video_play;
-                        (_this_host_video_play = _this.host.video.play()) === null || _this_host_video_play === void 0 ? void 0 : _this_host_video_play.catch(function() {});
+                    var canHardReload = wedged && elapsed >= graceMs && Date.now() - lastReloadAt >= reloadCooldownMs && hardReloads < maxHardReloads;
+                    if (canHardReload) {
+                        hardReloads++;
+                        lastReloadAt = Date.now();
+                        var liveSyncPos = _this.host.getLiveSyncPosition();
+                        var reloadPos = liveSyncPos != null && liveSyncPos > currentTime ? liveSyncPos : currentTime;
+                        if (_this.debug) {
+                            console.warn("[StormcloudVideoPlayer] Content wedged after ad break (t=".concat(currentTime.toFixed(2), "s, buffered=").concat(bufferedAhead.toFixed(2), "s) — forcing HLS reload at ").concat(reloadPos.toFixed(2), "s (hard reload ").concat(hardReloads, "/").concat(maxHardReloads, ")"));
+                        }
+                        if (liveSyncPos != null && liveSyncPos > currentTime) {
+                            video.currentTime = liveSyncPos;
+                        }
+                        _this.host.restartHlsLoad(reloadPos);
+                        baseline = video.currentTime;
+                        if (video.paused) {
+                            var _video_play1;
+                            (_video_play1 = video.play()) === null || _video_play1 === void 0 ? void 0 : _video_play1.catch(function() {});
+                        }
                     }
-                    _this.monitorLiveResumeStall(attempt + 1, _this.host.video.currentTime);
-                }, checkDelayMs);
+                    window.setTimeout(poll, pollIntervalMs);
+                };
+                window.setTimeout(poll, pollIntervalMs);
             }
         },
         {
@@ -8775,12 +8818,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 3:
                                 error = _state.sent();
-                                this.adBreak.adPodQueue = [];
-                                this.adBreak.inAdBreak = false;
-                                this.adBreak.showAds = false;
                                 if (this.debug) {
                                     console.warn("[StormcloudVideoPlayer] VMAP ad request failed:", error);
                                 }
+                                this.adBreak.handleAdPodComplete();
                                 return [
                                     3,
                                     4
@@ -8950,6 +8991,64 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
 // src/ui/StormcloudVideoPlayer.tsx
 var import_fa = require("react-icons/fa");
 var import_jsx_runtime = require("react/jsx-runtime");
+var ExpandIcon = function ExpandIcon(param) {
+    var _param_size = param.size, size = _param_size === void 0 ? 18 : _param_size;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+        width: size,
+        height: size,
+        viewBox: "0 0 24 24",
+        fill: "none",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        "aria-hidden": "true",
+        focusable: "false",
+        children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M9 4H4v5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M20 9V4h-5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M15 20h5v-5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M4 15v5h5"
+            })
+        ]
+    });
+};
+var CompressIcon = function CompressIcon(param) {
+    var _param_size = param.size, size = _param_size === void 0 ? 18 : _param_size;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+        width: size,
+        height: size,
+        viewBox: "0 0 24 24",
+        fill: "none",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        "aria-hidden": "true",
+        focusable: "false",
+        children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M4 9h5V4"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M15 4v5h5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M20 15h-5v5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M9 20v-5H4"
+            })
+        ]
+    });
+};
 var CRITICAL_PROPS = [
     "src",
     "allowNativeHls",
@@ -9987,9 +10086,9 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
                                                     minHeight: "".concat(36 * responsiveScale, "px")
                                                 },
                                                 title: isFullscreen2 ? "Exit Fullscreen" : "Enter Fullscreen",
-                                                children: isFullscreen2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaCompress, {
+                                                children: isFullscreen2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CompressIcon, {
                                                     size: Math.max(14, 18 * responsiveScale)
-                                                }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaExpand, {
+                                                }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExpandIcon, {
                                                     size: Math.max(14, 18 * responsiveScale)
                                                 })
                                             })
@@ -10188,9 +10287,9 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
                                             background: "rgba(0, 0, 0, 0.6)"
                                         },
                                         title: isFullscreen2 ? "Exit Fullscreen" : "Enter Fullscreen",
-                                        children: isFullscreen2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaCompress, {
+                                        children: isFullscreen2 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CompressIcon, {
                                             size: Math.max(14, 18 * responsiveScale)
-                                        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaExpand, {
+                                        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExpandIcon, {
                                             size: Math.max(14, 18 * responsiveScale)
                                         })
                                     })