stormcloud-video-player 0.7.9 → 0.7.11

package/lib/players/HlsPlayer.d.cts

@@ -1,5 +1,5 @@
 import { Component } from 'react';
-import { S as StormcloudVideoPlayerConfig } from '../types-ClqQZM3U.cjs';
+import { S as StormcloudVideoPlayerConfig } from '../types-jU4lq0ST.cjs';
 
 interface HlsPlayerProps extends StormcloudVideoPlayerConfig {
     onMount?: (player: any) => void;

package/lib/players/index.cjs

@@ -2840,6 +2840,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.isInAdTransition = false;
         this.maxPlaceholderDurationMs = 5e3;
         this.isShowingPlaceholder = false;
+        this.lastAdInsertionPoint = null;
+        this.processedAdInsertionUpdatedAt = null;
         this.totalAdRequestsInBreak = 0;
         this.maxTotalAdRequestsPerBreak = 20;
         this.pendingAdBreak = null;
@@ -2857,6 +2859,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.preloadedTokens = [];
         this.debugLogEntries = [];
         this.scteMarkerHistory = [];
+        this.adInsertionDebugHistory = [];
         initializePolyfills();
         var browserOverrides = getBrowserConfigOverrides();
         this.config = _object_spread({}, browserOverrides, config);
@@ -3041,6 +3044,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                     _state.sent();
                                                     _state.label = 2;
                                                 case 2:
+                                                    if (!this.config.disableAds && this.config.projectId) {
+                                                        this.startAdInsertionPolling();
+                                                    }
                                                     return [
                                                         2
                                                     ];
@@ -3048,78 +3054,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         });
                                     }).call(_this);
                                 });
-                                this.hls.on(import_hls.default.Events.LEVEL_LOADED, function(_evt, data) {
+                                this.hls.on(import_hls.default.Events.LEVEL_LOADED, function() {
                                     if (_this.inAdBreak || _this.pendingAdBreak) {
                                         return;
                                     }
-                                    var details = data === null || data === void 0 ? void 0 : data.details;
-                                    if (!details || !details.fragments || details.fragments.length === 0) {
-                                        return;
-                                    }
-                                    var fragmentsToScan = Math.min(5, details.fragments.length);
-                                    for(var i = 0; i < fragmentsToScan; i++){
-                                        var frag = details.fragments[i];
-                                        var tagList = frag === null || frag === void 0 ? void 0 : frag.tagList;
-                                        if (!Array.isArray(tagList)) continue;
-                                        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                                        try {
-                                            for(var _iterator = tagList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                                var entry = _step.value;
-                                                var tag = "";
-                                                var value = "";
-                                                if (Array.isArray(entry)) {
-                                                    var _entry_, _entry_1;
-                                                    tag = String((_entry_ = entry[0]) !== null && _entry_ !== void 0 ? _entry_ : "");
-                                                    value = String((_entry_1 = entry[1]) !== null && _entry_1 !== void 0 ? _entry_1 : "");
-                                                } else if (typeof entry === "string") {
-                                                    var idx = entry.indexOf(":");
-                                                    if (idx >= 0) {
-                                                        tag = entry.substring(0, idx);
-                                                        value = entry.substring(idx + 1);
-                                                    } else {
-                                                        tag = entry;
-                                                    }
-                                                }
-                                                if (!tag) continue;
-                                                if (tag.includes("EXT-X-CUE-OUT") || tag.includes("EXT-X-DATERANGE")) {
-                                                    var attrs = tag.includes("EXT-X-DATERANGE") ? _this.parseAttributeList(value) : {};
-                                                    var hasScteOut = tag.includes("EXT-X-CUE-OUT") || "SCTE35-OUT" in attrs || attrs["SCTE35-OUT"] !== void 0;
-                                                    if (hasScteOut) {
-                                                        var durationSeconds = _this.parseCueOutDuration(value);
-                                                        var marker = _object_spread_props(_object_spread({
-                                                            type: "start"
-                                                        }, durationSeconds !== void 0 ? {
-                                                            durationSeconds: durationSeconds
-                                                        } : {}), {
-                                                            raw: {
-                                                                tag: tag,
-                                                                value: value,
-                                                                earlyDetection: true
-                                                            }
-                                                        });
-                                                        if (_this.config.debugAdTiming) {
-                                                            console.log("[StormcloudVideoPlayer] \uD83C\uDFAF EARLY SCTE-35 DETECTION: Ad break marker found in fragment", i, "- starting pre-fetch (NOT playing yet)");
-                                                        }
-                                                        _this.startAdPrefetch(marker, frag === null || frag === void 0 ? void 0 : frag.sn);
-                                                        return;
-                                                    }
-                                                }
-                                            }
-                                        } catch (err) {
-                                            _didIteratorError = true;
-                                            _iteratorError = err;
-                                        } finally{
-                                            try {
-                                                if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                                    _iterator.return();
-                                                }
-                                            } finally{
-                                                if (_didIteratorError) {
-                                                    throw _iteratorError;
-                                                }
-                                            }
-                                        }
-                                    }
+                                    _this.checkAdInsertionInManifest();
                                 });
                                 this.hls.on(import_hls.default.Events.FRAG_BUFFERED, function(_evt, data) {
                                     return _async_to_generator(function() {
@@ -3181,124 +3120,42 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         });
                                     }).call(_this);
                                 });
