stormcloud-video-player 0.8.15 → 0.8.16

package/lib/index.cjs

@@ -3802,7 +3802,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     _this.showAds = true;
                     _this.resetGamNoFillCounter();
                     if (_this.inAdBreak && _this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                        _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                        _this.scheduleAdStopAtBreakBoundary();
                         if (_this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
                         }
@@ -4457,12 +4457,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         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);
+                                this.setAdBreakDurationBoundary(newDurationMs);
+                                this.scheduleAdStopAtBreakBoundary();
                                 if (this.config.debugAdTiming) {
-                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(remainingMs, "ms"));
+                                    console.log("[StormcloudVideoPlayer] Updated ad break duration from subsequent marker: ".concat(newDurationMs, "ms, remaining: ").concat(this.getWallClockRemainingAdMs(), "ms"));
                                 }
                             }
                         }
@@ -4536,13 +4534,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 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);
+                        this.setAdBreakDurationBoundary(marker.durationSeconds * 1e3);
                     }
+                    this.scheduleAdStopAtBreakBoundary();
                     if (!this.adPlayer.isAdPlaying() && this.activeAdRequestToken === null && this.adRequestQueue.length > 0 && this.hasTimeToStartAnotherAd()) {
                         this.tryNextAvailableAdWithRateLimit();
                     }
@@ -4566,15 +4560,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             activeAdRequest: this.activeAdRequestToken !== null
                         });
                     }
-                    if (adPlaying || remaining > 1e3 && hasQueuedAds) {
-                        if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Ignoring premature SCTE-35 end marker - ads still active");
-                        }
-                        return;
-                    }
-                    this.inAdBreak = false;
-                    this.expectedAdBreakDurationMs = void 0;
-                    this.currentAdBreakStartWallClockMs = void 0;
+                    this.scteAdBreakEndWallClockMs = Date.now();
                     this.clearAdStartTimer();
                     this.clearAdStopTimer();
                     if (adPlaying) {
@@ -4591,14 +4577,48 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.inAdBreak = true;
                 this.activeScte35BreakKey = cueKey !== null && cueKey !== void 0 ? cueKey : this.pendingScte35CueKey;
                 this.scheduledScte35BreakKey = void 0;
-                this.expectedAdBreakDurationMs = durationMs;
-                this.currentAdBreakStartWallClockMs = Date.now();
+                this.currentAdBreakStartWallClockMs = this.resolveScteBreakStartWallClockMs(marker);
+                this.setAdBreakDurationBoundary(durationMs);
                 this.handleAdStart(marker);
-                if (this.expectedAdBreakDurationMs != null) {
-                    this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
+                this.scheduleAdStopAtBreakBoundary();
+            }
+        },
+        {
+            key: "resolveScteBreakStartWallClockMs",
+            value: function resolveScteBreakStartWallClockMs(marker) {
+                var nowWallClockMs = Date.now();
+                if (typeof marker.ptsSeconds !== "number") {
+                    return nowWallClockMs;
+                }
+                var nowMs = this.video.currentTime * 1e3;
+                var estimatedCurrentPtsMs = nowMs - this.ptsDriftEmaMs;
+                var deltaMs = marker.ptsSeconds * 1e3 - estimatedCurrentPtsMs;
+                if (!Number.isFinite(deltaMs)) {
+                    return nowWallClockMs;
+                }
+                return nowWallClockMs + Math.floor(deltaMs);
+            }
+        },
+        {
+            key: "setAdBreakDurationBoundary",
+            value: function setAdBreakDurationBoundary(durationMs) {
+                this.expectedAdBreakDurationMs = durationMs;
+                if (durationMs != null && this.currentAdBreakStartWallClockMs != null) {
+                    this.scteAdBreakEndWallClockMs = this.currentAdBreakStartWallClockMs + durationMs;
+                } else {
+                    this.scteAdBreakEndWallClockMs = void 0;
                 }
             }
         },
+        {
+            key: "scheduleAdStopAtBreakBoundary",
+            value: function scheduleAdStopAtBreakBoundary() {
+                if (this.expectedAdBreakDurationMs == null) {
+                    return;
+                }
+                this.scheduleAdStopCountdown(this.getWallClockRemainingAdMs());
+            }
+        },
         {
             key: "parseCueOutDuration",
             value: function parseCueOutDuration(value) {
@@ -6246,7 +6266,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 currentVolume = this.video.volume;
                                 this.adPlayer.updateOriginalMutedState(currentMuted, currentVolume);
                                 this.inAdBreak = true;
-                                this.currentAdBreakStartWallClockMs = Date.now();
                                 this.adBreakPlayedDurationMs = 0;
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = 0;
@@ -6352,7 +6371,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume = currentMuted ? 0 : currentVolume;
                                 this.adPlayer.setAdVolume(adVolume);
@@ -6412,7 +6431,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume1 = currentMuted ? 0 : currentVolume;
                                 this.adPlayer.setAdVolume(adVolume1);
@@ -6485,7 +6504,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume2 = currentMuted ? 0 : currentVolume;
                                 this.adPlayer.setAdVolume(adVolume2);
@@ -6868,7 +6887,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 this.consecutiveFailures = 0;
@@ -7396,19 +7415,15 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "ensureAdStoppedByTimer",
             value: function ensureAdStoppedByTimer() {
-                var _this_config_adBreakCheckIntervalMs, _this_expectedAdBreakDurationMs;
+                var _this_config_adBreakCheckIntervalMs, _this_getAdBreakEndWallClockMs;
                 if (!this.inAdBreak) return;
                 this.adStopTimerId = void 0;
                 var adPlaying = this.adPlayer.isAdPlaying();
                 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 : 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 endWallClockMs = (_this_getAdBreakEndWallClockMs = this.getAdBreakEndWallClockMs()) !== null && _this_getAdBreakEndWallClockMs !== void 0 ? _this_getAdBreakEndWallClockMs : Date.now();
+                var overrunMs = Math.max(0, Date.now() - endWallClockMs);
                 var shouldExtendAdBreak = adPlaying && overrunMs < maxExtensionMs;
                 if (shouldExtendAdBreak) {
                     this.scheduleAdStopCountdown(checkIntervalMs);
@@ -7684,7 +7699,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 this.consecutiveFailures = 0;
@@ -7736,7 +7751,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 _state.sent();
                                 this.markAdStarted();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adPlayer.setAdVolume(this.getAdAudioVolume());
                                 return [
@@ -7882,6 +7897,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.scheduledScte35BreakKey = void 0;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
+                this.scteAdBreakEndWallClockMs = void 0;
                 this.clearAdStartTimer();
                 this.clearAdStopTimer();
                 this.adPodQueue = [];
@@ -8069,11 +8085,23 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "getWallClockRemainingAdMs",
             value: function getWallClockRemainingAdMs() {
+                var endWallClockMs = this.getAdBreakEndWallClockMs();
+                if (endWallClockMs != null) {
+                    return Math.max(0, endWallClockMs - Date.now());
+                }
+                return 0;
+            }
+        },
+        {
+            key: "getAdBreakEndWallClockMs",
+            value: function getAdBreakEndWallClockMs() {
+                if (this.scteAdBreakEndWallClockMs != null) {
+                    return this.scteAdBreakEndWallClockMs;
+                }
                 if (this.expectedAdBreakDurationMs == null || this.currentAdBreakStartWallClockMs == null) {
-                    return 0;
+                    return void 0;
                 }
-                var elapsed = Date.now() - this.currentAdBreakStartWallClockMs;
-                return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
+                return this.currentAdBreakStartWallClockMs + this.expectedAdBreakDurationMs;
             }
         },
         {