stormcloud-video-player 0.8.73 → 0.8.75

package/lib/player/AdBreakOrchestrator.d.cts

@@ -4,6 +4,7 @@ import { AdTimingService } from './AdTimingService.cjs';
 import { AdConfigManager } from './AdConfigManager.cjs';
 import { Scte35CueManager } from './Scte35CueManager.cjs';
 import { PlaceholderLayer } from './PlaceholderLayer.cjs';
+import './OptimizedPodRequest.cjs';
 import '../sdk/pal.cjs';
 import '../utils/vastMacros.cjs';
 import './playerTypes.cjs';
@@ -21,8 +22,8 @@ interface AdBreakOrchestratorHost {
     reloadLiveStream(): void;
     recoverMediaError(): void;
     requiresMediaPipelineResetAfterAds(): boolean;
-    generatePodVastUrl(baseUrl: string, breakDurationMs?: number): string;
-    /** Validated Edge pod URL, or undefined when Edge-first is disabled. */
+    generatePodVastUrl(baseUrl: string): string;
+    completeGamRequestSignals(url: string): Promise<string>;
     getEdgePodBaseUrl(): string | undefined;
     getFloorSnapshot(position: AdPosition): OpportunityFloor | undefined;
     onAdClick(): void;
@@ -88,12 +89,6 @@ declare class AdBreakOrchestrator {
     private isLiveBreak;
     private canRequestEdge;
     private markEdgeExhausted;
-    /**
-     * Builds the next Edge request from the budget left right now, or marks Edge
-     * exhausted for this break. Synchronous on purpose: callers must reach the
-     * REQUESTING state in the same tick so a second completion event cannot race
-     * in a parallel request.
-     */
     private prepareEdgePodRequest;
     private runEdgePod;
     private continueAfterEdgeOutcome;
@@ -112,7 +107,10 @@ declare class AdBreakOrchestrator {
     private recordRequestFailure;
     private recordRequestDiagnostic;
     private finalizeRequestDiagnostics;
-    private withCurrentPodBudget;
+    private createGamDispatchFinalizer;
+    private logPodDispatch;
+    private recordPodResponseDiagnostics;
+    private handlePodRequestNotSent;
     private opportunityFloorFields;
     private requestFloorFields;
     private applyOpportunityFloor;

package/lib/player/AdConfigManager.cjs

@@ -328,21 +328,20 @@ var ANDROID_ID_TYPES = /* @__PURE__ */ new Set([
     "adid"
 ]);
 function resolveVastEnvironmentSignals(isCtv) {
-    var _ref;
     var bridgeSignals = readNativeBridgeSignals();
     var platformDevice = readPlatformNativeDeviceId();
-    var realDeviceId = bridgeSignals.deviceId || (isCtv ? readStoredDeviceId() : void 0) || platformDevice.deviceId;
+    var bridgeDeviceId = validDeviceId(bridgeSignals.deviceId);
+    var realDeviceId = bridgeDeviceId || (isCtv ? validDeviceId(readStoredDeviceId()) : void 0) || validDeviceId(platformDevice.deviceId);
     var deviceId = realDeviceId;
-    var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || readStoredString("idtype") || platformDevice.deviceIdType || inferDeviceIdType();
-    var platformLat = bridgeSignals.deviceId ? bridgeSignals.limitAdTracking : platformDevice.limitAdTracking;
-    var limitAdTracking = deviceId != null ? (_ref = platformLat !== null && platformLat !== void 0 ? platformLat : readStoredLimitAdTracking()) !== null && _ref !== void 0 ? _ref : false : void 0;
+    var deviceIdType = (bridgeDeviceId ? bridgeSignals.deviceIdType : void 0) || readStoredString("deviceIdType") || readStoredString("idtype") || platformDevice.deviceIdType || inferDeviceIdType();
+    var platformLat = bridgeDeviceId ? bridgeSignals.limitAdTracking : platformDevice.limitAdTracking;
+    var limitAdTracking = deviceId != null ? platformLat !== null && platformLat !== void 0 ? platformLat : readStoredLimitAdTracking() : void 0;
     if (!deviceId && isCtv) {
         var dpid = getOrCreateStoredUuid(PLAYER_ID_STORAGE_KEY);
         if (dpid) {
-            var _ref1;
             deviceId = dpid;
             deviceIdType = "dpid";
-            limitAdTracking = (_ref1 = platformLat !== null && platformLat !== void 0 ? platformLat : readStoredLimitAdTracking()) !== null && _ref1 !== void 0 ? _ref1 : false;
+            limitAdTracking = platformLat !== null && platformLat !== void 0 ? platformLat : readStoredLimitAdTracking();
         }
     }
     var deviceTypeHint = resolveDeviceTypeHint(isCtv);
@@ -707,6 +706,9 @@ function isMacroPlaceholder(value) {
     var t = value.trim();
     return !t || /^(\[[^\]]*\]|\{[^}]*\}|%%[^%]*%%)$/.test(t) || /^(unknown|null|undefined|none|n\/a|\$\{[^}]+\})$/i.test(t) || ZEROED_AD_ID_PATTERNS.has(t.toLowerCase());
 }
+function validDeviceId(value) {
+    return value && !isMacroPlaceholder(value) ? value : void 0;
+}
 function isZeroedAdId(value) {
     return ZEROED_AD_ID_PATTERNS.has(value.trim().toLowerCase());
 }
@@ -1239,6 +1241,192 @@ function ensureVideoAdType(rawUrl) {
         return rawUrl;
     }
 }
