stormcloud-video-player 0.8.69 → 0.8.71

package/lib/sdk/hlsAdPlayer.cjs

@@ -880,7 +880,7 @@ function createHlsAdPlayer(contentVideo, options) {
                     img.onload = null;
                     img.onerror = null;
                     inFlightBeacons.delete(img);
-                    console.log("[HlsAdPlayer] Tracking pixel settled (".concat(outcome, "): ").concat(trackingUrl));
+                    console.log("[HlsAdPlayer] Tracking pixel settled (".concat(outcome, "): ").concat(trackingHost));
                     if (outcome !== "load") {
                         logFunnel("tracking_request_settled", {
                             reason: outcome,
@@ -898,7 +898,7 @@ function createHlsAdPlayer(contentVideo, options) {
                     return release("timeout");
                 }, BEACON_TIMEOUT_MS);
                 img.src = trackingUrl;
-                console.log("[HlsAdPlayer] Fired tracking pixel: ".concat(trackingUrl));
+                console.log("[HlsAdPlayer] Fired tracking pixel: ".concat(trackingHost));
                 logFunnel("tracking_request_created", {
                     trackingHost: trackingHost,
                     errorCode: options2 === null || options2 === void 0 ? void 0 : options2.errorCode
@@ -1352,7 +1352,7 @@ function createHlsAdPlayer(contentVideo, options) {
                         });
                     }
                     if (parsed.type === "wrapper") {
-                        console.log("[HlsAdPlayer] VAST wrapper detected, following VASTAdTagURI: ".concat(parsed.vastAdTagUri));
+                        console.log("[HlsAdPlayer] VAST wrapper detected, following VASTAdTagURI: ".concat(redactUrl(parsed.vastAdTagUri)));
                     }
                     return parsed;
                 }
@@ -1544,8 +1544,8 @@ function createHlsAdPlayer(contentVideo, options) {
                                     switch(_state.label){
                                         case 0:
                                             attempt++;
-                                            if (kind === "gam") {
-                                                logFunnel("gam_http_request_sent", {
+                                            if (kind !== "wrapper") {
+                                                logFunnel("".concat(kind, "_http_request_sent"), {
                                                     attempt: attempt,
                                                     credentials: creds
                                                 });
@@ -1565,8 +1565,8 @@ function createHlsAdPlayer(contentVideo, options) {
                                             ];
                                         case 1:
                                             response = _state.sent();
-                                            if (kind === "gam") {
-                                                logFunnel("gam_response_received", {
+                                            if (kind !== "wrapper") {
+                                                logFunnel("".concat(kind, "_response_received"), {
                                                     attempt: attempt,
                                                     httpStatus: response.status,
                                                     ok: response.ok,
@@ -1736,8 +1736,7 @@ function createHlsAdPlayer(contentVideo, options) {
                                 elapsedMs: Date.now() - fetchStartedAt
                             });
                         }
-                        console.log("[HlsAdPlayer] VAST XML received");
-                        console.log("[HlsAdPlayer] VAST XML content (first 2000 chars):", vastXml.substring(0, 2e3));
+                        console.log("[HlsAdPlayer] VAST XML received (length=".concat(vastXml.length, ")"));
                         parsed = parseVastXml(vastXml);
                         if (parsed.type === "empty") {
                             ;
@@ -1778,16 +1777,35 @@ function createHlsAdPlayer(contentVideo, options) {
             });
         }).apply(this, arguments);
     }
+    function isEdgeEmptySentinelAd(adElement) {
+        var _textOf;
+        if ((adElement.getAttribute("id") || "").trim().toLowerCase() === "empty") {
+            return true;
+        }
+        var inLine = adElement.querySelector(":scope > InLine");
+        if (!inLine) return false;
+        if (/^no ad available$/i.test((_textOf = textOf(inLine.querySelector(":scope > AdTitle"))) !== null && _textOf !== void 0 ? _textOf : "")) {
+            return true;
+        }
+        var durations = Array.from(inLine.querySelectorAll(":scope > Creatives > Creative > Linear > Duration")).map(function(el) {
+            return parseVastTime(textOf(el));
+        });
+        return durations.length > 0 && durations.every(function(seconds) {
+            return seconds === 0;
+        });
+    }
     function fetchAndParsePod(vastTagUrl) {
+        var source = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "gam";
         return _async_to_generator(function() {
-            var _root_getAttribute, _root_getAttribute1, vastXml, trimmedXml, xmlDoc, root, adElements, _root_getAttribute2, _empty_errorUrls, empty, _empty_errorCode, resolveAd, podElements, buffet, resolveAll, ads, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, ad, err, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, ad1, err;
+            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) {
                 switch(_state.label){
                     case 0:
                         lastPodAdElementCount = 0;
+                        isEdge = source === "edge";
                         return [
                             4,
-                            fetchVastXml(vastTagUrl)
+                            fetchVastXml(vastTagUrl, isEdge ? "omit" : "include", source)
                         ];
                     case 1:
                         vastXml = _state.sent();
@@ -1810,7 +1828,6 @@ function createHlsAdPlayer(contentVideo, options) {
                         }
                         xmlDoc = parseXml(vastXml);
                         if (!xmlDoc) {
-                            console.error("[HlsAdPlayer] Pod VAST XML content (first 2000 chars):", vastXml.substring(0, 2e3));
                             logFunnel("vast_parsed", {
                                 adElementCount: 0,
                                 reason: "xml_parse_error"
@@ -1882,12 +1899,24 @@ function createHlsAdPlayer(contentVideo, options) {
                                 });
                             })();
                         };
-                        podElements = adElements.filter(function(el) {
+                        candidates = adElements;
+                        if (isEdge) {
+                            candidates = adElements.filter(function(el) {
+                                return !isEdgeEmptySentinelAd(el);
+                            });
+                            if (candidates.length < adElements.length) {
+                                logFunnel("edge_empty_sentinel", {
+                                    sentinelCount: adElements.length - candidates.length,
+                                    adElementCount: adElements.length
+                                });
+                            }
+                        }
+                        podElements = candidates.filter(function(el) {
                             return getAdSequence(el) !== void 0;
                         }).sort(function(a, b) {
                             return getAdSequence(a) - getAdSequence(b);
                         });
-                        buffet = adElements.filter(function(el) {
+                        buffet = candidates.filter(function(el) {
                             return getAdSequence(el) === void 0;
                         });
                         resolveAll = function resolveAll(elements) {
@@ -2044,7 +2073,9 @@ function createHlsAdPlayer(contentVideo, options) {
                         lastPodAdElementCount = adElements.length;
                         return [
                             2,
-                            ads
+                            isEdge ? ads.filter(function(ad) {
+                                return ad.duration > 0;
+                            }) : ads
                         ];
                 }
             });
@@ -3045,13 +3076,14 @@ function createHlsAdPlayer(contentVideo, options) {
             contentVideo[AD_CONTAINER_PROP] = adContainerEl;
             attachContainerHandlers();
         },
-        requestAds: function requestAds(vastTagUrl) {
+        requestAds: function requestAds(vastTagUrl, requestOptions) {
             return _async_to_generator(function() {
-                var ads, preloaded, error;
+                var _ref, source, ads, preloaded, error;
                 return _ts_generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
-                            console.log("[HlsAdPlayer] Requesting ads:", vastTagUrl);
+                            source = (_ref = requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.source) !== null && _ref !== void 0 ? _ref : "gam";
+                            console.log("[HlsAdPlayer] Requesting ads (".concat(source, "):"), redactUrl(vastTagUrl));
                             if (adPlaying) {
                                 console.warn("[HlsAdPlayer] Cannot request new ads while an ad is playing");
                                 return [
@@ -3096,7 +3128,7 @@ function createHlsAdPlayer(contentVideo, options) {
                         case 2:
                             return [
                                 4,
-                                fetchAndParsePod(vastTagUrl)
+                                fetchAndParsePod(vastTagUrl, source)
                             ];
                         case 3:
                             ads = _state.sent();
@@ -3506,6 +3538,75 @@ function createHlsAdPlayer(contentVideo, options) {
             return podAds.reduce(function(total, ad) {
                 return total + (ad.duration > 0 ? ad.duration * 1e3 : 0);
             }, 0);
+        },
+        limitPodToBudget: function limitPodToBudget(maxDurationMs, maxAds) {
+            if (adPlaying) return podAds.length;
+            var kept = [];
+            var dropped = [];
+            var totalMs = 0;
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                for(var _iterator = podAds[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var ad = _step.value;
+                    var durationMs = Math.round(ad.duration * 1e3);
+                    if (kept.length < maxAds && totalMs + durationMs <= maxDurationMs) {
+                        kept.push(ad);
+                        totalMs += durationMs;
+                    } else {
+                        dropped.push(ad);
+                    }
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
+            if (dropped.length > 0) {
+                logFunnel("pod_trimmed_to_budget", {
+                    keptCount: kept.length,
+                    droppedCount: dropped.length,
+                    keptDurationMs: totalMs,
+                    maxDurationMs: maxDurationMs,
+                    maxAds: maxAds
+                });
+                var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
+                try {
+                    for(var _iterator1 = dropped[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+                        var ad1 = _step1.value;
+                        resolvedAds.add(ad1);
+                        fireTrackingPixels(ad1.trackingUrls.notUsed, {
+                            ad: ad1
+                        });
+                    }
+                } catch (err) {
+                    _didIteratorError1 = true;
+                    _iteratorError1 = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
+                            _iterator1.return();
+                        }
+                    } finally{
+                        if (_didIteratorError1) {
+                            throw _iteratorError1;
+                        }
+                    }
+                }
+            }
+            podAds = kept;
+            podIndex = 0;
+            currentAd = kept[0];
+            currentAdMediaFile = void 0;
+            return kept.length;
         }
     };
 }