senza-sdk 4.2.49 → 4.2.51-44b32dd.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.49",
+    "version": "4.2.51-44b32dd.0",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/remotePlayer.js

@@ -586,7 +586,7 @@ class RemotePlayer extends EventTarget {
                     currentFramePTS: metadata.mediaTime.toString(),
                     ptsSessionId: this._ptsSessionId
                 };
-                const request = {target: "UI-Streamer", waitForResponse: false, message: JSON.stringify(message)};
+                const request = { target: "UI-Streamer", waitForResponse: false, message: JSON.stringify(message) };
                 window.cefQuery({
                     request: JSON.stringify(request),
                     persistent: false
@@ -1189,7 +1189,6 @@ class RemotePlayer extends EventTarget {
         const prevSelectedAudioTrack = this._selectedAudioTrack;
         for (const track of this.getAudioTracks()) {
             if (track.id === audioTrackId) {
-                this._selectedAudioTrack = audioTrackId;
                 found = true;
                 break;
             }
@@ -1198,19 +1197,33 @@ class RemotePlayer extends EventTarget {
             sdkLogger.warn(`Invalid audioTrackId ${audioTrackId}`);
             return Promise.resolve();
         }
-        if (this._remotePlayerApiVersion < 2) {
-            return Promise.resolve(); // Resolve immediately for older versions
-        }
-        if (prevSelectedAudioTrack === this._selectedAudioTrack) {
+        if (this._selectedAudioTrack === audioTrackId) {
             return Promise.resolve(); // Audio language already selected
         }
 
-        return this._selectAudioTrack(audioTrackId, prevSelectedAudioTrack);
+        switch (this._remotePlayerApiVersion) {
+        case 0:
+        case 1:
+            this._selectedAudioTrack = audioTrackId;
+            return Promise.resolve(); // Resolve immediately for older versions
+        case 2:
+            return this._selectAudioTrackV2(audioTrackId, prevSelectedAudioTrack);
+        default:
+            return this._selectAudioTrackV3(audioTrackId, prevSelectedAudioTrack);
+        }
     }
 
-    async _selectAudioTrack(audioTrackId, prevSelectedAudioTrack) {
+    /**
+     * Handles the asynchronous selection of an audio track.
+     * If the player is playing, it pauses before changing the track and resumes playback if necessary.
+     *
+     * @param {string} audioTrackId - The ID of the audio track to select.
+     * @param {string} prevSelectedAudioTrack - The previously selected audio track ID.
+     * @returns {Promise<void>} Resolves when the operation is complete.
+     * */
+    async _selectAudioTrackV2(audioTrackId, prevSelectedAudioTrack) {
         const prevIsPlaying = this._isPlaying;
-        sdkLogger.log(`remotePlayer _selectAudioTrack: prevAudioTrack=${prevSelectedAudioTrack} audioTrackId=${audioTrackId} isPlaying=${this._isPlaying}`);
+        sdkLogger.log(`remotePlayer _selectAudioTrackV2: prevAudioTrack=${prevSelectedAudioTrack} audioTrackId=${audioTrackId} isPlaying=${this._isPlaying}`);
         try {
             if (this._isPlaying) await this.pause();
             let position = this.currentTime;
@@ -1218,9 +1231,9 @@ class RemotePlayer extends EventTarget {
                 position = this._videoElement.currentTime;
             }
             await this._load(this._loadedUrl, position, audioTrackId, undefined, false);
+            this._selectedAudioTrack = audioTrackId;
         } catch (e) {
-            // Do NOT reject - just log and revert selection
-            this._selectedAudioTrack = prevSelectedAudioTrack;
+            // Do NOT reject - just log
             sdkLogger.warn(`Failed to select audio track ${audioTrackId}: ${e.message}`);
             return;
         }
@@ -1237,6 +1250,63 @@ class RemotePlayer extends EventTarget {
         }
     }
 
+    /**
+     * Handles the asynchronous selection of an audio track.
+     * If the player is playing, it stops subtitle streamType before changing the track and resumes subtitle streamType playback if necessary.
+     * Available only from v3 and on
+     *
+     * @param {string} audioTrackId - The ID of the audio track to select.
+     * @param {string} prevSelectedAudioTrack - The previously selected audio track ID.
+     * @returns {Promise<void>} Resolves when the operation is complete.
+     * */
+    async _selectAudioTrackV3(audioTrackId, prevSelectedAudioTrack) {
+        sdkLogger.log(`remotePlayer _selectAudioTrackV3: prevAudioTrack=${prevSelectedAudioTrack} audioTrackId=${audioTrackId} isPlaying=${this._isPlaying}`);
+        if (window.cefQuery) {
+            const FCID = getFCID();
+            const logger = sdkLogger.withFields({ FCID });
+            logger.log("remotePlayer _selectAudioTrackV3: sending setAudioLanguage action");
+            const message = {
+                type: "remotePlayer.setAudioLanguage",
+                class: "remotePlayer",
+                action: "setAudioLanguage",
+                fcid: FCID,
+                language: audioTrackId,
+            };
+            const request = { target: "TC", waitForResponse: true, message: JSON.stringify(message) };
+            return new Promise((resolve, reject) => {
+                let timerId = 0;
+                const timeBeforeSendingRequest = Date.now();
+                const queryId = window.cefQuery({
+                    request: JSON.stringify(request),
+                    persistent: false,
+                    onSuccess: () => {
+                        this._selectedAudioTrack = audioTrackId;
+                        const duration = Date.now() - timeBeforeSendingRequest;
+                        logger.withFields({ duration }).log(`setAudioLanguage completed successfully after ${duration} ms`);
+                        timerId = clearTimer(timerId);
+                        resolve();
+                    },
+                    onFailure: (code, msg) => {
+                        const duration = Date.now() - timeBeforeSendingRequest;
+                        logger.withFields({ duration }).log(`setAudioLanguage failed after ${duration} ms. Error code: ${code}, error message: ${msg}`);
+                        timerId = clearTimer(timerId);
+                        reject(new RemotePlayerError(code, msg));
+                    }
+                });
+                logger.log(`window.cefQuery for setAudioLanguage returned query id ${queryId}`);
+                const timeout = this._remotePlayerConfirmationTimeout + 1000;
+                timerId = setTimeout(() => {
+                    logger.log(`setAudioLanguage reached timeout of ${timeout} ms, canceling query id ${queryId}`);
+                    window.cefQueryCancel(queryId);
+                    reject(new RemotePlayerError(6000, `setAudioLanguage reached timeout of ${timeout} ms`));
+                }, timeout, queryId);
+            });
+        }
+
+        sdkLogger.error("remotePlayer _selectAudioTrackV3: window.cefQuery is undefined");
+        return Promise.resolve(undefined);
+    }
+
     /** Select a specific text (subtitle) track.
      * Track id should come from a call to getTextTracks.
      * If no tracks exist - this is a no-op.
@@ -1256,7 +1326,6 @@ class RemotePlayer extends EventTarget {
         const prevSelectedTextTrack = this._selectedSubtitlesTrack;
         for (const track of this.getTextTracks()) {
             if (track.id === textTrackId) {
-                this._selectedSubtitlesTrack = textTrackId;
                 found = true;
                 break;
             }
@@ -1265,14 +1334,20 @@ class RemotePlayer extends EventTarget {
             sdkLogger.warn(`Invalid textTrackId ${textTrackId}`);
             return Promise.resolve();
         }
-        if (this._remotePlayerApiVersion < 2) {
-            return Promise.resolve(); // Resolve immediately for older versions
-        }
-        if (prevSelectedTextTrack === this._selectedSubtitlesTrack) {
+        if (this._selectedSubtitlesTrack === textTrackId) {
             return Promise.resolve(); // Subtitle language already selected
         }
 
-        return this._selectTextTrack(textTrackId, prevSelectedTextTrack);
+        switch (this._remotePlayerApiVersion) {
+        case 0:
+        case 1:
+            this._selectedSubtitlesTrack = textTrackId;
+            return Promise.resolve(); // Resolve immediately for older versions
+        case 2:
+            return this._selectTextTrackV2(textTrackId, prevSelectedTextTrack);
+        default:
+            return this._selectTextTrackV3(textTrackId, prevSelectedTextTrack);
+        }
     }
 
     /**
@@ -1283,9 +1358,9 @@ class RemotePlayer extends EventTarget {
      * @param {string} prevSelectedTextTrack - The previously selected text track ID.
      * @returns {Promise<void>} Resolves when the operation is complete.
      * */
-    async _selectTextTrack(textTrackId, prevSelectedTextTrack) {
+    async _selectTextTrackV2(textTrackId, prevSelectedTextTrack) {
         const prevIsPlaying = this._isPlaying;
-        sdkLogger.log(`remotePlayer _selectTextTrack: prevTextTrack=${prevSelectedTextTrack} textTrackId=${textTrackId} isPlaying=${this._isPlaying}`);
+        sdkLogger.log(`remotePlayer _selectTextTrackV2: prevTextTrack=${prevSelectedTextTrack} textTrackId=${textTrackId} isPlaying=${this._isPlaying}`);
         try {
             if (this._isPlaying) await this.pause();
             let position = this.currentTime;
@@ -1293,9 +1368,9 @@ class RemotePlayer extends EventTarget {
                 position = this._videoElement.currentTime;
             }
             await this._load(this._loadedUrl, position, undefined, textTrackId, false);
+            this._selectedSubtitlesTrack = textTrackId;
         } catch (e) {
-            // Do NOT reject - just log and revert selection
-            this._selectedSubtitlesTrack = prevSelectedTextTrack;
+            // Do NOT reject - just log
             sdkLogger.warn(`Failed to select text track ${textTrackId}: ${e.message}`);
             return;
         }
@@ -1312,6 +1387,65 @@ class RemotePlayer extends EventTarget {
         }
     }
 
+    /**
+     * Handles the asynchronous selection of a text track.
+     * If the player is playing, it stops subtitle streamType before changing the track and resumes subtitle streamType playback if necessary.
+     * Available only from v3 and on
+     *
+     * @param {string} textTrackId - The ID of the text track to select.
+     * @param {string} prevSelectedTextTrack - The previously selected text track ID.
+     * @returns {Promise<void>} Resolves when the operation is complete.
+     * */
+    async _selectTextTrackV3(textTrackId, prevSelectedTextTrack) {
+        sdkLogger.log(`remotePlayer _selectTextTrackV3: prevAudioTrack=${prevSelectedTextTrack} textTrackId=${textTrackId} isPlaying=${this._isPlaying}`);
+        if (window.cefQuery) {
+            const FCID = getFCID();
+            const logger = sdkLogger.withFields({ FCID });
+            logger.log("remotePlayer _selectTextTrackV3: sending setSubtitleLanguage action");
+            const message = {
+                type: "remotePlayer.setSubtitleLanguage",
+                class: "remotePlayer",
+                action: "setSubtitleLanguage",
+                fcid: FCID,
+                language: textTrackId,
+            };
+            const request = { target: "TC", waitForResponse: true, message: JSON.stringify(message) };
+            return new Promise((resolve, reject) => {
+                let timerId = 0;
+                const timeBeforeSendingRequest = Date.now();
+                const queryId = window.cefQuery({
+                    request: JSON.stringify(request),
+                    persistent: false,
+                    onSuccess: () => {
+                        this._selectedSubtitlesTrack = textTrackId;
+                        const duration = Date.now() - timeBeforeSendingRequest;
+                        logger.withFields({ duration }).log(`setSubtitleLanguage completed successfully after ${duration} ms`);
+                        timerId = clearTimer(timerId);
+                        resolve();
+                    },
+                    onFailure: (code, msg) => {
+                        const duration = Date.now() - timeBeforeSendingRequest;
+                        logger.withFields({ duration }).log(`setSubtitleLanguage failed after ${duration} ms. Error code: ${code}, error message: ${msg}`);
+                        timerId = clearTimer(timerId);
+                        reject(new RemotePlayerError(code, msg));
+                    }
+                });
+                logger.log(`window.cefQuery for setSubtitleLanguage returned query id ${queryId}`);
+                const timeout = this._remotePlayerConfirmationTimeout + 1000;
+                timerId = setTimeout(() => {
+                    logger.log(`setSubtitleLanguage reached timeout of ${timeout} ms, canceling query id ${queryId}`);
+                    window.cefQueryCancel(queryId);
+                    reject(new RemotePlayerError(6000, `setSubtitleLanguage reached timeout of ${timeout} ms`));
+                }, timeout, queryId);
+            });
+        }
+        sdkLogger.error("remotePlayer _selectAudioTrackV3: window.cefQuery is undefined");
+        return Promise.resolve(undefined);
+
+
+    }
+
+
     /**
      * Enable or disable the subtitles.
      * If the player is in an unloaded state, the request will be applied next time content is played.

package/src/senzaShakaPlayer.js

@@ -1,5 +1,5 @@
 import * as shaka from "shaka-player";
-import { remotePlayer, lifecycle } from "./api";
+import { remotePlayer, lifecycle, getPlatformInfo } from "./api";
 import { sdkLogger, iso6393to1 } from "./utils";
 
 //  Define custom error category
@@ -386,6 +386,18 @@ export class SenzaShakaPlayer extends shaka.Player {
             ]);
         };
 
+        // For live streams, we can set a default offset from the live edge
+        // This allows for synchronizing the start position for both local and remote players
+        // Note: For VOD content, negative start times are treated as 0
+        const { defaultInitialLiveOffset, minInitialLiveOffset } = getPlatformInfo()?.sessionInfo?.settings?.["ui-streamer"] || {};
+        if ((startTime === undefined || startTime === 0) && defaultInitialLiveOffset !== undefined) {
+            sdkLogger.debug(`load() was called with startTime=${startTime}, setting startTime to ${-defaultInitialLiveOffset}`);
+            startTime = -defaultInitialLiveOffset;
+        } else if (startTime <= 0 && minInitialLiveOffset !== undefined && startTime > -minInitialLiveOffset) {
+            sdkLogger.debug(`load() was called with startTime=${startTime}, setting startTime to ${-minInitialLiveOffset}`);
+            startTime = -minInitialLiveOffset;
+        }
+
         if (!this.isInRemotePlayback || remotePlayer.getAssetUri() !== url) {
             this._audioTracksMap = {};
             this._videoTracksMap = {};