+var SCVP_MACRO_DETECT = /\[SCVP-|%5BSCVP-|\(SCVP-|%28SCVP-/i;
+var SCVP_MACRO_PATTERN = /\[SCVP-([A-Z0-9-]+)\]|\(SCVP-([A-Z0-9-]+)\)/gi;
+var SCVP_WHOLE_VALUE_PATTERN = /^\s*(?:\[SCVP-([A-Z0-9-]+)\]|\(SCVP-([A-Z0-9-]+)\))\s*$/i;
+var NESTED_QUERY_PARAM_KEYS = /* @__PURE__ */ new Set([
+    "cust_params"
+]);
+var SCVP_POD_MACROS = /* @__PURE__ */ new Set([
+    "PMND",
+    "PMXD",
+    "PMAD"
+]);
+function hasScvpMacros(url) {
+    return !!url && SCVP_MACRO_DETECT.test(url);
+}
+function safeDecode(value) {
+    try {
+        return decodeURIComponent(value.replace(/\+/g, " "));
+    } catch (unused) {
+        return value;
+    }
+}
+function findScvpMacroNames(url) {
+    if (!url) return [];
+    var names = /* @__PURE__ */ new Set();
+    var text = url;
+    for(var pass = 0; pass < 3; pass++){
+        text.replace(SCVP_MACRO_PATTERN, function(_m, bracketName, parenName) {
+            names.add(String(bracketName || parenName).toUpperCase());
+            return "";
+        });
+        var decoded = safeDecode(text);
+        if (decoded === text) break;
+        text = decoded;
+    }
+    return Array.from(names);
+}
+function resolveScvpMacroValues(ctx) {
+    var _ctx_deviceId, _ctx_deviceIdType, _ctx_consent, _ctx_consent1, _ctx_consent2;
+    var values = /* @__PURE__ */ new Map();
+    var set = function set(name, value) {
+        if (value == null) return;
+        var str = String(value).trim();
+        if (str) values.set(name, str);
+    };
+    var toFlag = function toFlag(value) {
+        return value == null ? void 0 : value ? "1" : "0";
+    };
+    var deviceId = (_ctx_deviceId = ctx.deviceId) === null || _ctx_deviceId === void 0 ? void 0 : _ctx_deviceId.trim();
+    var deviceIdType = deviceId ? ((_ctx_deviceIdType = ctx.deviceIdType) === null || _ctx_deviceIdType === void 0 ? void 0 : _ctx_deviceIdType.trim()) || inferDeviceIdType() : void 0;
+    if (deviceId && deviceIdType) {
+        var _toFlag;
+        set("RDID", deviceId);
+        set("IDTYPE", deviceIdType);
+        set("IS-LAT", (_toFlag = toFlag(ctx.limitAdTracking)) !== null && _toFlag !== void 0 ? _toFlag : "0");
+    }
+    set("SID", ctx.sessionId);
+    set("DTH", ctx.deviceTypeHint);
+    set("GIVN", ctx.palNonce);
+    set("CT-TI", ctx.programTitle);
+    set("CT-CH", ctx.channelName);
+    set("POD", ctx.pod);
+    set("CORRELATOR", ctx.correlator);
+    set("SCOR", ctx.streamCorrelator);
+    set("VPMUTE", toFlag(ctx.adWillPlayMuted));
+    if (ctx.adWillAutoPlay != null) {
+        set("VPA", ctx.adWillAutoPlay ? "auto" : "click");
+    }
+    set("GDPR", (_ctx_consent = ctx.consent) === null || _ctx_consent === void 0 ? void 0 : _ctx_consent.gdpr);
+    set("GDPR-CONSENT", (_ctx_consent1 = ctx.consent) === null || _ctx_consent1 === void 0 ? void 0 : _ctx_consent1.gdprConsent);
+    set("US-PRIVACY", (_ctx_consent2 = ctx.consent) === null || _ctx_consent2 === void 0 ? void 0 : _ctx_consent2.usPrivacy);
+    return values;
+}
+var keepNone = function keepNone() {
+    return false;
+};
+function substituteScvpParams(params, values, unresolved, keep, nested) {
+    var out = [];
+    var replaceMacro = function replaceMacro(match, bracketName, parenName) {
+        var name = String(bracketName || parenName).toUpperCase();
+        var value = values.get(name);
+        if (value != null) return value;
+        if (keep(name)) return match;
+        unresolved.add(name);
+        return "";
+    };
+    params.forEach(function(value, key) {
+        var whole = value.match(SCVP_WHOLE_VALUE_PATTERN);
+        if (whole) {
+            var name = String(whole[1] || whole[2]).toUpperCase();
+            var resolved = values.get(name);
+            if (resolved != null) {
+                out.push([
+                    key,
+                    resolved
+                ]);
+            } else if (keep(name)) {
+                out.push([
+                    key,
+                    value
+                ]);
+            } else {
+                unresolved.add(name);
+            }
+            return;
+        }
+        if (!SCVP_MACRO_DETECT.test(value)) {
+            out.push([
+                key,
+                value
+            ]);
+            return;
+        }
+        if (!nested && NESTED_QUERY_PARAM_KEYS.has(key)) {
+            var inner = substituteScvpParams(new URLSearchParams(value), values, unresolved, keep, true);
+            if (inner.length > 0) {
+                out.push([
+                    key,
+                    inner.map(function(param) {
+                        var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
+                        return "".concat(encodeURIComponent(k), "=").concat(encodeURIComponent(v));
+                    }).join("&")
+                ]);
+            }
+            return;
+        }
+        out.push([
+            key,
+            value.replace(SCVP_MACRO_PATTERN, replaceMacro)
+        ]);
+    });
+    return out;
+}
+function substituteScvpMacros(baseUrl, values) {
+    var keep = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : keepNone;
+    var unresolved = /* @__PURE__ */ new Set();
+    var url;
+    try {
+        url = new URL(normalizeVastTagUrl(baseUrl));
+    } catch (unused) {
+        var replaced = baseUrl.replace(SCVP_MACRO_PATTERN, function(match, bracketName, parenName) {
+            var name = String(bracketName || parenName).toUpperCase();
+            var value = values.get(name);
+            if (value != null) return encodeURIComponent(value);
+            if (keep(name)) return match;
+            unresolved.add(name);
+            return "";
+        });
+        return {
+            url: replaced,
+            unresolved: Array.from(unresolved)
+        };
+    }
+    var entries = substituteScvpParams(url.searchParams, values, unresolved, keep, false);
+    var search = new URLSearchParams();
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], value = _step_value[1];
+            search.append(key, value);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    url.search = search.toString();
+    return {
+        url: url.toString(),
+        unresolved: Array.from(unresolved)
+    };
+}
+function applyScvpMacros(baseUrl, ctx) {
+    var deferred = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : /* @__PURE__ */ new Set();
+    return substituteScvpMacros(baseUrl, resolveScvpMacroValues(ctx), function(name) {
+        return deferred.has(name);
+    });
+}
 function applyVastMacros(baseUrl, ctx) {
     var expandedUrl = expandInlineMacroPlaceholders(baseUrl, ctx);
     var url;
@@ -1280,15 +1468,6 @@ function applyVastMacros(baseUrl, ctx) {
     }
     params.delete("ppos");
     params.delete("lip");
-    if (ctx.podMinDurationMs != null) {
-        params.set("pmnd", String(Math.max(0, Math.round(ctx.podMinDurationMs))));
-    }
-    if (ctx.podMaxDurationMs != null) {
-        params.set("pmxd", String(Math.max(0, Math.round(ctx.podMaxDurationMs))));
-    }
-    if (ctx.podMaxAds != null) {
-        params.set("pmad", String(Math.max(1, Math.round(ctx.podMaxAds))));
-    }
     var existingUrl = params.get("url") || "";
     if (EXAMPLE_COM_URL.test(existingUrl)) {
         params.delete("url");
@@ -1380,6 +1559,25 @@ function replaceCorrelatorFallback(baseUrl, correlator) {
     var sep = baseUrl.includes("?") ? "&" : "?";
     return "".concat(baseUrl).concat(sep, "correlator=").concat(correlator);
 }
+// src/player/OptimizedPodRequest.ts
+var DEFAULT_REQUEST_SAFETY_MS = 1500;
+function nonNegativeInt(value) {
+    return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.floor(value) : void 0;
+}
+function positiveInt(value) {
+    return typeof value === "number" && Number.isFinite(value) && value >= 1 ? Math.floor(value) : void 0;
+}
+function resolveAdPodConfig(config) {
+    var _config_adPodConfig, _nonNegativeInt, _nonNegativeInt1, _positiveInt;
+    var pod = (_config_adPodConfig = config.adPodConfig) !== null && _config_adPodConfig !== void 0 ? _config_adPodConfig : {};
+    return {
+        requestSafetyMs: (_nonNegativeInt = nonNegativeInt(pod.requestSafetyMs)) !== null && _nonNegativeInt !== void 0 ? _nonNegativeInt : DEFAULT_REQUEST_SAFETY_MS,
+        minPodDurationMs: (_nonNegativeInt1 = nonNegativeInt(pod.minPodDurationMs)) !== null && _nonNegativeInt1 !== void 0 ? _nonNegativeInt1 : 0,
+        maxAdsPerBreak: pod.maxAdsPerBreak === void 0 ? positiveInt(config.podMaxAds) : positiveInt(pod.maxAdsPerBreak),
+        maxPodDurationMs: (_positiveInt = positiveInt(pod.maxPodDurationMs)) !== null && _positiveInt !== void 0 ? _positiveInt : positiveInt(config.podMaxDurationMs),
+        exactDuration: config.podExactDuration === true
+    };
+}
 // src/utils/devUrl.ts
 var PRIVATE_HOST_PATTERNS = [
     /^localhost$/i,
@@ -1496,7 +1694,14 @@ function ingestPlayerTracking(licenseKey, channel, body) {
 // src/utils/tracking.ts
 var cachedBrowserId = null;
 function buildAnalyticsContext(config) {
+    var _config_contentNetwork, _config_channelName, _config_programTitle;
     var context = {};
+    var contentNetwork = (_config_contentNetwork = config.contentNetwork) === null || _config_contentNetwork === void 0 ? void 0 : _config_contentNetwork.trim();
+    var contentChannel = (_config_channelName = config.channelName) === null || _config_channelName === void 0 ? void 0 : _config_channelName.trim();
+    var contentTitle = (_config_programTitle = config.programTitle) === null || _config_programTitle === void 0 ? void 0 : _config_programTitle.trim();
+    if (contentNetwork) context.contentNetwork = contentNetwork;
+    if (contentChannel) context.contentChannel = contentChannel;
+    if (contentTitle) context.contentTitle = contentTitle;
     if (config.debugAdTiming) {
         context.debugAdTiming = true;
     }
@@ -1913,6 +2118,21 @@ function sendHeartbeat(_0) {
     }).apply(this, arguments);
 }
 // src/player/AdConfigManager.ts
+function withDeferredPodParams(rawUrl, deferNonce) {
+    try {
+        var url = new URL(rawUrl);
+        url.searchParams.set("pmnd", "[SCVP-PMND]");
+        url.searchParams.set("pmxd", "[SCVP-PMXD]");
+        url.searchParams.set("pmad", "[SCVP-PMAD]");
+        if (deferNonce && !url.searchParams.get("givn")) {
+            url.searchParams.delete("paln");
+            url.searchParams.set("givn", "[SCVP-GIVN]");
+        }
+        return url.toString();
+    } catch (unused) {
+        return rawUrl;
+    }
+}
 var AdConfigManager = /*#__PURE__*/ function() {
     function AdConfigManager(config, video) {
         _class_call_check(this, AdConfigManager);
@@ -1923,8 +2143,8 @@ var AdConfigManager = /*#__PURE__*/ function() {
         this.podCounter = 0;
         this.podAssignedByPrefetch = false;
         this.lastHeartbeatTime = 0;
-        this.defaultPodMaxAds = 6;
-        this.defaultPodMaxDurationMs = 12e4;
+        this.defaultEdgePodMaxAds = 6;
+        this.palNonceDispatchWaitMs = 1500;
         this.config = config;
         this.video = video;
     }
@@ -1952,7 +2172,7 @@ var AdConfigManager = /*#__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, decodedPayload, 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, apiUrl, headers, response, data, imaPayload, decodedPayload, numberAds;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -1973,28 +2193,6 @@ var AdConfigManager = /*#__PURE__*/ function() {
                                     2
                                 ];
                             case 2:
-                                vastMode = this.config.vastMode || "default";
-                                if (this.debug) {
-                                    console.log("[StormcloudVideoPlayer] VAST mode:", vastMode);
-                                }
-                                if (vastMode === "adstorm") {
-                                    if (!this.config.licenseKey) {
-                                        if (this.debug) {
-                                            console.warn("[StormcloudVideoPlayer] AdStorm mode requires a license key");
-                                        }
-                                        return [
-                                            2
-                                        ];
-                                    }
-                                    vastEndpoint = "https://adstorm.co/api-adstorm-dev/adstorm/vast/".concat(this.config.licenseKey);
-                                    this.apiVastTagUrl = vastEndpoint;
-                                    if (this.debug) {
-                                        console.log("[StormcloudVideoPlayer] Using AdStorm VAST endpoint (adstorm mode):", vastEndpoint);
-                                    }
-                                    return [
-                                        2
-                                    ];
-                                }
                                 if (this.config.vastTagUrl) {
                                     this.apiVastTagUrl = normalizeVastTagUrl(this.config.vastTagUrl);
                                     if (this.debug) {
@@ -2004,7 +2202,7 @@ var AdConfigManager = /*#__PURE__*/ function() {
                                         2
                                     ];
                                 }
-                                apiUrl = "https://adstorm.co/api-adstorm-dev/adstorm/ads/web";
+                                apiUrl = "https://edge.stormcloudhub.com/api/v1/adstorm/ads/web";
                                 if (this.debug) {
                                     console.log("[StormcloudVideoPlayer] Fetching ad configuration from:", apiUrl);
                                 }
@@ -2351,16 +2549,16 @@ var AdConfigManager = /*#__PURE__*/ function() {
             }
         },
         {
-            key: "resolvePodParams",
-            value: function resolvePodParams(breakDurationMs) {
-                var maxDurationMs = breakDurationMs != null && breakDurationMs > 0 ? breakDurationMs : this.config.podMaxDurationMs != null && this.config.podMaxDurationMs > 0 ? this.config.podMaxDurationMs : this.defaultPodMaxDurationMs;
-                var maxAds = this.config.podMaxAds && this.config.podMaxAds > 0 ? this.config.podMaxAds : this.apiNumberAds && this.apiNumberAds > 0 ? this.apiNumberAds : this.defaultPodMaxAds;
-                var minDurationMs = this.config.podExactDuration && maxDurationMs != null ? maxDurationMs : 0;
-                return {
-                    maxAds: maxAds,
-                    minDurationMs: minDurationMs,
-                    maxDurationMs: maxDurationMs
-                };
+            key: "resolveAdPodConfig",
+            value: function resolveAdPodConfig1() {
+                return resolveAdPodConfig(this.config);
+            }
+        },
+        {
+            key: "resolveEdgeMaxAds",
+            value: function resolveEdgeMaxAds() {
+                var _this_resolveAdPodConfig_maxAdsPerBreak;
+                return (_this_resolveAdPodConfig_maxAdsPerBreak = this.resolveAdPodConfig().maxAdsPerBreak) !== null && _this_resolveAdPodConfig_maxAdsPerBreak !== void 0 ? _this_resolveAdPodConfig_maxAdsPerBreak : this.apiNumberAds && this.apiNumberAds > 0 ? this.apiNumberAds : this.defaultEdgePodMaxAds;
             }
         },
         {
@@ -2377,17 +2575,13 @@ var AdConfigManager = /*#__PURE__*/ function() {
         },
         {
             key: "generatePodVastUrl",
-            value: function generatePodVastUrl(baseUrl, podParams, adPlayer, palNonce, inAdBreak) {
-                var _podParams_maxDurationMs;
+            value: function generatePodVastUrl(baseUrl, adPlayer, palNonce, inAdBreak) {
                 var adWillPlayMuted = inAdBreak ? adPlayer.getOriginalMutedState() : this.video.muted;
                 var envSignals = resolveVastEnvironmentSignals(!!this.config.ctvAdRequest);
-                var urlWithMacros = applyVastMacros(baseUrl, _object_spread_props(_object_spread({
+                var macroContext = _object_spread_props(_object_spread({
                     correlator: this.viewCorrelator,
                     streamCorrelator: this.streamCorrelator,
                     pod: this.podCounter > 0 ? this.podCounter : void 0,
-                    podMaxAds: podParams.maxAds,
-                    podMinDurationMs: podParams.minDurationMs,
-                    podMaxDurationMs: podParams.maxDurationMs,
                     isCtv: envSignals.isCtv,
                     pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? toDevSafeUrl(window.location.href) : void 0,
                     adWillPlayMuted: adWillPlayMuted,
@@ -2403,13 +2597,72 @@ var AdConfigManager = /*#__PURE__*/ function() {
                 } : {}, this.config.channelName ? {
                     channelName: this.config.channelName
                 } : {}), {
-                    consent: this.consentSignals
-                }));
-                var finalUrl = palNonce.injectNonce(ensureVideoAdType(urlWithMacros));
-                console.log("[StormcloudVideoPlayer] Resolved optimized-pod request URL (pod=".concat(this.podCounter, ", pmad=").concat(podParams.maxAds, ", pmnd=").concat(podParams.minDurationMs, ", pmxd=").concat((_podParams_maxDurationMs = podParams.maxDurationMs) !== null && _podParams_maxDurationMs !== void 0 ? _podParams_maxDurationMs : "?", "):"), finalUrl);
+                    consent: this.consentSignals,
+                    palNonce: palNonce.getCurrentNonce() || void 0
+                });
+                var nonceReady = !!macroContext.palNonce;
+                var finalUrl;
+                if (hasScvpMacros(baseUrl)) {
+                    var deferred = new Set(SCVP_POD_MACROS);
+                    if (!nonceReady) deferred.add("GIVN");
+                    var _applyScvpMacros = applyScvpMacros(baseUrl, macroContext, deferred), url = _applyScvpMacros.url, unresolved = _applyScvpMacros.unresolved;
+                    if (unresolved.length > 0) {
+                        console.warn("[StormcloudVideoPlayer] Unresolved SCVP macros (removed from request):", unresolved.join(", "));
+                    }
+                    finalUrl = ensureVideoAdType(url);
+                } else {
+                    finalUrl = withDeferredPodParams(palNonce.injectNonce(ensureVideoAdType(applyVastMacros(baseUrl, macroContext))), !nonceReady);
+                }
+                console.log("[StormcloudVideoPlayer] Prepared optimized-pod request URL (pod=".concat(this.podCounter, "; pmnd/pmxd/pmad resolved at dispatch):"), finalUrl);
                 return finalUrl;
             }
         },
+        {
+            key: "completeDeferredRequestSignals",
+            value: function completeDeferredRequestSignals(url, palNonce) {
+                return _async_to_generator(function() {
+                    var nonce, _tmp;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (findScvpMacroNames(url).indexOf("GIVN") === -1) return [
+                                    2,
+                                    url
+                                ];
+                                _tmp = palNonce.getCurrentNonce();
+                                if (_tmp) return [
+                                    3,
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    palNonce.waitForNonce(this.palNonceDispatchWaitMs)
+                                ];
+                            case 1:
+                                _tmp = _state.sent();
+                                _state.label = 2;
+                            case 2:
+                                nonce = _tmp;
+                                if (!nonce) return [
+                                    2,
+                                    url
+                                ];
+                                return [
+                                    2,
+                                    substituteScvpMacros(url, /* @__PURE__ */ new Map([
+                                        [
+                                            "GIVN",
+                                            nonce
+                                        ]
+                                    ]), function(name) {
+                                        return name !== "GIVN";
+                                    }).url
+                                ];
+                        }
+                    });
+                }).call(this);
+            }
+        },
         {
             // --- Tracking ---
             key: "initializeTracking",