stormcloud-video-player 0.8.73 → 0.8.74

package/lib/props.d.cts

@@ -1,6 +1,7 @@
 import { CSSProperties } from 'react';
 import { StormcloudVideoPlayer } from './player/StormcloudVideoPlayer.cjs';
 import './types.cjs';
+import './player/OptimizedPodRequest.cjs';
 import './player/FloorLadder.cjs';
 
 interface OnProgressProps {

package/lib/sdk/hlsAdPlayer.cjs

@@ -300,6 +300,9 @@ var hlsAdPlayer_exports = {};
 __export(hlsAdPlayer_exports, {
     createHlsAdPlayer: function createHlsAdPlayer1() {
         return createHlsAdPlayer;
+    },
+    resetGamCredentialsMode: function resetGamCredentialsMode1() {
+        return resetGamCredentialsMode;
     }
 });
 module.exports = __toCommonJS(hlsAdPlayer_exports);
@@ -570,6 +573,268 @@ function substituteVastTrackingMacros(url) {
         return KNOWN_VAST_MACROS.has(name) ? "" : match;
     });
 }
+// src/utils/vastEnvironmentSignals.ts
+var DEVICE_TYPE_HINT = {
+    FEATURE_PHONE: 1,
+    SMARTPHONE: 2,
+    DESKTOP: 3,
+    TABLET: 4,
+    CONNECTED_TV: 5,
+    GAME_CONSOLE: 6,
+    SET_TOP_BOX: 7
+};
+var DEVICE_TYPE_HINT_ALIASES = {
+    featurephone: DEVICE_TYPE_HINT.FEATURE_PHONE,
+    smartphone: DEVICE_TYPE_HINT.SMARTPHONE,
+    mobile: DEVICE_TYPE_HINT.SMARTPHONE,
+    phone: DEVICE_TYPE_HINT.SMARTPHONE,
+    desktop: DEVICE_TYPE_HINT.DESKTOP,
+    pc: DEVICE_TYPE_HINT.DESKTOP,
+    tablet: DEVICE_TYPE_HINT.TABLET,
+    ctv: DEVICE_TYPE_HINT.CONNECTED_TV,
+    tv: DEVICE_TYPE_HINT.CONNECTED_TV,
+    connectedtv: DEVICE_TYPE_HINT.CONNECTED_TV,
+    smarttv: DEVICE_TYPE_HINT.CONNECTED_TV,
+    console: DEVICE_TYPE_HINT.GAME_CONSOLE,
+    gameconsole: DEVICE_TYPE_HINT.GAME_CONSOLE,
+    stb: DEVICE_TYPE_HINT.SET_TOP_BOX,
+    settopbox: DEVICE_TYPE_HINT.SET_TOP_BOX
+};
+var PERSISTENT_ID_COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 5;
+// src/utils/vastMacros.ts
+var INVALID_VAST_PARAM_KEY = /^\s|\s$/;
+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.replace(/^\s+/, "");
+                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.replace(/\s+$/, "")
+                ].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;
+    }
+}
+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"
+]);
+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);
+}
+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 stripScvpMacros(url) {
+    if (findScvpMacroNames(url).length === 0) return {
+        url: url,
+        unresolved: []
+    };
+    return substituteScvpMacros(url, /* @__PURE__ */ new Map());
+}
+// src/player/OptimizedPodRequest.ts
+function isPodRequestAbortedError(error) {
+    return !!error && error.podRequestAborted === true;
+}
 // src/sdk/hlsAdPlayer.ts
 var LINEAR_TRACKING_EVENTS = [
     "creativeView",
@@ -650,6 +915,10 @@ function toVastMediaErrorCode(error) {
             return VAST_ERROR_MEDIA_DISPLAY;
     }
 }