-                                this.hls.on(import_hls.default.Events.FRAG_PARSING_METADATA, function(_evt, data) {
-                                    var id3Tags = ((data === null || data === void 0 ? void 0 : data.samples) || []).map(function(s) {
-                                        return {
-                                            key: "ID3",
-                                            value: s === null || s === void 0 ? void 0 : s.data,
-                                            ptsSeconds: s === null || s === void 0 ? void 0 : s.pts
-                                        };
-                                    });
-                                    id3Tags.forEach(function(tag) {
-                                        return _this.onId3Tag(tag);
-                                    });
-                                });
                                 this.hls.on(import_hls.default.Events.FRAG_CHANGED, function(_evt, data) {
                                     var frag = data === null || data === void 0 ? void 0 : data.frag;
-                                    var tagList = frag === null || frag === void 0 ? void 0 : frag.tagList;
-                                    if (!Array.isArray(tagList)) return;
-                                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                                    try {
-                                        for(var _iterator = tagList[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            var entry = _step.value;
-                                            var tag = "";
-                                            var value = "";
-                                            if (Array.isArray(entry)) {
-                                                var _entry_, _entry_1;
-                                                tag = String((_entry_ = entry[0]) !== null && _entry_ !== void 0 ? _entry_ : "");
-                                                value = String((_entry_1 = entry[1]) !== null && _entry_1 !== void 0 ? _entry_1 : "");
-                                            } else if (typeof entry === "string") {
-                                                var idx = entry.indexOf(":");
-                                                if (idx >= 0) {
-                                                    tag = entry.substring(0, idx);
-                                                    value = entry.substring(idx + 1);
-                                                } else {
-                                                    tag = entry;
-                                                    value = "";
-                                                }
+                                    if (!frag) return;
+                                    if (_this.lastAdInsertionPoint && !_this.inAdBreak && _this.lastAdInsertionPoint.updated_at !== _this.processedAdInsertionUpdatedAt) {
+                                        var segmentName = _this.lastAdInsertionPoint.segment_ts_name;
+                                        if (_this.fragmentMatchesSegment(frag, segmentName)) {
+                                            var _ref;
+                                            _this.processedAdInsertionUpdatedAt = _this.lastAdInsertionPoint.updated_at;
+                                            var offsetMs = (_this.lastAdInsertionPoint.offset_seconds || 0) * 1e3;
+                                            _this.pushAdInsertionDebug("segment_playing", segmentName, {
+                                                offsetSeconds: _this.lastAdInsertionPoint.offset_seconds,
+                                                detail: "sn=".concat((_ref = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref !== void 0 ? _ref : "?")
+                                            });
+                                            if (_this.config.debugAdTiming) {
+                                                console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" now playing — scheduling ad start in ').concat(offsetMs, "ms"));
                                             }
-                                            if (!tag) continue;
-                                            if (tag.includes("EXT-X-CUE-OUT-CONT")) {
-                                                var prog = _this.parseCueOutCont(value);
-                                                var marker = _object_spread_props(_object_spread({
-                                                    type: "progress"
-                                                }, (prog === null || prog === void 0 ? void 0 : prog.duration) !== void 0 ? {
-                                                    durationSeconds: prog.duration
-                                                } : {}, (prog === null || prog === void 0 ? void 0 : prog.elapsed) !== void 0 ? {
-                                                    ptsSeconds: prog.elapsed
-                                                } : {}), {
-                                                    raw: {
-                                                        tag: tag,
-                                                        value: value
-                                                    }
+                                            _this.pushAdInsertionDebug("ad_scheduled", segmentName, {
+                                                offsetSeconds: _this.lastAdInsertionPoint.offset_seconds,
+                                                detail: "in ".concat(offsetMs, "ms, dur=60s")
+                                            });
+                                            _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)"
                                                 });
-                                                _this.onScte35Marker(marker);
-                                            } else if (tag.includes("EXT-X-CUE-OUT")) {
-                                                var durationSeconds = _this.parseCueOutDuration(value);
-                                                var marker1 = _object_spread_props(_object_spread({
-                                                    type: "start"
-                                                }, durationSeconds !== void 0 ? {
-                                                    durationSeconds: durationSeconds
-                                                } : {}), {
+                                                var marker = {
+                                                    type: "start",
+                                                    durationSeconds: 60,
                                                     raw: {
-                                                        tag: tag,
-                                                        value: value
+                                                        apiInsertionPoint: _this.lastAdInsertionPoint
                                                     }
-                                                });
-                                                _this.onScte35Marker(marker1);
-                                            } else if (tag.includes("EXT-X-CUE-IN")) {
-                                                _this.onScte35Marker({
-                                                    type: "end",
-                                                    raw: {
-                                                        tag: tag,
-                                                        value: value
-                                                    }
-                                                });
-                                            } else if (tag.includes("EXT-X-DATERANGE")) {
-                                                var _attrs_CLASS;
-                                                var attrs = _this.parseAttributeList(value);
-                                                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 marker2 = _object_spread_props(_object_spread({
-                                                        type: "start"
-                                                    }, duration !== void 0 ? {
-                                                        durationSeconds: duration
-                                                    } : {}), {
-                                                        raw: {
-                                                            tag: tag,
-                                                            value: value,
-                                                            attrs: attrs
-                                                        }
-                                                    });
-                                                    _this.onScte35Marker(marker2);
-                                                }
-                                                if (hasScteIn) {
-                                                    _this.onScte35Marker({
-                                                        type: "end",
-                                                        raw: {
-                                                            tag: tag,
-                                                            value: value,
-                                                            attrs: attrs
-                                                        }
-                                                    });
-                                                }
-                                            }
-                                        }
-                                    } catch (err) {
-                                        _didIteratorError = true;
-                                        _iteratorError = err;
-                                    } finally{
-                                        try {
-                                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                                _iterator.return();
-                                            }
-                                        } finally{
-                                            if (_didIteratorError) {
-                                                throw _iteratorError;
-                                            }
+                                                };
+                                                _this.onScte35Marker(marker);
+                                            }, offsetMs);
                                         }
                                     }
                                 });
