stormcloud-video-player 0.3.39 → 0.3.40

package/lib/players/index.cjs

@@ -2896,7 +2896,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         this.adRequestQueue = [];
         this.maxPlaceholderDurationMs = 5e3;
         this.isShowingPlaceholder = false;
-        this.imaControllerPool = /* @__PURE__ */ new Map();
         this.totalAdRequestsInBreak = 0;
         this.maxTotalAdRequestsPerBreak = 20;
         this.pendingAdBreak = null;
@@ -3410,6 +3409,13 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     _this.clearAdRequestWatchdog();
                     _this.activeAdRequestToken = null;
                     _this.showAds = true;
+                    if (_this.isShowingPlaceholder) {
+                        if (_this.config.debugAdTiming) {
+                            console.log("[StormcloudVideoPlayer] Hiding placeholder - new ads starting");
+                        }
+                        _this.ima.hidePlaceholder();
+                        _this.isShowingPlaceholder = false;
+                    }
                 });
                 this.ima.on("content_resume", function() {
                     _this.clearAdFailsafeTimer();
@@ -3440,123 +3446,32 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (this.config.debugAdTiming) {
                     console.log("[StormcloudVideoPlayer] Recreating ImaController for new ad");
                 }
-                var oldIma = this.ima;
                 var shouldShowPlaceholder = this.inAdBreak && this.showAds;
-                var continueLiveStreamDuringAds = this.shouldContinueLiveStreamDuringAds();
-                this.ima = this.createAdPlayer(continueLiveStreamDuringAds);
-                this.ima.initialize();
-                this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
-                this.attachImaEventListeners();
-                if (shouldShowPlaceholder) {
+                if (shouldShowPlaceholder && this.ima) {
+                    if (this.config.debugAdTiming) {
+                        console.log("[StormcloudVideoPlayer] Showing placeholder before destroying old ImaController");
+                    }
                     this.ima.showPlaceholder();
+                    this.isShowingPlaceholder = true;
                 }
-                if (oldIma) {
+                if (this.ima) {
                     try {
-                        oldIma.destroy();
+                        this.ima.destroy();
                     } catch (error) {
                         if (this.config.debugAdTiming) {
                             console.warn("[StormcloudVideoPlayer] Error destroying old ImaController:", error);
                         }
                     }
                 }
-            }
-        },
-        {
-            key: "precreateImaController",
-            value: function precreateImaController(vastTagUrl) {
-                if (this.imaControllerPool.has(vastTagUrl)) {
-                    return this.imaControllerPool.get(vastTagUrl);
-                }
-                if (this.config.debugAdTiming) {
-                    console.log("[StormcloudVideoPlayer] Pre-creating ImaController for: ".concat(vastTagUrl));
-                }
-                var continueLiveStreamDuringAds = this.shouldContinueLiveStreamDuringAds();
-                var controller = this.createAdPlayer(continueLiveStreamDuringAds);
-                controller.initialize();
-                controller.updateOriginalMutedState(this.video.muted, this.video.volume);
-                this.attachImaEventListenersToController(controller);
-                this.imaControllerPool.set(vastTagUrl, controller);
-                return controller;
-            }
-        },
-        {
-            key: "getOrCreateImaController",
-            value: function getOrCreateImaController(vastTagUrl) {
-                if (this.imaControllerPool.has(vastTagUrl)) {
-                    var controller2 = this.imaControllerPool.get(vastTagUrl);
-                    this.imaControllerPool.delete(vastTagUrl);
-                    return controller2;
-                }
-                if (this.config.debugAdTiming) {
-                    console.log("[StormcloudVideoPlayer] Controller not in pool, creating new one for: ".concat(vastTagUrl));
-                }
                 var continueLiveStreamDuringAds = this.shouldContinueLiveStreamDuringAds();
-                var controller = this.createAdPlayer(continueLiveStreamDuringAds);
-                controller.initialize();
-                controller.updateOriginalMutedState(this.video.muted, this.video.volume);
-                this.attachImaEventListenersToController(controller);
-                return controller;
-            }
-        },
-        {
-            key: "switchToImaController",
-            value: function switchToImaController(vastTagUrl) {
-                var oldIma = this.ima;
-                var shouldShowPlaceholder = this.inAdBreak && this.showAds;
-                this.ima = this.getOrCreateImaController(vastTagUrl);
+                this.ima = this.createAdPlayer(continueLiveStreamDuringAds);
+                this.ima.initialize();
+                this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
+                this.attachImaEventListeners();
                 if (shouldShowPlaceholder) {
                     this.ima.showPlaceholder();
+                    this.isShowingPlaceholder = true;
                 }
-                if (oldIma && oldIma !== this.ima) {
-                    try {
-                        oldIma.destroy();
-                    } catch (error) {
-                        if (this.config.debugAdTiming) {
-                            console.warn("[StormcloudVideoPlayer] Error destroying old ImaController:", error);
-                        }
-                    }
-                }
-            }
-        },
-        {
-            key: "attachImaEventListenersToController",
-            value: function attachImaEventListenersToController(controller) {
-                var originalIma = this.ima;
-                this.ima = controller;
-                this.attachImaEventListeners();
-                this.ima = originalIma;
-            }
-        },
-        {
-            key: "cleanupImaControllerPool",
-            value: function cleanupImaControllerPool() {
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = this.imaControllerPool.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var _step_value = _sliced_to_array(_step.value, 2), vastTagUrl = _step_value[0], controller = _step_value[1];
-                        try {
-                            controller.destroy();
-                        } catch (error) {
-                            if (this.config.debugAdTiming) {
-                                console.warn("[StormcloudVideoPlayer] Error destroying controller for ".concat(vastTagUrl, ":"), error);
-                            }
-                        }
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                    }
-                }
-                this.imaControllerPool.clear();
             }
         },
         {
@@ -4352,7 +4267,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "handleAdStart",
             value: function handleAdStart(_marker) {
                 return _async_to_generator(function() {
-                    var scheduled, tags, baseVastUrl, adBreakDurationMs, mode, currentMuted, currentVolume, firstAdUrl, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, vastTagUrl, firstAdUrlArray, error;
+                    var scheduled, tags, baseVastUrl, adBreakDurationMs, mode, currentMuted, currentVolume, firstAdUrl, firstAdUrlArray, error;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -4399,32 +4314,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     if (this.config.debugAdTiming) {
                                         console.log("[CONTINUOUS-FETCH] \uD83D\uDE80 Using prefetched ad URLs (".concat(this.adRequestQueue.length + 1, " available)"));
                                     }
-                                    _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                                    try {
-                                        for(_iterator = this.adRequestQueue[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                            vastTagUrl = _step.value;
-                                            try {
-                                                this.precreateImaController(vastTagUrl);
-                                            } catch (error) {
-                                                if (this.config.debugAdTiming) {
-                                                    console.warn("[StormcloudVideoPlayer] Failed to pre-create controller for ".concat(vastTagUrl, ":"), error);
-                                                }
-                                            }
-                                        }
-                                    } catch (err) {
-                                        _didIteratorError = true;
-                                        _iteratorError = err;
-                                    } finally{
-                                        try {
-                                            if (!_iteratorNormalCompletion && _iterator.return != null) {
-                                                _iterator.return();
-                                            }
-                                        } finally{
-                                            if (_didIteratorError) {
-                                                throw _iteratorError;
-                                            }
-                                        }
-                                    }
                                     this.clearPendingAdBreak();
                                 } else {
                                     if (this.config.debugAdTiming) {
@@ -4623,13 +4512,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                                 }
                                                 _this.adRequestQueue.push(newAdUrl);
                                                 _this.totalAdsInBreak++;
-                                                try {
-                                                    _this.precreateImaController(newAdUrl);
-                                                } catch (error) {
-                                                    if (_this.config.debugAdTiming) {
-                                                        console.warn("[StormcloudVideoPlayer] Failed to pre-create controller for ".concat(newAdUrl, ":"), error);
-                                                    }
-                                                }
                                                 generationDelay = _this.consecutiveFailures > 0 ? Math.min(1e3 * Math.pow(2, _this.consecutiveFailures), 5e3) : 500;
                                                 return [
                                                     4,
@@ -4689,36 +4571,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 if (this.config.debugAdTiming) {
                     console.log("[CONTINUOUS-FETCH] \uD83D\uDED1 Stopping continuous ad fetching");
                 }
-                var queueSet = new Set(this.adRequestQueue);
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = this.imaControllerPool.entries()[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var _step_value = _sliced_to_array(_step.value, 2), vastTagUrl = _step_value[0], controller = _step_value[1];
-                        if (!queueSet.has(vastTagUrl)) {
-                            try {
-                                controller.destroy();
-                            } catch (error) {
-                                if (this.config.debugAdTiming) {
-                                    console.warn("[StormcloudVideoPlayer] Error destroying unused controller for ".concat(vastTagUrl, ":"), error);
-                                }
-                            }
-                            this.imaControllerPool.delete(vastTagUrl);
-                        }
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                    }
-                }
             }
         },
         {
@@ -5353,10 +5205,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                     }
                                     throw new Error("Too many consecutive failures");
                                 }
-                                this.switchToImaController(vastTagUrl);
-                                if (this.inAdBreak && this.showAds && !this.isShowingPlaceholder) {
-                                    this.ima.showPlaceholder();
-                                }
+                                this.recreateImaController();
                                 requestToken = ++this.adRequestTokenCounter;
                                 this.activeAdRequestToken = requestToken;
                                 this.startAdRequestWatchdog(requestToken);
@@ -5476,7 +5325,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                     this.isShowingPlaceholder = false;
                 }
                 this.adRequestQueue = [];
-                this.cleanupImaControllerPool();
                 this.inAdBreak = false;
                 this.expectedAdBreakDurationMs = void 0;
                 this.currentAdBreakStartWallClockMs = void 0;
@@ -5868,7 +5716,6 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }
                 (_this_hls = this.hls) === null || _this_hls === void 0 ? void 0 : _this_hls.destroy();
                 (_this_ima = this.ima) === null || _this_ima === void 0 ? void 0 : _this_ima.destroy();
-                this.cleanupImaControllerPool();
                 this.adRequestQueue = [];
                 this.consecutiveFailures = 0;
             }