stormcloud-video-player 0.8.3 → 0.8.5

package/lib/players/HlsPlayer.cjs

@@ -1385,6 +1385,99 @@ function createPalNonceManager() {
         }
     };
 }
+// 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() {
@@ -1531,7 +1624,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:
@@ -1542,7 +1635,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
                     ];
@@ -1580,8 +1673,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;
@@ -1590,8 +1682,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
@@ -1615,177 +1707,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
                     ];
@@ -1889,53 +1895,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
                     ];
@@ -1951,38 +1952,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
                     ];
@@ -2241,6 +2240,166 @@ function initializePolyfills() {
     polyfillTextEncoder();
     polyfillPromiseFinally();
 }
+// src/utils/vastMacros.ts
+function generateCorrelator() {
+    if (typeof crypto !== "undefined" && crypto.getRandomValues) {
+        try {
+            var _buf_, _buf_1;
+            var buf = new Uint32Array(2);
+            crypto.getRandomValues(buf);
+            var value = ((_buf_ = buf[0]) !== null && _buf_ !== void 0 ? _buf_ : 0) * 2097152 + (((_buf_1 = buf[1]) !== null && _buf_1 !== void 0 ? _buf_1 : 0) & 2097151);
+            if (value > 0) {
+                return String(value);
+            }
+        } catch (unused) {}
+    }
+    return String(Math.floor(Math.random() * Number.MAX_SAFE_INTEGER) + 1);
+}
+var UNEXPANDED_MACRO_PATTERN = /^(\[[^\]]*\]|\{[^}]*\}|%%[^%]*%%)$/;
+function applyVastMacros(baseUrl, ctx) {
+    var url;
+    try {
+        url = new URL(baseUrl);
+    } catch (unused) {
+        return replaceCorrelatorFallback(baseUrl, ctx.correlator);
+    }
+    var params = url.searchParams;
+    params.set("correlator", ctx.correlator);
+    params.set("scor", ctx.streamCorrelator);
+    if (ctx.pod != null) {
+        params.set("pod", String(ctx.pod));
+    }
+    if (ctx.adPosition != null) {
+        params.set("ppos", String(ctx.adPosition));
+    }
+    if (ctx.pageUrl) {
+        params.set("url", ctx.pageUrl);
+        params.set("description_url", ctx.pageUrl);
+    }
+    if (ctx.adWillPlayMuted != null) {
+        params.set("vpmute", ctx.adWillPlayMuted ? "1" : "0");
+    }
+    if (ctx.adWillAutoPlay != null) {
+        params.set("vpa", ctx.adWillAutoPlay ? "auto" : "click");
+    }
+    if (ctx.deviceId && ctx.deviceIdType) {
+        params.set("rdid", ctx.deviceId);
+        params.set("idtype", ctx.deviceIdType);
+        params.set("is_lat", ctx.limitAdTracking ? "1" : "0");
+    } else {
+        params.delete("rdid");
+        params.delete("idtype");
+        params.delete("is_lat");
+    }
+    var consent = ctx.consent;
+    if ((consent === null || consent === void 0 ? void 0 : consent.gdpr) != null) {
+        params.set("gdpr", consent.gdpr);
+    }
+    if ((consent === null || consent === void 0 ? void 0 : consent.gdprConsent) != null) {
+        params.set("gdpr_consent", consent.gdprConsent);
+    }
+    if ((consent === null || consent === void 0 ? void 0 : consent.usPrivacy) != null) {
+        params.set("us_privacy", consent.usPrivacy);
+    }
+    if (ctx.adTest) {
+        params.set("adtest", "on");
+    }
+    var staleKeys = [];
+    params.forEach(function(value, key) {
+        if (UNEXPANDED_MACRO_PATTERN.test(value)) {
+            staleKeys.push(key);
+        }
+    });
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = staleKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            params.delete(key);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return url.toString();
+}
+function replaceCorrelatorFallback(baseUrl, correlator) {
+    var correlatorRegex = /([?&])correlator=([^&]*)/;
+    if (correlatorRegex.test(baseUrl)) {
+        return baseUrl.replace(correlatorRegex, "$1correlator=".concat(correlator));
+    }
+    var sep = baseUrl.includes("?") ? "&" : "?";
+    return "".concat(baseUrl).concat(sep, "correlator=").concat(correlator);
+}
+function fetchConsentSignals() {
+    var timeoutMs = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 1500;
+    var signals = {};
+    if (typeof window === "undefined") {
+        return Promise.resolve(signals);
+    }
+    var tasks = [];
+    var tcfApi = window.__tcfapi;
+    if (typeof tcfApi === "function") {
+        tasks.push(new Promise(function(resolve) {
+            var settled = false;
+            try {
+                tcfApi("addEventListener", 2, function(tcData, success) {
+                    if (settled) return;
+                    if (success && tcData && (tcData.eventStatus === "tcloaded" || tcData.eventStatus === "useractioncomplete")) {
+                        settled = true;
+                        signals.gdpr = tcData.gdprApplies ? "1" : "0";
+                        if (typeof tcData.tcString === "string" && tcData.tcString) {
+                            signals.gdprConsent = tcData.tcString;
+                        }
+                        try {
+                            tcfApi("removeEventListener", 2, function() {}, tcData.listenerId);
+                        } catch (unused) {}
+                        resolve();
+                    }
+                });
+            } catch (unused) {
+                resolve();
+            }
+            setTimeout(function() {
+                if (!settled) {
+                    settled = true;
+                    resolve();
+                }
+            }, timeoutMs);
+        }));
+    }
+    var uspApi = window.__uspapi;
+    if (typeof uspApi === "function") {
+        tasks.push(new Promise(function(resolve) {
+            try {
+                uspApi("getUSPData", 1, function(data, success) {
+                    if (success && typeof (data === null || data === void 0 ? void 0 : data.uspString) === "string" && data.uspString) {
+                        signals.usPrivacy = data.uspString;
+                    }
+                    resolve();
+                });
+            } catch (unused) {
+                resolve();
+            }
+            setTimeout(resolve, timeoutMs);
+        }));
+    }
+    if (tasks.length === 0) {
+        return Promise.resolve(signals);
+    }
+    return Promise.all(tasks).then(function() {
+        return signals;
+    });
+}
 // src/utils/browserCompat.ts
 function getChromeVersion(ua) {
     var match = ua.match(/Chrome\/(\d+)/);
@@ -2466,6 +2625,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.preloadPoolLoopRunning = false;
         this.adDetectSentForCurrentBreak = false;
         this.palPlaybackStarted = false;
+        this.streamCorrelator = generateCorrelator();
+        this.consentSignals = {};
+        this.podCounter = 0;
+        this.podAssignedByPrefetch = false;
+        this.adRequestPositionInBreak = 0;
         this.continuousFetchLoopRunning = false;
         initializePolyfills();
         var browserOverrides = getBrowserConfigOverrides();
@@ -2538,6 +2702,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     adWillPlayMuted: !!this.config.muted,
                                     continuousPlayback: (_this_config_lowLatencyMode = this.config.lowLatencyMode) !== null && _this_config_lowLatencyMode !== void 0 ? _this_config_lowLatencyMode : false
                                 }).catch(function() {});
