stormcloud-video-player 0.8.12 → 0.8.14

package/lib/sdk/hlsAdPlayer.d.cts

@@ -1,4 +1,4 @@
-import { A as AdController } from '../types-BM5cceAy.cjs';
+import { A as AdController } from '../types-CWWADkvd.cjs';
 import Hls from 'hls.js';
 
 declare function createHlsAdPlayer(contentVideo: HTMLVideoElement, options?: {

package/lib/{types-BM5cceAy.d.cts → types-CWWADkvd.d.cts}

@@ -24,9 +24,7 @@ interface StormcloudVideoPlayerConfig {
     vmapUrl?: string;
     vastMode?: 'adstorm' | 'default';
     minSegmentsBeforePlay?: number;
-    deviceId?: string;
-    deviceIdType?: string;
-    limitAdTracking?: boolean;
+    ctvAdRequest?: boolean;
     adTest?: boolean;
 }
 interface AdController {

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -2326,6 +2326,20 @@ function generateCorrelator() {
     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 {
@@ -2335,16 +2349,42 @@ function applyVastMacros(baseUrl, ctx) {
     }
     var params = url.searchParams;
     params.set("correlator", ctx.correlator);
-    params.set("scor", ctx.streamCorrelator);
+    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));
     }
-    if (ctx.pageUrl) {
-        params.set("url", ctx.pageUrl);
-        params.set("description_url", ctx.pageUrl);
+    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");
@@ -2352,6 +2392,20 @@ 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) {
+        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);
@@ -2361,15 +2415,17 @@ function applyVastMacros(baseUrl, ctx) {
         params.delete("idtype");
         params.delete("is_lat");
     }
-    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.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");
@@ -2380,23 +2436,23 @@ function applyVastMacros(baseUrl, ctx) {
             staleKeys.push(key);
         }
     });
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
     try {
-        for(var _iterator = staleKeys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-            var key = _step.value;
-            params.delete(key);
+        for(var _iterator1 = staleKeys[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var key1 = _step1.value;
+            params.delete(key1);
         }
     } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
     } finally{
         try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                _iterator.return();
+            if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                _iterator1.return();
             }
         } finally{
-            if (_didIteratorError) {
-                throw _iteratorError;
+            if (_didIteratorError1) {
+                throw _iteratorError1;
             }
         }
     }
@@ -2636,6 +2692,262 @@ function logBrowserInfo() {
         userAgent: navigator.userAgent
     }));
 }
