stormcloud-video-player 0.8.42 → 0.8.44

package/lib/player/AdBreakOrchestrator.cjs

@@ -2514,31 +2514,134 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                 return 0;
             }
         },
+        {
+            key: "describeVideoState",
+            value: function describeVideoState() {
+                var _networkStates_v_networkState, _readyStates_v_readyState;
+                var v = this.host.video;
+                var networkStates = [
+                    "EMPTY",
+                    "IDLE",
+                    "LOADING",
+                    "NO_SOURCE"
+                ];
+                var readyStates = [
+                    "HAVE_NOTHING",
+                    "HAVE_METADATA",
+                    "HAVE_CURRENT_DATA",
+                    "HAVE_FUTURE_DATA",
+                    "HAVE_ENOUGH_DATA"
+                ];
+                var net = (_networkStates_v_networkState = networkStates[v.networkState]) !== null && _networkStates_v_networkState !== void 0 ? _networkStates_v_networkState : String(v.networkState);
+                var ready = (_readyStates_v_readyState = readyStates[v.readyState]) !== null && _readyStates_v_readyState !== void 0 ? _readyStates_v_readyState : String(v.readyState);
+                var err = v.error ? "code=".concat(v.error.code).concat(v.error.message ? " (".concat(v.error.message, ")") : "") : "none";
+                var ranges = [];
+                for(var i = 0; i < v.buffered.length; i++){
+                    ranges.push("[".concat(v.buffered.start(i).toFixed(2), "–").concat(v.buffered.end(i).toFixed(2), "]"));
+                }
+                return "t=".concat(v.currentTime.toFixed(2), "s paused=").concat(v.paused, " ended=").concat(v.ended, " seeking=").concat(v.seeking, " readyState=").concat(ready, " networkState=").concat(net, " error=").concat(err, " buffered=").concat(ranges.length ? ranges.join(",") : "none");
+            }
+        },
         {
             key: "monitorLiveResumeStall",
             value: function monitorLiveResumeStall(resumeBaseline) {
                 var _this = this;
                 var pollIntervalMs = 1e3;
                 var graceMs = 5e3;
-                var reloadCooldownMs = 5e3;
-                var maxHardReloads = 2;
-                var maxMonitorMs = 25e3;
+                var recoveryCooldownMs = 5e3;
+                var maxRecoveries = 2;
+                var maxMonitorMs = 3e4;
                 var startTime = Date.now();
                 var baseline = resumeBaseline;
-                var hardReloads = 0;
-                var lastReloadAt = 0;
+                var recoveries = 0;
+                var lastRecoveryAt = 0;
+                var video = this.host.video;
+                var listenersAttached = false;
+                var onMediaEvent;
+                var diagEvents = [
+                    "loadstart",
+                    "loadedmetadata",
+                    "loadeddata",
+                    "canplay",
+                    "canplaythrough",
+                    "play",
+                    "playing",
+                    "pause",
+                    "waiting",
+                    "stalled",
+                    "suspend",
+                    "seeking",
+                    "seeked",
+                    "emptied",
+                    "error",
+                    "ended"
+                ];
+                if (this.debug) {
+                    onMediaEvent = function onMediaEvent(e) {
+                        var dt = ((Date.now() - startTime) / 1e3).toFixed(1);
+                        console.log("[ResumeDiag] +".concat(dt, "s event=").concat(e.type, " — ").concat(_this.describeVideoState()));
+                    };
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = diagEvents[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var name = _step.value;
+                            video.addEventListener(name, onMediaEvent);
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                    listenersAttached = true;
+                    console.log("[ResumeDiag] +0.0s monitor start — ".concat(this.describeVideoState()));
+                }
+                var cleanup = function cleanup() {
+                    if (listenersAttached && onMediaEvent) {
+                        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                        try {
+                            for(var _iterator = diagEvents[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                var name = _step.value;
+                                video.removeEventListener(name, onMediaEvent);
+                            }
+                        } catch (err) {
+                            _didIteratorError = true;
+                            _iteratorError = err;
+                        } finally{
+                            try {
+                                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                    _iterator.return();
+                                }
+                            } finally{
+                                if (_didIteratorError) {
+                                    throw _iteratorError;
+                                }
+                            }
+                        }
+                        listenersAttached = false;
+                    }
+                };
                 var poll = function poll1() {
                     if (_this.inAdBreak) {
+                        cleanup();
                         return;
                     }
-                    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");
+                            console.log("[StormcloudVideoPlayer] Live stream resumed successfully after ad break — ".concat(_this.describeVideoState()));
                         }
+                        cleanup();
                         return;
                     }
                     if (video.paused) {
@@ -2550,23 +2653,32 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                     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)"));
+                            console.warn("[StormcloudVideoPlayer] Live stream failed to resume after ".concat((maxMonitorMs / 1e3).toFixed(0), "s — ").concat(_this.describeVideoState()));
                         }
+                        cleanup();
                         return;
                     }
-                    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;
+                    var canRecover = wedged && elapsed >= graceMs && Date.now() - lastRecoveryAt >= recoveryCooldownMs && recoveries < maxRecoveries;
+                    if (canRecover) {
+                        recoveries++;
+                        lastRecoveryAt = Date.now();
+                        var isFinalAttempt = recoveries >= maxRecoveries;
+                        if (!isFinalAttempt) {
+                            var liveSyncPos = _this.host.getLiveSyncPosition();
+                            var reloadPos = liveSyncPos != null && liveSyncPos > currentTime ? liveSyncPos : currentTime;
+                            if (_this.debug) {
+                                console.warn("[StormcloudVideoPlayer] Content wedged after ad break — restarting HLS load at ".concat(reloadPos.toFixed(2), "s (recovery ").concat(recoveries, "/").concat(maxRecoveries, ") — ").concat(_this.describeVideoState()));
+                            }
+                            if (liveSyncPos != null && liveSyncPos > currentTime) {
+                                video.currentTime = liveSyncPos;
+                            }
+                            _this.host.restartHlsLoad(reloadPos);
+                        } else {
+                            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();
                         }
-                        _this.host.restartHlsLoad(reloadPos);
                         baseline = video.currentTime;
                         if (video.paused) {
                             var _video_play1;