senza-sdk 4.2.55-fb0c331.0 → 4.2.56

package/package.json

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

package/src/remotePlayer.js

@@ -1031,6 +1031,8 @@ class RemotePlayer extends EventTarget {
             if (this._loadMode === this.LoadMode.LOADING || this._loadMode === this.LoadMode.UNLOADING) {
                 throw new RemotePlayerError(6502, "Cannot call unload() while previous unload/load is still in progress");
             }
+            this._abortSetAudioLanguage = true;
+            this._abortSetSubtitleLanguage = true;
             this._abortSeeking = true;
             const previousLoadMode = this._loadMode;
             this._changeLoadMode(this.LoadMode.UNLOADING);
@@ -1326,7 +1328,7 @@ class RemotePlayer extends EventTarget {
 
     /**
      * Handles the asynchronous selection of an audio track.
-     * If the player is playing, it stops audio streamType before changing the track and resumes audio streamType playback if necessary.
+     * It stops audio streamType before changing the track and resumes audio streamType playback if necessary.
      * Available only from v3 and on
      *
      * @param {string} audioTrackId - The ID of the audio track to select.
@@ -1462,7 +1464,7 @@ 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.
+     * 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.
@@ -1775,9 +1777,7 @@ class RemotePlayer extends EventTarget {
             await this._stop(StreamType.AUDIO);
         } catch (error) {
             sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} failed on stop with error ${error.message}.`);
-            if (!this._abortSetAudioLanguage) {
-                setLanguageError = error;
-            }
+            //  ignore error
         }
 
         // check if load/unload were called
@@ -1844,9 +1844,7 @@ class RemotePlayer extends EventTarget {
             await this._stop(StreamType.SUBTITLE);
         } catch (error) {
             sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} stop failed with error ${error.message}.`);
-            if (!this._abortSetSubtitleLanguage) {
-                setLanguageError = error;
-            }
+            // ignore error
         }
 
         // check if load/unload were called

package/src/senzaShakaPlayer.js

@@ -208,6 +208,8 @@ export class SenzaShakaPlayer extends shaka.Player {
             sdkLogger.warn("SenzaShakaPlayer constructor Adding videoElement in the constructor is going to be deprecated in the future. Please use attach method instead.");
         }
         SenzaShakaPlayer._prevInstance = this;
+
+
     }
 
     /**
@@ -233,6 +235,7 @@ export class SenzaShakaPlayer extends shaka.Player {
    * @export
    */
     async detach(keepAdManager = false) {
+
         await super.detach(keepAdManager);
         this._audioTracksMap = {};
         this._textTracksMap = {};
@@ -400,46 +403,74 @@ export class SenzaShakaPlayer extends shaka.Player {
      */
     async load(url, startTime, mimeType) {
 
-        const waitForLoadModeChange = () => {
-            const timeout = this.remotePlayer._remotePlayerConfirmationTimeout + 2000;
-            return Promise.race([
-                new Promise(resolve => this.remotePlayer.addEventListener("onloadmodechange", resolve, { once: true })),
-                new Promise((_, reject) => setTimeout(() => reject(`Timeout: Event "onloadmodechange" did not occur within ${timeout}ms`), timeout))
-            ]);
-        };
+        // Create a promise that will resolve when _remotePlayerLoad is called
+        let remoteLoadResolver;
+        let remoteLoadRejecter;
+        const remoteLoadPromise = new Promise((resolve,reject) => {
+            remoteLoadResolver = resolve;
+            remoteLoadRejecter = reject;
+        });
+        // Create a flag to indicate whether the manifest load has been handled
+        let manifestLoadHandled = false;
+        const MANIFEST_TIMEOUT = 15000;
 
         // 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}`);
+            sdkLogger.info(`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}`);
+            sdkLogger.info(`load() was called with startTime=${startTime}, setting startTime to ${-minInitialLiveOffset}`);
             startTime = -minInitialLiveOffset;
         }
 
-        if (!this.isInRemotePlayback || remotePlayer.getAssetUri() !== url) {
-            this._audioTracksMap = {};
-            this._videoTracksMap = {};
-            try {
-                if (this.remotePlayer.getLoadMode() === this.remotePlayer.LoadMode.UNLOADING) {
-                    sdkLogger.warn("load() was called while previous unload is still in progress, waiting for unload to finish");
-                    await waitForLoadModeChange();
+        // This callbakc will be activated when the manifest is loaded. It will trigger load of the remote player.
+        // This will ensure that the remote player is loaded only after the manifest is loaded by local player.
+        const responseFilterCallback = async (type) => {
+            if (type === shaka.net.NetworkingEngine.RequestType.MANIFEST && !manifestLoadHandled) {
+                manifestLoadHandled = true;
+                try {
+                    await this._remotePlayerLoad(url, startTime);
+                    remoteLoadResolver();
+                } catch (error) {
+                    remoteLoadRejecter(error);
                 }
-                await this.remotePlayer.load(url, startTime);
-            } catch (error) {
-                sdkLogger.log("Couldn't load remote player. Error:", error);
-                this.handleSenzaError(error.code, error.message);
+
             }
-        }
+        };
+
+        // Register the response filter
+        this.getNetworkingEngine().registerResponseFilter(responseFilterCallback);
+
+        const loadPromise = Promise.all([
+            super.load(url, startTime, mimeType),
+            remoteLoadPromise
+        ]);
+        // Set a timeout for the manifest load notification
+        let timerId;
+        const timerPromise = new Promise((_, reject) => {
+            timerId = setTimeout(() => {
+                const error = new Error("Manifest load timeout");
+                error.code = 8003;
+                reject(error);
+            }, MANIFEST_TIMEOUT);
+        });
+
         try {
-            await super.load(url, startTime, mimeType);
+            return await Promise.race([loadPromise, timerPromise]);
+
         } catch (error) {
-            sdkLogger.log("Couldn't load local player. Error:", error);
+            sdkLogger.log("Couldn't load player. Error:", error);
             this.handleSenzaError(error.code, error.message);
+
+        } finally {
+            this.getNetworkingEngine().unregisterResponseFilter(responseFilterCallback);
+            clearTimeout(timerId);
         }
+
     }
 
     /***
@@ -508,6 +539,32 @@ export class SenzaShakaPlayer extends shaka.Player {
 
     }
 
+    async _remotePlayerLoad(url,startTime) {
+        const waitForLoadModeChange = () => {
+            const timeout = this.remotePlayer._remotePlayerConfirmationTimeout + 2000;
+            return Promise.race([
+                new Promise(resolve => this.remotePlayer.addEventListener("onloadmodechange", resolve, { once: true })),
+                new Promise((_, reject) => setTimeout(() => reject(`Timeout: Event "onloadmodechange" did not occur within ${timeout}ms`), timeout))
+            ]);
+        };
+
+        if (!this.isInRemotePlayback || remotePlayer.getAssetUri() !== url) {
+            this._audioTracksMap = {};
+            this._videoTracksMap = {};
+            try {
+                if (this.remotePlayer.getLoadMode() === this.remotePlayer.LoadMode.UNLOADING) {
+                    sdkLogger.warn("load() was called while previous unload is still in progress, waiting for unload to finish");
+                    await waitForLoadModeChange();
+                }
+                sdkLogger.info("Loading remote player with startTime:", startTime);
+                await this.remotePlayer.load(url, startTime);
+                sdkLogger.log("Remote player loaded successfully");
+            } catch (error) {
+                sdkLogger.error("Couldn't load remote player. Error:", error);
+                this.handleSenzaError(error.code, error.message);
+            }
+        }
+    }
     /**
      * @private
      */