stormcloud-video-player 0.8.18 → 0.8.20

package/lib/player/StormcloudVideoPlayer.cjs

@@ -776,6 +776,7 @@ function createHlsAdPlayer(contentVideo, options) {
             handleAdComplete();
         });
         adVideoElement.addEventListener("error", function(e) {
+            if (!adPlaying) return;
             console.error("[HlsAdPlayer] Ad video error:", e);
             if (currentAd) {
                 fireTrackingPixels(currentAd.trackingUrls.error);
@@ -977,15 +978,15 @@ function createHlsAdPlayer(contentVideo, options) {
                             adVideoElement.muted = originalMutedState;
                             console.log("[HlsAdPlayer] Set ad video volume to ".concat(adVideoElement.volume, ", muted: ").concat(adVideoElement.muted, ", originalMutedState: ").concat(originalMutedState, ", contentVolume: ").concat(contentVolume));
                         }
+                        mediaFile = selectBestMediaFile(currentAd.mediaFiles);
+                        if (!mediaFile) {
+                            throw new Error("No media file available for ad");
+                        }
                         if (adContainerEl) {
                             adContainerEl.style.display = "flex";
                             adContainerEl.style.pointerEvents = "auto";
                         }
                         emit("content_pause");
-                        mediaFile = selectBestMediaFile(currentAd.mediaFiles);
-                        if (!mediaFile) {
-                            throw new Error("No media file available for ad");
-                        }
                         isHlsAd = isHlsMediaFile(mediaFile);
                         console.log("[HlsAdPlayer] Loading ".concat(isHlsAd ? "HLS" : "progressive", " ad from: ").concat(mediaFile.url));
                         if (isHlsAd && import_hls.default.isSupported()) {
@@ -2271,22 +2272,337 @@ function initializePolyfills() {
     polyfillTextEncoder();
     polyfillPromiseFinally();
 }
-// src/utils/vastMacros.ts
-function generateCorrelator() {
-    if (typeof crypto !== "undefined" && crypto.getRandomValues) {
+// src/utils/vastEnvironmentSignals.ts
+var AIRY_ANDROID_APP_ID = "com.freeairytv.android";
+var AIRY_WEBOS_APP_ID = "com.freeairytv.webos";
+var AIRY_TIZEN_APP_ID = "com.freeairytv.samsung";
+var AIRY_ROKU_APP_ID = "com.freeairytv.roku";
+var AIRY_APP_NAME = "AiryTV Movies & TV";
+var AIRY_DEFAULT_CONTENT_URL = "https://live.airy.tv";
+var CTV_SESSION_STORAGE_KEY = "stormcloud.ctv.sid";
+function getDefaultAppId() {
+    if (typeof navigator === "undefined") return AIRY_ANDROID_APP_ID;
+    var ua = navigator.userAgent;
+    if (/Web0S|webOS|LG Browser|LGSTB|LGE/i.test(ua)) return AIRY_WEBOS_APP_ID;
+    if (/Tizen|Samsung/i.test(ua)) return AIRY_TIZEN_APP_ID;
+    if (/Roku/i.test(ua)) return AIRY_ROKU_APP_ID;
+    return AIRY_ANDROID_APP_ID;
+}
+var DEVICE_ID_STORAGE_KEYS = [
+    "rdid",
+    "ifa",
+    "advertisingId",
+    "advertising_id",
+    "deviceAdvertisingId",
+    "aaid",
+    "adid",
+    "rida",
+    "tifa",
+    "lgudid"
+];
+var ANDROID_ID_TYPES = /* @__PURE__ */ new Set([
+    "aaid",
+    "adid"
+]);
+function resolveVastEnvironmentSignals(isCtv) {
+    var _ref, _bridgeSignals_limitAdTracking;
+    var bridgeSignals = readNativeBridgeSignals();
+    var deviceId = bridgeSignals.deviceId || readStoredDeviceId();
+    var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || readStoredString("idtype") || inferDeviceIdType();
+    var limitAdTracking = deviceId != null ? (_ref = (_bridgeSignals_limitAdTracking = bridgeSignals.limitAdTracking) !== null && _bridgeSignals_limitAdTracking !== void 0 ? _bridgeSignals_limitAdTracking : readStoredLimitAdTracking()) !== null && _ref !== void 0 ? _ref : false : void 0;
+    if (isCtv) {
+        return _object_spread_props(_object_spread({
+            isCtv: true,
+            contentUrl: bridgeSignals.contentUrl || readStoredString("contentUrl") || AIRY_DEFAULT_CONTENT_URL,
+            appId: bridgeSignals.appId || readStoredString("appId") || readStoredString("msid") || getDefaultAppId(),
+            appName: bridgeSignals.appName || readStoredString("appName") || readStoredString("an") || AIRY_APP_NAME,
+            sessionId: getOrCreateCtvSessionId()
+        }, deviceId ? {
+            deviceId: deviceId
+        } : {}, deviceIdType ? {
+            deviceIdType: deviceIdType
+        } : {}, limitAdTracking != null ? {
+            limitAdTracking: limitAdTracking
+        } : {}), {
+            deviceTypeHint: 5
+        });
+    }
+    return _object_spread({
+        isCtv: false
+    }, deviceId ? {
+        deviceId: deviceId
+    } : {}, deviceIdType ? {
+        deviceIdType: deviceIdType
+    } : {}, limitAdTracking != null ? {
+        limitAdTracking: limitAdTracking
+    } : {});
+}
+function inferDeviceIdType() {
+    if (typeof navigator === "undefined") {
+        return void 0;
+    }
+    var ua = navigator.userAgent;
+    if (/Roku/i.test(ua)) return "rida";
+    if (/Tizen|Samsung/i.test(ua)) return "tifa";
+    if (/AppleTV|Apple TV/i.test(ua)) return "tvOS";
+    if (/AFT|Fire TV|Amazon/i.test(ua)) return "afai";
+    if (/Web0S|webOS|LG Browser|LGSTB|LGE/i.test(ua)) return "lgudid";
+    if (/Android|Google TV/i.test(ua)) return "aaid";
+    if (/iPhone|iPad|iPod/i.test(ua)) return "idfa";
+    return void 0;
+}
+function isEquivalentDeviceIdType(tagType, runtimeType) {
+    if (!tagType || !runtimeType) return false;
+    var tag = tagType.toLowerCase();
+    var runtime = runtimeType.toLowerCase();
+    if (tag === runtime) return true;
+    return ANDROID_ID_TYPES.has(tag) && ANDROID_ID_TYPES.has(runtime);
+}
+function getOrCreateCtvSessionId() {
+    var existing = readStoredString(CTV_SESSION_STORAGE_KEY);
+    if (existing) {
+        return existing;
+    }
+    var sessionId = createUuid();
+    try {
+        var _window_localStorage;
+        (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.setItem(CTV_SESSION_STORAGE_KEY, sessionId);
+    } catch (unused) {}
+    return sessionId;
+}
+function createUuid() {
+    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+        return crypto.randomUUID();
+    }
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(char) {
+        var value = Math.floor(Math.random() * 16);
+        var nibble = char === "x" ? value : value & 3 | 8;
+        return nibble.toString(16);
+    });
+}
+function readNativeBridgeSignals() {
+    if (typeof window === "undefined") {
+        return {};
+    }
+    var candidates = [
+        window.__STORMCLOUD_CTV_AD_INFO__,
+        window.__STORMCLOUD_CTV__,
+        window.stormcloudCtv,
+        window.AiryTV,
+        window.Android,
+        window.webOS,
+        window.tizen,
+        window.amazon
+    ].filter(Boolean);
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = candidates[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var source = _step.value;
+            var contentUrl = readBridgeValue(source, [
+                "contentUrl",
+                "url",
+                "videoUrl",
+                "canonicalUrl"
+            ]) || void 0;
+            var appId = readBridgeValue(source, [
+                "appId",
+                "msid",
+                "applicationId",
+                "packageName"
+            ]) || void 0;
+            var appName = readBridgeValue(source, [
+                "appName",
+                "an",
+                "applicationName"
+            ]) || void 0;
+            var deviceId = readBridgeValue(source, [
+                "rdid",
+                "ifa",
+                "advertisingId",
+                "adId",
+                "deviceId",
+                "lgudid",
+                "LGUDID",
+                "tifa",
+                "rida",
+                "afai",
+                "aaid"
+            ]) || void 0;
+            if (!contentUrl && !deviceId && !appId && !appName) continue;
+            var deviceIdType = readBridgeValue(source, [
+                "idtype",
+                "deviceIdType",
+                "advertisingIdType",
+                "idType"
+            ]) || inferDeviceIdType();
+            var limitAdTracking = readBridgeBoolean(source, [
+                "is_lat",
+                "limitAdTracking",
+                "limitedAdTracking",
+                "lat"
+            ]);
+            return _object_spread({}, contentUrl ? {
+                contentUrl: contentUrl
+            } : {}, appId ? {
+                appId: appId
+            } : {}, appName ? {
+                appName: appName
+            } : {}, deviceId ? {
+                deviceId: deviceId
+            } : {}, deviceId && deviceIdType ? {
+                deviceIdType: deviceIdType
+            } : {}, deviceId && limitAdTracking != null ? {
+                limitAdTracking: limitAdTracking
+            } : {});
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
         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);
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
             }
-        } catch (unused) {}
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
     }
-    return String(Math.floor(Math.random() * Number.MAX_SAFE_INTEGER) + 1);
+    return {};
+}
+function readBridgeValue(source, keys) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = source === null || source === void 0 ? void 0 : source[key];
+            if (typeof value === "string" && value) {
+                return value;
+            }
+            if (typeof value === "function") {
+                try {
+                    var result = value.call(source);
+                    if (typeof result === "string" && result) {
+                        return result;
+                    }
+                } catch (unused) {}
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readBridgeBoolean(source, keys) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = source === null || source === void 0 ? void 0 : source[key];
+            var normalized = normalizeBoolean(value);
+            if (normalized != null) {
+                return normalized;
+            }
+            if (typeof value === "function") {
+                try {
+                    var result = normalizeBoolean(value.call(source));
+                    if (result != null) {
+                        return result;
+                    }
+                } catch (unused) {}
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readStoredDeviceId() {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = DEVICE_ID_STORAGE_KEYS[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = readStoredString(key);
+            if (value) {
+                return value;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readStoredString(key) {
+    if (typeof window === "undefined") {
+        return void 0;
+    }
+    try {
+        var _window_localStorage;
+        var value = (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.getItem(key);
+        return value || void 0;
+    } catch (unused) {
+        return void 0;
+    }
+}
+function readStoredLimitAdTracking() {
+    return normalizeBoolean(readStoredString("limitAdTracking") || readStoredString("limitedAdTracking") || readStoredString("is_lat"));
+}
+function normalizeBoolean(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "number") {
+        return value === 1;
+    }
+    if (typeof value === "string") {
+        var normalized = value.toLowerCase();
+        if (normalized === "1" || normalized === "true" || normalized === "yes") {
+            return true;
+        }
+        if (normalized === "0" || normalized === "false" || normalized === "no") {
+            return false;
+        }
+    }
+    return void 0;
 }
+// src/utils/vastMacros.ts
 var UNEXPANDED_MACRO_PATTERN = /^(\[[^\]]*\]|\{[^}]*\}|%%[^%]*%%)$/;
+var INVALID_VAST_PARAM_KEY = /^\s|\s$/;
+var EXAMPLE_COM_URL = /example\.com/i;
 var CTV_UNSUPPORTED_PARAMS = [
     "description_url",
     "tfcd",
@@ -2301,14 +2617,288 @@ var CTV_UNSUPPORTED_PARAMS = [
     "gdpr_consent",
     "us_privacy"
 ];
+var INLINE_DEVICE_MACRO_REPLACEMENTS = [
+    {
+        pattern: /\[RDID\]/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\[IFA\]/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\[ADVERTISING[_-]?ID(?:ENTIFIER)?\]/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\[DEVICE[_-]?ID\]/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\[IDTYPE\]/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceIdType;
+        }
+    },
+    {
+        pattern: /\{rdid\}/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\{device[_-]?id\}/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /\{idtype\}/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceIdType;
+        }
+    },
+    {
+        pattern: /%%ADVERTISING_IDENTIFIER_PLAIN%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /%%ADVERTISING_ID_OPT_OUT%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.limitAdTracking != null ? ctx.limitAdTracking ? "1" : "0" : void 0;
+        }
+    },
+    {
+        pattern: /%%ADVERTISING_ID_TYPE%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceIdType;
+        }
+    },
+    {
+        pattern: /%%ADVERTISING_ID%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.deviceId;
+        }
+    },
+    {
+        pattern: /%%LIMIT_AD_TRACKING%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.limitAdTracking != null ? ctx.limitAdTracking ? "1" : "0" : void 0;
+        }
+    },
+    {
+        pattern: /%%MSID%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.appId;
+        }
+    },
+    {
+        pattern: /%%APP_NAME%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.appName;
+        }
+    },
+    {
+        pattern: /%%SESSION_ID%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.sessionId;
+        }
+    },
+    {
+        pattern: /%%CORRELATOR%%/gi,
+        getValue: function getValue(ctx) {
+            return ctx.correlator;
+        }
+    }
+];
+function isMacroPlaceholder(value) {
+    if (value == null) return true;
+    var trimmed = value.trim();
+    if (!trimmed) return true;
+    if (UNEXPANDED_MACRO_PATTERN.test(trimmed)) return true;
+    return /^(unknown|null|undefined|none|n\/a|\$\{[^}]+\})$/i.test(trimmed);
+}
+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);
+}
+function expandInlineMacroPlaceholders(baseUrl, ctx) {
+    var url = baseUrl;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = INLINE_DEVICE_MACRO_REPLACEMENTS[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _step.value, pattern = _step_value.pattern, getValue = _step_value.getValue;
+            var value = getValue(ctx);
+            if (value != null && value !== "") {
+                url = url.replace(pattern, encodeURIComponent(value));
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return url;
+}
+function applyDeviceIdentityParams(params, ctx) {
+    var _ctx_deviceId, _ctx_deviceIdType;
+    var runtimeId = (_ctx_deviceId = ctx.deviceId) === null || _ctx_deviceId === void 0 ? void 0 : _ctx_deviceId.trim();
+    var runtimeType = ((_ctx_deviceIdType = ctx.deviceIdType) === null || _ctx_deviceIdType === void 0 ? void 0 : _ctx_deviceIdType.trim()) || inferDeviceIdType();
+    var tagRdid = params.get("rdid");
+    var tagType = params.get("idtype");
+    var tagLat = params.get("is_lat");
+    var latValue = ctx.limitAdTracking != null ? ctx.limitAdTracking ? "1" : "0" : void 0;
+    if (runtimeId) {
+        params.set("rdid", runtimeId);
+        params.set("idtype", runtimeType || tagType || "aaid");
+        params.set("is_lat", latValue !== null && latValue !== void 0 ? latValue : isMacroPlaceholder(tagLat) ? "0" : tagLat);
+        return;
+    }
+    var tagRdidValid = Boolean(tagRdid && !isMacroPlaceholder(tagRdid));
+    var tagTypeValid = Boolean(tagType && !isMacroPlaceholder(tagType));
+    if (tagRdidValid && tagTypeValid && runtimeType && !isEquivalentDeviceIdType(tagType, runtimeType)) {
+        params.delete("rdid");
+        params.delete("idtype");
+        params.delete("is_lat");
+        return;
+    }
+    if (tagRdidValid) {
+        if (isMacroPlaceholder(tagType) && runtimeType) {
+            params.set("idtype", runtimeType);
+        }
+        if (isMacroPlaceholder(tagLat)) {
+            params.set("is_lat", latValue !== null && latValue !== void 0 ? latValue : "0");
+        }
+        return;
+    }
+    params.delete("rdid");
+    params.delete("idtype");
+    params.delete("is_lat");
+}
+function removeBrokenAppNameOrphans(params, appName) {
+    var toDelete = [];
+    params.forEach(function(_value, key) {
+        if (!key || INVALID_VAST_PARAM_KEY.test(key)) {
+            toDelete.push(key);
+        }
+    });
+    if (appName && appName.includes("&")) {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = appName.split("&").slice(1)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var suffix = _step.value;
+                var trimmed = suffix.trimStart();
+                if (!trimmed) continue;
+                toDelete.push(suffix, " ".concat(trimmed), trimmed);
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+    }
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+    try {
+        for(var _iterator1 = new Set(toDelete)[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var key = _step1.value;
+            if (key) params.delete(key);
+        }
+    } catch (err) {
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+            }
+        } finally{
+            if (_didIteratorError1) {
+                throw _iteratorError1;
+            }
+        }
+    }
+}
+function normalizeVastTagUrl(raw) {
+    if (!raw) return raw;
+    try {
+        var url = new URL(raw);
+        var anValue = url.searchParams.get("an");
+        if (anValue !== null) {
+            var orphanFragments = [];
+            url.searchParams.forEach(function(_value, key) {
+                if (key && INVALID_VAST_PARAM_KEY.test(key)) {
+                    orphanFragments.push(key.trim());
+                }
+            });
+            if (orphanFragments.length > 0) {
+                var reconstructed = [
+                    anValue.trimEnd()
+                ].concat(_to_consumable_array(orphanFragments)).filter(Boolean).join(" & ");
+                url.searchParams.forEach(function(_value, key) {
+                    if (key && INVALID_VAST_PARAM_KEY.test(key)) {
+                        url.searchParams.delete(key);
+                    }
+                });
+                url.searchParams.set("an", reconstructed);
+                return url.toString().replace(/([?&]an=)([^&]*)/, function(_match, prefix, val) {
+                    return prefix + val.replace(/\+/g, "%20");
+                });
+            }
+        }
+        removeBrokenAppNameOrphans(url.searchParams);
+        return url.toString();
+    } catch (unused) {
+        return raw;
+    }
+}
 function applyVastMacros(baseUrl, ctx) {
+    var expandedUrl = expandInlineMacroPlaceholders(baseUrl, ctx);
     var url;
     try {
-        url = new URL(baseUrl);
+        url = new URL(normalizeVastTagUrl(expandedUrl));
     } catch (unused) {
-        return replaceCorrelatorFallback(baseUrl, ctx.correlator);
+        return replaceCorrelatorFallback(expandedUrl, ctx.correlator);
     }
     var params = url.searchParams;
+    removeBrokenAppNameOrphans(params, ctx.appName);
     params.set("correlator", ctx.correlator);
     if (ctx.isCtv) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
@@ -2346,6 +2936,12 @@ function applyVastMacros(baseUrl, ctx) {
         if (!ctx.isCtv) {
             params.set("description_url", requestUrl);
         }
+    } else {
+        var existingUrl = params.get("url") || "";
+        if (EXAMPLE_COM_URL.test(existingUrl)) {
+            params.delete("url");
+            params.delete("description_url");
+        }
     }
     if (ctx.adWillPlayMuted != null) {
         params.set("vpmute", ctx.adWillPlayMuted ? "1" : "0");
@@ -2357,6 +2953,7 @@ function applyVastMacros(baseUrl, ctx) {
         params.set("msid", ctx.appId);
     }
     if (ctx.appName) {
+        removeBrokenAppNameOrphans(params, ctx.appName);
         params.set("an", ctx.appName);
     }
     if (ctx.sessionId) {
@@ -2367,15 +2964,7 @@ function applyVastMacros(baseUrl, ctx) {
     } else if (ctx.isCtv) {
         params.set("dth", "5");
     }
-    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");
-    }
+    applyDeviceIdentityParams(params, ctx);
     if (!ctx.isCtv) {
         var consent = ctx.consent;
         if ((consent === null || consent === void 0 ? void 0 : consent.gdpr) != null) {
@@ -2393,7 +2982,7 @@ function applyVastMacros(baseUrl, ctx) {
     }
     var staleKeys = [];
     params.forEach(function(value, key) {
-        if (UNEXPANDED_MACRO_PATTERN.test(value)) {
+        if (isMacroPlaceholder(value)) {
             staleKeys.push(key);
         }
     });
@@ -2417,6 +3006,7 @@ function applyVastMacros(baseUrl, ctx) {
             }
         }
     }
+    removeBrokenAppNameOrphans(params, ctx.appName);
     return url.toString();
 }
 function replaceCorrelatorFallback(baseUrl, correlator) {
@@ -3667,276 +4257,10 @@ var Scte35CueManager = /*#__PURE__*/ function() {
     ]);
     return Scte35CueManager;
 }();
-// src/utils/ctvVastSignals.ts
-var AIRY_ANDROID_APP_ID = "com.freeairytv.android";
-var AIRY_APP_NAME = "AiryTV Movies & TV";
-var AIRY_DEFAULT_CONTENT_URL = "https://live.airy.tv";
-var CTV_SESSION_STORAGE_KEY = "stormcloud.ctv.sid";
-var DEVICE_ID_STORAGE_KEYS = [
-    "rdid",
-    "ifa",
-    "advertisingId",
-    "advertising_id",
-    "deviceAdvertisingId",
-    "aaid",
-    "adid",
-    "rida",
-    "tifa"
-];
-function resolveCtvVastSignals() {
-    var _ref, _bridgeSignals_limitAdTracking;
-    var bridgeSignals = readNativeBridgeSignals();
-    var deviceId = bridgeSignals.deviceId || readStoredDeviceId();
-    var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || inferDeviceIdType();
-    var contentUrl = bridgeSignals.contentUrl || readStoredString("contentUrl") || AIRY_DEFAULT_CONTENT_URL;
-    return _object_spread_props(_object_spread({
-        contentUrl: contentUrl,
-        appId: AIRY_ANDROID_APP_ID,
-        appName: AIRY_APP_NAME,
-        sessionId: getOrCreateCtvSessionId()
-    }, deviceId ? {
-        deviceId: deviceId
-    } : {}, deviceId && deviceIdType ? {
-        deviceIdType: deviceIdType
-    } : {}, deviceId ? {
-        limitAdTracking: (_ref = (_bridgeSignals_limitAdTracking = bridgeSignals.limitAdTracking) !== null && _bridgeSignals_limitAdTracking !== void 0 ? _bridgeSignals_limitAdTracking : readStoredLimitAdTracking()) !== null && _ref !== void 0 ? _ref : false
-    } : {}), {
-        deviceTypeHint: 5
-    });
-}
-function getOrCreateCtvSessionId() {
-    var existing = readStoredString(CTV_SESSION_STORAGE_KEY);
-    if (existing) {
-        return existing;
-    }
-    var sessionId = createUuid();
-    try {
-        var _window_localStorage;
-        (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.setItem(CTV_SESSION_STORAGE_KEY, sessionId);
-    } catch (unused) {}
-    return sessionId;
-}
-function createUuid() {
-    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-        return crypto.randomUUID();
-    }
-    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(char) {
-        var value = Math.floor(Math.random() * 16);
-        var nibble = char === "x" ? value : value & 3 | 8;
-        return nibble.toString(16);
-    });
-}
-function readNativeBridgeSignals() {
-    if (typeof window === "undefined") {
-        return {};
-    }
-    var candidates = [
-        window.__STORMCLOUD_CTV_AD_INFO__,
-        window.__STORMCLOUD_CTV__,
-        window.stormcloudCtv,
-        window.AiryTV,
-        window.Android
-    ].filter(Boolean);
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = candidates[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var source = _step.value;
-            var contentUrl = readBridgeValue(source, [
-                "contentUrl",
-                "url",
-                "videoUrl",
-                "canonicalUrl"
-            ]) || void 0;
-            var deviceId = readBridgeValue(source, [
-                "rdid",
-                "ifa",
-                "advertisingId",
-                "adId",
-                "deviceId"
-            ]) || void 0;
-            if (!contentUrl && !deviceId) continue;
-            var deviceIdType = readBridgeValue(source, [
-                "idtype",
-                "deviceIdType",
-                "advertisingIdType"
-            ]) || inferDeviceIdType();
-            var limitAdTracking = readBridgeBoolean(source, [
-                "is_lat",
-                "limitAdTracking",
-                "limitedAdTracking",
-                "lat"
-            ]);
-            return _object_spread({}, contentUrl ? {
-                contentUrl: contentUrl
-            } : {}, deviceId ? {
-                deviceId: deviceId
-            } : {}, deviceId && deviceIdType ? {
-                deviceIdType: deviceIdType
-            } : {}, deviceId && limitAdTracking != null ? {
-                limitAdTracking: limitAdTracking
-            } : {});
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return {};
-}
-function readBridgeValue(source, keys) {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            var value = source === null || source === void 0 ? void 0 : source[key];
-            if (typeof value === "string" && value) {
-                return value;
-            }
-            if (typeof value === "function") {
-                try {
-                    var result = value.call(source);
-                    if (typeof result === "string" && result) {
-                        return result;
-                    }
-                } catch (unused) {}
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return void 0;
-}
-function readBridgeBoolean(source, keys) {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            var value = source === null || source === void 0 ? void 0 : source[key];
-            var normalized = normalizeBoolean(value);
-            if (normalized != null) {
-                return normalized;
-            }
-            if (typeof value === "function") {
-                try {
-                    var result = normalizeBoolean(value.call(source));
-                    if (result != null) {
-                        return result;
-                    }
-                } catch (unused) {}
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return void 0;
-}
-function readStoredDeviceId() {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-    try {
-        for(var _iterator = DEVICE_ID_STORAGE_KEYS[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            var value = readStoredString(key);
-            if (value) {
-                return value;
-            }
-        }
-    } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
-            }
-        } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
-            }
-        }
-    }
-    return void 0;
-}
-function readStoredString(key) {
-    if (typeof window === "undefined") {
-        return void 0;
-    }
-    try {
-        var _window_localStorage;
-        var value = (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.getItem(key);
-        return value || void 0;
-    } catch (unused) {
-        return void 0;
-    }
-}
-function readStoredLimitAdTracking() {
-    return normalizeBoolean(readStoredString("limitAdTracking") || readStoredString("limitedAdTracking") || readStoredString("is_lat"));
-}
-function normalizeBoolean(value) {
-    if (typeof value === "boolean") {
-        return value;
-    }
-    if (typeof value === "number") {
-        return value === 1;
-    }
-    if (typeof value === "string") {
-        var normalized = value.toLowerCase();
-        if (normalized === "1" || normalized === "true" || normalized === "yes") {
-            return true;
-        }
-        if (normalized === "0" || normalized === "false" || normalized === "no") {
-            return false;
-        }
-    }
-    return void 0;
-}
-function inferDeviceIdType() {
-    if (typeof navigator === "undefined") {
-        return void 0;
-    }
-    var ua = navigator.userAgent;
-    if (/Roku/i.test(ua)) return "rida";
-    if (/Tizen|Samsung/i.test(ua)) return "tifa";
-    if (/AppleTV/i.test(ua)) return "tvOS";
-    if (/AFT|Fire TV|Amazon/i.test(ua)) return "afai";
-    if (/Web0S|webOS|LG/i.test(ua)) return "lgudid";
-    if (/Android|Google TV/i.test(ua)) return "aaid";
-    return void 0;
-}
-// src/player/VmapManager.ts
-var VmapManager = /*#__PURE__*/ function() {
-    function VmapManager(config, video) {
-        _class_call_check(this, VmapManager);
+// src/player/AdConfigManager.ts
+var AdConfigManager = /*#__PURE__*/ function() {
+    function AdConfigManager(config, video) {
+        _class_call_check(this, AdConfigManager);
         this.vmapBreaks = [];
         this.consumedVmapBreakIds = /* @__PURE__ */ new Set();
         this.streamCorrelator = generateCorrelator();
@@ -3948,7 +4272,7 @@ var VmapManager = /*#__PURE__*/ function() {
         this.config = config;
         this.video = video;
     }
-    _create_class(VmapManager, [
+    _create_class(AdConfigManager, [
         {
             key: "debug",
             get: function get() {
@@ -3966,7 +4290,7 @@ var VmapManager = /*#__PURE__*/ function() {
             key: "fetchAdConfiguration",
             value: function fetchAdConfiguration() {
                 return _async_to_generator(function() {
-                    var _data_response_ima_publisherdeskima, _data_response_ima, _data_response, _data_response_options_vast_cue_tones, _data_response_options_vast, _data_response_options, _data_response1, vastMode, vastEndpoint, apiUrl, headers, response, data, imaPayload, numberAds;
+                    var _data_response_ima_publisherdeskima, _data_response_ima, _data_response, _data_response_options_vast_cue_tones, _data_response_options_vast, _data_response_options, _data_response1, vastMode, vastEndpoint, apiUrl, headers, response, data, imaPayload, decodedPayload, numberAds;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -4010,7 +4334,7 @@ var VmapManager = /*#__PURE__*/ function() {
                                     ];
                                 }
                                 if (this.config.vastTagUrl) {
-                                    this.apiVastTagUrl = this.config.vastTagUrl;
+                                    this.apiVastTagUrl = normalizeVastTagUrl(this.config.vastTagUrl);
                                     if (this.debug) {
                                         console.log("[StormcloudVideoPlayer] Using custom VAST tag URL:", this.apiVastTagUrl);
                                     }
@@ -4050,9 +4374,16 @@ var VmapManager = /*#__PURE__*/ function() {
                                 data = _state.sent();
                                 imaPayload = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : (_data_response_ima = _data_response.ima) === null || _data_response_ima === void 0 ? void 0 : (_data_response_ima_publisherdeskima = _data_response_ima["publisherdesk.ima"]) === null || _data_response_ima_publisherdeskima === void 0 ? void 0 : _data_response_ima_publisherdeskima.payload;
                                 if (imaPayload) {
-                                    this.apiVastTagUrl = decodeURIComponent(imaPayload);
+                                    decodedPayload = imaPayload;
+                                    try {
+                                        decodedPayload = decodeURIComponent(imaPayload);
+                                    } catch (unused) {
+                                        console.warn("[StormcloudVideoPlayer] imaPayload was not URI-encoded; using as-is:", imaPayload);
+                                    }
+                                    console.log("[StormcloudVideoPlayer] Raw VAST tag URL (from API):", decodedPayload);
+                                    this.apiVastTagUrl = normalizeVastTagUrl(decodedPayload);
                                     if (this.debug) {
-                                        console.log("[StormcloudVideoPlayer] Extracted VAST tag URL from /ads/web:", this.apiVastTagUrl);
+                                        console.log("[StormcloudVideoPlayer] Normalized VAST tag URL:", this.apiVastTagUrl);
                                     }
                                 } else {
                                     if (this.debug) {
@@ -4365,28 +4696,30 @@ var VmapManager = /*#__PURE__*/ function() {
                 for(var i = 0; i < count; i++){
                     this.adRequestPositionInBreak++;
                     var adWillPlayMuted = inAdBreak ? adPlayer.getOriginalMutedState() : this.video.muted;
-                    var ctvSignals = this.config.ctvAdRequest ? resolveCtvVastSignals() : void 0;
+                    var envSignals = resolveVastEnvironmentSignals(!!this.config.ctvAdRequest);
                     var urlWithMacros = applyVastMacros(baseUrl, {
                         correlator: generateCorrelator(),
                         streamCorrelator: this.streamCorrelator,
                         pod: this.podCounter > 0 ? this.podCounter : void 0,
                         adPosition: this.adRequestPositionInBreak,
-                        isCtv: this.config.ctvAdRequest,
-                        contentUrl: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.contentUrl,
-                        pageUrl: !this.config.ctvAdRequest && typeof window !== "undefined" ? window.location.href : void 0,
+                        isCtv: envSignals.isCtv,
+                        contentUrl: envSignals.contentUrl,
+                        pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? window.location.href : void 0,
                         adWillPlayMuted: adWillPlayMuted,
                         adWillAutoPlay: !!this.config.autoplay,
-                        appId: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.appId,
-                        appName: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.appName,
-                        sessionId: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.sessionId,
-                        deviceId: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.deviceId,
-                        deviceIdType: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.deviceIdType,
-                        limitAdTracking: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.limitAdTracking,
-                        deviceTypeHint: ctvSignals === null || ctvSignals === void 0 ? void 0 : ctvSignals.deviceTypeHint,
+                        appId: envSignals.appId,
+                        appName: envSignals.appName,
+                        sessionId: envSignals.sessionId,
+                        deviceId: envSignals.deviceId,
+                        deviceIdType: envSignals.deviceIdType,
+                        limitAdTracking: envSignals.limitAdTracking,
+                        deviceTypeHint: envSignals.deviceTypeHint,
                         adTest: this.config.adTest,
                         consent: this.consentSignals
                     });
-                    urls.push(palNonce.injectNonce(urlWithMacros));
+                    var finalUrl = palNonce.injectNonce(urlWithMacros);
+                    console.log("[StormcloudVideoPlayer] Resolved ad request URL (pod=".concat(this.podCounter, ", pos=").concat(this.adRequestPositionInBreak, "):"), finalUrl);
+                    urls.push(finalUrl);
                 }
                 return urls;
             }
@@ -4435,7 +4768,7 @@ var VmapManager = /*#__PURE__*/ function() {
             }
         }
     ]);
-    return VmapManager;
+    return AdConfigManager;
 }();
 // src/player/AdTimingService.ts
 var AdTimingService = /*#__PURE__*/ function() {
@@ -6162,7 +6495,7 @@ function resizePlayer(video, adPlayer, debug) {
 }
 // src/player/AdBreakOrchestrator.ts
 var AdBreakOrchestrator = /*#__PURE__*/ function() {
-    function AdBreakOrchestrator(host, timing, preloadPool, vmap, cueManager, placeholder) {
+    function AdBreakOrchestrator(host, timing, preloadPool, adConfig, cueManager, placeholder) {
         _class_call_check(this, AdBreakOrchestrator);
         this.inAdBreak = false;
         this.showAds = false;
@@ -6177,7 +6510,7 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
         this.host = host;
         this.timing = timing;
         this.preloadPool = preloadPool;
-        this.vmap = vmap;
+        this.adConfig = adConfig;
         this.cueManager = cueManager;
         this.placeholder = placeholder;
     }
@@ -6343,7 +6676,7 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                 }
                 this.pendingAdBreak = null;
                 this.cueManager.pendingScte35CueKey = void 0;
-                this.vmap.podAssignedByPrefetch = false;
+                this.adConfig.podAssignedByPrefetch = false;
             }
         },
         {
@@ -6357,15 +6690,15 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                scheduled = this.vmap.findCurrentOrNextBreak(this.host.video.currentTime * 1e3);
+                                scheduled = this.adConfig.findCurrentOrNextBreak(this.host.video.currentTime * 1e3);
                                 if (scheduled) {
-                                    this.vmap.consumedVmapBreakIds.add(this.vmap.getAdBreakKey(scheduled));
+                                    this.adConfig.consumedVmapBreakIds.add(this.adConfig.getAdBreakKey(scheduled));
                                 }
-                                tags = this.vmap.selectVastTagsForBreak(scheduled);
+                                tags = this.adConfig.selectVastTagsForBreak(scheduled);
                                 if (tags && tags.length > 0 && tags[0]) {
                                     baseVastUrl = tags[0];
-                                } else if (this.vmap.apiVastTagUrl) {
-                                    baseVastUrl = this.vmap.apiVastTagUrl;
+                                } else if (this.adConfig.apiVastTagUrl) {
+                                    baseVastUrl = this.adConfig.apiVastTagUrl;
                                 } else {
                                     this.clearPendingAdBreak();
                                     return [
@@ -6383,10 +6716,10 @@ var AdBreakOrchestrator = /*#__PURE__*/ function() {
                                 this.continuousFetchingActive = true;
                                 this.isShowingPlaceholder = false;
                                 this.timing.totalAdRequestsInBreak = 0;
-                                if (this.vmap.podAssignedByPrefetch) {
-                                    this.vmap.podAssignedByPrefetch = false;
+                                if (this.adConfig.podAssignedByPrefetch) {
+                                    this.adConfig.podAssignedByPrefetch = false;
                                 } else {
-                                    this.vmap.beginNewAdPod();
+                                    this.adConfig.beginNewAdPod();
                                 }
                                 currentMuted = this.host.video.muted;
                                 currentVolume = this.host.video.volume;
@@ -7658,7 +7991,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return _this.adBreak.inAdBreak;
             }
         });
-        this.vmap = new VmapManager(this.config, this.video);
+        this.adConfig = new AdConfigManager(this.config, this.video);
         this.timing = new AdTimingService(this.config, this.video, {
             onAdStopTimerFired: function onAdStopTimerFired() {
                 return _this.onAdStopTimerFired();
@@ -7738,7 +8071,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             generateVastUrls: function generateVastUrls(base, count) {
                 return _this.generateVastUrls(base, count);
             }
-        }, this.timing, this.preloadPool, this.vmap, this.cueManager, this.placeholder);
+        }, this.timing, this.preloadPool, this.adConfig, this.cueManager, this.placeholder);
     }
     _create_class(StormcloudVideoPlayer, [
         {
@@ -7766,7 +8099,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "generateVastUrls",
             value: function generateVastUrls(baseUrl, count) {
-                return this.vmap.generateVastUrlsWithCorrelators(baseUrl, count, this.adPlayer, this.palNonce, this.adBreak.inAdBreak);
+                return this.adConfig.generateVastUrlsWithCorrelators(baseUrl, count, this.adPlayer, this.palNonce, this.adBreak.inAdBreak);
             }
         },
         {
@@ -7794,7 +8127,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ]);
                                 return [
                                     4,
-                                    this.vmap.fetchAdConfiguration()
+                                    this.adConfig.fetchAdConfiguration()
                                 ];
                             case 2:
                                 _state.sent();
@@ -7821,9 +8154,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     continuousPlayback: (_this_config_lowLatencyMode = this.config.lowLatencyMode) !== null && _this_config_lowLatencyMode !== void 0 ? _this_config_lowLatencyMode : false
                                 }).catch(function() {});
                                 fetchConsentSignals().then(function(signals) {
-                                    _this.vmap.consentSignals = signals;
+                                    _this.adConfig.consentSignals = signals;
                                 }).catch(function() {});
-                                this.vmap.initializeTracking();
+                                this.adConfig.initializeTracking();
                                 if (!this.hlsEngine.shouldUseNativeHls(function() {
                                     return _this.getStreamType();
                                 })) return [
@@ -7858,14 +8191,14 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 return _async_to_generator(function() {
                     var prerollKey, adBehavior;
                     return _ts_generator(this, function(_state) {
-                        if (!this.vmap.isVmapEnabled() && !isLive && this.vmap.vmapBreaks.length === 0 && this.vmap.apiVastTagUrl) {
+                        if (!this.adConfig.isVmapEnabled() && !isLive && this.adConfig.vmapBreaks.length === 0 && this.adConfig.apiVastTagUrl) {
                             prerollKey = "synthetic-vod-preroll";
-                            if (!this.vmap.consumedVmapBreakIds.has(prerollKey)) {
-                                this.vmap.vmapBreaks = [
+                            if (!this.adConfig.consumedVmapBreakIds.has(prerollKey)) {
+                                this.adConfig.vmapBreaks = [
                                     {
                                         id: prerollKey,
                                         startTimeMs: 0,
-                                        vastTagUrl: this.vmap.apiVastTagUrl
+                                        vastTagUrl: this.adConfig.apiVastTagUrl
                                     }
                                 ];
                                 if (this.debug) {
@@ -8132,19 +8465,19 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "startAdPrefetch",
             value: function startAdPrefetch(marker, fragmentSn, cueKey) {
                 if (this.adBreak.pendingAdBreak || this.adBreak.inAdBreak) return;
-                var scheduled = this.vmap.findCurrentOrNextBreak(this.video.currentTime * 1e3);
-                var tags = this.vmap.selectVastTagsForBreak(scheduled);
+                var scheduled = this.adConfig.findCurrentOrNextBreak(this.video.currentTime * 1e3);
+                var tags = this.adConfig.selectVastTagsForBreak(scheduled);
                 var baseVastUrl;
                 if (tags && tags.length > 0 && tags[0]) {
                     baseVastUrl = tags[0];
-                } else if (this.vmap.apiVastTagUrl) {
-                    baseVastUrl = this.vmap.apiVastTagUrl;
+                } else if (this.adConfig.apiVastTagUrl) {
+                    baseVastUrl = this.adConfig.apiVastTagUrl;
                 } else {
                     if (this.debug) console.warn("[StormcloudVideoPlayer] No VAST URL available for prefetch");
                     return;
                 }
-                this.vmap.beginNewAdPod();
-                this.vmap.podAssignedByPrefetch = true;
+                this.adConfig.beginNewAdPod();
+                this.adConfig.podAssignedByPrefetch = true;
                 var generatedUrls = this.generateVastUrls(baseVastUrl, 1);
                 this.adBreak.pendingAdBreak = _object_spread_props(_object_spread({
                     marker: marker
@@ -8179,10 +8512,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "onTimeUpdate",
             value: function onTimeUpdate(currentTimeSec) {
                 var _this = this;
-                if (!this.vmap.isVmapEnabled() || this.vmap.vmapBreaks.length === 0) return;
+                if (!this.adConfig.isVmapEnabled() || this.adConfig.vmapBreaks.length === 0) return;
                 if (this.adPlayer.isAdPlaying() || this.adBreak.inAdBreak) return;
                 var nowMs = currentTimeSec * 1e3;
-                var breakToPlay = this.vmap.findBreakForTime(nowMs);
+                var breakToPlay = this.adConfig.findBreakForTime(nowMs);
                 if (breakToPlay) {
                     void this.handleVmapAdBreak(breakToPlay, nowMs).catch(function(error) {
                         if (_this.debug) {
@@ -8196,11 +8529,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "onVideoEnded",
             value: function onVideoEnded() {
                 var _this = this;
-                if (!this.vmap.isVmapEnabled() || this.vmap.vmapBreaks.length === 0) return;
+                if (!this.adConfig.isVmapEnabled() || this.adConfig.vmapBreaks.length === 0) return;
                 if (this.adPlayer.isAdPlaying() || this.adBreak.inAdBreak) return;
                 var durationMs = Number.isFinite(this.video.duration) ? Math.floor(this.video.duration * 1e3) : 0;
-                var postroll = this.vmap.vmapBreaks.find(function(b) {
-                    return b.startTimeMs === -1 && !_this.vmap.consumedVmapBreakIds.has(_this.vmap.getAdBreakKey(b));
+                var postroll = this.adConfig.vmapBreaks.find(function(b) {
+                    return b.startTimeMs === -1 && !_this.adConfig.consumedVmapBreakIds.has(_this.adConfig.getAdBreakKey(b));
                 });
                 if (postroll) {
                     void this.handleVmapAdBreak(postroll, durationMs).catch(function(error) {
@@ -8219,11 +8552,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
-                                key = this.vmap.getAdBreakKey(adBreak);
-                                if (this.vmap.consumedVmapBreakIds.has(key)) return [
+                                key = this.adConfig.getAdBreakKey(adBreak);
+                                if (this.adConfig.consumedVmapBreakIds.has(key)) return [
                                     2
                                 ];
-                                breakStartMs = this.vmap.resolveBreakStartMs(adBreak);
+                                breakStartMs = this.adConfig.resolveBreakStartMs(adBreak);
                                 if (breakStartMs == null) return [
                                     2
                                 ];
@@ -8234,8 +8567,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     3,
                                     4
                                 ];
-                                this.vmap.consumedVmapBreakIds.add(key);
-                                tags = this.vmap.selectVastTagsForBreak(adBreak);
+                                this.adConfig.consumedVmapBreakIds.add(key);
+                                tags = this.adConfig.selectVastTagsForBreak(adBreak);
                                 if (!tags || tags.length === 0) return [
                                     2
                                 ];
@@ -8427,7 +8760,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.video.removeEventListener("emptied", this.emptiedHandler);
                     delete this.emptiedHandler;
                 }
-                this.vmap.destroyTracking();
+                this.adConfig.destroyTracking();
                 this.hlsEngine.destroy();
                 (_this_adPlayer = this.adPlayer) === null || _this_adPlayer === void 0 ? void 0 : _this_adPlayer.destroy();
                 if (this.palPlaybackStarted) {