stormcloud-video-player 0.7.12 → 0.7.13

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -3629,6 +3629,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     if (this.config.debugAdTiming) {
                                         console.log("[PREFETCH] First VAST request returned no ad, aborting prefetch");
                                     }
+                                    this.clearPendingAdBreak();
                                     return [
                                         2
                                     ];
@@ -3862,7 +3863,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "fetchAdInsertionPoint",
             value: function fetchAdInsertionPoint() {
                 return _async_to_generator(function() {
-                    var _this_lastAdInsertionPoint, resp, data, isNew, unused;
+                    var _this_lastAdInsertionPoint, _this_lastAdInsertionPoint1, resp, data, prevSegment, isNew, segmentChanged, unused;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -3892,7 +3893,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 3:
                                 data = _state.sent();
-                                isNew = data.updated_at !== ((_this_lastAdInsertionPoint = this.lastAdInsertionPoint) === null || _this_lastAdInsertionPoint === void 0 ? void 0 : _this_lastAdInsertionPoint.updated_at);
+                                prevSegment = (_this_lastAdInsertionPoint = this.lastAdInsertionPoint) === null || _this_lastAdInsertionPoint === void 0 ? void 0 : _this_lastAdInsertionPoint.segment_ts_name;
+                                isNew = data.updated_at !== ((_this_lastAdInsertionPoint1 = this.lastAdInsertionPoint) === null || _this_lastAdInsertionPoint1 === void 0 ? void 0 : _this_lastAdInsertionPoint1.updated_at);
+                                segmentChanged = prevSegment !== data.segment_ts_name;
                                 this.lastAdInsertionPoint = data;
                                 if (isNew) {
                                     this.pushAdInsertionDebug("api_response", data.segment_ts_name, {
@@ -3900,6 +3903,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         updatedAt: data.updated_at,
                                         detail: "project=".concat(data.project_id)
                                     });
+                                    if (segmentChanged && (this.pendingAdBreak || this.adInsertionOffsetTimerId != null)) {
+                                        this.clearAdInsertionOffsetTimer();
+                                        this.clearPendingAdBreak();
+                                        this.cancelAndClearPreloadedTokens();
+                                        if (this.config.debugAdTiming) {
+                                            console.log("[StormcloudVideoPlayer] Insertion segment changed (".concat(prevSegment, " → ").concat(data.segment_ts_name, "), stale pending state cleared"));
+                                        }
+                                    }
+                                    this.checkAdInsertionInManifest();
                                 }
                                 if (this.config.debugAdTiming) {
                                     console.log("[StormcloudVideoPlayer] Ad insertion point API response:", data);
@@ -3929,6 +3941,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "checkAdInsertionInManifest",
             value: function checkAdInsertionInManifest() {
+                var _this = this;
                 var _this_hls;
                 if (!this.lastAdInsertionPoint) return;
                 if (this.inAdBreak || this.pendingAdBreak) return;
@@ -3948,14 +3961,42 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             for(var _iterator1 = fragments[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
                                 var frag = _step1.value;
                                 if (this.fragmentMatchesSegment(frag, segmentName)) {
-                                    var _ref;
+                                    var _frag_start, _frag_duration, _ref;
+                                    var currentTime = this.video.currentTime;
+                                    var fragStart = (_frag_start = frag.start) !== null && _frag_start !== void 0 ? _frag_start : 0;
+                                    var fragDuration = (_frag_duration = frag.duration) !== null && _frag_duration !== void 0 ? _frag_duration : 0;
+                                    var isCurrentlyPlaying = fragDuration > 0 && currentTime >= fragStart && currentTime < fragStart + fragDuration;
                                     this.pushAdInsertionDebug("segment_found", segmentName, {
-                                        detail: "sn=".concat((_ref = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref !== void 0 ? _ref : "?")
+                                        detail: "sn=".concat((_ref = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref !== void 0 ? _ref : "?", " ").concat(isCurrentlyPlaying ? "(playing)" : "(future)")
                                     });
                                     if (this.config.debugAdTiming) {
-                                        console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" found in manifest — starting pre-fetch'));
+                                        console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" found in manifest — ') + (isCurrentlyPlaying ? "currently playing, scheduling directly" : "starting pre-fetch"));
                                     }
                                     this.startAdPrefetch(60, frag === null || frag === void 0 ? void 0 : frag.sn);
+                                    if (isCurrentlyPlaying && !this.inAdBreak) {
+                                        var _this_lastAdInsertionPoint_offset_seconds, _ref1;
+                                        this.processedAdInsertionUpdatedAt = this.lastAdInsertionPoint.updated_at;
+                                        var rawOffsetMs = ((_this_lastAdInsertionPoint_offset_seconds = this.lastAdInsertionPoint.offset_seconds) !== null && _this_lastAdInsertionPoint_offset_seconds !== void 0 ? _this_lastAdInsertionPoint_offset_seconds : 0) * 1e3;
+                                        var elapsedInFragMs = (currentTime - fragStart) * 1e3;
+                                        var remainingOffsetMs = Math.max(0, rawOffsetMs - elapsedInFragMs);
+                                        this.pushAdInsertionDebug("segment_playing", segmentName, {
+                                            offsetSeconds: this.lastAdInsertionPoint.offset_seconds,
+                                            detail: "sn=".concat((_ref1 = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref1 !== void 0 ? _ref1 : "?", " (caught in manifest check)")
+                                        });
+                                        this.pushAdInsertionDebug("ad_scheduled", segmentName, {
+                                            offsetSeconds: this.lastAdInsertionPoint.offset_seconds,
+                                            detail: "in ".concat(remainingOffsetMs, "ms (adjusted for elapsed ").concat(Math.round(elapsedInFragMs), "ms)")
+                                        });
+                                        this.clearAdInsertionOffsetTimer();
+                                        this.adInsertionOffsetTimerId = window.setTimeout(function() {
+                                            _this.adInsertionOffsetTimerId = void 0;
+                                            if (_this.inAdBreak) return;
+                                            _this.pushAdInsertionDebug("ad_triggered", segmentName, {
+                                                detail: "ad break started (60s, via manifest-check path)"
+                                            });
+                                            void _this.handleAdStart(60);
+                                        }, remainingOffsetMs);
+                                    }
                                     return;
                                 }
                             }