stormcloud-video-player 0.8.59 → 0.8.61

package/lib/player/AdBreakOrchestrator.d.cts

@@ -1,4 +1,4 @@
-import { S as Scte35Marker, a as StormcloudVideoPlayerConfig, A as AdController } from '../types-52ASml2N.cjs';
+import { Scte35Marker, StormcloudVideoPlayerConfig, AdController } from '../types.cjs';
 import { AdTimingService } from './AdTimingService.cjs';
 import { AdConfigManager } from './AdConfigManager.cjs';
 import { Scte35CueManager } from './Scte35CueManager.cjs';
@@ -21,6 +21,8 @@ interface AdBreakOrchestratorHost {
     recoverMediaError(): void;
     requiresMediaPipelineResetAfterAds(): boolean;
     generatePodVastUrl(baseUrl: string, breakDurationMs?: number): string;
+    onAdClick(): void;
+    onAdInteraction(event: MouseEvent | TouchEvent): void;
 }
 declare class AdBreakOrchestrator {
     inAdBreak: boolean;

package/lib/player/AdConfigManager.cjs

@@ -310,6 +310,8 @@ __export(AdConfigManager_exports, {
 module.exports = __toCommonJS(AdConfigManager_exports);
 // src/utils/vastEnvironmentSignals.ts
 var CTV_SESSION_STORAGE_KEY = "stormcloud.ctv.sid";
+var WEB_SESSION_STORAGE_KEY = "stormcloud.web.sid";
+var inMemoryWebSessionId;
 var PLAYER_ID_STORAGE_KEY = "stormcloud.player.id";
 var DEVICE_ID_STORAGE_KEYS = [
     "rdid",
@@ -331,7 +333,7 @@ function resolveVastEnvironmentSignals(isCtv) {
     var _ref;
     var bridgeSignals = readNativeBridgeSignals();
     var platformDevice = readPlatformNativeDeviceId();
-    var realDeviceId = bridgeSignals.deviceId || readStoredDeviceId() || platformDevice.deviceId;
+    var realDeviceId = bridgeSignals.deviceId || (isCtv ? readStoredDeviceId() : void 0) || platformDevice.deviceId;
     var deviceId = realDeviceId;
     var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || readStoredString("idtype") || platformDevice.deviceIdType || inferDeviceIdType();
     var platformLat = bridgeSignals.deviceId ? bridgeSignals.limitAdTracking : platformDevice.limitAdTracking;
@@ -345,6 +347,7 @@ function resolveVastEnvironmentSignals(isCtv) {
             limitAdTracking = (_ref1 = platformLat !== null && platformLat !== void 0 ? platformLat : readStoredLimitAdTracking()) !== null && _ref1 !== void 0 ? _ref1 : false;
         }
     }
+    var deviceTypeHint = resolveDeviceTypeHint(isCtv);
     if (isCtv) {
         return _object_spread_props(_object_spread({
             isCtv: true,
@@ -356,18 +359,157 @@ function resolveVastEnvironmentSignals(isCtv) {
         } : {}, deviceId && limitAdTracking != null ? {
             limitAdTracking: limitAdTracking
         } : {}), {
-            deviceTypeHint: 5
+            deviceTypeHint: deviceTypeHint
         });
     }
-    return _object_spread({
+    var webSessionId = getOrCreateWebSessionId();
+    return _object_spread_props(_object_spread({
         isCtv: false
-    }, deviceId ? {
+    }, webSessionId ? {
+        sessionId: webSessionId
+    } : {}, deviceId ? {
         deviceId: deviceId
     } : {}, deviceId && deviceIdType ? {
         deviceIdType: deviceIdType
     } : {}, deviceId && limitAdTracking != null ? {
         limitAdTracking: limitAdTracking
-    } : {});
+    } : {}), {
+        deviceTypeHint: deviceTypeHint
+    });
+}
+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 SET_TOP_BOX_UA = /LGSTB|\bSTB\b|STB\d|Set-?Top|SetTopBox|TV ?Box|Kaon|Humax|Arris|Technicolor|Sagemcom|Infomir|MAG\d{3}|KreaTV|Amino|Formuler|Dune ?HD|TiVo|MiBOX|Mi Box|SHIELD Android TV|\bAFT[A-Z]|Roku|AppleTV|Apple TV|CrKey/i;
+var GAME_CONSOLE_UA = /PlayStation|Xbox|Nintendo/i;
+var CONNECTED_TV_UA = /Web0S|webOS|Tizen|SMART-TV|SmartTV|NetCast|BRAVIA|HbbTV|VIDAA|Hisense|Philips|Viera|AQUOS|Android TV|Google TV|\bTV\b/i;
+var FEATURE_PHONE_UA = /KAIOS|MIDP|J2ME|Series40|Opera Mini/i;
+function resolveDeviceTypeHint(isCtv) {
+    var override = readDeviceTypeHintOverride(isCtv);
+    if (override != null) return override;
+    return inferDeviceTypeHint(isCtv);
+}
+function inferDeviceTypeHint(isCtv) {
+    var fallback = isCtv ? DEVICE_TYPE_HINT.CONNECTED_TV : DEVICE_TYPE_HINT.DESKTOP;
+    if (typeof navigator === "undefined") return fallback;
+    var ua = navigator.userAgent || "";
+    var maxTouchPoints = navigator.maxTouchPoints || 0;
+    if (SET_TOP_BOX_UA.test(ua)) return DEVICE_TYPE_HINT.SET_TOP_BOX;
+    if (GAME_CONSOLE_UA.test(ua)) return DEVICE_TYPE_HINT.GAME_CONSOLE;
+    if (CONNECTED_TV_UA.test(ua) && !/Mobile/i.test(ua)) {
+        return DEVICE_TYPE_HINT.CONNECTED_TV;
+    }
+    if (FEATURE_PHONE_UA.test(ua)) return DEVICE_TYPE_HINT.FEATURE_PHONE;
+    if (/iPad/i.test(ua) || /Macintosh/i.test(ua) && maxTouchPoints > 1) {
+        return DEVICE_TYPE_HINT.TABLET;
+    }
+    if (/iPhone|iPod/i.test(ua)) return DEVICE_TYPE_HINT.SMARTPHONE;
+    if (/Android/i.test(ua)) {
+        if (/Mobile/i.test(ua)) return DEVICE_TYPE_HINT.SMARTPHONE;
+        if (maxTouchPoints === 0) return DEVICE_TYPE_HINT.SET_TOP_BOX;
+        return DEVICE_TYPE_HINT.TABLET;
+    }
+    if (/Mobile|Windows Phone|BlackBerry/i.test(ua)) return DEVICE_TYPE_HINT.SMARTPHONE;
+    return fallback;
+}
+function readDeviceTypeHintOverride(isCtv) {
+    if (typeof window === "undefined") return void 0;
+    var keys = [
+        "dth",
+        "deviceTypeHint"
+    ];
+    var fromGlobal = normalizeDeviceTypeHint(window.__STORMCLOUD_DTH__);
+    if (fromGlobal != null) return fromGlobal;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = getNativeBridgeSources()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var source = _step.value;
+            var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+            try {
+                for(var _iterator1 = keys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                    var key = _step1.value;
+                    var value = source === null || source === void 0 ? void 0 : source[key];
+                    var normalized = normalizeDeviceTypeHint(typeof value === "function" ? safeCall(value, source) : value);
+                    if (normalized != null) return normalized;
+                }
+            } catch (err) {
+                _didIteratorError1 = true;
+                _iteratorError1 = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                        _iterator1.return();
+                    }
+                } finally{
+                    if (_didIteratorError1) {
+                        throw _iteratorError1;
+                    }
+                }
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    if (!isCtv) return void 0;
+    for(var _i = 0, _iter = [
+        "stormcloud.dth",
+        "dth"
+    ]; _i < _iter.length; _i++){
+        var key1 = _iter[_i];
+        var normalized1 = normalizeDeviceTypeHint(readStoredString(key1));
+        if (normalized1 != null) return normalized1;
+    }
+    return void 0;
+}
+function normalizeDeviceTypeHint(value) {
+    if (typeof value === "number") {
+        return Number.isInteger(value) && value >= 1 && value <= 7 ? value : void 0;
+    }
+    if (typeof value !== "string") return void 0;
+    var trimmed = value.trim();
+    if (/^[1-7]$/.test(trimmed)) return parseInt(trimmed, 10);
+    return DEVICE_TYPE_HINT_ALIASES[trimmed.toLowerCase().replace(/[\s_-]/g, "")];
+}
+function safeCall(fn, thisArg) {
+    try {
+        return fn.call(thisArg);
+    } catch (unused) {
+        return void 0;
+    }
 }
 function inferDeviceIdType() {
     if (typeof navigator === "undefined") {
@@ -391,9 +533,10 @@ function isEquivalentDeviceIdType(tagType, runtimeType) {
     return ANDROID_ID_TYPES.has(tag) && ANDROID_ID_TYPES.has(runtime);
 }
 function resolveNativeDeviceId() {
+    var includeStored = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
     var bridgeSignals = readNativeBridgeSignals();
     var platformDevice = readPlatformNativeDeviceId();
-    var deviceId = bridgeSignals.deviceId || readStoredDeviceId() || platformDevice.deviceId;
+    var deviceId = bridgeSignals.deviceId || (includeStored ? readStoredDeviceId() : void 0) || platformDevice.deviceId;
     if (!deviceId || isMacroPlaceholder(deviceId) || isZeroedAdId(deviceId)) {
         return void 0;
     }
@@ -422,6 +565,21 @@ function getOrCreateCtvSessionId() {
     writePersistentId(CTV_SESSION_STORAGE_KEY, sessionId);
     return sessionId;
 }
+function getOrCreateWebSessionId() {
+    if (typeof window === "undefined") return void 0;
+    try {
+        var _window_sessionStorage;
+        var existing = (_window_sessionStorage = window.sessionStorage) === null || _window_sessionStorage === void 0 ? void 0 : _window_sessionStorage.getItem(WEB_SESSION_STORAGE_KEY);
+        if (existing && !isMacroPlaceholder(existing)) return existing;
+    } catch (unused) {}
+    var sessionId = inMemoryWebSessionId || createUuid();
+    inMemoryWebSessionId = sessionId;
+    try {
+        var _window_sessionStorage1;
+        (_window_sessionStorage1 = window.sessionStorage) === null || _window_sessionStorage1 === void 0 ? void 0 : _window_sessionStorage1.setItem(WEB_SESSION_STORAGE_KEY, sessionId);
+    } catch (unused) {}
+    return sessionId;
+}
 function readPersistentId(storageKey) {
     return readStoredString(storageKey) || readCookie(storageKey);
 }
@@ -573,22 +731,9 @@ function isZeroedAdId(value) {
     return ZEROED_AD_ID_PATTERNS.has(value.trim().toLowerCase());
 }
 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){
+        for(var _iterator = getNativeBridgeSources()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
             var source = _step.value;
             var contentUrl = readBridgeValue(source, [
                 "contentUrl",
@@ -663,6 +808,21 @@ function readNativeBridgeSignals() {
     }
     return {};
 }
+function getNativeBridgeSources() {
+    if (typeof window === "undefined") {
+        return [];
+    }
+    return [
+        window.__STORMCLOUD_CTV_AD_INFO__,
+        window.__STORMCLOUD_CTV__,
+        window.stormcloudCtv,
+        window.AiryTV,
+        window.Android,
+        window.webOS,
+        window.tizen,
+        window.amazon
+    ].filter(Boolean);
+}
 function readBridgeValue(source, keys) {
     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
     try {
@@ -961,6 +1121,12 @@ function applyDeviceIdentityParams(params, ctx) {
         params.set("is_lat", latValue !== null && latValue !== void 0 ? latValue : isMacroPlaceholder2(tagLat) ? "0" : tagLat);
         return;
     }
+    if (!ctx.isCtv) {
+        params.delete("rdid");
+        params.delete("idtype");
+        params.delete("is_lat");
+        return;
+    }
     var tagRdidValid = Boolean(tagRdid && !isMacroPlaceholder2(tagRdid));
     var tagTypeValid = Boolean(tagType && !isMacroPlaceholder2(tagType));
     if (tagRdidValid && tagTypeValid && runtimeType && !isEquivalentDeviceIdType(tagType, runtimeType)) {
@@ -1115,15 +1281,24 @@ function applyVastMacros(baseUrl, ctx) {
     if (ctx.podMaxAds != null) {
         params.set("pmad", String(Math.max(1, Math.round(ctx.podMaxAds))));
     }
-    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.isCtv && ctx.pageUrl) {
+        if (isMacroPlaceholder2(params.get("url"))) {
+            params.set("url", ctx.pageUrl);
+        }
+        if (isMacroPlaceholder2(params.get("description_url"))) {
+            params.set("description_url", params.get("url") || ctx.pageUrl);
+        }
+    }
+    if (!ctx.isCtv) {
+        params.delete("an");
+        params.delete("msid");
+        params.delete("sid");
+    }
     if (ctx.adWillPlayMuted != null) {
         params.set("vpmute", ctx.adWillPlayMuted ? "1" : "0");
     }
@@ -1157,6 +1332,9 @@ function applyVastMacros(baseUrl, ctx) {
     if (ctx.programTitle) {
         params.set("ct_ti", ctx.programTitle);
     }
+    if (ctx.channelName) {
+        params.set("ct_ch", ctx.channelName);
+    }
     var staleKeys = [];
     params.forEach(function(value, key) {
         if (isMacroPlaceholder2(value)) {
@@ -1537,7 +1715,7 @@ function sha256Hex(input) {
     })();
 }
 function resolvePlayerIdentitySeed(clientInfo) {
-    var nativeDeviceId = resolveNativeDeviceId();
+    var nativeDeviceId = resolveNativeDeviceId(clientInfo.isSmartTV);
     if (nativeDeviceId) {
         return "device:".concat(nativeDeviceId);
     }
@@ -2201,7 +2379,7 @@ var AdConfigManager = /*#__PURE__*/ function() {
                     pageUrl: !envSignals.isCtv && typeof window !== "undefined" ? toDevSafeUrl(window.location.href) : void 0,
                     adWillPlayMuted: adWillPlayMuted,
                     adWillAutoPlay: !!this.config.autoplay,
-                    sessionId: envSignals.sessionId,
+                    sessionId: envSignals.isCtv || this.consentSignals.storageAllowed !== false ? envSignals.sessionId : void 0,
                     deviceId: envSignals.deviceId,
                     deviceIdType: envSignals.deviceIdType,
                     limitAdTracking: envSignals.limitAdTracking,
@@ -2209,6 +2387,8 @@ var AdConfigManager = /*#__PURE__*/ function() {
                     adTest: this.config.adTest
                 }, this.config.programTitle ? {
                     programTitle: this.config.programTitle
+                } : {}, this.config.channelName ? {
+                    channelName: this.config.channelName
                 } : {}), {
                     consent: this.consentSignals
                 }));