stormcloud-video-player 0.6.12 → 0.6.14

package/lib/players/HlsPlayer.cjs

@@ -2060,24 +2060,43 @@ function createVastAdLayer(contentVideo, options) {
         }
     };
 }
+// src/utils/mqttConfig.ts
+var DEFAULT_MQTT_CONFIG = {
+    enabled: true,
+    brokerAddress: "vecbae77.ala.us-east-1.emqxsl.com",
+    brokerPort: 8883,
+    wsPort: 8084,
+    username: "for-sonifi",
+    password: "sonifi-mqtt",
+    topicPrefix: "adstorm/players",
+    qos: 1
+};
+var mqttConfig = _object_spread({}, DEFAULT_MQTT_CONFIG);
+function isMQTTEnabled() {
+    return mqttConfig.enabled;
+}
+function buildMQTTBrokerUrl() {
+    if (mqttConfig.brokerUrl) return mqttConfig.brokerUrl;
+    return "wss://".concat(mqttConfig.brokerAddress, ":").concat(mqttConfig.wsPort, "/mqtt");
+}
+function buildPlayerTopic(licenseKey, channel) {
+    return "".concat(mqttConfig.topicPrefix, "/").concat(licenseKey, "/").concat(channel);
+}
 // src/utils/mqttClient.ts
 var import_mqtt = __toESM(require("mqtt"), 1);
 var LOG2 = "[StormcloudVideoPlayer][MQTT]";
 var client = null;
 var status = "disconnected";
-var brokerUrl = "";
-function isMQTTConfigured() {
-    return client !== null;
-}
-function initMQTTClient(url) {
-    var _topicPrefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "adstorm";
-    if (client) return;
-    brokerUrl = url;
+function initMQTTClient() {
+    if (client || !isMQTTEnabled()) return;
+    var url = buildMQTTBrokerUrl();
     status = "connecting";
     var clientId = "stormcloud-vp-".concat(Math.random().toString(36).slice(2, 9));
     try {
         client = import_mqtt.default.connect(url, {
             clientId: clientId,
+            username: mqttConfig.username,
+            password: mqttConfig.password,
             keepalive: 60,
             clean: true,
             reconnectPeriod: 5e3,
@@ -2111,13 +2130,22 @@ function initMQTTClient(url) {
         }
     });
 }
+function ensureMQTTClient() {
+    if (isMQTTEnabled() && !client) {
+        initMQTTClient();
+    }
+}
 function publishMQTT(topic, payload) {
+    if (!isMQTTEnabled()) {
+        return false;
+    }
+    ensureMQTTClient();
     if (!client) {
         return false;
     }
     try {
         client.publish(topic, JSON.stringify(payload), {
-            qos: 1
+            qos: mqttConfig.qos
         });
         return true;
     } catch (err) {
@@ -2130,7 +2158,6 @@ function disconnectMQTT() {
         client.end(true);
         client = null;
         status = "disconnected";
-        brokerUrl = "";
     }
 }
 // src/utils/tracking.ts
@@ -2352,171 +2379,91 @@ function getBrowserID(clientInfo) {
         });
     })();
 }
