stormcloud-video-player 0.2.10 → 0.2.12

package/lib/players/HlsPlayer.cjs

@@ -270,8 +270,11 @@ function createImaController(video, options) {
                       );
                       emit("ad_error");
                       if (!options?.continueLiveStreamDuringAds) {
-                        video.play()?.catch(() => {
-                        });
+                        if (video.paused) {
+                          console.log("[IMA] Resuming paused video after ad error");
+                          video.play()?.catch(() => {
+                          });
+                        }
                       }
                     }
                   }
@@ -362,10 +365,17 @@ function createImaController(video, options) {
                 console.error("[IMA] Error setting up ads manager:", e);
                 adPlaying = false;
                 video.muted = originalMutedState;
-                if (adContainerEl) adContainerEl.style.pointerEvents = "none";
+                if (adContainerEl) {
+                  adContainerEl.style.pointerEvents = "none";
+                  adContainerEl.style.display = "none";
+                  console.log("[IMA] Ad container hidden after setup error");
+                }
                 if (!options?.continueLiveStreamDuringAds) {
-                  video.play().catch(() => {
-                  });
+                  if (video.paused) {
+                    console.log("[IMA] Resuming paused video after setup error");
+                    video.play().catch(() => {
+                    });
+                  }
                 }
                 if (adsLoadedReject) {
                   adsLoadedReject(new Error("Failed to setup ads manager"));
@@ -383,10 +393,17 @@ function createImaController(video, options) {
               console.error("[IMA] Ads loader error:", adErrorEvent.getError());
               adPlaying = false;
               video.muted = originalMutedState;
-              if (adContainerEl) adContainerEl.style.pointerEvents = "none";
+              if (adContainerEl) {
+                adContainerEl.style.pointerEvents = "none";
+                adContainerEl.style.display = "none";
+                console.log("[IMA] Ad container hidden after loader error");
+              }
               if (!options?.continueLiveStreamDuringAds) {
-                video.play().catch(() => {
-                });
+                if (video.paused) {
+                  console.log("[IMA] Resuming paused video after loader error");
+                  video.play().catch(() => {
+                  });
+                }
               }
               if (adsLoadedReject) {
                 adsLoadedReject(new Error("Ads loader error"));
@@ -683,10 +700,18 @@ async function getBrowserID(clientInfo) {
   if (typeof crypto !== "undefined" && crypto.subtle && crypto.subtle.digest) {
     try {
       await crypto.subtle.digest("SHA-256", new Uint8Array([1, 2, 3]));
-      const hashBuffer = await crypto.subtle.digest(
-        "SHA-256",
-        new TextEncoder().encode(fingerprintString)
-      );
+      let encodedData;
+      if (typeof TextEncoder !== "undefined") {
+        encodedData = new TextEncoder().encode(fingerprintString);
+      } else {
+        const utf8 = unescape(encodeURIComponent(fingerprintString));
+        const buffer = new Uint8Array(utf8.length);
+        for (let i = 0; i < utf8.length; i++) {
+          buffer[i] = utf8.charCodeAt(i);
+        }
+        encodedData = buffer;
+      }
+      const hashBuffer = await crypto.subtle.digest("SHA-256", encodedData);
       const hashArray = Array.from(new Uint8Array(hashBuffer));
       const hashHex = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
       cachedBrowserId = hashHex;
@@ -963,15 +988,25 @@ var StormcloudVideoPlayer = class {
       if (this.config.debugAdTiming) {
         console.log("[StormcloudVideoPlayer] IMA ad_error event received");
       }
-      if (!this.inAdBreak) return;
-      const remaining = this.getRemainingAdMs();
-      if (remaining > 500 && this.adPodQueue.length > 0) {
-        const next = this.adPodQueue.shift();
-        this.currentAdIndex++;
-        this.playSingleAd(next).catch(() => {
-        });
-      } else {
-        this.handleAdFailure();
+      if (this.showAds) {
+        if (this.inAdBreak) {
+          const remaining = this.getRemainingAdMs();
+          if (remaining > 500 && this.adPodQueue.length > 0) {
+            const next = this.adPodQueue.shift();
+            this.currentAdIndex++;
+            this.playSingleAd(next).catch(() => {
+            });
+          } else {
+            this.handleAdFailure();
+          }
+        } else {
+          if (this.config.debugAdTiming) {
+            console.log(
+              "[StormcloudVideoPlayer] Ad error before ad break established - cleaning up"
+            );
+          }
+          this.handleAdFailure();
+        }
       }
     });
     this.ima.on("content_pause", () => {
@@ -1552,9 +1587,20 @@ var StormcloudVideoPlayer = class {
       return;
     }
     if (vastTagUrl) {
+      this.inAdBreak = true;
       this.showAds = true;
       this.currentAdIndex++;
-      await this.playSingleAd(vastTagUrl);
+      try {
+        await this.playSingleAd(vastTagUrl);
+      } catch (error) {
+        if (this.config.debugAdTiming) {
+          console.error(
+            "[StormcloudVideoPlayer] Ad playback failed in handleAdStart:",
+            error
+          );
+        }
+        this.handleAdFailure();
+      }
     }
     if (this.expectedAdBreakDurationMs == null && scheduled?.durationMs != null) {
       this.expectedAdBreakDurationMs = scheduled.durationMs;
@@ -1685,7 +1731,13 @@ var StormcloudVideoPlayer = class {
   handleAdFailure() {
     if (this.config.debugAdTiming) {
       console.log(
-        "[StormcloudVideoPlayer] Handling ad failure - resuming content"
+        "[StormcloudVideoPlayer] Handling ad failure - resuming content",
+        {
+          inAdBreak: this.inAdBreak,
+          showAds: this.showAds,
+          videoPaused: this.video.paused,
+          adPlaying: this.ima.isAdPlaying()
+        }
       );
     }
     this.inAdBreak = false;
@@ -1706,13 +1758,21 @@ var StormcloudVideoPlayer = class {
       );
     }
     if (this.video.paused) {
-      this.video.play()?.catch(() => {
+      if (this.config.debugAdTiming) {
+        console.log("[StormcloudVideoPlayer] Resuming paused video");
+      }
+      this.video.play()?.catch((error) => {
         if (this.config.debugAdTiming) {
           console.error(
-            "[StormcloudVideoPlayer] Failed to resume video after ad failure"
+            "[StormcloudVideoPlayer] Failed to resume video after ad failure:",
+            error
           );
         }
       });
+    } else {
+      if (this.config.debugAdTiming) {
+        console.log("[StormcloudVideoPlayer] Video is already playing, no resume needed");
+      }
     }
   }
   startAdFailsafeTimer() {
@@ -1724,10 +1784,12 @@ var StormcloudVideoPlayer = class {
       );
     }
     this.adFailsafeTimerId = window.setTimeout(() => {
-      if (this.video.paused) {
+      const shouldTrigger = this.video.paused || this.showAds && !this.ima.isAdPlaying();
+      if (shouldTrigger) {
         if (this.config.debugAdTiming) {
           console.warn(
-            "[StormcloudVideoPlayer] Failsafe timer triggered - forcing video resume"
+            "[StormcloudVideoPlayer] Failsafe timer triggered - forcing video resume",
+            { paused: this.video.paused, showAds: this.showAds, adPlaying: this.ima.isAdPlaying() }
           );
         }
         this.handleAdFailure();