stormcloud-video-player 0.8.57 → 0.8.58

package/lib/player/AdConfigManager.cjs

@@ -309,34 +309,8 @@ __export(AdConfigManager_exports, {
 });
 module.exports = __toCommonJS(AdConfigManager_exports);
 // 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";
 var PLAYER_ID_STORAGE_KEY = "stormcloud.player.id";
-var LG_TEST_APP_ID = "com.hulu.plus";
-var LG_TEST_APP_NAME = "Hulu";
-var LG_TEST_CONTENT_URL = "https://www.hulu.com/live-tv";
-var _lgTestDeviceId;
-function getLgTestDeviceId() {
-    if (!_lgTestDeviceId) _lgTestDeviceId = createUuid();
-    return _lgTestDeviceId;
-}
-function isLgWebOS() {
-    if (typeof navigator === "undefined") return false;
-    return /Web0S|webOS|LG Browser|LGSTB|LGE/i.test(navigator.userAgent);
-}
-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",
@@ -357,23 +331,29 @@ function resolveVastEnvironmentSignals(isCtv) {
     var _ref;
     var bridgeSignals = readNativeBridgeSignals();
     var platformDevice = readPlatformNativeDeviceId();
-    var lg = isCtv && isLgWebOS();
-    var deviceId = bridgeSignals.deviceId || readStoredDeviceId() || platformDevice.deviceId || (lg && platformDevice.limitAdTracking !== true ? getLgTestDeviceId() : void 0);
-    var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || readStoredString("idtype") || platformDevice.deviceIdType || inferDeviceIdType() || (lg ? "lgudid" : void 0);
+    var realDeviceId = bridgeSignals.deviceId || readStoredDeviceId() || 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;
+    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;
+        }
+    }
     if (isCtv) {
         return _object_spread_props(_object_spread({
             isCtv: true,
-            contentUrl: bridgeSignals.contentUrl || readStoredString("contentUrl") || (lg ? LG_TEST_CONTENT_URL : AIRY_DEFAULT_CONTENT_URL),
-            appId: bridgeSignals.appId || readStoredString("appId") || readStoredString("msid") || (lg ? LG_TEST_APP_ID : getDefaultAppId()),
-            appName: bridgeSignals.appName || readStoredString("appName") || readStoredString("an") || (lg ? LG_TEST_APP_NAME : AIRY_APP_NAME),
             sessionId: getOrCreateCtvSessionId()
         }, deviceId ? {
             deviceId: deviceId
-        } : {}, deviceIdType ? {
+        } : {}, deviceId && deviceIdType ? {
             deviceIdType: deviceIdType
-        } : {}, limitAdTracking != null ? {
+        } : {}, deviceId && limitAdTracking != null ? {
             limitAdTracking: limitAdTracking
         } : {}), {
             deviceTypeHint: 5
@@ -383,9 +363,9 @@ function resolveVastEnvironmentSignals(isCtv) {
         isCtv: false
     }, deviceId ? {
         deviceId: deviceId
-    } : {}, deviceIdType ? {
+    } : {}, deviceId && deviceIdType ? {
         deviceIdType: deviceIdType
-    } : {}, limitAdTracking != null ? {
+    } : {}, deviceId && limitAdTracking != null ? {
         limitAdTracking: limitAdTracking
     } : {});
 }
@@ -816,7 +796,6 @@ 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",
@@ -907,18 +886,6 @@ var INLINE_DEVICE_MACRO_REPLACEMENTS = [
             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) {
@@ -1109,7 +1076,7 @@ function applyVastMacros(baseUrl, ctx) {
         return replaceCorrelatorFallback(expandedUrl, ctx.correlator);
     }
     var params = url.searchParams;
-    removeBrokenAppNameOrphans(params, ctx.appName);
+    removeBrokenAppNameOrphans(params);
     params.set("correlator", ctx.correlator);
     params.set("scor", ctx.streamCorrelator);
     if (ctx.isCtv) {
@@ -1148,18 +1115,14 @@ function applyVastMacros(baseUrl, ctx) {
     if (ctx.podMaxAds != null) {
         params.set("pmad", String(Math.max(1, Math.round(ctx.podMaxAds))));
     }
-    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.isCtv && ctx.pageUrl) {
+        params.set("url", ctx.pageUrl);
+        params.set("description_url", ctx.pageUrl);
+    }
+    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");
@@ -1167,13 +1130,6 @@ function applyVastMacros(baseUrl, ctx) {
     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);
     }
@@ -1224,7 +1180,7 @@ function applyVastMacros(baseUrl, ctx) {
             }
         }
     }
-    removeBrokenAppNameOrphans(params, ctx.appName);
+    removeBrokenAppNameOrphans(params);
     return url.toString();
 }
 function replaceCorrelatorFallback(baseUrl, correlator) {
@@ -2213,6 +2169,18 @@ var AdConfigManager = /*#__PURE__*/ function() {
                 };
             }
         },
+        {
+            key: "getPalDescriptionUrl",
+            value: function getPalDescriptionUrl() {
+                if (!this.apiVastTagUrl) return void 0;
+                try {
+                    var params = new URL(this.apiVastTagUrl).searchParams;
+                    return params.get("description_url") || params.get("url") || void 0;
+                } catch (unused) {
+                    return void 0;
+                }
+            }
+        },
         {
             key: "generatePodVastUrl",
             value: function generatePodVastUrl(baseUrl, podParams, adPlayer, palNonce, inAdBreak) {
@@ -2227,12 +2195,9 @@ var AdConfigManager = /*#__PURE__*/ function() {
                     podMinDurationMs: podParams.minDurationMs,
                     podMaxDurationMs: podParams.maxDurationMs,
                     isCtv: envSignals.isCtv,
-                    contentUrl: envSignals.contentUrl,
                     pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? toDevSafeUrl(window.location.href) : void 0,
                     adWillPlayMuted: adWillPlayMuted,
                     adWillAutoPlay: !!this.config.autoplay,
-                    appId: envSignals.appId,
-                    appName: envSignals.appName,
                     sessionId: envSignals.sessionId,
                     deviceId: envSignals.deviceId,
                     deviceIdType: envSignals.deviceIdType,