@@ -4498,6 +4355,182 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.preloadedTokens = [];
             }
         },
+        {
+            key: "startAdInsertionPolling",
+            value: function startAdInsertionPolling() {
+                var _this = this;
+                if (this.adInsertionPollingId != null) return;
+                this.fetchAdInsertionPoint();
+                this.adInsertionPollingId = window.setInterval(function() {
+                    _this.fetchAdInsertionPoint();
+                }, 1e3);
+            }
+        },
+        {
+            key: "stopAdInsertionPolling",
+            value: function stopAdInsertionPolling() {
+                if (this.adInsertionPollingId != null) {
+                    clearInterval(this.adInsertionPollingId);
+                    this.adInsertionPollingId = void 0;
+                }
+            }
+        },
+        {
+            key: "fetchAdInsertionPoint",
+            value: function fetchAdInsertionPoint() {
+                return _async_to_generator(function() {
+                    var _this_lastAdInsertionPoint, resp, data, isNew, unused;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (!this.config.projectId) return [
+                                    2
+                                ];
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    4,
+                                    ,
+                                    5
+                                ]);
+                                return [
+                                    4,
+                                    fetch("https://adstorm.co/api-adstorm-dev/adstorm/swirl/projects/".concat(encodeURIComponent(this.config.projectId), "/ad-insertion-point"))
+                                ];
+                            case 2:
+                                resp = _state.sent();
+                                if (!resp.ok) return [
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    resp.json()
+                                ];
+                            case 3:
+                                data = _state.sent();
+                                isNew = data.updated_at !== ((_this_lastAdInsertionPoint = this.lastAdInsertionPoint) === null || _this_lastAdInsertionPoint === void 0 ? void 0 : _this_lastAdInsertionPoint.updated_at);
+                                this.lastAdInsertionPoint = data;
+                                if (isNew) {
+                                    this.pushAdInsertionDebug("api_response", data.segment_ts_name, {
+                                        offsetSeconds: data.offset_seconds,
+                                        updatedAt: data.updated_at,
+                                        detail: "project=".concat(data.project_id)
+                                    });
+                                }
+                                if (this.config.debugAdTiming) {
+                                    console.log("[StormcloudVideoPlayer] Ad insertion point API response:", data);
+                                }
+                                return [
+                                    3,
+                                    5
+                                ];
+                            case 4:
+                                unused = _state.sent();
+                                if (this.config.debugAdTiming) {
+                                    console.warn("[StormcloudVideoPlayer] Ad insertion point API fetch failed");
+                                }
+                                return [
+                                    3,
+                                    5
+                                ];
+                            case 5:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
+        {
+            key: "checkAdInsertionInManifest",
+            value: function checkAdInsertionInManifest() {
+                var _this_hls;
+                if (!this.lastAdInsertionPoint) return;
+                if (this.inAdBreak || this.pendingAdBreak) return;
+                if (this.lastAdInsertionPoint.updated_at === this.processedAdInsertionUpdatedAt) return;
+                var segmentName = this.lastAdInsertionPoint.segment_ts_name;
+                var levels = (_this_hls = this.hls) === null || _this_hls === void 0 ? void 0 : _this_hls.levels;
+                if (!levels) return;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = levels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var level = _step.value;
+                        var _level_details;
+                        var fragments = (_level_details = level.details) === null || _level_details === void 0 ? void 0 : _level_details.fragments;
+                        if (!Array.isArray(fragments)) continue;
+                        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                        try {
+                            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;
+                                    this.pushAdInsertionDebug("segment_found", segmentName, {
+                                        detail: "sn=".concat((_ref = frag === null || frag === void 0 ? void 0 : frag.sn) !== null && _ref !== void 0 ? _ref : "?")
+                                    });
+                                    if (this.config.debugAdTiming) {
+                                        console.log('[StormcloudVideoPlayer] Ad insertion segment "'.concat(segmentName, '" found in manifest — starting pre-fetch'));
+                                    }
+                                    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;
+                                }
+                            }
+                        } catch (err) {
+                            _didIteratorError1 = true;
+                            _iteratorError1 = err;
+                        } finally{
+                            try {
+                                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                                    _iterator1.return();
+                                }
+                            } finally{
+                                if (_didIteratorError1) {
+                                    throw _iteratorError1;
+                                }
+                            }
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+            }
+        },
+        {
+            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);
+            }
+        },
+        {
+            key: "clearAdInsertionOffsetTimer",
+            value: function clearAdInsertionOffsetTimer() {
+                if (this.adInsertionOffsetTimerId != null) {
+                    clearTimeout(this.adInsertionOffsetTimerId);
+                    this.adInsertionOffsetTimerId = void 0;
+                }
+            }
+        },
         {
             key: "startContinuousFetchLoop",
             value: function startContinuousFetchLoop() {
@@ -5419,6 +5452,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 this.clearAdRequestWatchdog();
                 this.clearAdFailsafeTimer();
+                this.clearAdInsertionOffsetTimer();
                 this.activeAdRequestToken = null;
                 this.isInAdTransition = false;
                 this.stopContinuousFetching();
@@ -5749,6 +5783,32 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 });
             }
         },
