stormcloud-video-player 0.3.13 → 0.3.14

package/lib/player/StormcloudVideoPlayer.cjs

@@ -922,6 +922,8 @@ function createHlsAdPlayer(contentVideo, options) {
   let sessionId;
   const preloadedAds = /* @__PURE__ */ new Map();
   const preloadingAds = /* @__PURE__ */ new Map();
+  let destroyed = false;
+  let pendingTimeouts = [];
   let trackingFired = {
     impression: false,
     start: false,
@@ -1250,13 +1252,27 @@ function createHlsAdPlayer(contentVideo, options) {
     adPlaying = false;
     setAdPlayingFlag(false);
     emit("content_resume");
-    setTimeout(() => {
-      if (!adPlaying && adContainerEl) {
-        adContainerEl.style.display = "none";
-        adContainerEl.style.pointerEvents = "none";
-        console.log("[HlsAdPlayer] Ad container hidden after completion (waiting for next ad)");
+    const timeoutId = window.setTimeout(() => {
+      if (destroyed) {
+        console.log("[HlsAdPlayer] Player destroyed, skipping post-completion check");
+        return;
+      }
+      const stillInPod = contentVideo.dataset.stormcloudAdPlaying === "true";
+      if (stillInPod) {
+        console.log(
+          "[HlsAdPlayer] Still in ad pod - keeping ad container visible (black screen)"
+        );
+        if (adContainerEl) {
+          adContainerEl.style.display = "flex";
+          adContainerEl.style.pointerEvents = "auto";
+        }
+      }
+      const idx = pendingTimeouts.indexOf(timeoutId);
+      if (idx !== -1) {
+        pendingTimeouts.splice(idx, 1);
       }
     }, 50);
+    pendingTimeouts.push(timeoutId);
   }
   function handleAdError() {
     console.log("[HlsAdPlayer] Handling ad error");
@@ -1486,6 +1502,11 @@ function createHlsAdPlayer(contentVideo, options) {
     },
     destroy() {
       console.log("[HlsAdPlayer] Destroying");
+      destroyed = true;
+      for (const timeoutId of pendingTimeouts) {
+        clearTimeout(timeoutId);
+      }
+      pendingTimeouts = [];
       adPlaying = false;
       setAdPlayingFlag(false);
       contentVideo.muted = originalMutedState;
@@ -2398,10 +2419,11 @@ var StormcloudVideoPlayer = class {
         this.handleAdPodComplete();
       }
     });
-    this.video.addEventListener("timeupdate", () => {
+    this.timeUpdateHandler = () => {
       this.onTimeUpdate(this.video.currentTime);
-    });
-    this.video.addEventListener("emptied", () => {
+    };
+    this.video.addEventListener("timeupdate", this.timeUpdateHandler);
+    this.emptiedHandler = () => {
       if (this.nativeHlsMode && this.videoSrcProtection && !this.ima.isAdPlaying()) {
         if (this.config.debugAdTiming) {
           console.log(
@@ -2418,7 +2440,8 @@ var StormcloudVideoPlayer = class {
           });
         }
       }
-    });
+    };
+    this.video.addEventListener("emptied", this.emptiedHandler);
   }
   shouldUseNativeHls() {
     const streamType = this.getStreamType();
@@ -3110,7 +3133,7 @@ var StormcloudVideoPlayer = class {
         continue;
       }
       if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch ad #${this.successfulAdRequests.length + this.adRequestQueue.length + 1} (queue: ${this.adRequestQueue.length}, remaining: ${Math.round(remaining / 1e3)}s)...`);
+        console.log(`[CONTINUOUS-FETCH] \u{1F4E1} Attempting to fetch ad (${this.successfulAdRequests.length + this.adRequestQueue.length + 1} total)...`);
       }
       try {
         const response = await fetch(newAdUrl, { mode: "cors" });
@@ -3126,8 +3149,7 @@ var StormcloudVideoPlayer = class {
             console.log("[CONTINUOUS-FETCH] \u26A0\uFE0F VAST response has no media files, skipping");
           }
           this.failedVastUrls.add(newAdUrl);
-          const retryDelay = this.adRequestQueue.length > 0 ? 1e3 : 500;
-          await new Promise((resolve) => setTimeout(resolve, retryDelay));
+          await new Promise((resolve) => setTimeout(resolve, 1e3));
           continue;
         }
         if (this.config.debugAdTiming) {
@@ -3135,19 +3157,17 @@ var StormcloudVideoPlayer = class {
         }
         this.adRequestQueue.push(newAdUrl);
         this.totalAdsInBreak++;
-        const successDelay = this.adRequestQueue.length <= 1 ? 300 : 500;
-        await new Promise((resolve) => setTimeout(resolve, successDelay));
+        await new Promise((resolve) => setTimeout(resolve, 500));
       } catch (error) {
         if (this.config.debugAdTiming) {
           console.log("[CONTINUOUS-FETCH] \u274C Ad fetch failed:", error.message);
         }
         this.failedVastUrls.add(newAdUrl);
-        const retryDelay = this.adRequestQueue.length > 0 ? 2e3 : 1e3;
-        await new Promise((resolve) => setTimeout(resolve, retryDelay));
+        await new Promise((resolve) => setTimeout(resolve, 2e3));
       }
     }
     if (this.config.debugAdTiming) {
-      console.log(`[CONTINUOUS-FETCH] \u{1F6D1} Continuous fetch loop ended (fetched ${this.successfulAdRequests.length} ads, ${this.adRequestQueue.length} in queue)`);
+      console.log("[CONTINUOUS-FETCH] \u{1F6D1} Continuous fetch loop ended");
     }
   }
   stopContinuousFetching() {
@@ -3185,27 +3205,20 @@ var StormcloudVideoPlayer = class {
         return;
       }
     }
-    const hasPlayedAtLeastOneAd = this.successfulAdRequests.length > 0;
-    const maxRetries = hasPlayedAtLeastOneAd ? 10 : 5;
-    const retryDelayMs = hasPlayedAtLeastOneAd ? 500 : 1e3;
-    const minRemainingForRetry = 1e3;
-    if (this.continuousFetchingActive && retryCount < maxRetries && remaining > minRemainingForRetry) {
+    const maxRetries = 5;
+    if (this.continuousFetchingActive && retryCount < maxRetries && remaining > 2e3) {
       if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u23F3 Queue empty but fetching active, waiting ${retryDelayMs}ms... (retry ${retryCount + 1}/${maxRetries}, remaining: ${remaining}ms)`);
+        console.log(`[CONTINUOUS-FETCH] \u23F3 Queue empty but fetching active, waiting... (retry ${retryCount + 1}/${maxRetries})`);
       }
-      await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
       await this.tryNextAvailableAd(retryCount + 1);
       return;
     }
-    const minTimeForPlaceholder = 3e3;
-    if (!this.isShowingPlaceholder && remaining >= minTimeForPlaceholder && this.continuousFetchingActive) {
-      if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u2B1B Last resort: showing placeholder (${remaining}ms remaining)`);
-      }
+    if (!this.isShowingPlaceholder && remaining > 1e3) {
       this.showPlaceholderAndWaitForAds();
     } else {
       if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u23F9\uFE0F No more ads available or insufficient time remaining (${remaining}ms), ending ad break`);
+        console.log("[CONTINUOUS-FETCH] \u23F9\uFE0F No more ads available, ending ad break");
       }
       this.handleAdPodComplete();
     }
@@ -3213,36 +3226,26 @@ var StormcloudVideoPlayer = class {
   async showPlaceholderAndWaitForAds() {
     const remaining = this.getRemainingAdMs();
     const waitTime = Math.min(this.maxPlaceholderDurationMs, remaining);
-    if (waitTime < 3e3) {
-      if (this.config.debugAdTiming) {
-        console.log(`[CONTINUOUS-FETCH] \u23F9\uFE0F Insufficient time for placeholder (${waitTime}ms), ending ad break`);
-      }
+    if (waitTime < 1e3) {
       this.handleAdPodComplete();
       return;
     }
     if (this.config.debugAdTiming) {
-      console.log(`[CONTINUOUS-FETCH] \u2B1B Showing black placeholder for up to ${waitTime}ms while waiting for ads (last resort)`);
+      console.log(`[CONTINUOUS-FETCH] \u2B1B Showing black placeholder for ${waitTime}ms while waiting for ads`);
     }
     this.isShowingPlaceholder = true;
     this.placeholderStartTimeMs = Date.now();
     this.ima.showPlaceholder();
-    const checkInterval = 300;
+    const checkInterval = 500;
     const maxChecks = Math.floor(waitTime / checkInterval);
     for (let i = 0; i < maxChecks; i++) {
       await new Promise((resolve) => setTimeout(resolve, checkInterval));
       if (!this.inAdBreak) {
-        if (this.config.debugAdTiming) {
-          console.log("[CONTINUOUS-FETCH] \u2139\uFE0F Ad break ended during placeholder wait");
-        }
-        this.isShowingPlaceholder = false;
-        this.placeholderStartTimeMs = null;
-        this.ima.hidePlaceholder();
         return;
       }
       if (this.adRequestQueue.length > 0) {
-        const elapsedInPlaceholder = Date.now() - (this.placeholderStartTimeMs || Date.now());
         if (this.config.debugAdTiming) {
-          console.log(`[CONTINUOUS-FETCH] \u2705 New ad became available during placeholder (after ${elapsedInPlaceholder}ms)`);
+          console.log("[CONTINUOUS-FETCH] \u2705 New ad became available during placeholder");
         }
         this.isShowingPlaceholder = false;
         this.placeholderStartTimeMs = null;
@@ -3261,9 +3264,8 @@ var StormcloudVideoPlayer = class {
         return;
       }
     }
-    const totalPlaceholderTime = Date.now() - (this.placeholderStartTimeMs || Date.now());
     if (this.config.debugAdTiming) {
-      console.log(`[CONTINUOUS-FETCH] \u23F0 Placeholder timeout reached after ${totalPlaceholderTime}ms, no ads fetched`);
+      console.log("[CONTINUOUS-FETCH] \u23F0 Placeholder timeout reached, no ads fetched");
     }
     this.isShowingPlaceholder = false;
     this.placeholderStartTimeMs = null;
@@ -4075,6 +4077,15 @@ var StormcloudVideoPlayer = class {
     this.clearAdStartTimer();
     this.clearAdStopTimer();
     this.clearAdFailsafeTimer();
+    this.clearAdRequestWatchdog();
+    if (this.timeUpdateHandler) {
+      this.video.removeEventListener("timeupdate", this.timeUpdateHandler);
+      delete this.timeUpdateHandler;
+    }
+    if (this.emptiedHandler) {
+      this.video.removeEventListener("emptied", this.emptiedHandler);
+      delete this.emptiedHandler;
+    }
     if (this.heartbeatInterval) {
       clearInterval(this.heartbeatInterval);
       this.heartbeatInterval = void 0;