-var mqttTopicPrefix = "adstorm";
-function setMQTTTopicPrefix(prefix) {
-    mqttTopicPrefix = prefix || "adstorm";
-}
-var PLAYER_TRACKING_BASE_URL = "https://adstorm.co/api-adstorm-dev/adstorm/player-tracking";
-var TRACK_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/metrics/ingest");
-var HEARTBEAT_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/heartbeat");
-var IMPRESSIONS_URL = "".concat(PLAYER_TRACKING_BASE_URL, "/impressions/ingest");
-function buildHeaders(licenseKey) {
-    var headers = {
-        "Content-Type": "application/json"
-    };
-    if (licenseKey) headers["Authorization"] = "Bearer ".concat(licenseKey);
-    return headers;
+function canPublish(licenseKey) {
+    return Boolean(isMQTTEnabled() && licenseKey);
 }
-function postJson(url, licenseKey, body) {
+function buildPlayerMetricEvent() {
     return _async_to_generator(function() {
-        var response;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        fetch(url, {
-                            method: "POST",
-                            headers: buildHeaders(licenseKey),
-                            body: JSON.stringify(body)
-                        })
-                    ];
-                case 1:
-                    response = _state.sent();
-                    if (!response.ok) throw new Error("HTTP error! status: ".concat(response.status));
-                    return [
-                        4,
-                        response.json()
-                    ];
-                case 2:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
-}
-function buildPlayerMetricEvent(_0) {
-    return _async_to_generator(function(licenseKey) {
-        var context, flags, _flags_captureAt, clientInfo, browserId, captureAt;
+        var context, flags, _flags_captureAt, _flags_adLoaded, _flags_adDetect, clientInfo, playerId, captureAt;
         var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, flags = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    context = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, flags = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
                     clientInfo = getClientInfo();
                     return [
                         4,
                         getBrowserID(clientInfo)
                     ];
                 case 1:
-                    browserId = _state.sent();
+                    playerId = _state.sent();
                     captureAt = (_flags_captureAt = flags.captureAt) !== null && _flags_captureAt !== void 0 ? _flags_captureAt : /* @__PURE__ */ new Date().toISOString();
                     return [
                         2,
-                        {
-                            player_id: browserId,
-                            browserId: browserId,
+                        _object_spread({
+                            player_id: playerId,
                             device_type: clientInfo.deviceType,
-                            deviceType: clientInfo.deviceType,
-                            input_stream_type: context.inputStreamType,
-                            os: clientInfo.os,
-                            ad_loaded: flags.adLoaded,
-                            ad_detect: flags.adDetect,
-                            license_key: licenseKey,
-                            capture_at: captureAt,
-                            timestamp: captureAt
-                        }
+                            os: clientInfo.os.toLowerCase(),
+                            ad_loaded: (_flags_adLoaded = flags.adLoaded) !== null && _flags_adLoaded !== void 0 ? _flags_adLoaded : false,
+                            ad_detect: (_flags_adDetect = flags.adDetect) !== null && _flags_adDetect !== void 0 ? _flags_adDetect : false,
+                            capture_at: captureAt
+                        }, context.inputStreamType ? {
+                            input_stream_type: context.inputStreamType
+                        } : {})
                     ];
             }
         });
     }).apply(this, arguments);
 }
