stormcloud-video-player 0.3.64 → 0.3.66

package/lib/player/StormcloudVideoPlayer.d.cts

@@ -9,6 +9,7 @@ declare class StormcloudVideoPlayer {
     private inAdBreak;
     private currentAdBreakStartWallClockMs;
     private expectedAdBreakDurationMs;
+    private scteAdBreakEndWallClockMs;
     private adStopTimerId;
     private adStartTimerId;
     private adFailsafeTimerId;
@@ -105,6 +106,9 @@ declare class StormcloudVideoPlayer {
     private activatePendingScte35CuesForFragment;
     private onScte35Marker;
     private startScte35AdBreak;
+    private resolveScteBreakStartWallClockMs;
+    private setAdBreakDurationBoundary;
+    private scheduleAdStopAtBreakBoundary;
     private parseCueOutDuration;
     private parseCueOutCont;
     private parseAttributeList;
@@ -130,6 +134,7 @@ declare class StormcloudVideoPlayer {
     private initializeTracking;
     private sendHeartbeatIfNeeded;
     private isVmapEnabled;
+    private applyMqttConfigFromResponse;
     private fetchAdConfiguration;
     private fetchAndParseVmap;
     private parseVmapToBreaks;
@@ -188,6 +193,7 @@ declare class StormcloudVideoPlayer {
     private selectVastTagsForBreak;
     private logAdState;
     private getRemainingAdMs;
+    private getAdBreakEndWallClockMs;
     private findBreakForTime;
     toggleMute(): void;
     toggleFullscreen(): Promise<void>;

package/lib/players/HlsPlayer.cjs

@@ -2442,6 +2442,9 @@ var DEFAULT_MQTT_CONFIG = {
     qos: 1
 };
 var mqttConfig = _object_spread({}, DEFAULT_MQTT_CONFIG);
+function applyMQTTConfig(overrides) {
+    Object.assign(mqttConfig, overrides);
+}
 function isMQTTEnabled() {
     return mqttConfig.enabled;
 }
@@ -3879,7 +3882,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)");
                         }
@@ -4523,12 +4526,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.getRemainingAdMs(), "ms"));
                                 }
                             }
                         }
@@ -4602,13 +4603,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.ima.isAdPlaying() && this.activeAdRequestToken === null && this.adRequestQueue.length > 0) {
                         this.tryNextAvailableAdWithRateLimit();
                     }
@@ -4633,15 +4630,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) {
@@ -4665,12 +4654,46 @@ 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.getRemainingAdMs());
             }
         },
         {
@@ -5396,6 +5419,20 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return !!(this.config.isVmap && ((_this_config_vmapUrl = this.config.vmapUrl) === null || _this_config_vmapUrl === void 0 ? void 0 : _this_config_vmapUrl.trim()));
             }
         },
+        {
+            key: "applyMqttConfigFromResponse",
+            value: function applyMqttConfigFromResponse(data) {
+                var _data_response;
+                var mqttConfig2 = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : _data_response.mqtt_config;
+                if (!mqttConfig2 || (typeof mqttConfig2 === "undefined" ? "undefined" : _type_of(mqttConfig2)) !== "object") {
+                    return;
+                }
+                applyMQTTConfig(mqttConfig2);
+                if (this.config.debugAdTiming) {
+                    console.log("[StormcloudVideoPlayer] Applied MQTT config from /ads/web:", mqttConfig2);
+                }
+            }
+        },
         {
             key: "fetchAdConfiguration",
             value: function fetchAdConfiguration() {
@@ -5482,6 +5519,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 4:
                                 data = _state.sent();
+                                this.applyMqttConfigFromResponse(data);
                                 imaPayload = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : (_data_response_ima = _data_response.ima) === null || _data_response_ima === void 0 ? void 0 : (_data_response_ima_publisherdeskima = _data_response_ima["publisherdesk.ima"]) === null || _data_response_ima_publisherdeskima === void 0 ? void 0 : _data_response_ima_publisherdeskima.payload;
                                 if (imaPayload) {
                                     this.apiVastTagUrl = decodeURIComponent(imaPayload);
@@ -6298,7 +6336,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     }
                                 }
                                 this.inAdBreak = true;
-                                this.currentAdBreakStartWallClockMs = Date.now();
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = 1;
                                 this.adPodQueue = [];
@@ -6385,7 +6422,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 2:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume);
@@ -6428,7 +6465,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 6:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume1 = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume1);
@@ -6483,7 +6520,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 10:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 adVolume2 = currentMuted ? 0 : currentVolume;
                                 this.ima.setAdVolume(adVolume2);
@@ -6835,7 +6872,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 2:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
@@ -7335,21 +7372,16 @@ 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.ima.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 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 maxExtensionMs = typeof maxExtensionMsConfig === "number" && maxExtensionMsConfig > 0 ? maxExtensionMsConfig : 0;
+                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);
                     return;
@@ -7615,7 +7647,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 5:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
@@ -7665,7 +7697,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 8:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 currentMuted1 = this.video.muted;
                                 currentVolume1 = this.video.volume;
@@ -7810,6 +7842,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 = [];
@@ -7999,9 +8032,21 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "getRemainingAdMs",
             value: function getRemainingAdMs() {
-                if (this.expectedAdBreakDurationMs == null || this.currentAdBreakStartWallClockMs == null) return 0;
-                var elapsed = Date.now() - this.currentAdBreakStartWallClockMs;
-                return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
+                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 void 0;
+                return this.currentAdBreakStartWallClockMs + this.expectedAdBreakDurationMs;
             }
         },
         {