senza-sdk 4.2.58-a3e6d19.0 → 4.2.59-c9128b1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.58-a3e6d19.0",
+    "version": "4.2.59-c9128b1.0",
     "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?.settings?.["ui-streamer"]?.clientIpOverride || sessionInfoObj.clientIp,
+                clientIp: sessionInfoObj.clientIp,
                 countryCode: sessionInfoObj.general?.location?.["x-country-code"],
                 connectionType: (!sessionInfoObj.connectionType || sessionInfoObj.connectionType === "direct") ? "device" : sessionInfoObj.connectionType
             };

package/src/lifecycle.js

@@ -637,10 +637,10 @@ class Lifecycle extends EventTarget {
             return new Promise((resolve, reject) => {
                 const FCID = getFCID();
                 const logger = sdkLogger.withFields({ FCID });
-                logger.log("lifecycle moveToBackground: sending play action");
                 const configuration = remotePlayer.getConfiguration();
                 const audioLanguage = remotePlayer._selectedAudioTrack || configuration.preferredAudioLanguage || "";
-                const subtitlesLanguage = remotePlayer.textTrackVisibility && (remotePlayer._selectedSubtitlesTrack || configuration.preferredSubtitlesLanguage) || "";
+                const subtitlesLanguage = remotePlayer._selectedSubtitlesTrack || configuration.preferredSubtitlesLanguage || "";
+
                 let request;
                 const message = {
                     action: "play",
@@ -652,7 +652,7 @@ class Lifecycle extends EventTarget {
                     message.type = "remotePlayer.play";
                     message.class = "remotePlayer";
                     message.switchMode = remotePlayer._isAudioSyncEnabled() ? SwitchMode.SEAMLESS : SwitchMode.NON_SEAMLESS;
-                    message.streamType = StreamType.AUDIO | StreamType.VIDEO | StreamType.SUBTITLE;
+                    message.streamType = remotePlayer.textTrackVisibility ? (StreamType.AUDIO | StreamType.VIDEO | StreamType.SUBTITLE) : (StreamType.AUDIO | StreamType.VIDEO);
                     request = {
                         target: "TC",
                         waitForResponse: true,
@@ -660,8 +660,12 @@ class Lifecycle extends EventTarget {
                         message: JSON.stringify(message)
                     };
                 } else {
+                    if (!remotePlayer.textTrackVisibility) {
+                        message.subtitlesLanguage = "";
+                    }
                     request = message;
                 }
+                logger.log(`lifecycle moveToBackground: sending play action audioLanguage=${message.audioLanguage} subtitlesLanguage=${message.subtitlesLanguage} textTrackVisibility=${remotePlayer.textTrackVisibility}`);
                 let timerId = 0;
                 const timeBeforeSendingRequest = Date.now();
                 const queryId = window.cefQuery({

package/src/remotePlayer.js

@@ -495,13 +495,7 @@ class RemotePlayer extends EventTarget {
         }
         if (this._availableTextTracks) {
             const selectedTrack = this._availableTextTracks.find((track) => track.selected === true);
-            if (selectedTrack) {
-                this._selectedSubtitlesTrack = selectedTrack.id;
-                this._textTrackVisibility = true;
-            } else {
-                this._selectedSubtitlesTrack = "";
-                this._textTrackVisibility = false;
-            }
+            this._selectedSubtitlesTrack = selectedTrack?.id || "";
         }
     }
 
@@ -698,12 +692,9 @@ class RemotePlayer extends EventTarget {
         if (window.cefQuery) {
             const FCID = getFCID();
             const logger = sdkLogger.withFields({ FCID });
-            logger.log("remotePlayer play: sending play action");
             const audioLanguage = this._selectedAudioTrack || this._config.preferredAudioLanguage || "";
-            let subtitlesLanguage = "";
-            if (this._textTrackVisibility) {
-                subtitlesLanguage = this._selectedSubtitlesTrack || this._config.preferredSubtitlesLanguage || "";
-            }
+            const subtitlesLanguage = this._selectedSubtitlesTrack || this._config.preferredSubtitlesLanguage || "";
+
             const message = {
                 type: "remotePlayer.play",
                 class: "remotePlayer",
@@ -718,7 +709,23 @@ class RemotePlayer extends EventTarget {
                 message.switchMode = this._isAudioSyncEnabled() ? SwitchMode.SEAMLESS : SwitchMode.NON_SEAMLESS;
                 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.");
+                    }
+                }
+            } else if (!this.textTrackVisibility) {
+                message.subtitlesLanguage = "";
             }
+            logger.log(`remotePlayer play: sending play action remotePlayer._isPlaying: ${this._isPlaying} audioLanguage=${message.audioLanguage} subtitlesLanguage=${message.subtitlesLanguage} textTrackVisibility=${this.textTrackVisibility}`);
             const request = { target: "TC", waitForResponse: waitForResponse, message: JSON.stringify(message) };
             return new Promise((resolve, reject) => {
                 let timerId = 0;
@@ -947,10 +954,7 @@ class RemotePlayer extends EventTarget {
                 const playbackPosition = position ?? 0;
                 const logger = sdkLogger.withFields({ FCID, loadUrl: url, playbackPosition });
                 const audioLanguage = audioTrackId || this._selectedAudioTrack || this._config.preferredAudioLanguage || "";
-                let subtitlesLanguage = "";
-                if (this._textTrackVisibility) {
-                    subtitlesLanguage = textTrackId || this._selectedSubtitlesTrack || this._config.preferredSubtitlesLanguage || "";
-                }
+                const subtitlesLanguage = textTrackId || this._selectedSubtitlesTrack || this._config.preferredSubtitlesLanguage || "";
 
                 const message = {
                     url,
@@ -968,7 +972,7 @@ class RemotePlayer extends EventTarget {
                 } else {
                     message.type = "setPlayableUri";
                 }
-                logger.log(`remotePlayer load: sending ${message.type} request. remotePlayer._isPlaying: ${this._isPlaying}`);
+                logger.log(`remotePlayer load: sending ${message.type} request. remotePlayer._isPlaying: ${this._isPlaying} audioLanguage=${audioLanguage} subtitlesLanguage=${subtitlesLanguage}`);
                 const request = { target: "TC", waitForResponse: true, message: JSON.stringify(message) };
                 let timerId = 0;
                 const timeBeforeSendingRequest = Date.now();
@@ -1519,20 +1523,23 @@ class RemotePlayer extends EventTarget {
     /**
      * Enable or disable the subtitles.
      * If the player is in an unloaded state, the request will be applied next time content is played.
-     * @param {boolean} visible whether the subtitles are visible or not
-     * @throws {TypeError} if visible is not a boolean variable
+     * @param {boolean|0|1} visible whether the subtitles are visible or not
+     * @throws {TypeError} if visible is not a boolean variable or 0/1
      */
     setTextTrackVisibility(visible) {
         const oldVisibility = this._textTrackVisibility;
-        if (typeof visible !== "boolean") {
-            throw new TypeError("visible parameter must be a boolean");
+        if (typeof visible !== "boolean" && !(visible === 0 || visible === 1)) {
+            throw new TypeError("visible parameter must be a boolean or 0/1");
         }
-        const newVisibility = visible;
-        if (newVisibility === oldVisibility) {
+        // Convert to boolean in case apps pass 0/1 instead false/true.
+        const newVisibility = !!visible;
+
+        if (oldVisibility === newVisibility) {
             return;
         }
+
         this._textTrackVisibility = newVisibility;
-        if (!newVisibility) {
+        if (!this._textTrackVisibility) {
             // Setting the visibility to false clears any previous selections user has done
             this._selectedSubtitlesTrack = "";
         }

package/src/senzaShakaPlayer.js

@@ -1,6 +1,7 @@
 import * as shaka from "shaka-player";
 import { remotePlayer, lifecycle, getPlatformInfo } from "./api";
 import { sdkLogger, iso6393to1 } from "./utils";
+
 //  Define custom error category
 shaka.util.Error.Category.SENZA_PLAYER_ERROR = 50;
 shaka.util.Error.Code.SENZA_PLAYER_ERROR = 10500;
@@ -75,6 +76,13 @@ export class SenzaShakaPlayer extends shaka.Player {
      * @description Object containing event listeners for the video element.
      */
     _videoEventListeners = {
+        "play": () => {
+            this.remotePlayer.play()
+                .catch(error => {
+                    sdkLogger.error("Failed to play remote player:", error);
+                    this.handleSenzaError(error.code, error.message || "Unknown play error");
+                });
+        },
         "pause": () => {
             this.remotePlayer.pause()
                 .catch(error => {
@@ -211,7 +219,6 @@ export class SenzaShakaPlayer extends shaka.Player {
      * @param {boolean} [initializeMediaSource=true] - Whether to initialize the media source.
      */
     async attach(videoElement, initializeMediaSource = true) {
-
         await super.attach(videoElement, initializeMediaSource);
         this.videoElement = videoElement;
         this._attachVideoElementToRemotePlayer();
@@ -256,8 +263,8 @@ export class SenzaShakaPlayer extends shaka.Player {
    */
     async unload(initializeMediaSource = true, keepAdManager = false) {
         // Call the remote player's unload method
-
         try {
+            await lifecycle.moveToForeground();
             await remotePlayer.unload();
         } catch (error) {
             sdkLogger.error("Failed to unload remote player:", error);
@@ -399,7 +406,7 @@ export class SenzaShakaPlayer extends shaka.Player {
         // Create a promise that will resolve when _remotePlayerLoad is called
         let remoteLoadResolver;
         let remoteLoadRejecter;
-        const remoteLoadPromise = new Promise((resolve,reject) => {
+        const remoteLoadPromise = new Promise((resolve, reject) => {
             remoteLoadResolver = resolve;
             remoteLoadRejecter = reject;
         });
@@ -473,7 +480,8 @@ export class SenzaShakaPlayer extends shaka.Player {
      * @returns {Boolean}
      */
 
-    destroy() {
+    async destroy() {
+        await lifecycle.moveToForeground();
         SenzaShakaPlayer._prevInstance = null;
         this._removeRemotePlayerEventListeners();
         return super.destroy();
@@ -494,6 +502,8 @@ export class SenzaShakaPlayer extends shaka.Player {
      * });
      */
     configure(config) {
+        sdkLogger.log("configure player with: ", JSON.stringify(config));
+
         // Handle custom configuration
         if (config.shouldStopRemotePlayerOnError !== undefined) {
             this._shouldStopRemotePlayerOnError = !!config.shouldStopRemotePlayerOnError;
@@ -514,6 +524,7 @@ export class SenzaShakaPlayer extends shaka.Player {
             remoteConfiguration["preferredSubtitlesLanguage"] = config["preferredTextLanguage"];
         }
 
+        sdkLogger.log("configure remote player with: ", JSON.stringify(remoteConfiguration));
         remotePlayer.configure(remoteConfiguration);
     }
 
@@ -532,7 +543,7 @@ export class SenzaShakaPlayer extends shaka.Player {
 
     }
 
-    async _remotePlayerLoad(url,startTime) {
+    async _remotePlayerLoad(url, startTime) {
         const waitForLoadModeChange = () => {
             const timeout = this.remotePlayer._remotePlayerConfirmationTimeout + 2000;
             return Promise.race([
@@ -575,26 +586,6 @@ export class SenzaShakaPlayer extends shaka.Player {
             for (const [event, listener] of Object.entries(this._videoEventListeners)) {
                 this.videoElement.addEventListener(event, listener);
             }
-
-            this.videoElement.origPlay=this.videoElement.play;
-            this.videoElement.play = async () => {
-                sdkLogger.info("video tag play was called - first calling remotePlayer Play");
-
-                try {
-                    await this.remotePlayer.play();
-                } catch (error) {
-                    sdkLogger.error("Failed to play remote player:", error);
-                    this.handleSenzaError(error.code, error.message || "Unknown play error");
-                }
-
-                sdkLogger.info("Waiting for 30 seconds");
-                setTimeout(() => {
-                    sdkLogger.info("Now calling origPlay");
-                    return this.videoElement.origPlay();
-                }, 30 * 1000);
-
-            };
-
         }
 
     }