stormcloud-video-player 0.7.11 → 0.7.13

package/lib/players/index.cjs

@@ -1479,7 +1479,6 @@ function createAdStormPlayer(contentVideo, options) {
                     contentVideo.muted = originalMutedState;
                     contentVideo.volume = originalVolume;
                     currentAd = void 0;
-                    tornDown = false;
                     return [
                         2,
                         Promise.resolve()
@@ -1594,6 +1593,15 @@ function createAdStormPlayer(contentVideo, options) {
                             if (!token) return [
                                 2
                             ];
+                            if (currentAd) {
+                                preloadSlots.set(token, {
+                                    ad: currentAd
+                                });
+                                currentAd = void 0;
+                                return [
+                                    2
+                                ];
+                            }
                             requestContext = typeof arg1 === "string" ? arg2 : arg1;
                             return [
                                 4,
@@ -2087,56 +2095,6 @@ function sendInitialTracking(licenseKey) {
         });
     })();
 }
-function sendAdDetectTracking(licenseKey, adDetectInfo) {
-    return _async_to_generator(function() {
-        var clientInfo, browserId, trackingData, error;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    _state.trys.push([
-                        0,
-                        3,
-                        ,
-                        4
-                    ]);
-                    clientInfo = getClientInfo();
-                    return [
-                        4,
-                        getBrowserID(clientInfo)
-                    ];
-                case 1:
-                    browserId = _state.sent();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
-                    return [
-                        4,
-                        sendTrackRequest(licenseKey, _object_spread_props(_object_spread({}, trackingData), {
-                            licenseKey: licenseKey,
-                            adDetectInfo: adDetectInfo
-                        }))
-                    ];
-                case 2:
-                    _state.sent();
-                    return [
-                        3,
-                        4
-                    ];
-                case 3:
-                    error = _state.sent();
-                    console.error("[StormcloudVideoPlayer] Error sending ad detect tracking:", error);
-                    return [
-                        3,
-                        4
-                    ];
-                case 4:
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
-}
 function sendAdLoadedTracking(licenseKey, adLoadedInfo) {
     return _async_to_generator(function() {
         var clientInfo, browserId, trackingData, error;
@@ -2821,7 +2779,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.continuousFetchLoopPromise = null;
         this.attached = false;
         this.inAdBreak = false;
-        this.ptsDriftEmaMs = 0;
         this.adPodQueue = [];
         this.lastHeartbeatTime = 0;
         this.currentAdIndex = 0;
@@ -2845,7 +2802,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.totalAdRequestsInBreak = 0;
         this.maxTotalAdRequestsPerBreak = 20;
         this.pendingAdBreak = null;
-        this.savedMutedStateBeforeScte = null;
+        this.savedMutedStateBeforeAd = null;
         this.consecutiveFailures = 0;
         this.maxConsecutiveFailures = 5;
         this.lastAdRequestTime = 0;
@@ -2858,7 +2815,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.adRequestRetryBackoffMs = 1500;
         this.preloadedTokens = [];
         this.debugLogEntries = [];
-        this.scteMarkerHistory = [];
         this.adInsertionDebugHistory = [];
         initializePolyfills();
         var browserOverrides = getBrowserConfigOverrides();
@@ -3147,18 +3103,44 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                 _this.pushAdInsertionDebug("ad_triggered", segmentName, {
                                                     detail: "ad break started (60s)"
                                                 });
-                                                var marker = {
-                                                    type: "start",
-                                                    durationSeconds: 60,
-                                                    raw: {
-                                                        apiInsertionPoint: _this.lastAdInsertionPoint
-                                                    }
-                                                };
-                                                _this.onScte35Marker(marker);
+                                                void _this.handleAdStart(60);
                                             }, offsetMs);
                                         }
                                     }
                                 });
