stormcloud-video-player 0.8.18 → 0.8.19

package/lib/player/{VmapManager.cjs → AdConfigManager.cjs}

@@ -306,171 +306,15 @@ var __toCommonJS = function __toCommonJS(mod) {
         value: true
     }), mod);
 };
-// src/player/VmapManager.ts
-var VmapManager_exports = {};
-__export(VmapManager_exports, {
-    VmapManager: function VmapManager1() {
-        return VmapManager;
+// src/player/AdConfigManager.ts
+var AdConfigManager_exports = {};
+__export(AdConfigManager_exports, {
+    AdConfigManager: function AdConfigManager1() {
+        return AdConfigManager;
     }
 });
-module.exports = __toCommonJS(VmapManager_exports);
-// 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 = /^(\[[^\]]*\]|\{[^}]*\}|%%[^%]*%%)$/;
-var CTV_UNSUPPORTED_PARAMS = [
-    "description_url",
-    "tfcd",
-    "npa",
-    "min_ad_duration",
-    "max_ad_duration",
-    "unviewed_position_start",
-    "impl",
-    "scor",
-    "vad_type",
-    "gdpr",
-    "gdpr_consent",
-    "us_privacy"
-];
-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);
-    if (ctx.isCtv) {
-        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-        try {
-            for(var _iterator = CTV_UNSUPPORTED_PARAMS[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;
-                }
-            }
-        }
-    } else {
-        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));
-    }
-    var requestUrl = ctx.contentUrl || ctx.pageUrl;
-    if (requestUrl) {
-        params.set("url", requestUrl);
-        if (!ctx.isCtv) {
-            params.set("description_url", requestUrl);
-        }
-    }
-    if (ctx.adWillPlayMuted != null) {
-        params.set("vpmute", ctx.adWillPlayMuted ? "1" : "0");
-    }
-    if (ctx.adWillAutoPlay != null) {
-        params.set("vpa", ctx.adWillAutoPlay ? "auto" : "click");
-    }
-    if (ctx.appId) {
-        params.set("msid", ctx.appId);
-    }
-    if (ctx.appName) {
-        params.set("an", ctx.appName);
-    }
-    if (ctx.sessionId) {
-        params.set("sid", ctx.sessionId);
-    }
-    if (ctx.deviceTypeHint != null) {
-        params.set("dth", String(ctx.deviceTypeHint));
-    } 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");
-    }
-    if (!ctx.isCtv) {
-        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 _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-    try {
-        for(var _iterator1 = staleKeys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-            var key1 = _step1.value;
-            params.delete(key1);
-        }
-    } catch (err) {
-        _didIteratorError1 = true;
-        _iteratorError1 = err;
-    } finally{
-        try {
-            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                _iterator1.return();
-            }
-        } finally{
-            if (_didIteratorError1) {
-                throw _iteratorError1;
-            }
-        }
-    }
-    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);
-}
-// src/utils/ctvVastSignals.ts
+module.exports = __toCommonJS(AdConfigManager_exports);
+// src/utils/vastEnvironmentSignals.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";
@@ -484,28 +328,66 @@ var DEVICE_ID_STORAGE_KEYS = [
     "aaid",
     "adid",
     "rida",
-    "tifa"
+    "tifa",
+    "lgudid"
 ];
-function resolveCtvVastSignals() {
+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") || 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()
+    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") || AIRY_ANDROID_APP_ID,
+            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
-    } : {}, deviceId && deviceIdType ? {
+    } : {}, 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
-    });
+    } : {}, 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);
@@ -538,7 +420,10 @@ function readNativeBridgeSignals() {
         window.__STORMCLOUD_CTV__,
         window.stormcloudCtv,
         window.AiryTV,
-        window.Android
+        window.Android,
+        window.webOS,
+        window.tizen,
+        window.amazon
     ].filter(Boolean);
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
@@ -550,18 +435,36 @@ function readNativeBridgeSignals() {
                 "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"
+                "deviceId",
+                "lgudid",
+                "LGUDID",
+                "tifa",
+                "rida",
+                "afai",
+                "aaid"
             ]) || void 0;
