stormcloud-video-player 0.3.63 → 0.3.65

package/lib/players/index.cjs

@@ -2466,6 +2466,99 @@ function createHlsAdPlayer(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 LOG = "[StormcloudVideoPlayer][MQTT]";
+var client = null;
+var status = "disconnected";
+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,
+            connectTimeout: 1e4,
+            queueQoSZero: false
+        });
+    } catch (err) {
+        status = "error";
+        console.warn("".concat(LOG, " connect() threw:"), err);
+        return;
+    }
+    client.on("connect", function() {
+        status = "connected";
+        console.info("".concat(LOG, " connected to ").concat(url));
+    });
+    client.on("reconnect", function() {
+        status = "connecting";
+        console.info("".concat(LOG, " reconnecting…"));
+    });
+    client.on("offline", function() {
+        status = "disconnected";
+        console.warn("".concat(LOG, " offline"));
+    });
+    client.on("error", function(err) {
+        status = "error";
+        console.warn("".concat(LOG, " error:"), err.message);
+    });
+    client.on("close", function() {
+        if (status === "connected") {
+            status = "disconnected";
+        }
+    });
+}
+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: mqttConfig.qos
+        });
+        return true;
+    } catch (err) {
+        console.warn("".concat(LOG, " publish failed on ").concat(topic, ":"), err);
+        return false;
+    }
+}
 // src/utils/tracking.ts
 var cachedBrowserId = null;
 function getClientInfo() {
@@ -2612,7 +2705,7 @@ function getClientInfo() {
 }
 function getBrowserID(clientInfo) {
     return _async_to_generator(function() {
-        var fingerprintString, encodedData, utf8, buffer, i, hashBuffer, hashArray, hashHex, error, hash, i1, char, fallbackHash, timestamp, random;
+        var _crypto_subtle, fingerprintString, encodedData, utf8, buffer, i, hashBuffer, hashHex, unused, hash, i1, char, fallbackHash, timestamp, random;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -2623,7 +2716,7 @@ function getBrowserID(clientInfo) {
                         ];
                     }
                     fingerprintString = JSON.stringify(clientInfo);
-                    if (!(typeof crypto !== "undefined" && crypto.subtle && crypto.subtle.digest)) return [
+                    if (!(typeof crypto !== "undefined" && ((_crypto_subtle = crypto.subtle) === null || _crypto_subtle === void 0 ? void 0 : _crypto_subtle.digest))) return [
                         3,
                         5
                     ];
@@ -2661,8 +2754,7 @@ function getBrowserID(clientInfo) {
                     ];
                 case 3:
                     hashBuffer = _state.sent();
-                    hashArray = Array.from(new Uint8Array(hashBuffer));
-                    hashHex = hashArray.map(function(b) {
+                    hashHex = Array.from(new Uint8Array(hashBuffer)).map(function(b) {
                         return b.toString(16).padStart(2, "0");
                     }).join("");
                     cachedBrowserId = hashHex;
@@ -2671,8 +2763,8 @@ function getBrowserID(clientInfo) {
                         hashHex
                     ];
                 case 4:
-                    error = _state.sent();
-                    console.warn("[StormcloudVideoPlayer] crypto.subtle.digest not supported, using fallback hash");
+                    unused = _state.sent();
+                    console.warn("[StormcloudVideoPlayer] crypto.subtle not supported, using fallback hash");
                     return [
                         3,
                         5
@@ -2696,177 +2788,91 @@ function getBrowserID(clientInfo) {
         });
     })();
 }
-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 sendTrackRequest(licenseKey, body) {
-    return _async_to_generator(function() {
-        var response;
-        return _ts_generator(this, function(_state) {
-            switch(_state.label){
-                case 0:
-                    return [
-                        4,
-                        fetch(TRACK_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 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 publishTracking(licenseKey, channel, body) {
+    ensureMQTTClient();
+    publishMQTT(buildPlayerTopic(licenseKey, channel), body);
+}
 function sendInitialTracking(_0) {
     return _async_to_generator(function(licenseKey) {
-        var context, clientInfo, browserId, trackingData, 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)
-                    ];
-                case 2:
-                    browserId = _state.sent();
-                    trackingData = _object_spread({
-                        browserId: browserId
-                    }, clientInfo);
-                    return [
-                        4,
-                        sendTrackRequest(licenseKey, {
-                            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: /* @__PURE__ */ new Date().toISOString()
-                                }
-                            ],
-                            trackingData: trackingData
+                        buildPlayerMetricEvent(context, {
+                            adLoaded: false,
+                            adDetect: false
                         })
                     ];
-                case 3:
-                    _state.sent();
+                case 2:
+                    metricEvent = _state.sent();
+                    publishTracking(licenseKey, "metrics", {
+                        events: [
+                            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
                     ];
@@ -2970,53 +2976,48 @@ function sendAdImpressionTracking(_0, _1) {
             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();
-                    return [
-                        4,
-                        Promise.all([
-                            postJson(HEARTBEAT_URL, licenseKey, metricEvent),
-                            postJson(IMPRESSIONS_URL, licenseKey, {
-                                events: [
-                                    {
-                                        player_id: metricEvent.player_id,
-                                        ad_played_count: 1,
-                                        ad_url: adImpressionInfo.adUrl,
-                                        license_key: licenseKey,
-                                        capture_at: adImpressionInfo.timestamp
-                                    }
-                                ]
-                            })
-                        ])
-                    ];
-                case 3:
-                    _state.sent();
+                    publishTracking(licenseKey, "heartbeat", metricEvent);
+                    publishTracking(licenseKey, "impressions", {
+                        events: [
+                            {
+                                player_id: metricEvent.player_id,
+                                ad_played_count: 1,
+                                ad_url: adImpressionInfo.adUrl,
+                                capture_at: adImpressionInfo.timestamp
+                            }
+                        ]
+                    });
                     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
                     ];
@@ -3032,38 +3033,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,
-                        postJson(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
                     ];
@@ -3916,7 +3915,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)");
                         }
@@ -4560,12 +4559,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"));
                                 }
                             }
                         }
@@ -4639,13 +4636,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();
                     }
@@ -4670,15 +4663,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) {
@@ -4702,12 +4687,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());
             }
         },
         {
@@ -6335,7 +6354,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     }
                                 }
                                 this.inAdBreak = true;
-                                this.currentAdBreakStartWallClockMs = Date.now();
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = 1;
                                 this.adPodQueue = [];
@@ -6422,7 +6440,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);
@@ -6465,7 +6483,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);
@@ -6520,7 +6538,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);
@@ -6872,7 +6890,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;
@@ -7372,21 +7390,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;
@@ -7652,7 +7665,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;
@@ -7702,7 +7715,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;
@@ -7847,6 +7860,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 = [];
@@ -8036,9 +8050,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;
             }
         },
         {