+                                this.hls.on(import_hls.default.Events.FRAG_PARSING_USERDATA, function(_evt, data) {
+                                    var _ref;
+                                    var samples = (_ref = data === null || data === void 0 ? void 0 : data.samples) !== null && _ref !== void 0 ? _ref : [];
+                                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                    try {
+                                        for(var _iterator = samples[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                            var sample = _step.value;
+                                            var _ref1, _ref2;
+                                            var _data_frag, _data_frag1;
+                                            var bytes = sample === null || sample === void 0 ? void 0 : sample.data;
+                                            if (!bytes || bytes.length < 5) continue;
+                                            var isSCTE35 = bytes[0] === 252;
+                                            if (!isSCTE35) continue;
+                                            var segName = (_ref1 = (_ref2 = data === null || data === void 0 ? void 0 : (_data_frag = data.frag) === null || _data_frag === void 0 ? void 0 : _data_frag.relurl) !== null && _ref2 !== void 0 ? _ref2 : data === null || data === void 0 ? void 0 : (_data_frag1 = data.frag) === null || _data_frag1 === void 0 ? void 0 : _data_frag1.url) !== null && _ref1 !== void 0 ? _ref1 : "";
+                                            _this.pushAdInsertionDebug("scte35_inserted", segName, {
+                                                detail: "len=".concat(bytes.length, "B")
+                                            });
+                                        }
+                                    } catch (err) {
+                                        _didIteratorError = true;
+                                        _iteratorError = err;
+                                    } finally{
+                                        try {
+                                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                                _iterator.return();
+                                            }
+                                        } finally{
+                                            if (_didIteratorError) {
+                                                throw _iteratorError;
+                                            }
+                                        }
+                                    }
+                                });
                                 this.hls.on(import_hls.default.Events.ERROR, function(_evt, data) {
                                     if (data === null || data === void 0 ? void 0 : data.fatal) {
                                         switch(data.type){
@@ -3233,8 +3215,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     _this.activeAdRequestToken = null;
                     _this.showAds = true;
                     if (_this.config.disableFiller) {
-                        if (_this.savedMutedStateBeforeScte == null) {
-                            _this.savedMutedStateBeforeScte = {
+                        if (_this.savedMutedStateBeforeAd == null) {
+                            _this.savedMutedStateBeforeAd = {
                                 muted: _this.video.muted,
                                 volume: _this.video.volume
                             };
@@ -3262,10 +3244,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 });
                 this.adLayer.on("content_resume", function() {
                     var _ref, _ref1;
-                    var _this_savedMutedStateBeforeScte, _this_savedMutedStateBeforeScte1;
+                    var _this_savedMutedStateBeforeAd, _this_savedMutedStateBeforeAd1;
                     var remaining = _this.getRemainingAdMs();
-                    var breakMuted = (_ref = (_this_savedMutedStateBeforeScte = _this.savedMutedStateBeforeScte) === null || _this_savedMutedStateBeforeScte === void 0 ? void 0 : _this_savedMutedStateBeforeScte.muted) !== null && _ref !== void 0 ? _ref : _this.adLayer.getOriginalMutedState();
-                    var breakVolume = (_ref1 = (_this_savedMutedStateBeforeScte1 = _this.savedMutedStateBeforeScte) === null || _this_savedMutedStateBeforeScte1 === void 0 ? void 0 : _this_savedMutedStateBeforeScte1.volume) !== null && _ref1 !== void 0 ? _ref1 : _this.adLayer.getOriginalVolume();
+                    var breakMuted = (_ref = (_this_savedMutedStateBeforeAd = _this.savedMutedStateBeforeAd) === null || _this_savedMutedStateBeforeAd === void 0 ? void 0 : _this_savedMutedStateBeforeAd.muted) !== null && _ref !== void 0 ? _ref : _this.adLayer.getOriginalMutedState();
+                    var breakVolume = (_ref1 = (_this_savedMutedStateBeforeAd1 = _this.savedMutedStateBeforeAd) === null || _this_savedMutedStateBeforeAd1 === void 0 ? void 0 : _this_savedMutedStateBeforeAd1.volume) !== null && _ref1 !== void 0 ? _ref1 : _this.adLayer.getOriginalVolume();
                     if (_this.config.debugAdTiming) {
                         console.log("[StormcloudVideoPlayer] content_resume received, inAdBreak=%s, remaining=%s, preloadedTokens=%d, pendingNext=%s", _this.inAdBreak, remaining, _this.preloadedTokens.length, !!_this.pendingNextAdBids);
                     }
@@ -3342,7 +3324,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     var remainingFinal = _this.getRemainingAdMs();
                     if (_this.inAdBreak && remainingFinal > _this.MIN_AD_REMAINING_MS) {
                         if (_this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] content_resume: no more ads, showing filler for", remainingFinal, "ms");
+                            console.log("[StormcloudVideoPlayer] content_resume: ad ended/failed with time remaining, showing filler and continuing fetch for", remainingFinal, "ms");
                         }
                         if (!_this.config.disableFiller) {
                             _this.showPlaceholderLayer();
@@ -3360,7 +3342,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 (_this_video_play = _this.video.play()) === null || _this_video_play === void 0 ? void 0 : _this_video_play.catch(function() {});
                             }
                         }
-                        _this.stopContinuousFetching();
+                        _this.continuousFetchingActive = true;
+                        _this.startContinuousFetchLoop();
                         return;
                     }
                     if (_this.config.debugAdTiming) {
@@ -3507,547 +3490,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return !!(this.config.allowNativeHls && canNative);
             }
         },
-        {
-            key: "onId3Tag",
-            value: function onId3Tag(tag) {
-                if (typeof tag.ptsSeconds === "number") {
-                    this.updatePtsDrift(tag.ptsSeconds);
-                }
-                var marker = this.parseScte35FromId3(tag);
-                if (marker) {
-                    this.onScte35Marker(marker);
-                }
-            }
-        },
-        {
-            key: "parseScte35FromId3",
-            value: function parseScte35FromId3(tag) {
-                var text = this.decodeId3ValueToText(tag.value);
-                if (!text) return void 0;
-                var cueOutMatch = text.match(/EXT-X-CUE-OUT(?::([^\r\n]*))?/i) || text.match(/CUE-OUT(?::([^\r\n]*))?/i);
-                if (cueOutMatch) {
-                    var _cueOutMatch_;
-                    var arg = ((_cueOutMatch_ = cueOutMatch[1]) !== null && _cueOutMatch_ !== void 0 ? _cueOutMatch_ : "").trim();
-                    var dur = this.parseCueOutDuration(arg);
-                    var marker = _object_spread_props(_object_spread({
-                        type: "start"
-                    }, tag.ptsSeconds !== void 0 ? {
-                        ptsSeconds: tag.ptsSeconds
-                    } : {}, dur !== void 0 ? {
-                        durationSeconds: dur
-                    } : {}), {
-                        raw: {
-                            id3: text
-                        }
-                    });
-                    return marker;
-                }
-                var cueOutContMatch = text.match(/EXT-X-CUE-OUT-CONT:([^\r\n]*)/i);
-                if (cueOutContMatch) {
-                    var _cueOutContMatch_;
-                    var arg1 = ((_cueOutContMatch_ = cueOutContMatch[1]) !== null && _cueOutContMatch_ !== void 0 ? _cueOutContMatch_ : "").trim();
-                    var cont = this.parseCueOutCont(arg1);
-                    var marker1 = _object_spread_props(_object_spread({
-                        type: "progress"
-                    }, tag.ptsSeconds !== void 0 ? {
-                        ptsSeconds: tag.ptsSeconds
-                    } : {}, (cont === null || cont === void 0 ? void 0 : cont.duration) !== void 0 ? {
-                        durationSeconds: cont.duration
-                    } : {}), {
-                        raw: {
-                            id3: text
-                        }
-                    });
-                    return marker1;
-                }
-                var cueInMatch = text.match(/EXT-X-CUE-IN\b/i) || text.match(/CUE-IN\b/i);
-                if (cueInMatch) {
-                    var marker2 = _object_spread_props(_object_spread({
-                        type: "end"
-                    }, tag.ptsSeconds !== void 0 ? {
-                        ptsSeconds: tag.ptsSeconds
-                    } : {}), {
-                        raw: {
-                            id3: text
-                        }
-                    });
-                    return marker2;
-                }
-                var daterangeMatch = text.match(/EXT-X-DATERANGE:([^\r\n]*)/i);
-                if (daterangeMatch) {
-                    var _daterangeMatch_, _attrs_CLASS;
-                    var attrs = this.parseAttributeList((_daterangeMatch_ = daterangeMatch[1]) !== null && _daterangeMatch_ !== void 0 ? _daterangeMatch_ : "");
-                    var hasScteOut = "SCTE35-OUT" in attrs || attrs["SCTE35-OUT"] !== void 0;
-                    var hasScteIn = "SCTE35-IN" in attrs || attrs["SCTE35-IN"] !== void 0;
-                    var klass = String((_attrs_CLASS = attrs["CLASS"]) !== null && _attrs_CLASS !== void 0 ? _attrs_CLASS : "");
-                    var duration = this.toNumber(attrs["DURATION"]);
-                    if (hasScteOut || /com\.apple\.hls\.cue/i.test(klass)) {
-                        var marker3 = _object_spread_props(_object_spread({
-                            type: "start"
-                        }, tag.ptsSeconds !== void 0 ? {
-                            ptsSeconds: tag.ptsSeconds
-                        } : {}, duration !== void 0 ? {
-                            durationSeconds: duration
-                        } : {}), {
-                            raw: {
-                                id3: text,
-                                attrs: attrs
-                            }
-                        });
-                        return marker3;
-                    }
-                    if (hasScteIn) {
-                        var marker4 = _object_spread_props(_object_spread({
-                            type: "end"
-                        }, tag.ptsSeconds !== void 0 ? {
-                            ptsSeconds: tag.ptsSeconds
-                        } : {}), {
-                            raw: {
-                                id3: text,
-                                attrs: attrs
-                            }
-                        });
-                        return marker4;
-                    }
-                }
-                if (/SCTE35-OUT/i.test(text)) {
-                    var marker5 = _object_spread_props(_object_spread({
-                        type: "start"
-                    }, tag.ptsSeconds !== void 0 ? {
-                        ptsSeconds: tag.ptsSeconds
-                    } : {}), {
-                        raw: {
-                            id3: text
-                        }
-                    });
-                    return marker5;
-                }
-                if (/SCTE35-IN/i.test(text)) {
-                    var marker6 = _object_spread_props(_object_spread({
-                        type: "end"
-                    }, tag.ptsSeconds !== void 0 ? {
-                        ptsSeconds: tag.ptsSeconds
-                    } : {}), {
-                        raw: {
-                            id3: text
-                        }
-                    });
-                    return marker6;
-                }
-                if (_instanceof(tag.value, Uint8Array)) {
-                    var bin = this.parseScte35Binary(tag.value);
-                    if (bin) return bin;
-                }
-                return void 0;
-            }
-        },
-        {
-            key: "decodeId3ValueToText",
-            value: function decodeId3ValueToText(value) {
-                try {
-                    if (typeof value === "string") return value;
-                    var decoder = new TextDecoder("utf-8", {
-                        fatal: false
-                    });
-                    var text = decoder.decode(value);
-                    if (text && /[\x20-\x7E]/.test(text)) return text;
-                    var out = "";
-                    for(var i = 0; i < value.length; i++)out += String.fromCharCode(value[i]);
-                    return out;
-                } catch (unused) {
-                    return void 0;
-                }
-            }
-        },
-        {
-            key: "onScte35Marker",
-            value: function onScte35Marker(marker) {
-                var _this = this;
-                if (this.config.disableAds) return;
-                this.pushScteMarker(marker);
-                this.pushDebugLog("info", "scte35", "SCTE-35 marker detected", {
-                    type: marker.type,
-                    ptsSeconds: marker.ptsSeconds,
-                    durationSeconds: marker.durationSeconds,
-                    currentTime: this.video.currentTime
-                });
-                if (this.config.debugAdTiming) {
-                    console.log("[StormcloudVideoPlayer] SCTE-35 marker detected:", {
-                        type: marker.type,
-                        ptsSeconds: marker.ptsSeconds,
-                        durationSeconds: marker.durationSeconds,
-                        currentTime: this.video.currentTime,
-                        raw: marker.raw,
-                        hasPendingAdBreak: !!this.pendingAdBreak
-                    });
-                }
-                if (marker.type === "start") {
-                    var _this_config_immediateManifestAds;
-                    var _this_pendingAdBreak;
-                    if (this.savedMutedStateBeforeScte == null) {
-                        this.savedMutedStateBeforeScte = {
-                            muted: this.video.muted,
-                            volume: this.video.volume
-                        };
-                        this.adLayer.updateOriginalMutedState(this.video.muted, this.video.volume);
-                    }
-                    if (!this.config.disableFiller && !this.video.muted && !this.adLayer.isAdPlaying()) {
-                        this.video.muted = true;
-                        this.video.volume = 0;
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Muted video on SCTE start marker");
-                        }
-                    }
-                    if (this.inAdBreak) {
-                        if (marker.durationSeconds != null) {
-                            var newDurationMs = marker.durationSeconds * 1e3;
-                            if (this.expectedAdBreakDurationMs == null || newDurationMs > this.expectedAdBreakDurationMs) {
-                                this.expectedAdBreakDurationMs = newDurationMs;
-                                var elapsedMs = this.currentAdBreakStartWallClockMs != null ? Date.now() - this.currentAdBreakStartWallClockMs : 0;
-                                var remainingMs = Math.max(0, newDurationMs - elapsedMs);
-                                this.scheduleAdStopCountdown(remainingMs);
-                                if (this.config.debugAdTiming) {
-                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(remainingMs, "ms"));
-                                }
-                            }
-                        }
-                        return;
-                    }
-                    this.inAdBreak = true;
-                    var durationMs = marker.durationSeconds != null ? marker.durationSeconds * 1e3 : ((_this_pendingAdBreak = this.pendingAdBreak) === null || _this_pendingAdBreak === void 0 ? void 0 : _this_pendingAdBreak.marker.durationSeconds) != null ? this.pendingAdBreak.marker.durationSeconds * 1e3 : void 0;
-                    this.expectedAdBreakDurationMs = durationMs;
-                    this.currentAdBreakStartWallClockMs = Date.now();
-                    if (this.config.licenseKey) {
-                        var _this_pendingAdBreak1;
-                        var adDetectInfo = _object_spread({
-                            source: "scte35",
-                            timestamp: /* @__PURE__ */ new Date().toISOString()
-                        }, marker.durationSeconds != null && {
-                            durationSeconds: marker.durationSeconds
-                        }, marker.ptsSeconds != null && {
-                            ptsSeconds: marker.ptsSeconds
-                        }, ((_this_pendingAdBreak1 = this.pendingAdBreak) === null || _this_pendingAdBreak1 === void 0 ? void 0 : _this_pendingAdBreak1.detectedAtFragmentSn) != null && {
-                            detectedAtFragmentSn: this.pendingAdBreak.detectedAtFragmentSn
-                        });
-                        sendAdDetectTracking(this.config.licenseKey, adDetectInfo);
-                    }
-                    var isManifestMarker = this.isManifestBasedMarker(marker);
-                    var forceImmediate = (_this_config_immediateManifestAds = this.config.immediateManifestAds) !== null && _this_config_immediateManifestAds !== void 0 ? _this_config_immediateManifestAds : true;
-                    if (this.config.debugAdTiming) {
-                        console.log("[StormcloudVideoPlayer] Ad start decision:", {
-                            isManifestMarker: isManifestMarker,
-                            forceImmediate: forceImmediate,
-                            hasPts: typeof marker.ptsSeconds === "number"
-                        });
-                    }
-                    if (isManifestMarker && forceImmediate) {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Starting ad immediately (manifest-based)");
-                        }
-                        this.clearAdStartTimer();
-                        this.handleAdStart(marker);
-                    } else if (typeof marker.ptsSeconds === "number") {
-                        var _this_config_driftToleranceMs;
-                        var tol = (_this_config_driftToleranceMs = this.config.driftToleranceMs) !== null && _this_config_driftToleranceMs !== void 0 ? _this_config_driftToleranceMs : 1e3;
-                        var nowMs = this.video.currentTime * 1e3;
-                        var estCurrentPtsMs = nowMs - this.ptsDriftEmaMs;
-                        var deltaMs = Math.floor(marker.ptsSeconds * 1e3 - estCurrentPtsMs);
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] PTS-based timing calculation:", {
-                                nowMs: nowMs,
-                                estCurrentPtsMs: estCurrentPtsMs,
-                                markerPtsMs: marker.ptsSeconds * 1e3,
-                                deltaMs: deltaMs,
-                                tolerance: tol
-                            });
-                        }
-                        if (deltaMs > tol) {
-                            if (this.config.debugAdTiming) {
-                                console.log("[StormcloudVideoPlayer] Scheduling ad start in ".concat(deltaMs, "ms"));
-                            }
-                            this.scheduleAdStartIn(deltaMs);
-                        } else {
-                            if (this.config.debugAdTiming) {
-                                console.log("[StormcloudVideoPlayer] Starting ad immediately (within tolerance)");
-                            }
-                            this.clearAdStartTimer();
-                            this.handleAdStart(marker);
-                        }
-                    } else {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Starting ad immediately (fallback)");
-                        }
-                        this.clearAdStartTimer();
-                        this.handleAdStart(marker);
-                    }
-                    if (this.expectedAdBreakDurationMs != null) {
-                        this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
-                    }
-                    return;
-                }
-                if (marker.type === "progress" && this.inAdBreak) {
-                    if (marker.durationSeconds != null) {
-                        this.expectedAdBreakDurationMs = marker.durationSeconds * 1e3;
-                    }
-                    if (this.expectedAdBreakDurationMs != null && this.currentAdBreakStartWallClockMs != null) {
-                        var elapsedMs1 = Date.now() - this.currentAdBreakStartWallClockMs;
-                        var remainingMs1 = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs1);
-                        this.scheduleAdStopCountdown(remainingMs1);
-                    }
-                    if (!this.adLayer.isAdPlaying() && this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0) {
-                        var bids = this.pendingNextAdBids;
-                        this.pendingNextAdBids = null;
-                        this.currentAdIndex++;
-                        this.adLayer.playAd(bids).catch(function() {
-                            return _this.handleAdFailure();
-                        });
-                    }
-                    return;
-                }
-                if (marker.type === "end") {
-                    var remaining = this.getRemainingAdMs();
-                    var adPlaying = this.adLayer.isAdPlaying();
-                    var hasQueuedAds = this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0;
-                    if (this.config.debugAdTiming) {
-                        console.log("[StormcloudVideoPlayer] SCTE-35 end marker received:", {
-                            inAdBreak: this.inAdBreak,
-                            remaining: remaining,
-                            adPlaying: adPlaying,
-                            hasQueuedAds: hasQueuedAds,
-                            activeAdRequest: this.activeAdRequestToken !== null
-                        });
-                    }
-                    if (!this.inAdBreak) {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Ignoring SCTE-35 end marker - not in ad break");
-                        }
-                        return;
-                    }
-                    if (adPlaying || remaining > 500) {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Ignoring premature SCTE-35 end marker - ads still active or time remaining");
-                        }
-                        return;
-                    }
-                    this.inAdBreak = false;
-                    this.expectedAdBreakDurationMs = void 0;
-                    this.currentAdBreakStartWallClockMs = void 0;
-                    this.clearAdStartTimer();
-                    this.clearAdStopTimer();
-                    if (adPlaying) {
-                        this.adLayer.stop().catch(function() {});
-                    }
-                    this.handleAdPodComplete();
-                    return;
-                }
-            }
-        },
-        {
-            key: "parseCueOutDuration",
-            value: function parseCueOutDuration(value) {
-                var num = parseFloat(value.trim());
-                if (!Number.isNaN(num)) return num;
-                var match = value.match(/(?:^|[,\s])DURATION\s*=\s*([0-9.]+)/i) || value.match(/Duration\s*=\s*([0-9.]+)/i);
-                if (match && match[1] != null) {
-                    var dStr = match[1];
-                    var d = parseFloat(dStr);
-                    return Number.isNaN(d) ? void 0 : d;
-                }
-                return void 0;
-            }
-        },
-        {
-            key: "parseCueOutCont",
-            value: function parseCueOutCont(value) {
-                var res = {};
-                var elapsedMatch = value.match(/Elapsed\s*=\s*([0-9.]+)/i);
-                var durationMatch = value.match(/Duration\s*=\s*([0-9.]+)/i);
-                if (elapsedMatch && elapsedMatch[1] != null) {
-                    var e = parseFloat(elapsedMatch[1]);
-                    if (!Number.isNaN(e)) res.elapsed = e;
-                }
-                if (durationMatch && durationMatch[1] != null) {
-                    var d = parseFloat(durationMatch[1]);
-                    if (!Number.isNaN(d)) res.duration = d;
-                }
-                if (!("elapsed" in res) || !("duration" in res)) {
-                    var slashMatch = value.match(/([0-9.]+)\s*\/\s*([0-9.]+)/);
-                    if (slashMatch && slashMatch[1] && slashMatch[2]) {
-                        var elapsed = parseFloat(slashMatch[1]);
-                        var duration = parseFloat(slashMatch[2]);
-                        if (!Number.isNaN(elapsed) && !("elapsed" in res)) res.elapsed = elapsed;
-                        if (!Number.isNaN(duration) && !("duration" in res)) res.duration = duration;
-                    }
-                }
-                if ("elapsed" in res || "duration" in res) return res;
-                return void 0;
-            }
-        },
-        {
-            key: "parseAttributeList",
-            value: function parseAttributeList(value) {
-                var attrs = {};
-                var regex = /([A-Z0-9-]+)=(("[^"]*")|([^",]*))(?:,|$)/gi;
-                var match;
-                while((match = regex.exec(value)) !== null){
-                    var _match_, _ref, _match_1;
-                    var key = (_match_ = match[1]) !== null && _match_ !== void 0 ? _match_ : "";
-                    var rawVal = (_ref = (_match_1 = match[3]) !== null && _match_1 !== void 0 ? _match_1 : match[4]) !== null && _ref !== void 0 ? _ref : "";
-                    if (rawVal.startsWith('"') && rawVal.endsWith('"')) {
-                        rawVal = rawVal.slice(1, -1);
-                    }
-                    if (key) {
-                        attrs[key] = rawVal;
-                    }
-                }
-                return attrs;
-            }
-        },
-        {
-            key: "toNumber",
-            value: function toNumber(val) {
-                if (val == null) return void 0;
-                var n = typeof val === "string" ? parseFloat(val) : Number(val);
-                return Number.isNaN(n) ? void 0 : n;
-            }
-        },
-        {
-            key: "isManifestBasedMarker",
-            value: function isManifestBasedMarker(marker) {
-                var raw = marker.raw;
-                if (!raw) return false;
-                if (raw.tag) {
-                    var tag = String(raw.tag);
-                    return tag.includes("EXT-X-CUE-OUT") || tag.includes("EXT-X-CUE-IN") || tag.includes("EXT-X-DATERANGE");
-                }
-                if (raw.id3) return false;
-                if (raw.splice_command_type) return false;
-                return false;
-            }
-        },
-        {
-            key: "parseScte35Binary",
-            value: function parseScte35Binary(data) {
-                var BitReader = /*#__PURE__*/ function() {
-                    function BitReader(buf) {
-                        _class_call_check(this, BitReader);
-                        this.buf = buf;
-                        this.bytePos = 0;
-                        this.bitPos = 0;
-                    }
-                    _create_class(BitReader, [
-                        {
-                            key: "readBits",
-                            value: function readBits(numBits) {
-                                var result = 0;
-                                while(numBits > 0){
-                                    if (this.bytePos >= this.buf.length) return result;
-                                    var remainingInByte = 8 - this.bitPos;
-                                    var toRead = Math.min(numBits, remainingInByte);
-                                    var currentByte = this.buf[this.bytePos];
-                                    var shift = remainingInByte - toRead;
-                                    var mask = (1 << toRead) - 1 & 255;
-                                    var bits = currentByte >> shift & mask;
-                                    result = result << toRead | bits;
-                                    this.bitPos += toRead;
-                                    if (this.bitPos >= 8) {
-                                        this.bitPos = 0;
-                                        this.bytePos += 1;
-                                    }
-                                    numBits -= toRead;
-                                }
-                                return result >>> 0;
-                            }
-                        },
-                        {
-                            key: "skipBits",
-                            value: function skipBits(n) {
-                                this.readBits(n);
-                            }
-                        }
-                    ]);
-                    return BitReader;
-                }();
-                var r = new BitReader(data);
-                var tableId = r.readBits(8);
-                if (tableId !== 252) return void 0;
-                r.readBits(1);
-                r.readBits(1);
-                r.readBits(2);
-                var sectionLength = r.readBits(12);
-                r.readBits(8);
-                r.readBits(1);
-                r.readBits(6);
-                var ptsAdjHigh = r.readBits(1);
-                var ptsAdjLow = r.readBits(32);
-                void ptsAdjHigh;
-                void ptsAdjLow;
-                r.readBits(8);
-                r.readBits(12);
-                var spliceCommandLength = r.readBits(12);
-                var spliceCommandType = r.readBits(8);
-                if (spliceCommandType !== 5) {
-                    return void 0;
-                }
-                r.readBits(32);
-                var cancel = r.readBits(1) === 1;
-                r.readBits(7);
-                if (cancel) return void 0;
-                var outOfNetwork = r.readBits(1) === 1;
-                var programSpliceFlag = r.readBits(1) === 1;
-                var durationFlag = r.readBits(1) === 1;
-                var spliceImmediateFlag = r.readBits(1) === 1;
-                r.readBits(4);
-                if (programSpliceFlag && !spliceImmediateFlag) {
-                    var timeSpecifiedFlag = r.readBits(1) === 1;
-                    if (timeSpecifiedFlag) {
-                        r.readBits(6);
-                        r.readBits(33);
-                    } else {
-                        r.readBits(7);
-                    }
-                } else if (!programSpliceFlag) {
-                    var componentCount = r.readBits(8);
-                    for(var i = 0; i < componentCount; i++){
-                        r.readBits(8);
-                        if (!spliceImmediateFlag) {
-                            var timeSpecifiedFlag1 = r.readBits(1) === 1;
-                            if (timeSpecifiedFlag1) {
-                                r.readBits(6);
-                                r.readBits(33);
-                            } else {
-                                r.readBits(7);
-                            }
-                        }
-                    }
-                }
-                var durationSeconds = void 0;
-                if (durationFlag) {
-                    r.readBits(6);
-                    r.readBits(1);
-                    var high = r.readBits(1);
-                    var low = r.readBits(32);
-                    var durationTicks = high * 4294967296 + low;
-                    durationSeconds = durationTicks / 9e4;
-                }
-                r.readBits(16);
-                r.readBits(8);
-                r.readBits(8);
-                if (outOfNetwork) {
-                    var marker = _object_spread_props(_object_spread({
-                        type: "start"
-                    }, durationSeconds !== void 0 ? {
-                        durationSeconds: durationSeconds
-                    } : {}), {
-                        raw: {
-                            splice_command_type: 5
-                        }
-                    });
-                    return marker;
-                }
-                return void 0;
-            }
-        },
         {
             key: "initializeTracking",
             value: function initializeTracking() {
@@ -4169,35 +3611,35 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         },
         {
             key: "startAdPrefetch",
-            value: function startAdPrefetch(marker, fragmentSn) {
+            value: function startAdPrefetch(durationSeconds, fragmentSn) {
                 if (this.config.disableAds) return;
                 if (this.pendingAdBreak || this.inAdBreak) {
                     return;
                 }
-                this.pendingAdBreak = _object_spread_props(_object_spread({
-                    marker: marker
-                }, fragmentSn !== void 0 ? {
+                this.pendingAdBreak = _object_spread_props(_object_spread({}, durationSeconds !== void 0 ? {
+                    durationSeconds: durationSeconds
+                } : {}, fragmentSn !== void 0 ? {
                     detectedAtFragmentSn: fragmentSn
                 } : {}), {
                     isFetching: false,
                     fetchStartTime: Date.now()
                 });
-                void this.runAdPrefetch(marker);
+                void this.runAdPrefetch(durationSeconds);
                 if (this.config.debugAdTiming) {
-                    console.log("[PREFETCH] Ad break marker registered, multi-ad prefetch started");
+                    console.log("[PREFETCH] Ad break registered, multi-ad prefetch started");
                 }
             }
         },
         {
             key: "runAdPrefetch",
-            value: function runAdPrefetch(marker) {
+            value: function runAdPrefetch(durationSeconds) {
                 return _async_to_generator(function() {
-                    var _this, _marker_durationSeconds, _ref, _firstBids_, durSec, context, firstBids, unused, adDurationSec, estimatedCount, firstToken, remaining, results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, result, token;
+                    var _this, _ref, _firstBids_, durSec, context, firstBids, unused, adDurationSec, estimatedCount, firstToken, unused1, remaining, results, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, result, token, unused2, err;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this = this;
-                                durSec = (_marker_durationSeconds = marker.durationSeconds) !== null && _marker_durationSeconds !== void 0 ? _marker_durationSeconds : 60;
+                                durSec = durationSeconds !== null && durationSeconds !== void 0 ? durationSeconds : 60;
                                 context = {
                                     breakDurationSec: durSec,
                                     remainingBreakSec: durSec
@@ -4237,6 +3679,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     if (this.config.debugAdTiming) {
                                         console.log("[PREFETCH] First VAST request returned no ad, aborting prefetch");
                                     }
+                                    this.clearPendingAdBreak();
                                     return [
                                         2
                                     ];
@@ -4247,14 +3690,43 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     console.log("[PREFETCH] Ad duration=".concat(adDurationSec, "s, break=").concat(durSec, "s → ").concat(estimatedCount, " ad(s) needed"));
                                 }
                                 firstToken = "preload_".concat(Date.now(), "_").concat(Math.random().toString(36).slice(2, 7));
-                                this.preloadedTokens.push(firstToken);
-                                void this.adLayer.preloadAd(firstBids, firstToken);
+                                _state.label = 5;
+                            case 5:
+                                _state.trys.push([
+                                    5,
+                                    7,
+                                    ,
+                                    8
+                                ]);
+                                return [
+                                    4,
+                                    this.adLayer.preloadAd(firstBids, firstToken)
+                                ];
+                            case 6:
+                                _state.sent();
+                                if (!this.inAdBreak) {
+                                    this.preloadedTokens.push(firstToken);
+                                    if (this.config.debugAdTiming) {
+                                        console.log("[PREFETCH] First ad preloaded and queued, token=".concat(firstToken));
+                                    }
+                                }
+                                return [
+                                    3,
+                                    8
+                                ];
+                            case 7:
+                                unused1 = _state.sent();
                                 if (this.config.debugAdTiming) {
-                                    console.log("[PREFETCH] First ad preloading, token=".concat(firstToken));
+                                    console.warn("[PREFETCH] First ad preload failed, token=".concat(firstToken));
                                 }
+                                return [
+                                    3,
+                                    8
+                                ];
+                            case 8:
                                 if (!(estimatedCount > 1)) return [
                                     3,
-                                    6
+                                    19
                                 ];
                                 remaining = Array.from({
                                     length: estimatedCount - 1
@@ -4276,38 +3748,100 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     4,
                                     Promise.all(remaining)
                                 ];
-                            case 5:
+                            case 9:
                                 results = _state.sent();
                                 _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _state.label = 10;
+                            case 10:
+                                _state.trys.push([
+                                    10,
+                                    17,
+                                    18,
+                                    19
+                                ]);
+                                _iterator = results[Symbol.iterator]();
+                                _state.label = 11;
+                            case 11:
+                                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                                    3,
+                                    16
+                                ];
+                                result = _step.value;
+                                if (this.inAdBreak) return [
+                                    3,
+                                    16
+                                ];
+                                if (!(result.ok && result.value.length > 0)) return [
+                                    3,
+                                    15
+                                ];
+                                token = "preload_".concat(Date.now(), "_").concat(Math.random().toString(36).slice(2, 7));
+                                _state.label = 12;
+                            case 12:
+                                _state.trys.push([
+                                    12,
+                                    14,
+                                    ,
+                                    15
+                                ]);
+                                return [
+                                    4,
+                                    this.adLayer.preloadAd(result.value, token)
+                                ];
+                            case 13:
+                                _state.sent();
+                                if (!this.inAdBreak) {
+                                    this.preloadedTokens.push(token);
+                                    if (this.config.debugAdTiming) {
+                                        console.log("[PREFETCH] Additional ad preloaded and queued, token=".concat(token));
+                                    }
+                                }
+                                return [
+                                    3,
+                                    15
+                                ];
+                            case 14:
+                                unused2 = _state.sent();
+                                if (this.config.debugAdTiming) {
+                                    console.warn("[PREFETCH] Additional ad preload failed, token=".concat(token));
+                                }
+                                return [
+                                    3,
+                                    15
+                                ];
+                            case 15:
+                                _iteratorNormalCompletion = true;
+                                return [
+                                    3,
+                                    11
+                                ];
+                            case 16:
+                                return [
+                                    3,
+                                    19
+                                ];
+                            case 17:
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                                return [
+                                    3,
+                                    19
+                                ];
+                            case 18:
                                 try {
-                                    for(_iterator = results[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                        result = _step.value;
-                                        if (this.inAdBreak) break;
-                                        if (result.ok && result.value.length > 0) {
-                                            token = "preload_".concat(Date.now(), "_").concat(Math.random().toString(36).slice(2, 7));
-                                            this.preloadedTokens.push(token);
-                                            void this.adLayer.preloadAd(result.value, token);
-                                            if (this.config.debugAdTiming) {
-                                                console.log("[PREFETCH] Additional ad preloading, token=".concat(token));
-                                            }
-                                        }
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
                                     }
-                                } catch (err) {
-                                    _didIteratorError = true;
-                                    _iteratorError = err;
                                 } finally{
-                                    try {
-                                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                            _iterator.return();
-                                        }
-                                    } finally{
-                                        if (_didIteratorError) {
-                                            throw _iteratorError;
-                                        }
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
                                     }
                                 }
-                                _state.label = 6;
-                            case 6:
+                                return [
+                                    7
+                                ];
+                            case 19:
                                 if (this.config.debugAdTiming) {
                                     console.log("[PREFETCH] Pre-fetch complete: ".concat(this.preloadedTokens.length, " ad(s) queued"));
                                 }
@@ -4379,7 +3913,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:
@@ -4409,7 +3943,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, {
@@ -4417,6 +3953,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);
@@ -4446,6 +3991,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;
@@ -4465,22 +4011,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);
                                     }
-                                    var marker = {
-                                        type: "start",
-                                        durationSeconds: 60,
-                                        raw: {
-                                            apiInsertionPoint: this.lastAdInsertionPoint,
-                                            earlyDetection: true
-                                        }
-                                    };
-                                    this.startAdPrefetch(marker, frag === null || frag === void 0 ? void 0 : frag.sn);
                                     return;
                                 }
                             }
@@ -4518,8 +4084,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "fragmentMatchesSegment",
             value: function fragmentMatchesSegment(frag, segmentName) {
-                var url = (frag === null || frag === void 0 ? void 0 : frag.url) || (frag === null || frag === void 0 ? void 0 : frag.relurl) || "";
-                return url.endsWith(segmentName) || url.includes("/" + segmentName);
+                var _rawUrl_split_;
+                var rawUrl = (frag === null || frag === void 0 ? void 0 : frag.url) || (frag === null || frag === void 0 ? void 0 : frag.relurl) || "";
+                var url = (_rawUrl_split_ = rawUrl.split("?")[0]) !== null && _rawUrl_split_ !== void 0 ? _rawUrl_split_ : "";
+                var name = segmentName.startsWith("/") ? segmentName : "/" + segmentName;
+                return url.endsWith(name) || url.includes(name);
             }
         },
         {
@@ -4856,13 +4425,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         },
         {
             key: "handleAdStart",
-            value: function handleAdStart(_marker) {
+            value: function handleAdStart(durationSeconds) {
                 return _async_to_generator(function() {
-                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, adBreakToken, adVolume, token, remaining, err;
+                    var _this_savedMutedStateBeforeAd, adBreakDurationMs, mode, state, adBreakToken, adVolume, token, remaining, err;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                adBreakDurationMs = _marker.durationSeconds != null ? _marker.durationSeconds * 1e3 : void 0;
+                                adBreakDurationMs = durationSeconds != null ? durationSeconds * 1e3 : void 0;
                                 if (this.config.debugAdTiming) {
                                     mode = this.isLiveStream ? "LIVE" : "VOD";
                                     console.log("[CONTINUOUS-FETCH] \uD83D\uDCFA ".concat(mode, " MODE: Target duration=").concat(adBreakDurationMs, "ms"));
@@ -4873,13 +4442,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.pendingNextAdBids = null;
                                 this.isShowingPlaceholder = false;
                                 this.totalAdRequestsInBreak = 0;
-                                if (this.savedMutedStateBeforeScte == null && !this.video.muted) {
-                                    this.savedMutedStateBeforeScte = {
+                                if (this.savedMutedStateBeforeAd == null && !this.video.muted) {
+                                    this.savedMutedStateBeforeAd = {
                                         muted: false,
                                         volume: this.video.volume
                                     };
                                 }
-                                state = (_this_savedMutedStateBeforeScte = this.savedMutedStateBeforeScte) !== null && _this_savedMutedStateBeforeScte !== void 0 ? _this_savedMutedStateBeforeScte : {
+                                state = (_this_savedMutedStateBeforeAd = this.savedMutedStateBeforeAd) !== null && _this_savedMutedStateBeforeAd !== void 0 ? _this_savedMutedStateBeforeAd : {
                                     muted: this.video.muted,
                                     volume: this.video.volume
                                 };
@@ -4906,6 +4475,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
                                     this.expectedAdBreakDurationMs = adBreakDurationMs;
                                 }
+                                if (this.expectedAdBreakDurationMs != null) {
+                                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                                }
                                 this.clearPendingAdBreak();
                                 adBreakToken = Date.now();
                                 this.activeAdRequestToken = adBreakToken;
@@ -5404,49 +4976,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.handleAdPodComplete();
             }
         },
-        {
-            key: "scheduleAdStartIn",
-            value: function scheduleAdStartIn(delayMs) {
-                var _this = this;
-                this.clearAdStartTimer();
-                var ms = Math.max(0, Math.floor(delayMs));
-                if (ms === 0) {
-                    this.handleAdStart({
-                        type: "start"
-                    }).catch(function() {});
-                    return;
-                }
-                this.adStartTimerId = window.setTimeout(function() {
-                    _this.handleAdStart({
-                        type: "start"
-                    }).catch(function() {});
-                }, ms);
-            }
-        },
-        {
-            key: "clearAdStartTimer",
-            value: function clearAdStartTimer() {
-                if (this.adStartTimerId != null) {
-                    clearTimeout(this.adStartTimerId);
-                    this.adStartTimerId = void 0;
-                }
-            }
-        },
-        {
-            key: "updatePtsDrift",
-            value: function updatePtsDrift(ptsSecondsSample) {
-                var sampleMs = (this.video.currentTime - ptsSecondsSample) * 1e3;
-                if (!Number.isFinite(sampleMs) || Math.abs(sampleMs) > 6e4) return;
-                var alpha = 0.1;
-                this.ptsDriftEmaMs = this.ptsDriftEmaMs * (1 - alpha) + sampleMs * alpha;
-            }
-        },
         {
             key: "handleAdPodComplete",
             value: function handleAdPodComplete() {
                 var _this = this;
                 var _ref, _ref1;
-                var _this_savedMutedStateBeforeScte, _this_savedMutedStateBeforeScte1;
+                var _this_savedMutedStateBeforeAd, _this_savedMutedStateBeforeAd1;
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] \uD83C\uDFC1 Ad pod complete - cleaning up");
                 }
@@ -5468,7 +5003,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.inAdBreak = false;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
-                this.clearAdStartTimer();
                 this.clearAdStopTimer();
                 this.adPodQueue = [];
                 this.showAds = false;
@@ -5476,8 +5010,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.totalAdsInBreak = 0;
                 this.totalAdRequestsInBreak = 0;
                 this.consecutiveFailures = 0;
-                var restoredMuted = (_ref = (_this_savedMutedStateBeforeScte = this.savedMutedStateBeforeScte) === null || _this_savedMutedStateBeforeScte === void 0 ? void 0 : _this_savedMutedStateBeforeScte.muted) !== null && _ref !== void 0 ? _ref : this.adLayer.getOriginalMutedState();
-                var restoredVolume = (_ref1 = (_this_savedMutedStateBeforeScte1 = this.savedMutedStateBeforeScte) === null || _this_savedMutedStateBeforeScte1 === void 0 ? void 0 : _this_savedMutedStateBeforeScte1.volume) !== null && _ref1 !== void 0 ? _ref1 : this.adLayer.getOriginalVolume();
+                var restoredMuted = (_ref = (_this_savedMutedStateBeforeAd = this.savedMutedStateBeforeAd) === null || _this_savedMutedStateBeforeAd === void 0 ? void 0 : _this_savedMutedStateBeforeAd.muted) !== null && _ref !== void 0 ? _ref : this.adLayer.getOriginalMutedState();
+                var restoredVolume = (_ref1 = (_this_savedMutedStateBeforeAd1 = this.savedMutedStateBeforeAd) === null || _this_savedMutedStateBeforeAd1 === void 0 ? void 0 : _this_savedMutedStateBeforeAd1.volume) !== null && _ref1 !== void 0 ? _ref1 : this.adLayer.getOriginalVolume();
                 this.adLayer.updateOriginalMutedState(restoredMuted, restoredVolume);
                 this.adLayer.stop().catch(function() {});
                 if (this.video.muted !== restoredMuted) {
@@ -5586,7 +5120,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }, delay);
                     });
                 }
-                this.savedMutedStateBeforeScte = null;
+                this.savedMutedStateBeforeAd = null;
             }
         },
         {
@@ -5736,19 +5270,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
             }
         },
-        {
-            key: "pushScteMarker",
-            value: function pushScteMarker(marker) {
-                if (!this.config.debugAdTiming) return;
-                this.scteMarkerHistory.push({
-                    timestampMs: Date.now(),
-                    marker: marker
-                });
-                if (this.scteMarkerHistory.length > DEBUG_HISTORY_LIMIT) {
-                    this.scteMarkerHistory = this.scteMarkerHistory.slice(-DEBUG_HISTORY_LIMIT);
-                }
-            }
-        },
         {
             key: "pushDebugLog",
             value: function pushDebugLog(level, category, message, details) {
@@ -5766,23 +5287,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
-        {
-            key: "getRecentScteMarkers",
-            value: function getRecentScteMarkers() {
-                return this.scteMarkerHistory.map(function(entry) {
-                    return _object_spread({
-                        timestampMs: entry.timestampMs,
-                        type: entry.marker.type
-                    }, entry.marker.ptsSeconds !== void 0 ? {
-                        ptsSeconds: entry.marker.ptsSeconds
-                    } : {}, entry.marker.durationSeconds !== void 0 ? {
-                        durationSeconds: entry.marker.durationSeconds
-                    } : {}, entry.marker.raw !== void 0 ? {
-                        raw: entry.marker.raw
-                    } : {});
-                });
-            }
-        },
         {
             key: "pushAdInsertionDebug",
             value: function pushAdInsertionDebug(event, segmentName, opts) {
@@ -6079,7 +5583,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.clearAdInsertionOffsetTimer();
                 this.stopContinuousFetching();
                 this.stopFillerBreakTimer();
-                this.clearAdStartTimer();
                 this.clearAdStopTimer();
                 this.clearAdFailsafeTimer();
                 this.clearAdRequestWatchdog();
@@ -6107,7 +5610,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 (_this_adLayer = this.adLayer) === null || _this_adLayer === void 0 ? void 0 : _this_adLayer.destroy();
                 this.consecutiveFailures = 0;
                 this.debugLogEntries = [];
-                this.scteMarkerHistory = [];
                 this.adInsertionDebugHistory = [];
             }
         }