stormcloud-video-player 0.2.5 → 0.2.6

package/lib/index.cjs

@@ -127,8 +127,6 @@ function createImaController(video, options) {
   let adsLoadedPromise;
   let adsLoadedResolve;
   let adsLoadedReject;
-  let currentAdDuration = 0;
-  let preloadedAds = [];
   function makeAdsRequest(google, vastTagUrl) {
     const adsRequest = new google.ima.AdsRequest();
     adsRequest.adTagUrl = vastTagUrl;
@@ -235,7 +233,6 @@ function createImaController(video, options) {
                     } catch {
                     }
                     adPlaying = false;
-                    currentAdDuration = 0;
                     video.muted = originalMutedState;
                     if (adContainerEl)
                       adContainerEl.style.pointerEvents = "none";
@@ -307,22 +304,9 @@ function createImaController(video, options) {
                     emit("content_resume");
                   }
                 );
-                adsManager.addEventListener(AdEvent.STARTED, (adEvent) => {
-                  console.log("[IMA] Ad started");
-                  try {
-                    const ad = adEvent.getAd();
-                    if (ad && ad.getDuration) {
-                      currentAdDuration = ad.getDuration();
-                      console.log(`[IMA] Ad duration: ${currentAdDuration}s`);
-                    }
-                  } catch (error) {
-                    console.warn("[IMA] Could not get ad duration:", error);
-                  }
-                });
                 adsManager.addEventListener(AdEvent.ALL_ADS_COMPLETED, () => {
                   console.log("[IMA] All ads completed");
                   adPlaying = false;
-                  currentAdDuration = 0;
                   video.muted = originalMutedState;
                   if (adContainerEl) adContainerEl.style.pointerEvents = "none";
                   if (!options?.continueLiveStreamDuringAds) {
@@ -507,84 +491,6 @@ function createImaController(video, options) {
         }
       }
       return 1;
-    },
-    getAdDuration() {
-      return currentAdDuration;
-    },
-    async preloadAds(vastTagUrls) {
-      console.log(`[IMA] Preloading ${vastTagUrls.length} ads`);
-      const adInfos = [];
-      for (const vastTagUrl of vastTagUrls) {
-        try {
-          await ensureImaLoaded();
-          const google = window.google;
-          const tempAdsLoader = new google.ima.AdsLoader(adDisplayContainer);
-          const adInfo = await new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
-              reject(new Error("Preload timeout"));
-            }, 5e3);
-            tempAdsLoader.addEventListener(
-              google.ima.AdsManagerLoadedEvent.Type.ADS_MANAGER_LOADED,
-              (evt) => {
-                clearTimeout(timeout);
-                try {
-                  const tempAdsManager = evt.getAdsManager(video);
-                  let duration = 30;
-                  try {
-                    const ads = tempAdsManager.getCuePoints?.() || [];
-                    if (ads.length > 0) {
-                      duration = 15;
-                    }
-                  } catch {
-                  }
-                  tempAdsManager.destroy();
-                  resolve({
-                    duration,
-                    vastTagUrl,
-                    isPreloaded: true
-                  });
-                } catch (error) {
-                  clearTimeout(timeout);
-                  reject(error);
-                }
-              }
-            );
-            tempAdsLoader.addEventListener(
-              google.ima.AdErrorEvent.Type.AD_ERROR,
-              (errorEvent) => {
-                clearTimeout(timeout);
-                console.warn(
-                  `[IMA] Preload error for ${vastTagUrl}:`,
-                  errorEvent.getError()
-                );
-                resolve({
-                  duration: 30,
-                  vastTagUrl,
-                  isPreloaded: false
-                });
-              }
-            );
-            const adsRequest = new google.ima.AdsRequest();
-            adsRequest.adTagUrl = vastTagUrl;
-            tempAdsLoader.requestAds(adsRequest);
-          });
-          adInfos.push(adInfo);
-          tempAdsLoader.destroy();
-        } catch (error) {
-          console.warn(`[IMA] Failed to preload ad ${vastTagUrl}:`, error);
-          adInfos.push({
-            duration: 30,
-            vastTagUrl,
-            isPreloaded: false
-          });
-        }
-      }
-      preloadedAds = adInfos;
-      console.log(
-        `[IMA] Preloaded ${adInfos.length} ads with total duration:`,
-        adInfos.reduce((sum, ad) => sum + ad.duration, 0)
-      );
-      return adInfos;
     }
   };
 }