+        {
+            key: "pushAdInsertionDebug",
+            value: function pushAdInsertionDebug(event, segmentName, opts) {
+                if (!this.config.debugAdTiming) return;
+                this.adInsertionDebugHistory.push(_object_spread({
+                    timestampMs: Date.now(),
+                    event: event,
+                    segmentName: segmentName
+                }, (opts === null || opts === void 0 ? void 0 : opts.offsetSeconds) !== void 0 ? {
+                    offsetSeconds: opts.offsetSeconds
+                } : {}, (opts === null || opts === void 0 ? void 0 : opts.updatedAt) ? {
+                    updatedAt: opts.updatedAt
+                } : {}, (opts === null || opts === void 0 ? void 0 : opts.detail) ? {
+                    detail: opts.detail
+                } : {}));
+                if (this.adInsertionDebugHistory.length > DEBUG_HISTORY_LIMIT) {
+                    this.adInsertionDebugHistory = this.adInsertionDebugHistory.slice(-DEBUG_HISTORY_LIMIT);
+                }
+            }
+        },
+        {
+            key: "getAdInsertionDebugLog",
+            value: function getAdInsertionDebugLog() {
+                return this.adInsertionDebugHistory.slice();
+            }
+        },
         {
             key: "getDebugLogs",
             value: function getDebugLogs() {
@@ -6015,6 +6075,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "destroy",
             value: function destroy() {
                 var _this_hls, _this_adLayer;
+                this.stopAdInsertionPolling();
+                this.clearAdInsertionOffsetTimer();
                 this.stopContinuousFetching();
                 this.stopFillerBreakTimer();
                 this.clearAdStartTimer();
@@ -6046,6 +6108,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.consecutiveFailures = 0;
                 this.debugLogEntries = [];
                 this.scteMarkerHistory = [];
+                this.adInsertionDebugHistory = [];
             }
         }
     ]);