senza-sdk 4.2.59-c9128b1.0 → 4.2.60

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.59-c9128b1.0",
+    "version": "4.2.60",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/deviceManager.js

@@ -85,7 +85,7 @@ class DeviceManager extends EventTarget {
                 connectionId: sessionInfoObj.connectionId,
                 community: sessionInfoObj.community,
                 tenant: sessionInfoObj.tenant,
-                clientIp: sessionInfoObj.clientIp,
+                clientIp: sessionInfoObj?.settings?.["ui-streamer"]?.clientIpOverride || sessionInfoObj.clientIp,
                 countryCode: sessionInfoObj.general?.location?.["x-country-code"],
                 connectionType: (!sessionInfoObj.connectionType || sessionInfoObj.connectionType === "direct") ? "device" : sessionInfoObj.connectionType
             };

package/src/lifecycle.js

@@ -136,7 +136,7 @@ class Lifecycle extends EventTarget {
             const event = new Event("onstatechange");
             event.state = e.detail;
             this._state = event.state;
-            if (this._autoBackground && this.state === this.UiState.FOREGROUND) {
+            if (this._isAutoBackgroundEnabled() && this.state === this.UiState.FOREGROUND) {
                 this._startCountdown();
             }
             this.dispatchEvent(event);
@@ -160,7 +160,7 @@ class Lifecycle extends EventTarget {
         });
 
         typeof document !== "undefined" && document.addEventListener("keydown", () => {
-            if (this._autoBackground) {
+            if (this._isAutoBackgroundEnabled()) {
                 if (this.state === this.UiState.BACKGROUND ||
                     this.state === this.UiState.IN_TRANSITION_TO_BACKGROUND) {
                     this.moveToForeground();
@@ -172,7 +172,7 @@ class Lifecycle extends EventTarget {
 
         // Add playModeChange listener
         remotePlayer.addEventListener("playModeChange", (event) => {
-            if (this._autoBackground && this.state === this.UiState.FOREGROUND) {
+            if (this._isAutoBackgroundEnabled() && this.state === this.UiState.FOREGROUND) {
                 sdkLogger.log("Resetting auto background timer due to play mode change", event.detail.isPlaying);
                 this._startCountdown(event.detail.isPlaying);
             }
@@ -264,6 +264,11 @@ class Lifecycle extends EventTarget {
 
             // Apply autoBackground settings if provided
             if (uiStreamerSettings?.autoBackground) {
+                // Overrides stored before any auto background settings are applied
+                if (uiStreamerSettings.autoBackground.overrides) {
+                    this._autoBackgroundOverrides = uiStreamerSettings.autoBackground.overrides;
+                    sdkLogger.warn(`Using overrides for autoBackground settings: ${JSON.stringify(this._autoBackgroundOverrides)}`);
+                }
                 this.configure({
                     autoBackground: uiStreamerSettings.autoBackground
                 });
@@ -271,6 +276,35 @@ class Lifecycle extends EventTarget {
         }
     }
 
+    /** @private Checks if auto background is enabled including overrides.
+     * @returns {boolean}
+     */
+    _isAutoBackgroundEnabled() {
+        return this._autoBackgroundOverrides?.enabled ?? this._autoBackground;
+    }
+
+    /** @private Gets the auto background video delay including overrides.
+     * @returns {number}
+     */
+    _getAutoBackgroundOnVideoDelay() {
+        const playing = this._autoBackgroundOverrides?.timeout?.playing;
+        if (playing !== undefined) {
+            return playing === false ? -1 : playing;
+        }
+        return this._autoBackgroundOnVideoDelay;
+    }
+
+    /** @private Gets the auto background UI delay including overrides.
+     * @returns {number}
+     */
+    _getAutoBackgroundOnUIDelay() {
+        const idle = this._autoBackgroundOverrides?.timeout?.idle;
+        if (idle !== undefined) {
+            return idle === false ? -1 : idle;
+        }
+        return this._autoBackgroundOnUIDelay;
+    }
+
     /**
      * Configure lifecycle settings
      * @param {Object} config - Configuration object
@@ -309,8 +343,9 @@ class Lifecycle extends EventTarget {
                     }
                 }
             }
+
             // Start or stop countdown based on new configuration
-            if (this._autoBackground) {
+            if (this._isAutoBackgroundEnabled()) {
                 this._startCountdown();
             } else {
                 this._stopCountdown();
@@ -419,7 +454,7 @@ class Lifecycle extends EventTarget {
      */
     set autoBackground(enabled) {
         this._autoBackground = enabled;
-        if (enabled) {
+        if (this._isAutoBackgroundEnabled()) {
             this._startCountdown();
         } else {
             this._stopCountdown();
@@ -440,8 +475,7 @@ class Lifecycle extends EventTarget {
      */
     set autoBackgroundDelay(delay) {
         this._autoBackgroundOnVideoDelay = delay;
-
-        if (this.autoBackground && remotePlayer._isPlaying) {
+        if (this._isAutoBackgroundEnabled() && remotePlayer._isPlaying) {
             this._startCountdown();
         }
     }
@@ -460,8 +494,7 @@ class Lifecycle extends EventTarget {
      */
     set autoBackgroundOnUIDelay(delay) {
         this._autoBackgroundOnUIDelay = delay;
-
-        if (this.autoBackground && !remotePlayer._isPlaying) {
+        if (this._isAutoBackgroundEnabled() && !remotePlayer._isPlaying) {
             this._startCountdown();
         }
     }
@@ -476,7 +509,7 @@ class Lifecycle extends EventTarget {
     _startCountdown(isPlaying = remotePlayer._isPlaying) {
         this._stopCountdown();
 
-        const timeoutDelay = isPlaying ? this._autoBackgroundOnVideoDelay : this._autoBackgroundOnUIDelay;
+        const timeoutDelay = isPlaying ? this._getAutoBackgroundOnVideoDelay() : this._getAutoBackgroundOnUIDelay();
 
         // Only start countdown if delay is positive
         if (timeoutDelay > 0) {

package/src/remotePlayer.js

@@ -695,6 +695,11 @@ class RemotePlayer extends EventTarget {
             const audioLanguage = this._selectedAudioTrack || this._config.preferredAudioLanguage || "";
             const subtitlesLanguage = this._selectedSubtitlesTrack || this._config.preferredSubtitlesLanguage || "";
 
+            if (this._remotePlayerApiVersion >= 2 && !this._textTrackVisibility && streamType === StreamType.SUBTITLE) {
+                logger.log("remotePlayer play: text track visibility is disabled and streamType is only SUBTITLE. returning early with no action.");
+                return Promise.resolve(undefined); // nothing to do
+            }
+
             const message = {
                 type: "remotePlayer.play",
                 class: "remotePlayer",
@@ -710,17 +715,10 @@ class RemotePlayer extends EventTarget {
                 message.streamType = streamType;
                 waitForResponse = true;
 
-                if (!this._textTrackVisibility) {
-                    const onlySubtitle = message.streamType === StreamType.SUBTITLE;
-                    if (onlySubtitle) {
-                        logger.log("remotePlayer play: text track visibility is disabled and streamType is only SUBTITLE. returning early with no action.");
-                        return Promise.resolve(undefined); // nothing to do
-                    }
-                    if (message.streamType && StreamType.SUBTITLE) {
-                        // remove SUBTITLE
-                        message.streamType = message.streamType & ~StreamType.SUBTITLE;
-                        logger.log("remotePlayer play: text track visibility is disabled. Removed SUBTITLE from streamType.");
-                    }
+                if (!this._textTrackVisibility && (message.streamType & StreamType.SUBTITLE) !== 0) {
+                    // remove SUBTITLE
+                    message.streamType = message.streamType & ~StreamType.SUBTITLE;
+                    logger.log("remotePlayer play: text track visibility is disabled. Removed SUBTITLE from streamType.");
                 }
             } else if (!this.textTrackVisibility) {
                 message.subtitlesLanguage = "";