@@ -817,8 +723,6 @@ var StormcloudVideoPlayer = class {
     this.totalAdsInBreak = 0;
     this.showAds = false;
     this.isLiveStream = false;
-    this.preloadedAdInfo = [];
-    this.cumulativeAdDurationMs = 0;
     this.config = config;
     this.video = config.videoElement;
     this.ima = createImaController(this.video, {
@@ -990,28 +894,16 @@ var StormcloudVideoPlayer = class {
     this.ima.initialize();
     this.ima.on("all_ads_completed", () => {
       if (!this.inAdBreak) return;
-      const actualAdDuration = this.ima.getAdDuration();
-      if (actualAdDuration > 0) {
-        this.cumulativeAdDurationMs += actualAdDuration * 1e3;
-        if (this.config.debugAdTiming) {
-          console.log(
-            `[StormcloudVideoPlayer] Ad completed. Duration: ${actualAdDuration}s, Cumulative: ${this.cumulativeAdDurationMs}ms`
-          );
-        }
-      }
       const remaining = this.getRemainingAdMs();
-      const shouldContinue = this.shouldContinueAdBreak(remaining);
-      if (shouldContinue && this.adPodQueue.length > 0) {
+      if (remaining > 500 && this.adPodQueue.length > 0) {
         const next = this.adPodQueue.shift();
         this.currentAdIndex++;
         this.playSingleAd(next).catch(() => {
         });
-      } else if (shouldContinue && this.canRequestMoreAds()) {
-        this.requestAdditionalAds().catch(() => {
-          this.endAdBreak();
-        });
       } else {
-        this.endAdBreak();
+        this.currentAdIndex = 0;
+        this.totalAdsInBreak = 0;
+        this.showAds = false;
       }
     });
     this.ima.on("ad_error", () => {
@@ -1020,16 +912,11 @@ var StormcloudVideoPlayer = class {
       }
       if (!this.inAdBreak) return;
       const remaining = this.getRemainingAdMs();
-      const shouldContinue = this.shouldContinueAdBreak(remaining);
-      if (shouldContinue && this.adPodQueue.length > 0) {
+      if (remaining > 500 && this.adPodQueue.length > 0) {
         const next = this.adPodQueue.shift();
         this.currentAdIndex++;
         this.playSingleAd(next).catch(() => {
         });
-      } else if (shouldContinue && this.canRequestMoreAds()) {
-        this.requestAdditionalAds().catch(() => {
-          this.handleAdFailure();
-        });
       } else {
         this.handleAdFailure();
       }
@@ -1520,25 +1407,6 @@ var StormcloudVideoPlayer = class {
   isShowingAds() {
     return this.showAds;
   }
-  getAdBreakStats() {
-    const remainingDurationMs = this.currentAdBreakTargetDurationMs != null ? Math.max(
-      0,
-      this.currentAdBreakTargetDurationMs - this.cumulativeAdDurationMs
-    ) : void 0;
-    const estimatedFillRate = this.currentAdBreakTargetDurationMs != null && this.currentAdBreakTargetDurationMs > 0 ? this.cumulativeAdDurationMs / this.currentAdBreakTargetDurationMs * 100 : void 0;
-    return {
-      isInAdBreak: this.inAdBreak,
-      currentAdIndex: this.currentAdIndex,
-      totalAdsInBreak: this.totalAdsInBreak,
-      targetDurationMs: this.currentAdBreakTargetDurationMs,
-      cumulativeDurationMs: this.cumulativeAdDurationMs,
-      estimatedFillRate,
-      remainingDurationMs
-    };
-  }
-  getPreloadedAdInfo() {
-    return [...this.preloadedAdInfo];
-  }
   getStreamType() {
     const url = this.config.src.toLowerCase();
     if (url.includes(".m3u8") || url.includes("/hls/") || url.includes("application/vnd.apple.mpegurl")) {
@@ -1562,70 +1430,59 @@ var StormcloudVideoPlayer = class {
     }
     return true;
   }
-  async loadDefaultVastFromAdstorm(adstormApiUrl, params) {
-    const usp = new URLSearchParams(params || {});
-    const url = `${adstormApiUrl}?${usp.toString()}`;
-    const res = await fetch(url);
-    if (!res.ok) throw new Error(`Failed to fetch adstorm ads: ${res.status}`);
-    const data = await res.json();
-    const tag = data?.adTagUrl || data?.vastTagUrl || data?.tagUrl;
-    if (typeof tag === "string" && tag.length > 0) {
-      this.apiVastTagUrl = tag;
-    }
-  }
-  async handleAdStart(marker) {
+  async handleAdStart(_marker) {
     const scheduled = this.findCurrentOrNextBreak(
       this.video.currentTime * 1e3
     );
-    let targetDurationMs = this.expectedAdBreakDurationMs;
-    if (!targetDurationMs && scheduled?.durationMs != null) {
-      targetDurationMs = scheduled.durationMs;
-    }
-    if (!targetDurationMs && marker.durationSeconds != null) {
-      targetDurationMs = marker.durationSeconds * 1e3;
-    }
-    this.currentAdBreakTargetDurationMs = targetDurationMs;
-    this.cumulativeAdDurationMs = 0;
-    if (this.config.debugAdTiming) {
-      console.log(
-        "[StormcloudVideoPlayer] Starting ad break with target duration:",
-        {
-          targetDurationMs,
-          scte35Duration: marker.durationSeconds,
-          scheduledDuration: scheduled?.durationMs
+    const tags = this.selectVastTagsForBreak(scheduled);
+    let vastTagUrl;
+    let adsNumber = 1;
+    if (this.apiVastTagUrl) {
+      vastTagUrl = this.apiVastTagUrl;
+      if (this.vastConfig) {
+        const isHls = this.config.src.includes(".m3u8") || this.config.src.includes("hls");
+        if (isHls && this.vastConfig.cue_tones?.number_ads) {
+          adsNumber = this.vastConfig.cue_tones.number_ads;
+        } else if (!isHls && this.vastConfig.timer_vod?.number_ads) {
+          adsNumber = this.vastConfig.timer_vod.number_ads;
         }
-      );
-    }
-    const adQueue = await this.buildAdQueueForDuration(targetDurationMs);
-    if (adQueue.length === 0) {
+      }
+      this.adPodQueue = new Array(adsNumber - 1).fill(vastTagUrl);
+      this.currentAdIndex = 0;
+      this.totalAdsInBreak = adsNumber;
       if (this.config.debugAdTiming) {
-        console.log("[StormcloudVideoPlayer] No ads available for ad break");
+        console.log(
+          `[StormcloudVideoPlayer] Using API VAST tag with ${adsNumber} ads:`,
+          vastTagUrl
+        );
+      }
+    } else if (tags && tags.length > 0) {
+      vastTagUrl = tags[0];
+      const rest = tags.slice(1);
+      this.adPodQueue = rest;
+      this.currentAdIndex = 0;
+      this.totalAdsInBreak = tags.length;
+      if (this.config.debugAdTiming) {
+        console.log(
+          "[StormcloudVideoPlayer] Using scheduled VAST tag:",
+          vastTagUrl
+        );
+      }
+    } else {
+      if (this.config.debugAdTiming) {
+        console.log("[StormcloudVideoPlayer] No VAST tag available for ad");
       }
       return;
     }
-    this.adPodQueue = adQueue.slice(1);
-    this.preloadedAdInfo = await this.getAdInfoForQueue(adQueue);
-    this.currentAdIndex = 0;
-    this.totalAdsInBreak = adQueue.length;
-    this.showAds = true;
-    if (this.config.debugAdTiming) {
-      const totalEstimatedDuration = this.preloadedAdInfo.reduce(
-        (sum, ad) => sum + ad.duration,
-        0
-      );
-      console.log("[StormcloudVideoPlayer] Ad queue built:", {
-        totalAds: adQueue.length,
-        estimatedTotalDuration: totalEstimatedDuration,
-        targetDuration: targetDurationMs ? targetDurationMs / 1e3 : "unknown",
-        fillRate: targetDurationMs ? totalEstimatedDuration * 1e3 / targetDurationMs : "unknown"
-      });
+    if (vastTagUrl) {
+      this.showAds = true;
+      this.currentAdIndex++;
+      await this.playSingleAd(vastTagUrl);
     }
-    this.currentAdIndex++;
-    await this.playSingleAd(adQueue[0]);
-    if (targetDurationMs != null) {
-      this.expectedAdBreakDurationMs = targetDurationMs;
+    if (this.expectedAdBreakDurationMs == null && scheduled?.durationMs != null) {
+      this.expectedAdBreakDurationMs = scheduled.durationMs;
       this.currentAdBreakStartWallClockMs = this.currentAdBreakStartWallClockMs ?? Date.now();
-      this.scheduleAdStopCountdown(targetDurationMs);
+      this.scheduleAdStopCountdown(this.expectedAdBreakDurationMs);
     }
   }
   findCurrentOrNextBreak(nowMs) {
@@ -1742,89 +1599,25 @@ var StormcloudVideoPlayer = class {
         "[StormcloudVideoPlayer] Handling ad failure - resuming content"
       );
     }
-    this.endAdBreak();
-    if (this.video.paused) {
-      this.video.play().catch(() => {
-        if (this.config.debugAdTiming) {
-          console.error(
-            "[StormcloudVideoPlayer] Failed to resume video after ad failure"
-          );
-        }
-      });
-    }
-  }
-  endAdBreak() {
-    if (this.config.debugAdTiming) {
-      const targetDuration = this.currentAdBreakTargetDurationMs ? this.currentAdBreakTargetDurationMs / 1e3 : "unknown";
-      const actualDuration = this.cumulativeAdDurationMs / 1e3;
-      const fillRate = this.currentAdBreakTargetDurationMs ? (this.cumulativeAdDurationMs / this.currentAdBreakTargetDurationMs * 100).toFixed(1) : "unknown";
-      console.log("[StormcloudVideoPlayer] Ad break ended:", {
-        targetDurationSeconds: targetDuration,
-        actualDurationSeconds: actualDuration,
-        fillRate: `${fillRate}%`,
-        totalAdsPlayed: this.currentAdIndex
-      });
-    }
     this.inAdBreak = false;
     this.expectedAdBreakDurationMs = void 0;
     this.currentAdBreakStartWallClockMs = void 0;
-    this.currentAdBreakTargetDurationMs = void 0;
-    this.cumulativeAdDurationMs = 0;
     this.clearAdStartTimer();
     this.clearAdStopTimer();
     this.clearAdFailsafeTimer();
     this.adPodQueue = [];
-    this.preloadedAdInfo = [];
     this.showAds = false;
     this.currentAdIndex = 0;
     this.totalAdsInBreak = 0;
-  }
-  shouldContinueAdBreak(remainingMs) {
-    if (remainingMs > 500) {
-      return true;
-    }
-    if (this.currentAdBreakTargetDurationMs) {
-      const targetRemainingMs = this.currentAdBreakTargetDurationMs - this.cumulativeAdDurationMs;
-      const minAdDuration = this.config.minAdDurationMs ?? 5e3;
-      if (targetRemainingMs > minAdDuration) {
+    if (this.video.paused) {
+      this.video.play().catch(() => {
         if (this.config.debugAdTiming) {
-          console.log(
-            `[StormcloudVideoPlayer] Target duration not filled, continuing. Remaining: ${targetRemainingMs}ms`
+          console.error(
+            "[StormcloudVideoPlayer] Failed to resume video after ad failure"
           );
         }
-        return true;
-      }
-    }
-    return false;
-  }
-  canRequestMoreAds() {
-    const maxAdsPerBreak = this.config.maxAdsPerBreak ?? 10;
-    if (this.currentAdIndex >= maxAdsPerBreak) {
-      return false;
-    }
-    return !!this.apiVastTagUrl;
-  }
-  async requestAdditionalAds() {
-    if (!this.currentAdBreakTargetDurationMs || !this.apiVastTagUrl) {
-      throw new Error(
-        "Cannot request additional ads without target duration and VAST URL"
-      );
-    }
-    const remainingDurationMs = this.currentAdBreakTargetDurationMs - this.cumulativeAdDurationMs;
-    const estimatedAdDurationMs = this.getEstimatedAdDuration() * 1e3;
-    if (remainingDurationMs < estimatedAdDurationMs * 0.5) {
-      throw new Error("Not enough time remaining for additional ads");
-    }
-    if (this.config.debugAdTiming) {
-      console.log(
-        `[StormcloudVideoPlayer] Requesting additional ads for remaining ${remainingDurationMs}ms`
-      );
+      });
     }
-    this.adPodQueue.push(this.apiVastTagUrl);
-    this.totalAdsInBreak++;
-    const next = this.adPodQueue.shift();
-    this.currentAdIndex++;
-    await this.playSingleAd(next);
   }
   startAdFailsafeTimer() {
     this.clearAdFailsafeTimer();
@@ -1858,109 +1651,6 @@ var StormcloudVideoPlayer = class {
     }
     return [b.vastTagUrl];
   }
-  async buildAdQueueForDuration(targetDurationMs) {
-    const adQueue = [];
-    let baseVastTagUrl = this.apiVastTagUrl;
-    if (!baseVastTagUrl) {
-      const scheduled = this.findCurrentOrNextBreak(
-        this.video.currentTime * 1e3
-      );
-      const scheduledTags = this.selectVastTagsForBreak(scheduled);
-      if (scheduledTags && scheduledTags.length > 0) {
-        baseVastTagUrl = scheduledTags[0];
-      }
-    }
-    if (!baseVastTagUrl) {
-      return adQueue;
-    }
-    if (!targetDurationMs) {
-      let adsNumber = 1;
-      if (this.vastConfig) {
-        const isHls = this.config.src.includes(".m3u8") || this.config.src.includes("hls");
-        if (isHls && this.vastConfig.cue_tones?.number_ads) {
-          adsNumber = this.vastConfig.cue_tones.number_ads;
-        } else if (!isHls && this.vastConfig.timer_vod?.number_ads) {
-          adsNumber = this.vastConfig.timer_vod.number_ads;
-        }
-      }
-      return new Array(adsNumber).fill(baseVastTagUrl);
-    }
-    const targetDurationSeconds = targetDurationMs / 1e3;
-    let cumulativeDurationSeconds = 0;
-    const maxAdsToTry = 10;
-    let adsAdded = 0;
-    if (this.config.debugAdTiming) {
-      console.log(
-        `[StormcloudVideoPlayer] Attempting to fill ${targetDurationSeconds}s with ads`
-      );
-    }
-    while (cumulativeDurationSeconds < targetDurationSeconds && adsAdded < maxAdsToTry) {
-      adQueue.push(baseVastTagUrl);
-      adsAdded++;
-      const estimatedAdDuration = this.getEstimatedAdDuration();
-      cumulativeDurationSeconds += estimatedAdDuration;
-      if (this.config.debugAdTiming) {
-        console.log(
-          `[StormcloudVideoPlayer] Added ad ${adsAdded}, cumulative duration: ${cumulativeDurationSeconds}s`
-        );
-      }
-      const remainingDuration = targetDurationSeconds - cumulativeDurationSeconds;
-      const toleranceSeconds = (this.config.adBreakGapToleranceMs ?? 2e3) / 1e3;
-      if (remainingDuration < estimatedAdDuration && remainingDuration >= -toleranceSeconds) {
-        if (this.config.debugAdTiming) {
-          console.log(
-            `[StormcloudVideoPlayer] Within tolerance, adding final ad. Overage: ${-remainingDuration}s`
-          );
-        }
-        break;
-      }
-      if (remainingDuration < estimatedAdDuration && remainingDuration < -toleranceSeconds) {
-        if (this.config.debugAdTiming) {
-          console.log(
-            `[StormcloudVideoPlayer] Would exceed duration by too much, stopping at ${adsAdded} ads`
-          );
-        }
-        break;
-      }
-    }
-    return adQueue;
-  }
-  getEstimatedAdDuration() {
-    if (this.vastConfig) {
-      return 15;
-    }
-    return 30;
-  }
-  async getAdInfoForQueue(adQueue) {
-    if (this.config.enableAdPreloading === false) {
-      if (this.config.debugAdTiming) {
-        console.log(
-          "[StormcloudVideoPlayer] Ad preloading disabled, using estimates"
-        );
-      }
-      return adQueue.map((vastTagUrl) => ({
-        duration: this.getEstimatedAdDuration(),
-        vastTagUrl,
-        isPreloaded: false
-      }));
-    }
-    try {
-      const adInfos = await this.ima.preloadAds(adQueue);
-      return adInfos;
-    } catch (error) {
-      if (this.config.debugAdTiming) {
-        console.warn(
-          "[StormcloudVideoPlayer] Failed to preload ads, using estimates:",
-          error
-        );
-      }
-      return adQueue.map((vastTagUrl) => ({
-        duration: this.getEstimatedAdDuration(),
-        vastTagUrl,
-        isPreloaded: false
-      }));
-    }
-  }
   getRemainingAdMs() {
     if (this.expectedAdBreakDurationMs == null || this.currentAdBreakStartWallClockMs == null)
       return 0;