stormcloud-video-player 0.8.19 → 0.8.21

package/lib/players/HlsPlayer.cjs

@@ -827,6 +827,7 @@ function createHlsAdPlayer(contentVideo, options) {
             handleAdComplete();
         });
         adVideoElement.addEventListener("error", function(e) {
+            if (!adPlaying) return;
             console.error("[HlsAdPlayer] Ad video error:", e);
             if (currentAd) {
                 fireTrackingPixels(currentAd.trackingUrls.error);
@@ -1028,15 +1029,15 @@ function createHlsAdPlayer(contentVideo, options) {
                             adVideoElement.muted = originalMutedState;
                             console.log("[HlsAdPlayer] Set ad video volume to ".concat(adVideoElement.volume, ", muted: ").concat(adVideoElement.muted, ", originalMutedState: ").concat(originalMutedState, ", contentVolume: ").concat(contentVolume));
                         }
+                        mediaFile = selectBestMediaFile(currentAd.mediaFiles);
+                        if (!mediaFile) {
+                            throw new Error("No media file available for ad");
+                        }
                         if (adContainerEl) {
                             adContainerEl.style.display = "flex";
                             adContainerEl.style.pointerEvents = "auto";
                         }
                         emit("content_pause");
-                        mediaFile = selectBestMediaFile(currentAd.mediaFiles);
-                        if (!mediaFile) {
-                            throw new Error("No media file available for ad");
-                        }
                         isHlsAd = isHlsMediaFile(mediaFile);
                         console.log("[HlsAdPlayer] Loading ".concat(isHlsAd ? "HLS" : "progressive", " ad from: ").concat(mediaFile.url));
                         if (isHlsAd && import_hls.default.isSupported()) {
@@ -2324,9 +2325,20 @@ function initializePolyfills() {
 }
 // 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";
+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",
@@ -2353,7 +2365,7 @@ function resolveVastEnvironmentSignals(isCtv) {
         return _object_spread_props(_object_spread({
             isCtv: true,
             contentUrl: bridgeSignals.contentUrl || readStoredString("contentUrl") || AIRY_DEFAULT_CONTENT_URL,
-            appId: bridgeSignals.appId || readStoredString("appId") || readStoredString("msid") || AIRY_ANDROID_APP_ID,
+            appId: bridgeSignals.appId || readStoredString("appId") || readStoredString("msid") || getDefaultAppId(),
             appName: bridgeSignals.appName || readStoredString("appName") || readStoredString("an") || AIRY_APP_NAME,
             sessionId: getOrCreateCtvSessionId()
         }, deviceId ? {
@@ -2650,7 +2662,6 @@ var CTV_UNSUPPORTED_PARAMS = [
     "max_ad_duration",
     "unviewed_position_start",
     "impl",
-    "scor",
     "vad_type",
     "gdpr",
     "gdpr_consent",
@@ -2899,6 +2910,29 @@ 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.trimEnd()
+                ].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) {
@@ -2916,6 +2950,7 @@ function applyVastMacros(baseUrl, ctx) {
     var params = url.searchParams;
     removeBrokenAppNameOrphans(params, ctx.appName);
     params.set("correlator", ctx.correlator);
+    params.set("scor", ctx.streamCorrelator);
     if (ctx.isCtv) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {
@@ -2937,8 +2972,6 @@ function applyVastMacros(baseUrl, ctx) {
                 }
             }
         }
-    } else {
-        params.set("scor", ctx.streamCorrelator);
     }
     if (ctx.pod != null) {
         params.set("pod", String(ctx.pod));
@@ -4306,7 +4339,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, 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, vastMode, vastEndpoint, apiUrl, headers, response, data, imaPayload, decodedPayload, numberAds;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -4390,9 +4423,16 @@ var AdConfigManager = /*#__PURE__*/ function() {
                                 data = _state.sent();
                                 imaPayload = (_data_response = data.response) === null || _data_response === void 0 ? void 0 : (_data_response_ima = _data_response.ima) === null || _data_response_ima === void 0 ? void 0 : (_data_response_ima_publisherdeskima = _data_response_ima["publisherdesk.ima"]) === null || _data_response_ima_publisherdeskima === void 0 ? void 0 : _data_response_ima_publisherdeskima.payload;
                                 if (imaPayload) {
-                                    this.apiVastTagUrl = normalizeVastTagUrl(imaPayload);
+                                    decodedPayload = imaPayload;
+                                    try {
+                                        decodedPayload = decodeURIComponent(imaPayload);
+                                    } catch (unused) {
+                                        console.warn("[StormcloudVideoPlayer] imaPayload was not URI-encoded; using as-is:", imaPayload);
+                                    }
+                                    console.log("[StormcloudVideoPlayer] Raw VAST tag URL (from API):", decodedPayload);
+                                    this.apiVastTagUrl = normalizeVastTagUrl(decodedPayload);
                                     if (this.debug) {
-                                        console.log("[StormcloudVideoPlayer] Extracted VAST tag URL from /ads/web:", this.apiVastTagUrl);
+                                        console.log("[StormcloudVideoPlayer] Normalized VAST tag URL:", this.apiVastTagUrl);
                                     }
                                 } else {
                                     if (this.debug) {
@@ -4726,7 +4766,9 @@ var AdConfigManager = /*#__PURE__*/ function() {
                         adTest: this.config.adTest,
                         consent: this.consentSignals
                     });
-                    urls.push(palNonce.injectNonce(urlWithMacros));
+                    var finalUrl = palNonce.injectNonce(urlWithMacros);
+                    console.log("[StormcloudVideoPlayer] Resolved ad request URL (pod=".concat(this.podCounter, ", pos=").concat(this.adRequestPositionInBreak, "):"), finalUrl);
+                    urls.push(finalUrl);
                 }
                 return urls;
             }