+var gamCredentialsMode = "include";
+function resetGamCredentialsMode() {
+    gamCredentialsMode = "include";
+}
 function createHlsAdPlayer(contentVideo, options) {
     var _contentVideo_AD_VIDEO_PROP, _contentVideo_AD_CONTAINER_PROP, _ref;
     var adPlaying = false;
@@ -1521,9 +1790,9 @@ function createHlsAdPlayer(contentVideo, options) {
         }
     }
     function fetchVastXml(vastTagUrl) {
-        var credentials = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "include", kind = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "gam";
+        var credentials = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "include", kind = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "gam", finalizeRequestUrl = arguments.length > 3 ? arguments[3] : void 0;
         return _async_to_generator(function() {
-            var controller, timeoutId, startedAt, attempt, requestVast, response, error, error1;
+            var controller, timeoutId, startedAt, attempt, resolveDispatchUrl, requestVast, response, error, error1;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -1537,13 +1806,32 @@ function createHlsAdPlayer(contentVideo, options) {
                         }, VAST_REQUEST_TIMEOUT_MS) : void 0;
                         startedAt = Date.now();
                         attempt = 0;
+                        resolveDispatchUrl = function resolveDispatchUrl() {
+                            if (kind === "wrapper") return vastTagUrl;
+                            if (finalizeRequestUrl) return finalizeRequestUrl(vastTagUrl, attempt);
+                            var _stripScvpMacros = stripScvpMacros(vastTagUrl), url = _stripScvpMacros.url, unresolved = _stripScvpMacros.unresolved;
+                            if (unresolved.length > 0) {
+                                console.warn("[HlsAdPlayer] Removed unresolved SCVP macros before dispatch:", unresolved.join(", "));
+                            }
+                            return url;
+                        };
                         requestVast = function requestVast(creds) {
                             return _async_to_generator(function() {
-                                var response;
+                                var pending, response;
                                 return _ts_generator(this, function(_state) {
                                     switch(_state.label){
                                         case 0:
                                             attempt++;
+                                            pending = fetch(resolveDispatchUrl(), _object_spread({
+                                                mode: "cors",
+                                                credentials: creds,
+                                                headers: {
+                                                    "Accept": "application/xml, text/xml, */*"
+                                                },
+                                                referrerPolicy: "no-referrer-when-downgrade"
+                                            }, controller ? {
+                                                signal: controller.signal
+                                            } : {}));
                                             if (kind !== "wrapper") {
                                                 logFunnel("".concat(kind, "_http_request_sent"), {
                                                     attempt: attempt,
@@ -1552,16 +1840,7 @@ function createHlsAdPlayer(contentVideo, options) {
                                             }
                                             return [
                                                 4,
-                                                fetch(vastTagUrl, _object_spread({
-                                                    mode: "cors",
-                                                    credentials: creds,
-                                                    headers: {
-                                                        "Accept": "application/xml, text/xml, */*"
-                                                    },
-                                                    referrerPolicy: "no-referrer-when-downgrade"
-                                                }, controller ? {
-                                                    signal: controller.signal
-                                                } : {}))
+                                                pending
                                             ];
                                         case 1:
                                             response = _state.sent();
@@ -1585,9 +1864,9 @@ function createHlsAdPlayer(contentVideo, options) {
                     case 1:
                         _state.trys.push([
                             1,
-                            10,
-                            11,
-                            12
+                            7,
+                            8,
+                            9
                         ]);
                         _state.label = 2;
                     case 2:
@@ -1595,7 +1874,7 @@ function createHlsAdPlayer(contentVideo, options) {
                             2,
                             4,
                             ,
-                            8
+                            5
                         ]);
                         return [
                             4,
@@ -1605,36 +1884,21 @@ function createHlsAdPlayer(contentVideo, options) {
                         response = _state.sent();
                         return [
                             3,
-                            8
+                            5
                         ];
                     case 4:
                         error = _state.sent();
-                        if (!(credentials !== "omit" && !(controller === null || controller === void 0 ? void 0 : controller.signal.aborted))) return [
-                            3,
-                            6
-                        ];
-                        console.warn('[HlsAdPlayer] VAST fetch failed with credentials="'.concat(credentials, '", retrying without credentials:'), error);
-                        logFunnel("vast_credentials_retry", {
-                            errorMessage: error === null || error === void 0 ? void 0 : error.message
-                        });
-                        return [
-                            4,
-                            requestVast("omit")
-                        ];
-                    case 5:
-                        response = _state.sent();
-                        return [
-                            3,
-                            7
-                        ];
-                    case 6:
+                        if (kind === "gam" && !(controller === null || controller === void 0 ? void 0 : controller.signal.aborted) && !isPodRequestAbortedError(error)) {
+                            gamCredentialsMode = credentials === "include" ? "omit" : "include";
+                            console.warn('[HlsAdPlayer] GAM fetch failed with credentials="'.concat(credentials, '"; next GAM request will use credentials="').concat(gamCredentialsMode, '":'), error);
+                            logFunnel("gam_credentials_mode_changed", {
+                                from: credentials,
+                                to: gamCredentialsMode,
+                                errorMessage: error === null || error === void 0 ? void 0 : error.message
+                            });
+                        }
                         throw error;
-                    case 7:
-                        return [
-                            3,
-                            8
-                        ];
-                    case 8:
+                    case 5:
                         if (!response.ok) {
                             throw new Error("Failed to fetch VAST: HTTP ".concat(response.status, " ").concat(response.statusText));
                         }
@@ -1642,12 +1906,12 @@ function createHlsAdPlayer(contentVideo, options) {
                             4,
                             response.text()
                         ];
-                    case 9:
+                    case 6:
                         return [
                             2,
                             _state.sent()
                         ];
-                    case 10:
+                    case 7:
                         error1 = _state.sent();
                         if (controller === null || controller === void 0 ? void 0 : controller.signal.aborted) {
                             if (pendingRequestAbortReason) {
@@ -1656,13 +1920,13 @@ function createHlsAdPlayer(contentVideo, options) {
                             throw new Error("VAST request timeout after ".concat(VAST_REQUEST_TIMEOUT_MS, "ms: ").concat(vastTagUrl));
                         }
                         throw error1;
-                    case 11:
+                    case 8:
                         if (timeoutId !== void 0) clearTimeout(timeoutId);
                         if (controller) pendingVastRequests.delete(controller);
                         return [
                             7
                         ];
-                    case 12:
+                    case 9:
                         return [
                             2
                         ];
@@ -1795,7 +2059,7 @@ function createHlsAdPlayer(contentVideo, options) {
         });
     }
     function fetchAndParsePod(vastTagUrl) {
-        var source = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "gam";
+        var source = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "gam", finalizeRequestUrl = arguments.length > 2 ? arguments[2] : void 0;
         return _async_to_generator(function() {
             var _root_getAttribute, _root_getAttribute1, isEdge, vastXml, trimmedXml, xmlDoc, root, adElements, _root_getAttribute2, _empty_errorUrls, empty, _empty_errorCode, resolveAd, candidates, podElements, buffet, resolveAll, ads, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, ad, err, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, ad1, err;
             return _ts_generator(this, function(_state) {
@@ -1805,7 +2069,7 @@ function createHlsAdPlayer(contentVideo, options) {
                         isEdge = source === "edge";
                         return [
                             4,
-                            fetchVastXml(vastTagUrl, isEdge ? "omit" : "include", source)
+                            fetchVastXml(vastTagUrl, isEdge ? "omit" : gamCredentialsMode, source, finalizeRequestUrl)
                         ];
                     case 1:
                         vastXml = _state.sent();
@@ -3128,7 +3392,7 @@ function createHlsAdPlayer(contentVideo, options) {
                         case 2:
                             return [
                                 4,
-                                fetchAndParsePod(vastTagUrl, source)
+                                fetchAndParsePod(vastTagUrl, source, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.finalizeRequestUrl)
                             ];
                         case 3:
                             ads = _state.sent();
@@ -3612,6 +3876,7 @@ function createHlsAdPlayer(contentVideo, options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-    createHlsAdPlayer: createHlsAdPlayer
+    createHlsAdPlayer: createHlsAdPlayer,
+    resetGamCredentialsMode: resetGamCredentialsMode
 });
 //# sourceMappingURL=hlsAdPlayer.cjs.map