stormcloud-video-player 0.2.25 → 0.2.27

package/lib/index.cjs

@@ -266,6 +266,7 @@ function supportsFeature(feature) {
 function createImaController(video, options) {
   let adPlaying = false;
   let originalMutedState = false;
+  let originalVolume = typeof video.volume === "number" && !Number.isNaN(video.volume) ? Math.max(0, Math.min(1, video.volume)) : 1;
   const listeners = /* @__PURE__ */ new Map();
   const preloadedVast = /* @__PURE__ */ new Map();
   const preloadingVast = /* @__PURE__ */ new Map();
@@ -374,6 +375,22 @@ function createImaController(video, options) {
     adsRequest.linearAdSlotHeight = videoHeight;
     adsRequest.nonLinearAdSlotWidth = videoWidth;
     adsRequest.nonLinearAdSlotHeight = videoHeight;
+    if (typeof adsRequest.setAdWillAutoPlay === "function") {
+      try {
+        const willAutoPlay = !video.paused || video.autoplay;
+        adsRequest.setAdWillAutoPlay(willAutoPlay);
+      } catch (error) {
+        console.warn("[IMA] Failed to call setAdWillAutoPlay:", error);
+      }
+    }
+    if (typeof adsRequest.setAdWillPlayMuted === "function") {
+      try {
+        const willPlayMuted = video.muted || video.volume === 0;
+        adsRequest.setAdWillPlayMuted(willPlayMuted);
+      } catch (error) {
+        console.warn("[IMA] Failed to call setAdWillPlayMuted:", error);
+      }
+    }
     adsRequest.vastLoadTimeout = 5e3;
     console.log(`[IMA] Ads request dimensions: ${videoWidth}x${videoHeight}`);
     adsLoader.requestAds(adsRequest);
@@ -779,7 +796,7 @@ function createImaController(video, options) {
         console.log(`[IMA] Initializing ads manager (${width}x${height})`);
         adsManager.init(width, height, window.google.ima.ViewMode.NORMAL);
         adPlaying = true;
-        const adVolume = originalMutedState ? 0 : video.volume;
+        const adVolume = originalMutedState ? 0 : originalVolume;
         try {
           adsManager.setVolume(adVolume);
           console.log(`[IMA] Set ad volume to ${adVolume}`);
@@ -821,6 +838,7 @@ function createImaController(video, options) {
       destroyAdsManager();
       adPlaying = false;
       video.muted = originalMutedState;
+      video.volume = originalVolume;
       setAdPlayingFlag(false);
       if (adContainerEl) {
         adContainerEl.style.pointerEvents = "none";
@@ -865,15 +883,20 @@ function createImaController(video, options) {
       var _a;
       (_a = listeners.get(event)) == null ? void 0 : _a.delete(listener);
     },
-    updateOriginalMutedState(muted) {
+    updateOriginalMutedState(muted, volume) {
+      const nextVolume = typeof volume === "number" && !Number.isNaN(volume) ? Math.max(0, Math.min(1, volume)) : originalVolume;
       console.log(
-        `[IMA] updateOriginalMutedState called: ${originalMutedState} -> ${muted}`
+        `[IMA] updateOriginalMutedState called: { muted: ${originalMutedState} -> ${muted}, volume: ${originalVolume} -> ${nextVolume} }`
       );
       originalMutedState = muted;
+      originalVolume = nextVolume;
     },
     getOriginalMutedState() {
       return originalMutedState;
     },
+    getOriginalVolume() {
+      return originalVolume;
+    },
     setAdVolume(volume) {
       if (adsManager && adPlaying) {
         try {
@@ -915,6 +938,7 @@ var import_hls = __toESM(require("hls.js"), 1);
 function createHlsAdPlayer(contentVideo, options) {
   let adPlaying = false;
   let originalMutedState = false;
+  let originalVolume = Math.max(0, Math.min(1, contentVideo.volume || 1));
   const listeners = /* @__PURE__ */ new Map();
   const licenseKey = options == null ? void 0 : options.licenseKey;
   const mainHlsInstance = options == null ? void 0 : options.mainHlsInstance;
@@ -1272,6 +1296,7 @@ function createHlsAdPlayer(contentVideo, options) {
     setAdPlayingFlag(false);
     const previousMutedState = contentVideo.muted;
     contentVideo.muted = originalMutedState;
+    contentVideo.volume = originalMutedState ? 0 : originalVolume;
     console.log(
       `[HlsAdPlayer] Restored mute state: ${previousMutedState} -> ${originalMutedState}`
     );
@@ -1401,6 +1426,10 @@ function createHlsAdPlayer(contentVideo, options) {
           complete: false
         };
         const contentVolume = contentVideo.volume;
+        originalVolume = Math.max(
+          0,
+          Math.min(1, contentVolume || originalVolume)
+        );
         if (!(options == null ? void 0 : options.continueLiveStreamDuringAds)) {
           contentVideo.pause();
           console.log("[HlsAdPlayer] Content paused (VOD mode)");
@@ -1413,7 +1442,7 @@ function createHlsAdPlayer(contentVideo, options) {
         adPlaying = true;
         setAdPlayingFlag(true);
         if (adVideoElement) {
-          const adVolume = originalMutedState ? 0 : contentVolume;
+          const adVolume = originalMutedState ? 0 : originalVolume;
           adVideoElement.volume = Math.max(0, Math.min(1, adVolume));
           adVideoElement.muted = false;
           console.log(
@@ -1492,6 +1521,7 @@ function createHlsAdPlayer(contentVideo, options) {
       adPlaying = false;
       setAdPlayingFlag(false);
       contentVideo.muted = originalMutedState;
+      contentVideo.volume = originalMutedState ? 0 : originalVolume;
       if (adHls) {
         adHls.destroy();
         adHls = void 0;
@@ -1533,15 +1563,20 @@ function createHlsAdPlayer(contentVideo, options) {
       var _a;
       (_a = listeners.get(event)) == null ? void 0 : _a.delete(listener);
     },
-    updateOriginalMutedState(muted) {
+    updateOriginalMutedState(muted, volume) {
+      const nextVolume = typeof volume === "number" && !Number.isNaN(volume) ? Math.max(0, Math.min(1, volume)) : originalVolume;
       console.log(
-        `[HlsAdPlayer] updateOriginalMutedState called: ${originalMutedState} -> ${muted}`
+        `[HlsAdPlayer] updateOriginalMutedState called: { muted: ${originalMutedState} -> ${muted}, volume: ${originalVolume} -> ${nextVolume} }`
       );
       originalMutedState = muted;
+      originalVolume = nextVolume;
     },
     getOriginalMutedState() {
       return originalMutedState;
     },
+    getOriginalVolume() {
+      return originalVolume;
+    },
     setAdVolume(volume) {
       if (adVideoElement && adPlaying) {
         adVideoElement.volume = Math.max(0, Math.min(1, volume));
@@ -2322,7 +2357,7 @@ var StormcloudVideoPlayer = class {
     this.video.autoplay = !!this.config.autoplay;
     this.video.muted = !!this.config.muted;
     this.ima.initialize();
-    this.ima.updateOriginalMutedState(this.video.muted);
+    this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
     this.ima.on("all_ads_completed", () => {
       if (this.config.debugAdTiming) {
         console.log(
@@ -3211,7 +3246,7 @@ var StormcloudVideoPlayer = class {
           }
         );
       }
-      this.ima.updateOriginalMutedState(this.video.muted);
+      this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
     } else if (this.config.debugAdTiming) {
       console.log(
         `[StormcloudVideoPlayer] Keeping existing original mute state (currently showing ads)`
@@ -3273,8 +3308,9 @@ var StormcloudVideoPlayer = class {
     this.ima.stop().catch(() => {
     });
     const originalMutedState = this.ima.getOriginalMutedState();
+    const originalVolume = typeof this.ima.getOriginalVolume === "function" ? this.ima.getOriginalVolume() : this.video.volume;
     this.video.muted = originalMutedState;
-    this.video.volume = originalMutedState ? 0 : 1;
+    this.video.volume = originalVolume;
     if (this.config.debugAdTiming) {
       console.log(
         `[StormcloudVideoPlayer] Restored main video - muted: ${originalMutedState}, volume: ${this.video.volume}`
@@ -3425,7 +3461,7 @@ var StormcloudVideoPlayer = class {
     if (this.ima.isAdPlaying()) {
       const currentPerceptualState = this.isMuted();
       const newMutedState = !currentPerceptualState;
-      this.ima.updateOriginalMutedState(newMutedState);
+      this.ima.updateOriginalMutedState(newMutedState, this.video.volume);
       this.ima.setAdVolume(newMutedState ? 0 : 1);
       if (this.config.debugAdTiming) {
         console.log(
@@ -3435,7 +3471,7 @@ var StormcloudVideoPlayer = class {
       }
     } else {
       this.video.muted = !this.video.muted;
-      this.ima.updateOriginalMutedState(this.video.muted);
+      this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
       if (this.config.debugAdTiming) {
         console.log("[StormcloudVideoPlayer] Muted:", this.video.muted);
       }
@@ -3507,7 +3543,7 @@ var StormcloudVideoPlayer = class {
     }
     this.video.muted = muted;
     if (adPlaying) {
-      this.ima.updateOriginalMutedState(muted);
+      this.ima.updateOriginalMutedState(muted, this.video.volume);
       this.ima.setAdVolume(muted ? 0 : 1);
       if (this.config.debugAdTiming) {
         console.log("[StormcloudVideoPlayer] setMuted applied during ad", {
@@ -3516,11 +3552,31 @@ var StormcloudVideoPlayer = class {
       }
       return;
     }
-    this.ima.updateOriginalMutedState(muted);
+    this.ima.updateOriginalMutedState(muted, this.video.volume);
     if (this.config.debugAdTiming) {
       console.log("[StormcloudVideoPlayer] setMuted called:", muted);
     }
   }
+  setVolume(volume) {
+    const clampedVolume = Math.max(0, Math.min(1, volume));
+    const adPlaying = this.ima.isAdPlaying();
+    if (adPlaying) {
+      this.ima.setAdVolume(clampedVolume);
+      this.ima.updateOriginalMutedState(clampedVolume === 0, clampedVolume);
+      if (this.config.debugAdTiming) {
+        console.log("[StormcloudVideoPlayer] setVolume applied during ad", {
+          volume: clampedVolume
+        });
+      }
+    } else {
+      this.video.volume = clampedVolume;
+      this.video.muted = clampedVolume === 0;
+      this.ima.updateOriginalMutedState(clampedVolume === 0, clampedVolume);
+      if (this.config.debugAdTiming) {
+        console.log("[StormcloudVideoPlayer] setVolume called:", clampedVolume);
+      }
+    }
+  }
   isFullscreen() {
     return !!document.fullscreenElement;
   }
@@ -3692,10 +3748,9 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(
       }
     };
     const handleVolumeChange = (newVolume) => {
-      if (videoRef.current && isFinite(newVolume)) {
+      if (playerRef.current && isFinite(newVolume)) {
         const clampedVolume = Math.max(0, Math.min(1, newVolume));
-        videoRef.current.volume = clampedVolume;
-        videoRef.current.muted = clampedVolume === 0;
+        playerRef.current.setVolume(clampedVolume);
       }
     };
     const handlePlaybackRateChange = (rate) => {
@@ -3797,7 +3852,7 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(
         if (autoplay !== void 0 && playerRef.current.videoElement) {
           playerRef.current.videoElement.autoplay = autoplay;
         }
-        if (muted !== void 0) {
+        if (muted !== void 0 && !playerRef.current.isShowingAds()) {
           playerRef.current.setMuted(muted);
         }
       } catch (error) {