-            if (!contentUrl && !deviceId) continue;
+            if (!contentUrl && !deviceId && !appId && !appName) continue;
             var deviceIdType = readBridgeValue(source, [
                 "idtype",
                 "deviceIdType",
-                "advertisingIdType"
+                "advertisingIdType",
+                "idType"
             ]) || inferDeviceIdType();
             var limitAdTracking = readBridgeBoolean(source, [
                 "is_lat",
@@ -571,6 +474,10 @@ function readNativeBridgeSignals() {
             ]);
             return _object_spread({}, contentUrl ? {
                 contentUrl: contentUrl
+            } : {}, appId ? {
+                appId: appId
+            } : {}, appName ? {
+                appName: appName
             } : {}, deviceId ? {
                 deviceId: deviceId
             } : {}, deviceId && deviceIdType ? {
@@ -723,18 +630,400 @@ function normalizeBoolean(value) {
     }
     return void 0;
 }
-function inferDeviceIdType() {
-    if (typeof navigator === "undefined") {
-        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",
+    "npa",
+    "min_ad_duration",
+    "max_ad_duration",
+    "unviewed_position_start",
+    "impl",
+    "scor",
+    "vad_type",
+    "gdpr",
+    "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;
+        }
     }
-    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;
+];
+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);
+        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(normalizeVastTagUrl(expandedUrl));
+    } catch (unused) {
+        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;
+        try {
+            for(var _iterator = CTV_UNSUPPORTED_PARAMS[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;
+                }
+            }
+        }
+    } else {
+        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));
+    }
+    var requestUrl = ctx.contentUrl || ctx.pageUrl;
+    if (requestUrl) {
+        params.set("url", requestUrl);
+        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");
+    }
+    if (ctx.adWillAutoPlay != null) {
+        params.set("vpa", ctx.adWillAutoPlay ? "auto" : "click");
+    }
+    if (ctx.appId) {
+        params.set("msid", ctx.appId);
+    }
+    if (ctx.appName) {
+        removeBrokenAppNameOrphans(params, ctx.appName);
+        params.set("an", ctx.appName);
+    }
+    if (ctx.sessionId) {
+        params.set("sid", ctx.sessionId);
+    }
+    if (ctx.deviceTypeHint != null) {
+        params.set("dth", String(ctx.deviceTypeHint));
+    } else if (ctx.isCtv) {
+        params.set("dth", "5");
+    }
+    applyDeviceIdentityParams(params, ctx);
+    if (!ctx.isCtv) {
+        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 (isMacroPlaceholder(value)) {
+            staleKeys.push(key);
+        }
+    });
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+    try {
+        for(var _iterator1 = staleKeys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var key1 = _step1.value;
+            params.delete(key1);
+        }
+    } catch (err) {
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
+            }
+        } finally{
+            if (_didIteratorError1) {
+                throw _iteratorError1;
+            }
+        }
+    }
+    removeBrokenAppNameOrphans(params, ctx.appName);
+    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);
 }
 // src/utils/mqttConfig.ts
 var DEFAULT_MQTT_CONFIG = {
@@ -1195,10 +1484,10 @@ function sendHeartbeat(_0) {
         });
     }).apply(this, arguments);
 }
-// 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();
@@ -1210,7 +1499,7 @@ var VmapManager = /*#__PURE__*/ function() {
         this.config = config;
         this.video = video;
     }
-    _create_class(VmapManager, [
+    _create_class(AdConfigManager, [
         {
             key: "debug",
             get: function get() {
@@ -1272,7 +1561,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);
                                     }
@@ -1312,7 +1601,7 @@ 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);
+                                    this.apiVastTagUrl = normalizeVastTagUrl(imaPayload);
                                     if (this.debug) {
                                         console.log("[StormcloudVideoPlayer] Extracted VAST tag URL from /ads/web:", this.apiVastTagUrl);
                                     }
@@ -1627,24 +1916,24 @@ 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
                     });
@@ -1697,10 +1986,10 @@ var VmapManager = /*#__PURE__*/ function() {
             }
         }
     ]);
-    return VmapManager;
+    return AdConfigManager;
 }();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-    VmapManager: VmapManager
+    AdConfigManager: AdConfigManager
 });
-//# sourceMappingURL=VmapManager.cjs.map
+//# sourceMappingURL=AdConfigManager.cjs.map