stormcloud-video-player 0.5.7 → 0.5.9

package/lib/index.cjs

@@ -708,8 +708,8 @@ function createEmptyTrackingState() {
         complete: false
     };
 }
-function fireTrackingPixels(urls, sessionId, licenseKey) {
-    var logPrefix = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : "[VastParser]";
+function fireTrackingPixels(urls, sessionId) {
+    var logPrefix = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "[VastParser]";
     if (!urls || urls.length === 0) return;
     urls.forEach(function(url) {
         try {
@@ -717,10 +717,8 @@ function fireTrackingPixels(urls, sessionId, licenseKey) {
             if (sessionId) {
                 trackingUrl = "".concat(trackingUrl).concat(trackingUrl.includes("?") ? "&" : "?", "session_id=").concat(sessionId);
             }
-            if (licenseKey) {
-                trackingUrl = "".concat(trackingUrl).concat(trackingUrl.includes("?") ? "&" : "?", "license_key=").concat(licenseKey);
-            }
             var img = new Image(1, 1);
+            img.onerror = function() {};
             img.src = trackingUrl;
             console.log("".concat(logPrefix, " Fired tracking pixel: ").concat(trackingUrl));
         } catch (error) {
@@ -1121,7 +1119,7 @@ function createPrebidController(contentVideo, options) {
         return "session-".concat(Date.now(), "-").concat(Math.random().toString(36).substr(2, 9));
     }
     function fireTrackingPixels2(urls) {
-        fireTrackingPixels(urls, sessionId, licenseKey, LOG);
+        fireTrackingPixels(urls, sessionId, LOG);
     }
     function getMainStreamQuality() {
         if (!mainHlsInstance || !mainHlsInstance.levels) {
@@ -2883,6 +2881,8 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.totalAdRequestsInBreak = 0;
         this.maxTotalAdRequestsPerBreak = 20;
         this.pendingAdBreak = null;
+        this.prefetchAdPromise = null;
+        this.savedMutedStateBeforeScte = null;
         this.consecutiveFailures = 0;
         this.maxConsecutiveFailures = 5;
         this.lastAdRequestTime = 0;
@@ -3358,6 +3358,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                         }
                     }
                     console.error("[AD-ERROR]", errorMessage, errorPayload || "");
+                    _this.adController.stop().catch(function() {});
                     _this.handleAdFailure();
                 });
                 this.adController.on("content_pause", function() {
@@ -3400,6 +3401,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     _this.activeAdRequestToken = null;
                     _this.showAds = false;
                     if (!_this.inAdBreak) {
+                        if (_this.config.debugAdTiming) {
+                            console.log("[StormcloudVideoPlayer] content_resume: break already ended (e.g. by CUE-IN or handleAdPodComplete), skipping next-ad path");
+                        }
                         return;
                     }
                     _this.consecutiveFailures = 0;
@@ -3412,6 +3416,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     if (remaining > 500) {
                         _this.tryNextAvailableAdWithRateLimit();
                     } else {
+                        if (_this.config.debugAdTiming) {
+                            console.log("[StormcloudVideoPlayer] content_resume: remaining time too low to try next ad, ending ad pod");
+                        }
                         _this.handleAdPodComplete();
                     }
                 });
@@ -3420,6 +3427,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "recreateAdController",
             value: function recreateAdController() {
+                this.prefetchAdPromise = null;
                 var shouldShowPlaceholder = this.inAdBreak && this.showAds;
                 if (shouldShowPlaceholder && this.adController) {
                     this.showPlaceholderLayer();
@@ -3748,6 +3756,11 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (marker.type === "start") {
                     var _this_config_immediateManifestAds;
                     var _this_pendingAdBreak;
+                    this.savedMutedStateBeforeScte = {
+                        muted: this.video.muted,
+                        volume: this.video.volume
+                    };
+                    this.adController.updateOriginalMutedState(this.video.muted, this.video.volume);
                     if (!this.video.muted) {
                         this.video.muted = true;
                         this.video.volume = 0;
@@ -3870,9 +3883,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             activeAdRequest: this.activeAdRequestToken !== null
                         });
                     }
-                    if (adPlaying || remaining > 1e3 && hasQueuedAds) {
+                    if (adPlaying || remaining > 500) {
                         if (this.config.debugAdTiming) {
-                            console.log("[StormcloudVideoPlayer] Ignoring premature SCTE-35 end marker - ads still active");
+                            console.log("[StormcloudVideoPlayer] Ignoring premature SCTE-35 end marker - ads still active or time remaining");
                         }
                         return;
                     }
@@ -4189,6 +4202,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "startAdPrefetch",
             value: function startAdPrefetch(marker, fragmentSn) {
+                var _this = this;
                 if (this.pendingAdBreak || this.inAdBreak) {
                     return;
                 }
@@ -4200,8 +4214,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     isFetching: false,
                     fetchStartTime: Date.now()
                 });
+                this.prefetchAdPromise = this.adController.requestAds().catch(function() {
+                    if (_this.config.debugAdTiming) {
+                        console.log("[PREFETCH] Prebid auction prefetch failed, will request at playback time");
+                    }
+                });
                 if (this.config.debugAdTiming) {
-                    console.log("[PREFETCH] Ad break marker registered, auction runs at playback time via controller");
+                    console.log("[PREFETCH] Ad break marker registered, auction prefetch started");
                 }
             }
         },
@@ -4212,6 +4231,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     clearTimeout(this.prefetchTimerId);
                     this.prefetchTimerId = void 0;
                 }
+                this.prefetchAdPromise = null;
                 this.pendingAdBreak = null;
             }
         },