+// src/utils/ctvVastSignals.ts
+var AIRY_ANDROID_APP_ID = "com.freeairytv.android";
+var AIRY_APP_NAME = "AiryTV Movies & TV";
+var CTV_SESSION_STORAGE_KEY = "stormcloud.ctv.sid";
+var DEVICE_ID_STORAGE_KEYS = [
+    "rdid",
+    "ifa",
+    "advertisingId",
+    "advertising_id",
+    "deviceAdvertisingId",
+    "aaid",
+    "adid",
+    "rida",
+    "tifa"
+];
+function resolveCtvVastSignals() {
+    var _ref, _bridgeSignals_limitAdTracking;
+    var bridgeSignals = readNativeBridgeSignals();
+    var deviceId = bridgeSignals.deviceId || readStoredDeviceId();
+    var deviceIdType = bridgeSignals.deviceIdType || readStoredString("deviceIdType") || inferDeviceIdType();
+    return _object_spread_props(_object_spread({
+        contentUrl: "https://".concat(AIRY_ANDROID_APP_ID, ".example.com"),
+        appId: AIRY_ANDROID_APP_ID,
+        appName: AIRY_APP_NAME,
+        sessionId: getOrCreateCtvSessionId()
+    }, deviceId ? {
+        deviceId: deviceId
+    } : {}, deviceId && 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
+    });
+}
+function getOrCreateCtvSessionId() {
+    var existing = readStoredString(CTV_SESSION_STORAGE_KEY);
+    if (existing) {
+        return existing;
+    }
+    var sessionId = createUuid();
+    try {
+        var _window_localStorage;
+        (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.setItem(CTV_SESSION_STORAGE_KEY, sessionId);
+    } catch (unused) {}
+    return sessionId;
+}
+function createUuid() {
+    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+        return crypto.randomUUID();
+    }
+    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(char) {
+        var value = Math.floor(Math.random() * 16);
+        var nibble = char === "x" ? value : value & 3 | 8;
+        return nibble.toString(16);
+    });
+}
+function readNativeBridgeSignals() {
+    if (typeof window === "undefined") {
+        return {};
+    }
+    var candidates = [
+        window.__STORMCLOUD_CTV_AD_INFO__,
+        window.__STORMCLOUD_CTV__,
+        window.stormcloudCtv,
+        window.AiryTV,
+        window.Android
+    ].filter(Boolean);
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = candidates[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var source = _step.value;
+            var deviceId = readBridgeValue(source, [
+                "rdid",
+                "ifa",
+                "advertisingId",
+                "adId",
+                "deviceId"
+            ]) || void 0;
+            if (!deviceId) continue;
+            var deviceIdType = readBridgeValue(source, [
+                "idtype",
+                "deviceIdType",
+                "advertisingIdType"
+            ]) || inferDeviceIdType();
+            var limitAdTracking = readBridgeBoolean(source, [
+                "is_lat",
+                "limitAdTracking",
+                "limitedAdTracking",
+                "lat"
+            ]);
+            return _object_spread({
+                deviceId: deviceId
+            }, deviceIdType ? {
+                deviceIdType: deviceIdType
+            } : {}, limitAdTracking != null ? {
+                limitAdTracking: limitAdTracking
+            } : {});
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return {};
+}
+function readBridgeValue(source, keys) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = source === null || source === void 0 ? void 0 : source[key];
+            if (typeof value === "string" && value) {
+                return value;
+            }
+            if (typeof value === "function") {
+                try {
+                    var result = value.call(source);
+                    if (typeof result === "string" && result) {
+                        return result;
+                    }
+                } catch (unused) {}
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readBridgeBoolean(source, keys) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = source === null || source === void 0 ? void 0 : source[key];
+            var normalized = normalizeBoolean(value);
+            if (normalized != null) {
+                return normalized;
+            }
+            if (typeof value === "function") {
+                try {
+                    var result = normalizeBoolean(value.call(source));
+                    if (result != null) {
+                        return result;
+                    }
+                } catch (unused) {}
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readStoredDeviceId() {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = DEVICE_ID_STORAGE_KEYS[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var key = _step.value;
+            var value = readStoredString(key);
+            if (value) {
+                return value;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return void 0;
+}
+function readStoredString(key) {
+    if (typeof window === "undefined") {
+        return void 0;
+    }
+    try {
+        var _window_localStorage;
+        var value = (_window_localStorage = window.localStorage) === null || _window_localStorage === void 0 ? void 0 : _window_localStorage.getItem(key);
+        return value || void 0;
+    } catch (unused) {
+        return void 0;
+    }
+}
+function readStoredLimitAdTracking() {
+    return normalizeBoolean(readStoredString("limitAdTracking") || readStoredString("limitedAdTracking") || readStoredString("is_lat"));
+}
+function normalizeBoolean(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "number") {
+        return value === 1;
+    }
+    if (typeof value === "string") {
+        var normalized = value.toLowerCase();
+        if (normalized === "1" || normalized === "true" || normalized === "yes") {
+            return true;
+        }
+        if (normalized === "0" || normalized === "false" || normalized === "no") {
+            return false;
+        }
+    }
+    return void 0;
+}
+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/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;
+}
 // src/player/StormcloudVideoPlayer.ts
 var StormcloudVideoPlayer = /*#__PURE__*/ function() {
     function StormcloudVideoPlayer(config) {
@@ -5077,17 +5389,24 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 for(var i = 0; i < count; i++){
                     this.adRequestPositionInBreak++;
                     var adWillPlayMuted = this.inAdBreak ? this.adPlayer.getOriginalMutedState() : this.video.muted;
+                    var ctvSignals = this.config.ctvAdRequest ? resolveCtvVastSignals() : void 0;
                     var urlWithMacros = applyVastMacros(baseUrl, {
                         correlator: generateCorrelator(),
                         streamCorrelator: this.streamCorrelator,
                         pod: this.podCounter > 0 ? this.podCounter : void 0,
                         adPosition: this.adRequestPositionInBreak,
-                        pageUrl: typeof window !== "undefined" ? window.location.href : void 0,
+                        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,
                         adWillPlayMuted: adWillPlayMuted,
                         adWillAutoPlay: !!this.config.autoplay,
-                        deviceId: this.config.deviceId,
-                        deviceIdType: this.config.deviceIdType,
-                        limitAdTracking: this.config.limitAdTracking,
+                        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,
                         adTest: this.config.adTest,
                         consent: this.consentSignals
                     });
@@ -5671,21 +5990,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 currentMuted = this.video.muted;
                                 currentVolume = this.video.volume;
                                 this.adPlayer.updateOriginalMutedState(currentMuted, currentVolume);
-                                if (!this.video.muted) {
-                                    this.video.muted = true;
-                                    if (this.config.debugAdTiming) {
-                                        console.log("[StormcloudVideoPlayer] Muted video in handleAdStart");
-                                    }
-                                }
                                 this.inAdBreak = true;
                                 this.currentAdBreakStartWallClockMs = Date.now();
                                 this.adBreakPlayedDurationMs = 0;
                                 this.currentAdIndex = 0;
                                 this.totalAdsInBreak = 0;
                                 this.adPodQueue = [];
-                                this.showAds = true;
-                                this.showPlaceholderLayer();
-                                this.adPlayer.showPlaceholder();
+                                this.showAds = false;
                                 if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
                                     this.expectedAdBreakDurationMs = adBreakDurationMs;
                                 }
@@ -7900,12 +8211,13 @@ var CRITICAL_PROPS = [
     "vmapUrl",
     "lowLatencyMode",
     "driftToleranceMs",
-    "vastMode"
+    "vastMode",
+    "ctvAdRequest"
 ];
 var CONTROLS_HIDE_DELAY = 3e3;
 var DEFAULT_PLAYER_ASPECT_RATIO = 16 / 9;
 var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
-    var src = props.src, autoplay = props.autoplay, muted = props.muted, lowLatencyMode = props.lowLatencyMode, allowNativeHls = props.allowNativeHls, isLiveStream = props.isLiveStream, driftToleranceMs = props.driftToleranceMs, immediateManifestAds = props.immediateManifestAds, debugAdTiming = props.debugAdTiming, showCustomControls = props.showCustomControls, hideLoadingIndicator = props.hideLoadingIndicator, onVolumeToggle = props.onVolumeToggle, onFullscreenToggle = props.onFullscreenToggle, onControlClick = props.onControlClick, onReady = props.onReady, wrapperClassName = props.wrapperClassName, wrapperStyle = props.wrapperStyle, className = props.className, style = props.style, controls = props.controls, playsInline = props.playsInline, preload = props.preload, poster = props.poster, children = props.children, licenseKey = props.licenseKey, vastMode = props.vastMode, vastTagUrl = props.vastTagUrl, isVmap = props.isVmap, vmapUrl = props.vmapUrl, minSegmentsBeforePlay = props.minSegmentsBeforePlay, restVideoAttrs = _object_without_properties(props, [
+    var src = props.src, autoplay = props.autoplay, muted = props.muted, lowLatencyMode = props.lowLatencyMode, allowNativeHls = props.allowNativeHls, isLiveStream = props.isLiveStream, driftToleranceMs = props.driftToleranceMs, immediateManifestAds = props.immediateManifestAds, debugAdTiming = props.debugAdTiming, showCustomControls = props.showCustomControls, hideLoadingIndicator = props.hideLoadingIndicator, onVolumeToggle = props.onVolumeToggle, onFullscreenToggle = props.onFullscreenToggle, onControlClick = props.onControlClick, onReady = props.onReady, wrapperClassName = props.wrapperClassName, wrapperStyle = props.wrapperStyle, className = props.className, style = props.style, controls = props.controls, playsInline = props.playsInline, preload = props.preload, poster = props.poster, children = props.children, licenseKey = props.licenseKey, vastMode = props.vastMode, vastTagUrl = props.vastTagUrl, isVmap = props.isVmap, vmapUrl = props.vmapUrl, minSegmentsBeforePlay = props.minSegmentsBeforePlay, ctvAdRequest = props.ctvAdRequest, restVideoAttrs = _object_without_properties(props, [
         "src",
         "autoplay",
         "muted",
@@ -7935,7 +8247,8 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
         "vastTagUrl",
         "isVmap",
         "vmapUrl",
-        "minSegmentsBeforePlay"
+        "minSegmentsBeforePlay",
+        "ctvAdRequest"
     ]);
     var videoRef = (0, import_react.useRef)(null);
     var playerRef = (0, import_react.useRef)(null);
@@ -8124,6 +8437,7 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
         if (isVmap !== void 0) cfg.isVmap = isVmap;
         if (vmapUrl !== void 0) cfg.vmapUrl = vmapUrl;
         if (minSegmentsBeforePlay !== void 0) cfg.minSegmentsBeforePlay = minSegmentsBeforePlay;
+        if (ctvAdRequest !== void 0) cfg.ctvAdRequest = ctvAdRequest;
         var player = new StormcloudVideoPlayer(cfg);
         playerRef.current = player;
         player.load().then(function() {