stormcloud-video-player 0.3.66 → 0.3.67

package/lib/ui/StormcloudVideoPlayer.cjs

@@ -3873,10 +3873,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                             console.log("[StormcloudVideoPlayer] Starting ad break timer on content_pause (first ad starting)");
                         }
                     }
-                    var currentMuted = _this.video.muted;
-                    var currentVolume = _this.video.volume;
-                    var adVolume = currentMuted ? 0 : currentVolume;
-                    _this.ima.setAdVolume(adVolume);
+                    _this.ima.setAdVolume(_this.getPreAdBreakAdVolume());
                     if (_this.isShowingPlaceholder) {
                         if (_this.config.debugAdTiming) {
                             console.log("[StormcloudVideoPlayer] Hiding placeholder - new ads starting");
@@ -4630,6 +4627,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
         {
             key: "startScte35AdBreak",
             value: function startScte35AdBreak(marker, cueKey, durationMs) {
+                this.capturePreAdBreakAudio();
                 if (!this.video.muted) {
                     this.video.muted = true;
                     this.video.volume = 0;
@@ -6311,9 +6309,9 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 this.continuousFetchingActive = true;
                                 this.isShowingPlaceholder = false;
                                 this.totalAdRequestsInBreak = 0;
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                this.ima.updateOriginalMutedState(currentMuted, currentVolume);
+                                this.capturePreAdBreakAudio();
+                                currentMuted = this.preAdBreakAudio.muted;
+                                currentVolume = this.preAdBreakAudio.volume;
                                 if (!this.video.muted) {
                                     this.video.muted = true;
                                     this.video.volume = 0;
@@ -6788,7 +6786,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             value: function tryNextAvailableAd() {
                 var retryCount = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
                 return _async_to_generator(function() {
-                    var remaining, preloaded, currentMuted, currentVolume, adVolume, error, nextAdUrl, currentMuted1, currentVolume1, error1, errorMessage, maxRetries;
+                    var remaining, preloaded, error, _ref, _ref1, _this_preAdBreakAudio, _this_preAdBreakAudio1, nextAdUrl, error1, errorMessage, maxRetries;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -6860,10 +6858,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopAtBreakBoundary();
                                 }
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                adVolume = currentMuted ? 0 : currentVolume;
-                                this.ima.setAdVolume(adVolume);
+                                this.ima.setAdVolume(this.getPreAdBreakAdVolume());
                                 this.consecutiveFailures = 0;
                                 return [
                                     2
@@ -6910,9 +6905,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.config.debugAdTiming) {
                                     console.log("[CONTINUOUS-FETCH] \uD83C\uDFAC Requesting next ad via IMA SDK (".concat(this.currentAdIndex + 1, "/").concat(this.totalAdsInBreak, ", ").concat(this.adRequestQueue.length, " remaining in queue)"));
                                 }
-                                currentMuted1 = this.video.muted;
-                                currentVolume1 = this.video.volume;
-                                this.ima.updateOriginalMutedState(currentMuted1, currentVolume1);
+                                this.ima.updateOriginalMutedState((_ref = (_this_preAdBreakAudio = this.preAdBreakAudio) === null || _this_preAdBreakAudio === void 0 ? void 0 : _this_preAdBreakAudio.muted) !== null && _ref !== void 0 ? _ref : this.video.muted, (_ref1 = (_this_preAdBreakAudio1 = this.preAdBreakAudio) === null || _this_preAdBreakAudio1 === void 0 ? void 0 : _this_preAdBreakAudio1.volume) !== null && _ref1 !== void 0 ? _ref1 : this.video.volume);
                                 this.currentAdIndex++;
                                 this.totalAdRequestsInBreak++;
                                 this.lastAdRequestTime = Date.now();
@@ -7005,7 +6998,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "showPlaceholderAndWaitForAds",
             value: function showPlaceholderAndWaitForAds() {
                 return _async_to_generator(function() {
-                    var remaining, waitTime, checkInterval, maxChecks, i, nextAdUrl, currentMuted, currentVolume, error, errorMessage;
+                    var remaining, waitTime, checkInterval, maxChecks, i, _ref, _ref1, _this_preAdBreakAudio, _this_preAdBreakAudio1, nextAdUrl, error, errorMessage;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -7101,9 +7094,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 }
                                 this.isShowingPlaceholder = false;
                                 this.ima.hidePlaceholder();
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                this.ima.updateOriginalMutedState(currentMuted, currentVolume);
+                                this.ima.updateOriginalMutedState((_ref = (_this_preAdBreakAudio = this.preAdBreakAudio) === null || _this_preAdBreakAudio === void 0 ? void 0 : _this_preAdBreakAudio.muted) !== null && _ref !== void 0 ? _ref : this.video.muted, (_ref1 = (_this_preAdBreakAudio1 = this.preAdBreakAudio) === null || _this_preAdBreakAudio1 === void 0 ? void 0 : _this_preAdBreakAudio1.volume) !== null && _ref1 !== void 0 ? _ref1 : this.video.volume);
                                 this.currentAdIndex++;
                                 this.totalAdRequestsInBreak++;
                                 this.lastAdRequestTime = Date.now();
@@ -7285,7 +7276,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 first = tags[0];
                                 rest = tags.slice(1);
                                 this.adPodQueue = rest;
-                                this.ima.updateOriginalMutedState(this.video.muted, this.video.volume);
+                                this.capturePreAdBreakAudio();
                                 this.showAds = true;
                                 this.inAdBreak = true;
                                 this.currentAdBreakStartWallClockMs = Date.now();
@@ -7312,12 +7303,10 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 3:
                                 error = _state.sent();
-                                this.adPodQueue = [];
-                                this.inAdBreak = false;
-                                this.showAds = false;
                                 if (this.config.debugAdTiming) {
                                     console.warn("[StormcloudVideoPlayer] VMAP ad request failed:", error);
                                 }
+                                this.handleAdPodComplete();
                                 return [
                                     3,
                                     4
@@ -7548,7 +7537,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
             key: "playSingleAd",
             value: function playSingleAd(vastTagUrl) {
                 return _async_to_generator(function() {
-                    var requestToken, currentMuted, currentVolume, adVolume, playError, preloadedFallback, currentMuted1, currentVolume1, adVolume1, fallbackError, error, errorMessage, preloadedFallback1, currentMuted2, currentVolume2, adVolume2, fallbackError1;
+                    var requestToken, playError, preloadedFallback, fallbackError, error, errorMessage, preloadedFallback1, fallbackError1;
                     return _ts_generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -7635,10 +7624,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopAtBreakBoundary();
                                 }
-                                currentMuted = this.video.muted;
-                                currentVolume = this.video.volume;
-                                adVolume = currentMuted ? 0 : currentVolume;
-                                this.ima.setAdVolume(adVolume);
+                                this.ima.setAdVolume(this.getPreAdBreakAdVolume());
                                 this.consecutiveFailures = 0;
                                 this.temporaryFailureUrls.delete(vastTagUrl);
                                 return [
@@ -7685,10 +7671,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 if (this.expectedAdBreakDurationMs != null && this.adStopTimerId == null) {
                                     this.scheduleAdStopAtBreakBoundary();
                                 }
-                                currentMuted1 = this.video.muted;
-                                currentVolume1 = this.video.volume;
-                                adVolume1 = currentMuted1 ? 0 : currentVolume1;
-                                this.ima.setAdVolume(adVolume1);
+                                this.ima.setAdVolume(this.getPreAdBreakAdVolume());
                                 return [
                                     2
                                 ];
@@ -7762,10 +7745,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                                 ];
                             case 14:
                                 _state.sent();
-                                currentMuted2 = this.video.muted;
-                                currentVolume2 = this.video.volume;
-                                adVolume2 = currentMuted2 ? 0 : currentVolume2;
-                                this.ima.setAdVolume(adVolume2);
+                                this.ima.setAdVolume(this.getPreAdBreakAdVolume());
                                 return [
                                     2
                                 ];
@@ -7805,6 +7785,33 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 }).call(this);
             }
         },
+        {
+            key: "capturePreAdBreakAudio",
+            value: function capturePreAdBreakAudio() {
+                if (this.preAdBreakAudio) {
+                    return;
+                }
+                var captured = {
+                    muted: this.video.muted,
+                    volume: typeof this.video.volume === "number" && !Number.isNaN(this.video.volume) ? Math.max(0, Math.min(1, this.video.volume)) : 1
+                };
+                this.preAdBreakAudio = captured;
+                this.ima.updateOriginalMutedState(captured.muted, captured.volume);
+                if (this.config.debugAdTiming) {
+                    console.log("[StormcloudVideoPlayer] Captured pre-ad-break audio state: muted=".concat(captured.muted, ", volume=").concat(captured.volume));
+                }
+            }
+        },
+        {
+            key: "getPreAdBreakAdVolume",
+            value: function getPreAdBreakAdVolume() {
+                var state = this.preAdBreakAudio;
+                if (state) {
+                    return state.muted ? 0 : state.volume;
+                }
+                return this.ima.getOriginalMutedState() ? 0 : this.ima.getOriginalVolume();
+            }
+        },
         {
             key: "handleAdPodComplete",
             value: function handleAdPodComplete() {
@@ -7838,14 +7845,19 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.consecutiveFailures = 0;
                 this.globalConsecutiveNoFills = 0;
                 this.ima.stop().catch(function() {});
-                var restoredMuted = this.ima.getOriginalMutedState();
-                var restoredVolume = this.ima.getOriginalVolume();
+                var restoredMuted = this.preAdBreakAudio ? this.preAdBreakAudio.muted : this.ima.getOriginalMutedState();
+                var restoredVolume = this.preAdBreakAudio ? this.preAdBreakAudio.volume : this.ima.getOriginalVolume();
+                this.ima.updateOriginalMutedState(restoredMuted, restoredVolume);
                 if (this.video.muted !== restoredMuted) {
                     this.video.muted = restoredMuted;
                 }
                 if (Math.abs(this.video.volume - restoredVolume) > 0.01) {
                     this.video.volume = restoredVolume;
                 }
+                this.preAdBreakAudio = void 0;
+                if (this.config.debugAdTiming) {
+                    console.log("[StormcloudVideoPlayer] Restored post-ad-break audio state: muted=".concat(restoredMuted, ", volume=").concat(restoredVolume));
+                }
                 if (this.shouldContinueLiveStreamDuringAds()) {
                     if (this.video.paused) {
                         var _this_video_play;
@@ -8255,6 +8267,7 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
                 this.clearAdFailsafeTimer();
                 this.clearAdRequestWatchdog();
                 this.clearPendingAdBreak();
+                this.preAdBreakAudio = void 0;
                 if (this.placeholderContainer) {
                     if (this.placeholderContainer.parentElement) {
                         this.placeholderContainer.parentElement.removeChild(this.placeholderContainer);
@@ -8289,6 +8302,64 @@ var StormcloudVideoPlayer = /*#__PURE__*/ function() {
 // src/ui/StormcloudVideoPlayer.tsx
 var import_fa = require("react-icons/fa");
 var import_jsx_runtime = require("react/jsx-runtime");
+var ExpandIcon = function ExpandIcon(param) {
+    var _param_size = param.size, size = _param_size === void 0 ? 18 : _param_size;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+        width: size,
+        height: size,
+        viewBox: "0 0 24 24",
+        fill: "none",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        "aria-hidden": "true",
+        focusable: "false",
+        children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M9 4H4v5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M20 9V4h-5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M15 20h5v-5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M4 15v5h5"
+            })
+        ]
+    });
+};
+var CompressIcon = function CompressIcon(param) {
+    var _param_size = param.size, size = _param_size === void 0 ? 18 : _param_size;
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("svg", {
+        width: size,
+        height: size,
+        viewBox: "0 0 24 24",
+        fill: "none",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        "aria-hidden": "true",
+        focusable: "false",
+        children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M4 9h5V4"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M15 4v5h5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M20 15h-5v5"
+            }),
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("path", {
+                d: "M9 20v-5H4"
+            })
+        ]
+    });
+};
 var CRITICAL_PROPS = [
     "src",
     "allowNativeHls",
@@ -9339,9 +9410,9 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
                                                     minHeight: "".concat(36 * responsiveScale, "px")
                                                 },
                                                 title: isFullscreen ? "Exit Fullscreen" : "Enter Fullscreen",
-                                                children: isFullscreen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaCompress, {
+                                                children: isFullscreen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CompressIcon, {
                                                     size: Math.max(14, 18 * responsiveScale)
-                                                }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaExpand, {
+                                                }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExpandIcon, {
                                                     size: Math.max(14, 18 * responsiveScale)
                                                 })
                                             })
@@ -9539,9 +9610,9 @@ var StormcloudVideoPlayerComponent = import_react.default.memo(function(props) {
                                             background: "rgba(0, 0, 0, 0.6)"
                                         },
                                         title: isFullscreen ? "Exit Fullscreen" : "Enter Fullscreen",
-                                        children: isFullscreen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaCompress, {
+                                        children: isFullscreen ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CompressIcon, {
                                             size: Math.max(14, 18 * responsiveScale)
-                                        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_fa.FaExpand, {
+                                        }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ExpandIcon, {
                                             size: Math.max(14, 18 * responsiveScale)
                                         })
                                     })