@@ -4219,7 +4239,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "handleAdStart",
             value: function handleAdStart(_marker) {
                 return _async_to_generator(function() {
-                    var adBreakDurationMs, mode, currentMuted, currentVolume, adLoadedInfo, adVolume, error;
+                    var _this_savedMutedStateBeforeScte, adBreakDurationMs, mode, state, unused, unused1, adLoadedInfo, adVolume, error;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -4232,9 +4252,12 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.continuousFetchingActive = true;
                                 this.isShowingPlaceholder = false;
                                 this.totalAdRequestsInBreak = 0;
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                this.adController.updateOriginalMutedState(currentMuted, currentVolume);
+                                state = (_this_savedMutedStateBeforeScte = this.savedMutedStateBeforeScte) !== null && _this_savedMutedStateBeforeScte !== void 0 ? _this_savedMutedStateBeforeScte : {
+                                    muted: this.video.muted,
+                                    volume: this.video.volume
+                                };
+                                this.adController.updateOriginalMutedState(state.muted, state.volume);
+                                this.savedMutedStateBeforeScte = null;
                                 if (!this.video.muted) {
                                     this.video.muted = true;
                                     this.video.volume = 0;
@@ -4253,25 +4276,94 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs == null && adBreakDurationMs != null) {
                                     this.expectedAdBreakDurationMs = adBreakDurationMs;
                                 }
-                                this.clearPendingAdBreak();
                                 if (this.config.debugAdTiming) {
-                                    console.log("[CONTINUOUS-FETCH] \uD83D\uDCCB Prebid auction via requestAds()");
+                                    console.log("[CONTINUOUS-FETCH] \uD83D\uDCCB Prebid auction (prefetch or requestAds)");
                                 }
                                 _state.label = 1;
                             case 1:
                                 _state.trys.push([
                                     1,
-                                    4,
+                                    6,
                                     ,
-                                    6
+                                    12
                                 ]);
                                 this.lastAdRequestTime = Date.now();
+                                if (!this.prefetchAdPromise) return [
+                                    3,
+                                    3
+                                ];
                                 return [
                                     4,
-                                    this.adController.requestAds()
+                                    this.prefetchAdPromise
                                 ];
                             case 2:
                                 _state.sent();
+                                this.prefetchAdPromise = null;
+                                return [
+                                    3,
+                                    5
+                                ];
+                            case 3:
+                                return [
+                                    4,
+                                    this.adController.requestAds()
+                                ];
+                            case 4:
+                                _state.sent();
+                                _state.label = 5;
+                            case 5:
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 6:
+                                unused = _state.sent();
+                                _state.label = 7;
+                            case 7:
+                                _state.trys.push([
+                                    7,
+                                    9,
+                                    ,
+                                    11
+                                ]);
+                                return [
+                                    4,
+                                    this.adController.requestAds()
+                                ];
+                            case 8:
+                                _state.sent();
+                                return [
+                                    3,
+                                    11
+                                ];
+                            case 9:
+                                unused1 = _state.sent();
+                                this.clearPendingAdBreak();
+                                this.consecutiveFailures++;
+                                return [
+                                    4,
+                                    this.tryNextAvailableAdWithRateLimit()
+                                ];
+                            case 10:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                            case 11:
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 12:
+                                this.clearPendingAdBreak();
+                                _state.label = 13;
+                            case 13:
+                                _state.trys.push([
+                                    13,
+                                    15,
+                                    ,
+                                    17
+                                ]);
                                 if (this.config.licenseKey) {
                                     adLoadedInfo = {
                                         source: this.getAdSource(),
@@ -4288,19 +4380,19 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     4,
                                     this.adController.play()
                                 ];
-                            case 3:
+                            case 14:
                                 _state.sent();
                                 if (this.expectedAdBreakDurationMs != null) {
                                     this.currentAdBreakStartWallClockMs = Date.now();
                                     this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
                                 }
-                                adVolume = currentMuted ? 0 : currentVolume;
+                                adVolume = state.muted ? 0 : state.volume;
                                 this.adController.setAdVolume(adVolume);
                                 return [
                                     3,
-                                    6
+                                    17
                                 ];
-                            case 4:
+                            case 15:
                                 error = _state.sent();
                                 if (this.config.debugAdTiming) {
                                     console.warn("[CONTINUOUS-FETCH] \u26A0\uFE0F First ad request failed:", error);
@@ -4310,13 +4402,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     4,
                                     this.tryNextAvailableAdWithRateLimit()
                                 ];
-                            case 5:
+                            case 16:
                                 _state.sent();
                                 return [
                                     3,
-                                    6
+                                    17
                                 ];
-                            case 6:
+                            case 17:
                                 return [
                                     2
                                 ];