-function publishOrPost(mqttTopic, httpUrl, licenseKey, body) {
-    return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    if (isMQTTConfigured()) {
-                        publishMQTT(mqttTopic, body);
-                        return [
-                            2
-                        ];
-                    }
-                    return [
-                        4,
-                        postJson(httpUrl, licenseKey, body)
-                    ];
-                case 1:
-                    _state.sent();
-                    return [
-                        2
-                    ];
-            }
-        });
-    })();
+function publishTracking(licenseKey, channel, body) {
+    ensureMQTTClient();
+    publishMQTT(buildPlayerTopic(licenseKey, channel), body);
 }
 function sendInitialTracking(_0) {
     return _async_to_generator(function(licenseKey) {
-        var context, clientInfo, browserId, captureAt, trackingData, metricsBody, error;
+        var context, metricEvent, error;
         var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
-                    clientInfo = getClientInfo();
                     return [
                         4,
-                        getBrowserID(clientInfo)
+                        buildPlayerMetricEvent(context, {
+                            adLoaded: false,
+                            adDetect: false
+                        })
                     ];
                 case 2:
-                    browserId = _state.sent();
-                    captureAt = /* @__PURE__ */ new Date().toISOString();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
-                    metricsBody = {
+                    metricEvent = _state.sent();
+                    publishTracking(licenseKey, "metrics", {
                         events: [
-                            {
-                                player_id: browserId,
-                                device_type: clientInfo.deviceType,
-                                input_stream_type: context.inputStreamType,
-                                os: clientInfo.os,
-                                ad_loaded: false,
-                                ad_detect: false,
-                                license_key: licenseKey,
-                                capture_at: captureAt
-                            }
-                        ],
-                        trackingData: trackingData
-                    };
-                    return [
-                        4,
-                        publishOrPost("".concat(mqttTopicPrefix, "/tracking/metrics"), TRACK_URL, licenseKey, metricsBody)
-                    ];
-                case 3:
-                    _state.sent();
+                            metricEvent
+                        ]
+                    });
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending initial tracking data:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -2614,61 +2561,54 @@ function sendAdLoadedTracking(_0, _1) {
 }
 function sendAdImpressionTracking(_0, _1) {
     return _async_to_generator(function(licenseKey, adImpressionInfo) {
-        var context, metricEvent, heartbeatBody, impressionsBody, error;
+        var context, metricEvent, error;
         var _arguments = arguments;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
                     context = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
                     return [
                         4,
-                        buildPlayerMetricEvent(licenseKey, context, {
+                        buildPlayerMetricEvent(context, {
                             captureAt: adImpressionInfo.timestamp
                         })
                     ];
                 case 2:
                     metricEvent = _state.sent();
-                    heartbeatBody = metricEvent;
-                    impressionsBody = {
+                    publishTracking(licenseKey, "heartbeat", metricEvent);
+                    publishTracking(licenseKey, "impressions", {
                         events: [
                             {
                                 player_id: metricEvent.player_id,
                                 ad_played_count: 1,
                                 ad_url: adImpressionInfo.adUrl,
-                                license_key: licenseKey,
                                 capture_at: adImpressionInfo.timestamp
                             }
                         ]
-                    };
-                    return [
-                        4,
-                        Promise.all([
-                            publishOrPost("".concat(mqttTopicPrefix, "/tracking/heartbeat"), HEARTBEAT_URL, licenseKey, heartbeatBody),
-                            publishOrPost("".concat(mqttTopicPrefix, "/tracking/impressions"), IMPRESSIONS_URL, licenseKey, impressionsBody)
-                        ])
-                    ];
-                case 3:
-                    _state.sent();
+                    });
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending ad impression tracking:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -2684,38 +2624,36 @@ function sendHeartbeat(_0) {
             switch(_state.label){
                 case 0:
                     context = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : {}, flags = _arguments.length > 2 && _arguments[2] !== void 0 ? _arguments[2] : {};
+                    if (!canPublish(licenseKey)) return [
+                        2
+                    ];
                     _state.label = 1;
                 case 1:
                     _state.trys.push([
                         1,
-                        4,
+                        3,
                         ,
-                        5
+                        4
                     ]);
                     return [
                         4,
-                        buildPlayerMetricEvent(licenseKey, context, flags)
+                        buildPlayerMetricEvent(context, flags)
                     ];
                 case 2:
                     heartbeatData = _state.sent();
-                    return [
-                        4,
-                        publishOrPost("".concat(mqttTopicPrefix, "/tracking/heartbeat"), HEARTBEAT_URL, licenseKey, heartbeatData)
-                    ];
-                case 3:
-                    _state.sent();
+                    publishTracking(licenseKey, "heartbeat", heartbeatData);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 4:
+                case 3:
                     error = _state.sent();
                     console.error("[StormcloudVideoPlayer] Error sending heartbeat:", error);
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 5:
+                case 4:
                     return [
                         2
                     ];
@@ -3844,7 +3782,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         _this.adLayer.showPlaceholder();
                     }
                     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)");
                         }
@@ -4278,12 +4216,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"));
                                 }
                             }
                         }
@@ -4291,8 +4227,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }
                     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();
+                    this.currentAdBreakStartWallClockMs = this.resolveScteBreakStartWallClockMs(marker);
+                    this.setAdBreakDurationBoundary(durationMs);
                     if (this.config.licenseKey) {
                         var _this_pendingAdBreak1;
                         var adDetectInfo = _object_spread({
@@ -4356,20 +4292,14 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         this.clearAdStartTimer();
                         this.handleAdStart(marker);
                     }
-                    if (this.expectedAdBreakDurationMs != null) {
-                        this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
-                    }
+                    this.scheduleAdStopAtBreakBoundary();
                     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);
+                        this.setAdBreakDurationBoundary(marker.durationSeconds * 1e3);
                     }
+                    this.scheduleAdStopAtBreakBoundary();
                     if (!this.adLayer.isAdPlaying() && this.pendingNextAdBids != null && this.pendingNextAdBids.length > 0) {
                         var bids = this.pendingNextAdBids;
                         this.pendingNextAdBids = null;
@@ -4400,15 +4330,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }
                         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.scteAdBreakEndWallClockMs = Date.now();
                     this.clearAdStartTimer();
                     this.clearAdStopTimer();
                     if (adPlaying) {
@@ -4419,6 +4341,42 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            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());
+            }
+        },
         {
             key: "parseCueOutDuration",
             value: function parseCueOutDuration(value) {
@@ -4629,10 +4587,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "initializeTracking",
             value: function initializeTracking() {
                 var _this = this;
-                if (this.config.mqttBrokerUrl) {
-                    var topicPrefix = "adstorm";
-                    setMQTTTopicPrefix(topicPrefix);
-                    initMQTTClient(this.config.mqttBrokerUrl, topicPrefix);
+                if (isMQTTEnabled()) {
+                    initMQTTClient();
                 }
                 sendInitialTracking(this.config.licenseKey, this.getAnalyticsContext()).then(function() {
                     _this.heartbeatInterval = window.setInterval(function() {
@@ -5056,7 +5012,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                             case 9:
                                                 _state.sent();
                                                 if (_this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                                                    _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                                                    _this.scheduleAdStopAtBreakBoundary();
                                                 }
                                                 _this.adLayer.setAdVolume(_this.adLayer.getOriginalMutedState() ? 1 : _this.adLayer.getOriginalVolume());
                                                 return [
@@ -5161,7 +5117,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                             case 19:
                                                 _state.sent();
                                                 if (_this.expectedAdBreakDurationMs != null && _this.adStopTimerId == null) {
-                                                    _this.scheduleAdStopCountdown(_this.getRemainingAdMs());
+                                                    _this.scheduleAdStopAtBreakBoundary();
                                                 }
                                                 _this.adLayer.setAdVolume(_this.adLayer.getOriginalMutedState() ? 1 : _this.adLayer.getOriginalVolume());
                                                 _state.label = 20;
@@ -5244,7 +5200,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "handleAdStart",
             value: function handleAdStart(_marker) {
                 return _async_to_generator(function() {
-                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, adBreakToken, adVolume, token, remaining, err;
+                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, fillerRemainingMs, adBreakToken, adVolume, token, remaining, err;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -5278,20 +5234,21 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     }
                                 }
                                 this.inAdBreak = true;
-                                this.currentAdBreakStartWallClockMs = Date.now();
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = Math.max(1, this.preloadedTokens.length);
                                 this.adPodQueue = [];
                                 if (!this.config.disableFiller) this.showAds = true;
-                                if (adBreakDurationMs != null) {
-                                    this.startFillerBreakTimer(adBreakDurationMs);
+                                if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
+                                    this.currentAdBreakStartWallClockMs = Date.now();
+                                    this.setAdBreakDurationBoundary(adBreakDurationMs);
+                                }
+                                fillerRemainingMs = this.getRemainingAdMs();
+                                if (this.expectedAdBreakDurationMs != null && fillerRemainingMs > 0) {
+                                    this.startFillerBreakTimer(fillerRemainingMs);
                                 } else if (!this.config.disableFiller && this.preloadedTokens.length === 0) {
                                     this.showPlaceholderLayer();
                                 }
                                 if (!this.config.disableFiller) this.adLayer.showPlaceholder();
-                                if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
-                                    this.expectedAdBreakDurationMs = adBreakDurationMs;
-                                }
                                 this.clearPendingAdBreak();
                                 adBreakToken = Date.now();
                                 this.activeAdRequestToken = adBreakToken;
@@ -5328,7 +5285,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 2:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adLayer.setAdVolume(adVolume);
                                 return [
@@ -5514,7 +5471,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 4:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
-                                    this.scheduleAdStopCountdown(this.getRemainingAdMs());
+                                    this.scheduleAdStopAtBreakBoundary();
                                 }
                                 this.adLayer.setAdVolume(this.adLayer.getOriginalMutedState() ? 1 : this.adLayer.getOriginalVolume());
                                 _state.label = 5;
@@ -5756,21 +5713,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.adLayer.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;
@@ -5844,6 +5796,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.inAdBreak = false;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
+                this.scteAdBreakEndWallClockMs = void 0;
                 this.clearAdStartTimer();
                 this.clearAdStopTimer();
                 this.adPodQueue = [];
@@ -6105,10 +6058,25 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "getRemainingAdMs",
             value: function getRemainingAdMs() {
+                var endWallClockMs = this.getAdBreakEndWallClockMs();
+                if (endWallClockMs != null) {
+                    return Math.max(0, endWallClockMs - Date.now());
+                }
                 if (this.currentAdBreakStartWallClockMs == null) return 0;
                 if (this.expectedAdBreakDurationMs == null) return Number.MAX_SAFE_INTEGER;
-                var elapsed = Date.now() - this.currentAdBreakStartWallClockMs;
-                return Math.max(0, this.expectedAdBreakDurationMs - elapsed);
+                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;
             }
         },
         {
@@ -6313,7 +6281,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     clearInterval(this.heartbeatInterval);
                     this.heartbeatInterval = void 0;
                 }
-                if (this.config.mqttBrokerUrl) {
+                if (isMQTTEnabled()) {
                     disconnectMQTT();
                 }
                 (_this_hls = this.hls) === null || _this_hls === void 0 ? void 0 : _this_hls.destroy();