+                                fetchConsentSignals().then(function(signals) {
+                                    _this.consentSignals = signals;
+                                }).catch(function() {});
                                 this.initializeTracking();
                                 if (!this.shouldUseNativeHls()) return [
                                     3,
@@ -2605,7 +2772,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                         var _level_details, _level_details1;
                                                         return (level === null || level === void 0 ? void 0 : (_level_details = level.details) === null || _level_details === void 0 ? void 0 : _level_details.live) === true || (level === null || level === void 0 ? void 0 : (_level_details1 = level.details) === null || _level_details1 === void 0 ? void 0 : _level_details1.type) === "LIVE";
                                                     })) !== null && _ref !== void 0 ? _ref : false;
-                                                    if (!this.isLiveStream && this.vmapBreaks.length === 0 && this.apiVastTagUrl) {
+                                                    if (!this.isVmapEnabled() && !this.isLiveStream && this.vmapBreaks.length === 0 && this.apiVastTagUrl) {
                                                         prerollKey = "synthetic-vod-preroll";
                                                         if (!this.consumedVmapBreakIds.has(prerollKey)) {
                                                             this.vmapBreaks = [
@@ -3190,12 +3357,14 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         _this.palNonce.sendPlaybackStart();
                     }
                 });
-                this.video.addEventListener("ended", function() {
+                this.endedHandler = function() {
                     if (_this.palPlaybackStarted) {
                         _this.palPlaybackStarted = false;
                         _this.palNonce.sendPlaybackEnd();
                     }
-                });
+                    _this.onVideoEnded();
+                };
+                this.video.addEventListener("ended", this.endedHandler);
                 this.video.addEventListener("mousedown", function(e) {
                     _this.palNonce.sendAdTouch(e);
                 });
@@ -4517,6 +4686,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "isVmapEnabled",
+            value: function isVmapEnabled() {
+                var _this_config_vmapUrl;
+                return !!(this.config.isVmap && ((_this_config_vmapUrl = this.config.vmapUrl) === null || _this_config_vmapUrl === void 0 ? void 0 : _this_config_vmapUrl.trim()));
+            }
+        },
         {
             key: "fetchAdConfiguration",
             value: function fetchAdConfiguration() {
@@ -4525,7 +4701,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                if (!this.config.vmapUrl) return [
+                                if (!this.isVmapEnabled()) return [
                                     3,
                                     2
                                 ];
@@ -4535,7 +4711,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 1:
                                 _state.sent();
-                                _state.label = 2;
+                                if (this.config.debugAdTiming) {
+                                    console.log("[StormcloudVideoPlayer] VMAP mode enabled");
+                                }
+                                return [
+                                    2
+                                ];
                             case 2:
                                 vastMode = this.config.vastMode || "default";
                                 if (this.config.debugAdTiming) {
@@ -4703,7 +4884,16 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }
                     return [];
                 }
-                var adBreakNodes = Array.from(doc.querySelectorAll("AdBreak, vmap\\:AdBreak"));
+                var VMAP_NS = "http://www.iab.net/videosuite/vmap";
+                var adBreakNodes = Array.from(doc.getElementsByTagNameNS(VMAP_NS, "AdBreak"));
+                if (adBreakNodes.length === 0) {
+                    adBreakNodes = Array.from(doc.querySelectorAll("AdBreak, vmap\\:AdBreak"));
+                }
+                if (adBreakNodes.length === 0) {
+                    adBreakNodes = Array.from(doc.getElementsByTagName("*")).filter(function(el) {
+                        return el.localName === "AdBreak";
+                    });
+                }
                 var parsed = [];
                 adBreakNodes.forEach(function(node, index) {
                     var timeOffsetRaw = (node.getAttribute("timeOffset") || "").trim();
@@ -4711,7 +4901,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     if (startTimeMs == null) {
                         return;
                     }
-                    var adTagNode = node.querySelector("AdTagURI, vmap\\:AdTagURI");
+                    var adTagNode = node.getElementsByTagNameNS(VMAP_NS, "AdTagURI")[0];
+                    if (!adTagNode) {
+                        var _node_querySelector;
+                        adTagNode = (_node_querySelector = node.querySelector("AdTagURI, vmap\\:AdTagURI")) !== null && _node_querySelector !== void 0 ? _node_querySelector : void 0;
+                    }
                     var adTagUrl = ((adTagNode === null || adTagNode === void 0 ? void 0 : adTagNode.textContent) || "").trim();
                     if (!adTagUrl) {
                         return;
@@ -4807,25 +5001,35 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return this.getRemainingAdMs();
             }
         },
+        {
+            key: "beginNewAdPod",
+            value: function beginNewAdPod() {
+                this.podCounter++;
+                this.adRequestPositionInBreak = 0;
+            }
+        },
         {
             key: "generateVastUrlsWithCorrelators",
             value: function generateVastUrlsWithCorrelators(baseUrl, count) {
                 var urls = [];
-                var baseTimestamp = Date.now();
                 for(var i = 0; i < count; i++){
-                    var timestamp = baseTimestamp + i;
-                    var random = Math.floor(Math.random() * 1e12);
-                    var uniqueCorrelator = "".concat(timestamp, "_").concat(random, "_").concat(i);
-                    var urlWithCorrelator = void 0;
-                    var correlatorRegex = /([?&])correlator=([^&]*)/;
-                    if (correlatorRegex.test(baseUrl)) {
-                        urlWithCorrelator = baseUrl.replace(correlatorRegex, "$1correlator=".concat(uniqueCorrelator));
-                    } else if (baseUrl.includes("?")) {
-                        urlWithCorrelator = "".concat(baseUrl, "&correlator=").concat(uniqueCorrelator);
-                    } else {
-                        urlWithCorrelator = "".concat(baseUrl, "?correlator=").concat(uniqueCorrelator);
-                    }
-                    urls.push(this.palNonce.injectNonce(urlWithCorrelator));
+                    this.adRequestPositionInBreak++;
+                    var adWillPlayMuted = this.inAdBreak ? this.adPlayer.getOriginalMutedState() : this.video.muted;
+                    var urlWithMacros = applyVastMacros(baseUrl, {
+                        correlator: generateCorrelator(),
+                        streamCorrelator: this.streamCorrelator,
+                        pod: this.podCounter > 0 ? this.podCounter : void 0,
+                        adPosition: this.adRequestPositionInBreak,
+                        pageUrl: typeof window !== "undefined" ? window.location.href : void 0,
+                        adWillPlayMuted: adWillPlayMuted,
+                        adWillAutoPlay: !!this.config.autoplay,
+                        deviceId: this.config.deviceId,
+                        deviceIdType: this.config.deviceIdType,
+                        limitAdTracking: this.config.limitAdTracking,
+                        adTest: this.config.adTest,
+                        consent: this.consentSignals
+                    });
+                    urls.push(this.palNonce.injectNonce(urlWithMacros));
                 }
                 return urls;
             }
@@ -4895,6 +5099,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     }
                     return;
                 }
+                this.beginNewAdPod();
+                this.podAssignedByPrefetch = true;
                 var urlsToPregenerate = 5;
                 var generatedUrls = this.generateVastUrlsWithCorrelators(baseVastUrl, urlsToPregenerate);
                 this.pendingAdBreak = _object_spread_props(_object_spread({
@@ -4932,6 +5138,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 this.pendingAdBreak = null;
                 this.pendingScte35CueKey = void 0;
+                this.podAssignedByPrefetch = false;
             }
         },
         {
@@ -5368,6 +5575,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.continuousFetchingActive = true;
                                 this.isShowingPlaceholder = false;
                                 this.totalAdRequestsInBreak = 0;
+                                if (this.podAssignedByPrefetch) {
+                                    this.podAssignedByPrefetch = false;
+                                } else {
+                                    this.beginNewAdPod();
+                                }
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
                                 this.adPlayer.updateOriginalMutedState(currentMuted, currentVolume);
@@ -6268,23 +6480,49 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "onTimeUpdate",
             value: function onTimeUpdate(currentTimeSec) {
                 var _this = this;
+                if (!this.isVmapEnabled() || this.vmapBreaks.length === 0) {
+                    return;
+                }
                 if (this.adPlayer.isAdPlaying() || this.inAdBreak) return;
                 var nowMs = currentTimeSec * 1e3;
                 var breakToPlay = this.findBreakForTime(nowMs);
                 if (breakToPlay) {
-                    void this.handleMidAdJoin(breakToPlay, nowMs).catch(function(error) {
+                    void this.handleVmapAdBreak(breakToPlay, nowMs).catch(function(error) {
                         if (_this.config.debugAdTiming) {
-                            console.warn("[StormcloudVideoPlayer] Mid-roll VMAP join failed gracefully:", error);
+                            console.warn("[StormcloudVideoPlayer] VMAP ad break failed gracefully:", error);
                         }
                     });
                 }
             }
         },
         {
-            key: "handleMidAdJoin",
-            value: function handleMidAdJoin(adBreak, nowMs) {
+            key: "onVideoEnded",
+            value: function onVideoEnded() {
+                var _this = this;
+                if (!this.isVmapEnabled() || this.vmapBreaks.length === 0) {
+                    return;
+                }
+                if (this.adPlayer.isAdPlaying() || this.inAdBreak) {
+                    return;
+                }
+                var durationMs = Number.isFinite(this.video.duration) ? Math.floor(this.video.duration * 1e3) : 0;
+                var postroll = this.vmapBreaks.find(function(b) {
+                    return b.startTimeMs === -1 && !_this.consumedVmapBreakIds.has(_this.getAdBreakKey(b));
+                });
+                if (postroll) {
+                    void this.handleVmapAdBreak(postroll, durationMs).catch(function(error) {
+                        if (_this.config.debugAdTiming) {
+                            console.warn("[StormcloudVideoPlayer] VMAP post-roll failed gracefully:", error);
+                        }
+                    });
+                }
+            }
+        },
+        {
+            key: "handleVmapAdBreak",
+            value: function handleVmapAdBreak(adBreak, nowMs) {
                 return _async_to_generator(function() {
-                    var _adBreak_durationMs, _this_config_driftToleranceMs, key, breakStartMs, durationMs, endMs, tol, inWindow, remainingMs, tags, first, rest, error;
+                    var _adBreak_durationMs, key, breakStartMs, durationMs, endMs, inWindow, tags, first, rest, error;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -6302,25 +6540,28 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 }
                                 durationMs = (_adBreak_durationMs = adBreak.durationMs) !== null && _adBreak_durationMs !== void 0 ? _adBreak_durationMs : 0;
                                 endMs = breakStartMs + durationMs;
-                                tol = (_this_config_driftToleranceMs = this.config.driftToleranceMs) !== null && _this_config_driftToleranceMs !== void 0 ? _this_config_driftToleranceMs : 1e3;
-                                inWindow = durationMs > 0 ? nowMs > breakStartMs && nowMs < endMs : nowMs + tol >= breakStartMs;
+                                inWindow = durationMs > 0 ? nowMs >= breakStartMs && nowMs < endMs : nowMs >= breakStartMs;
                                 if (!inWindow) return [
                                     3,
                                     4
                                 ];
                                 this.consumedVmapBreakIds.add(key);
-                                remainingMs = durationMs > 0 ? Math.max(0, endMs - nowMs) : 0;
-                                tags = this.selectVastTagsForBreak(adBreak) || (this.apiVastTagUrl ? [
-                                    this.apiVastTagUrl
-                                ] : void 0);
-                                if (!(tags && tags.length > 0)) return [
-                                    3,
-                                    4
-                                ];
+                                tags = this.selectVastTagsForBreak(adBreak);
+                                if (!tags || tags.length === 0) {
+                                    return [
+                                        2
+                                    ];
+                                }
                                 first = tags[0];
                                 rest = tags.slice(1);
                                 this.adPodQueue = rest;
                                 this.adPlayer.updateOriginalMutedState(this.video.muted, this.video.volume);
+                                this.showAds = true;
+                                this.inAdBreak = true;
+                                this.currentAdBreakStartWallClockMs = Date.now();
+                                if (!this.video.paused) {
+                                    this.video.pause();
+                                }
                                 _state.label = 1;
                             case 1:
                                 _state.trys.push([
@@ -6335,10 +6576,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 2:
                                 _state.sent();
-                                this.inAdBreak = true;
-                                this.expectedAdBreakDurationMs = remainingMs;
-                                this.currentAdBreakStartWallClockMs = Date.now();
-                                this.scheduleAdStopCountdown(remainingMs);
                                 return [
                                     3,
                                     4
@@ -6346,8 +6583,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             case 3:
                                 error = _state.sent();
                                 this.adPodQueue = [];
+                                this.inAdBreak = false;
+                                this.showAds = false;
                                 if (this.config.debugAdTiming) {
-                                    console.warn("[StormcloudVideoPlayer] Mid-roll VMAP ad request failed:", error);
+                                    console.warn("[StormcloudVideoPlayer] VMAP ad request failed:", error);
                                 }
                                 return [
                                     3,
@@ -7059,9 +7298,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "findBreakForTime",
             value: function findBreakForTime(nowMs) {
-                var _this_config_driftToleranceMs;
                 var schedule = this.vmapBreaks;
-                var tol = (_this_config_driftToleranceMs = this.config.driftToleranceMs) !== null && _this_config_driftToleranceMs !== void 0 ? _this_config_driftToleranceMs : 1e3;
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
                     for(var _iterator = schedule[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -7073,9 +7310,14 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         if (breakStartMs == null) {
                             continue;
                         }
-                        var end = breakStartMs + (b.durationMs || 0);
-                        var effectiveTol = breakStartMs === 0 ? Math.max(tol, 3e4) : tol;
-                        if (nowMs >= breakStartMs && (b.durationMs ? nowMs < end : nowMs <= breakStartMs + effectiveTol)) {
+                        if (b.durationMs) {
+                            var end = breakStartMs + b.durationMs;
+                            if (nowMs >= breakStartMs && nowMs < end) {
+                                return b;
+                            }
+                            continue;
+                        }
+                        if (nowMs >= breakStartMs) {
                             return b;
                         }
                     }
@@ -7283,6 +7525,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.video.removeEventListener("timeupdate", this.timeUpdateHandler);
                     delete this.timeUpdateHandler;
                 }
+                if (this.endedHandler) {
+                    this.video.removeEventListener("ended", this.endedHandler);
+                    delete this.endedHandler;
+                }
                 if (this.emptiedHandler) {
                     this.video.removeEventListener("emptied", this.emptiedHandler);
                     delete this.emptiedHandler;