stormcloud-video-player 0.8.8 → 0.8.10

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -1,4 +1,4 @@
-import { S as StormcloudVideoPlayerConfig } from '../types-CUKMIqHL.cjs';
+import { S as StormcloudVideoPlayerConfig } from '../types-DQM-Tu6a.cjs';
 
 declare class StormcloudVideoPlayer {
     private readonly video;
@@ -61,6 +61,7 @@ declare class StormcloudVideoPlayer {
     private readonly maxConsecutiveFailures;
     private lastAdRequestTime;
     private readonly minAdRequestIntervalMs;
+    private readonly defaultMinRemainingMsToStartAd;
     private readonly backoffBaseMs;
     private readonly maxBackoffMs;
     private placeholderContainer;
@@ -76,6 +77,7 @@ declare class StormcloudVideoPlayer {
     private preloadPoolActive;
     private preloadPoolLoopRunning;
     private adDetectSentForCurrentBreak;
+    private adBreakEpoch;
     private palNonce;
     private palPlaybackStarted;
     private readonly streamCorrelator;
@@ -195,6 +197,8 @@ declare class StormcloudVideoPlayer {
     private selectVastTagsForBreak;
     private logAdState;
     private getRemainingAdMs;
+    private getMinRemainingMsToStartAd;
+    private hasTimeToStartAnotherAd;
     private findBreakForTime;
     toggleMute(): void;
     toggleFullscreen(): Promise<void>;

package/lib/players/HlsPlayer.cjs

@@ -2688,6 +2688,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.maxConsecutiveFailures = 5;
         this.lastAdRequestTime = 0;
         this.minAdRequestIntervalMs = 3e3;
+        this.defaultMinRemainingMsToStartAd = 4e3;
         this.backoffBaseMs = 1e3;
         this.maxBackoffMs = 15e3;
         this.globalConsecutiveNoFills = 0;
@@ -2702,6 +2703,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.preloadPoolActive = false;
         this.preloadPoolLoopRunning = false;
         this.adDetectSentForCurrentBreak = false;
+        this.adBreakEpoch = 0;
         this.palPlaybackStarted = false;
         this.streamCorrelator = generateCorrelator();
         this.consentSignals = {};
@@ -3206,7 +3208,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         } : {});
                     }
                     if (_this.inAdBreak) {
-                        if (remaining > 500) {
+                        if (_this.hasTimeToStartAnotherAd()) {
                             _this.tryNextAvailableAdWithRateLimit();
                         } else {
                             _this.handleAdPodComplete();
@@ -3279,7 +3281,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             queuedUrls: _to_consumable_array(_this.adRequestQueue)
                         } : {});
                     }
-                    if (remaining > 500) {
+                    if (_this.hasTimeToStartAnotherAd()) {
                         _this.tryNextAvailableAdWithRateLimit();
                     } else {
                         _this.handleAdPodComplete();
@@ -3979,7 +3981,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         var remainingMs1 = Math.max(0, this.expectedAdBreakDurationMs - elapsedMs1);
                         this.scheduleAdStopCountdown(remainingMs1);
                     }
-                    if (!this.adPlayer.isAdPlaying() && this.activeAdRequestToken === null && this.adRequestQueue.length > 0) {
+                    if (!this.adPlayer.isAdPlaying() && this.activeAdRequestToken === null && this.adRequestQueue.length > 0 && this.hasTimeToStartAnotherAd()) {
                         this.tryNextAvailableAdWithRateLimit();
                     }
                     return;
@@ -5249,7 +5251,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "preloadAdIntoPool",
             value: function preloadAdIntoPool(vastUrl) {
                 return _async_to_generator(function() {
-                    var _this, loadPromise;
+                    var _this, epoch, loadPromise;
                     return _ts_generator(this, function(_state) {
                         _this = this;
                         if (this.isGamInCooldown()) {
@@ -5275,6 +5277,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         if (this.config.debugAdTiming) {
                             console.log("[PRELOAD-POOL] \uD83D\uDCE5 Preloading ad into pool: ".concat(vastUrl));
                         }
+                        epoch = this.adBreakEpoch;
                         loadPromise = function() {
                             return _async_to_generator(function() {
                                 var _this, hasAdError, adErrorPayload, errorListenerCleanup, continueLiveStreamDuringAds, preloadAd, errorListener, isNoFill, poolEntry, lateErrorListener, error;
@@ -5352,6 +5355,20 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                     2
                                                 ];
                                             }
+                                            if (!this.preloadPoolActive || epoch !== this.adBreakEpoch) {
+                                                if (this.config.debugAdTiming) {
+                                                    console.log("[PRELOAD-POOL] \uD83D\uDEAB Discarding preloaded ad - break ended during fetch");
+                                                }
+                                                if (errorListenerCleanup) {
+                                                    errorListenerCleanup();
+                                                }
+                                                try {
+                                                    preloadAd.destroy();
+                                                } catch (unused) {}
+                                                return [
+                                                    2
+                                                ];
+                                            }
                                             poolEntry = {
                                                 vastUrl: vastUrl,
                                                 adController: preloadAd,
@@ -5423,7 +5440,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "preloadPoolLoop",
             value: function preloadPoolLoop(baseVastUrl) {
                 return _async_to_generator(function() {
-                    var remaining, newUrls, newUrl;
+                    var epoch, newUrls, newUrl;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5433,12 +5450,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     ];
                                 }
                                 this.preloadPoolLoopRunning = true;
+                                epoch = this.adBreakEpoch;
                                 if (this.config.debugAdTiming) {
                                     console.log("[PRELOAD-POOL] \uD83D\uDD04 Starting continuous preload loop");
                                 }
                                 _state.label = 1;
                             case 1:
-                                if (!this.preloadPoolActive) return [
+                                if (!(this.preloadPoolActive && epoch === this.adBreakEpoch)) return [
                                     3,
                                     10
                                 ];
@@ -5483,20 +5501,20 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     3,
                                     8
                                 ];
-                                if (!this.preloadPoolActive || this.isGamInCooldown()) {
+                                if (!this.preloadPoolActive || epoch !== this.adBreakEpoch || this.isGamInCooldown()) {
                                     return [
                                         3,
                                         8
                                     ];
                                 }
-                                if (this.inAdBreak) {
-                                    remaining = this.getRemainingAdMs();
-                                    if (remaining <= 0) {
-                                        return [
-                                            3,
-                                            8
-                                        ];
+                                if (this.inAdBreak && !this.hasTimeToStartAnotherAd()) {
+                                    if (this.config.debugAdTiming) {
+                                        console.log("[PRELOAD-POOL] Not enough ad break time left, stopping preload");
                                     }
+                                    return [
+                                        3,
+                                        8
+                                    ];
                                 }
                                 newUrls = this.generateVastUrlsWithCorrelators(baseVastUrl, 1);
                                 newUrl = newUrls[0];
@@ -5916,7 +5934,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "continuousFetchLoop",
             value: function continuousFetchLoop(baseVastUrl) {
                 return _async_to_generator(function() {
-                    var _this, _loop, _ret;
+                    var _this, _loop, epoch, _ret;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5926,9 +5944,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         switch(_state.label){
                                             case 0:
                                                 remaining = _this.getRemainingAdMs();
-                                                if (remaining <= 0) {
+                                                if (remaining <= _this.getMinRemainingMsToStartAd()) {
                                                     if (_this.config.debugAdTiming) {
-                                                        console.log("[CONTINUOUS-FETCH] \u23F9\uFE0F Ad break time expired, stopping URL generation");
+                                                        console.log("[CONTINUOUS-FETCH] ⏹️ Not enough ad break time left (".concat(remaining, "ms), stopping URL generation"));
                                                     }
                                                     return [
                                                         2,
@@ -6026,9 +6044,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         }
                                     });
                                 };
+                                epoch = this.adBreakEpoch;
                                 _state.label = 1;
                             case 1:
-                                if (!(this.continuousFetchingActive && this.inAdBreak)) return [
+                                if (!(this.continuousFetchingActive && this.inAdBreak && epoch === this.adBreakEpoch)) return [
                                     3,
                                     3
                                 ];
@@ -6077,10 +6096,16 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "tryNextAvailableAdWithRateLimit",
             value: function tryNextAvailableAdWithRateLimit() {
                 return _async_to_generator(function() {
-                    var backoffMultiplier, backoffDelay, effectiveMinInterval, timeSinceLastRequest, waitTime;
+                    var epoch, backoffMultiplier, backoffDelay, effectiveMinInterval, timeSinceLastRequest, waitTime;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                if (!this.inAdBreak) {
+                                    return [
+                                        2
+                                    ];
+                                }
+                                epoch = this.adBreakEpoch;
                                 if (this.consecutiveFailures >= this.maxConsecutiveFailures) {
                                     if (this.config.debugAdTiming) {
                                         console.log("[CONTINUOUS-FETCH] \uD83D\uDED1 Too many consecutive failures (".concat(this.consecutiveFailures, "), ending ad break gracefully"));
@@ -6112,6 +6137,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 _state.label = 2;
                             case 2:
+                                if (!this.inAdBreak || epoch !== this.adBreakEpoch) {
+                                    return [
+                                        2
+                                    ];
+                                }
                                 return [
                                     2,
                                     this.tryNextAvailableAd(0)
@@ -6130,10 +6160,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
+                                if (!this.inAdBreak) {
+                                    return [
+                                        2
+                                    ];
+                                }
                                 remaining = this.getRemainingAdMs();
-                                if (remaining <= 500) {
+                                if (!this.hasTimeToStartAnotherAd()) {
                                     if (this.config.debugAdTiming) {
-                                        console.log("[CONTINUOUS-FETCH] \u23F9\uFE0F No time remaining, ending ad break");
+                                        console.log("[CONTINUOUS-FETCH] ⏹️ Not enough time remaining (".concat(remaining, "ms) to start another ad, ending ad break"));
                                     }
                                     this.handleAdPodComplete();
                                     return [
@@ -6405,12 +6440,27 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                         10
                                     ];
                                 }
+                                if (!this.hasTimeToStartAnotherAd()) {
+                                    if (this.config.debugAdTiming) {
+                                        console.log("[CONTINUOUS-FETCH] \u23F9\uFE0F Not enough time remaining during placeholder wait, ending ad break");
+                                    }
+                                    return [
+                                        3,
+                                        10
+                                    ];
+                                }
                                 _state.label = 3;
                             case 3:
                                 if (!(this.adRequestQueue.length > 0)) return [
                                     3,
                                     9
                                 ];
+                                if (!this.hasTimeToStartAnotherAd()) {
+                                    return [
+                                        3,
+                                        9
+                                    ];
+                                }
                                 nextAdUrl = this.adRequestQueue.shift();
                                 if (!nextAdUrl) {
                                     return [
@@ -6693,21 +6743,23 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (!this.inAdBreak) return;
                 this.adStopTimerId = void 0;
                 var adPlaying = this.adPlayer.isAdPlaying();
-                var pendingAds = this.adPodQueue.length > 0;
                 var checkIntervalMs = Math.max(250, Math.floor((_this_config_adBreakCheckIntervalMs = this.config.adBreakCheckIntervalMs) !== null && _this_config_adBreakCheckIntervalMs !== void 0 ? _this_config_adBreakCheckIntervalMs : 1e3));
                 var maxExtensionMsConfig = this.config.maxAdBreakExtensionMs;
-                var maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 6e4;
+                var maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 0;
                 var elapsedSinceStartMs = 0;
                 if (this.currentAdBreakStartWallClockMs != null) {
                     elapsedSinceStartMs = Date.now() - this.currentAdBreakStartWallClockMs;
                 }
                 var expectedDurationMs = (_this_expectedAdBreakDurationMs = this.expectedAdBreakDurationMs) !== null && _this_expectedAdBreakDurationMs !== void 0 ? _this_expectedAdBreakDurationMs : 0;
                 var overrunMs = Math.max(0, elapsedSinceStartMs - expectedDurationMs);
-                var shouldExtendAdBreak = (adPlaying || pendingAds || this.showAds) && overrunMs < maxExtensionMs;
+                var shouldExtendAdBreak = adPlaying && overrunMs < maxExtensionMs;
                 if (shouldExtendAdBreak) {
                     this.scheduleAdStopCountdown(checkIntervalMs);
                     return;
                 }
+                if (this.config.debugAdTiming) {
+                    console.log("[StormcloudVideoPlayer] ⏱️ Ad break boundary reached (overrun=".concat(overrunMs, "ms) - hard-stopping ads and resuming stream"));
+                }
                 if (adPlaying) {
                     this.adPlayer.stop().catch(function() {});
                 }
@@ -7142,6 +7194,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] \uD83C\uDFC1 Ad pod complete - cleaning up");
                 }
+                this.adBreakEpoch++;
                 this.clearAdRequestWatchdog();
                 this.clearAdFailsafeTimer();
                 this.activeAdRequestToken = null;
@@ -7212,11 +7265,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.handleAdPodComplete();
                     return;
                 }
-                if (remaining > 500) {
+                if (this.hasTimeToStartAnotherAd()) {
                     this.tryNextAvailableAdWithRateLimit();
                 } else {
                     if (this.config.debugAdTiming) {
-                        console.log("[AD-ERROR] Ad failed and no time remaining. Failed URLs:", this.failedVastUrls.size);
+                        console.log("[AD-ERROR] Ad failed and not enough time remaining for another ad. Failed URLs:", this.failedVastUrls.size);
                     }
                     this.handleAdPodComplete();
                 }
@@ -7351,6 +7404,22 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
             }
         },
+        {
+            key: "getMinRemainingMsToStartAd",
+            value: function getMinRemainingMsToStartAd() {
+                var configured = this.config.minRemainingMsToStartAd;
+                if (typeof configured === "number" && configured >= 0) {
+                    return configured;
+                }
+                return this.defaultMinRemainingMsToStartAd;
+            }
+        },
+        {
+            key: "hasTimeToStartAnotherAd",
+            value: function hasTimeToStartAnotherAd() {
+                return this.getRemainingAdMs() > this.getMinRemainingMsToStartAd();
+            }
+        },
         {
             key: "findBreakForTime",
             value: function findBreakForTime(nowMs) {