senza-sdk 4.2.55-5e1095e.0 → 4.2.55-b8f40a8.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.55-5e1095e.0",
+    "version": "4.2.55-b8f40a8.0",
     "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);
@@ -1770,24 +1772,25 @@ class RemotePlayer extends EventTarget {
         this._abortSetAudioLanguage = false;
         this._isSetAudioInProgress = true;
 
+        let setLanguageError;
         try {
             await this._stop(StreamType.AUDIO);
-            if (this._abortSetAudioLanguage) {
-                this._isSetAudioInProgress = false;
-                sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} aborted.`);
-                return Promise.resolve();
-            }
         } catch (error) {
+            sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} failed on stop with error ${error.message}.`);
+            //  ignore error
+        }
+
+        // check if load/unload were called
+        if (this._abortSetAudioLanguage) {
             this._isSetAudioInProgress = false;
-            sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} failed on stop. aborting.`);
-            return Promise.reject(error);
+            sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} aborted right after stop.`);
+            return Promise.resolve();
         }
 
-        let setLanguageError;
         try {
             await this._selectAudioTrackV3(audioTrackId);
         } catch (error) {
-            sdkLogger.error(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} failed with error ${error.message}.`);
+            sdkLogger.error(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} _selectAudioTrackV3 failed with error ${error.message}.`);
             if (!this._abortSetAudioLanguage) {
                 setLanguageError = error;
             }
@@ -1796,7 +1799,7 @@ class RemotePlayer extends EventTarget {
         // check if load/unload were called
         if (this._abortSetAudioLanguage) {
             this._isSetAudioInProgress = false;
-            sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} aborted.`);
+            sdkLogger.warn(`remotePlayer _atomicSetAudioLanguage: audioTrackId=${audioTrackId} aborted right after _selectAudioTrackV3.`);
             return Promise.resolve();
         }
 
@@ -1822,7 +1825,7 @@ class RemotePlayer extends EventTarget {
 
     async _atomicSetSubtitleLanguage(textTrackId, prevSelectedTextTrack) {
         if (this._isSetSubtitlesInProgress) {
-            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} already in progress., ignoring.`);
+            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} already in progress, ignoring.`);
             return Promise.resolve();
         }
         if (this._isSeekingByApplication) {
@@ -1836,24 +1839,25 @@ class RemotePlayer extends EventTarget {
         this._abortSetSubtitleLanguage = false;
         this._isSetSubtitlesInProgress = true;
 
+        let setLanguageError;
         try {
             await this._stop(StreamType.SUBTITLE);
-            if (this._abortSetSubtitleLanguage) {
-                this._isSetSubtitlesInProgress = false;
-                sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} aborted.`);
-                return Promise.resolve();
-            }
         } catch (error) {
+            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} stop failed with error ${error.message}.`);
+            // ignore error
+        }
+
+        // check if load/unload were called
+        if (this._abortSetSubtitleLanguage) {
             this._isSetSubtitlesInProgress = false;
-            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} failed on stop. aborting.`);
-            return Promise.reject(error);
+            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} aborted right after stop.`);
+            return Promise.resolve();
         }
 
-        let setLanguageError;
         try {
             await this._selectTextTrackV3(textTrackId);
         } catch (error) {
-            sdkLogger.error(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} failed with error ${error.message}.`);
+            sdkLogger.error(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} _selectTextTrackV3 failed with error ${error.message}.`);
             if (!this._abortSetSubtitleLanguage) {
                 setLanguageError = error;
             }
@@ -1862,7 +1866,7 @@ class RemotePlayer extends EventTarget {
         // check if load/unload were called
         if (this._abortSetSubtitleLanguage) {
             this._isSetSubtitlesInProgress = false;
-            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} aborted.`);
+            sdkLogger.warn(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} aborted right after _selectTextTrackV3.`);
             return Promise.resolve();
         }
 
@@ -1885,7 +1889,6 @@ class RemotePlayer extends EventTarget {
         sdkLogger.log(`remotePlayer _atomicSetSubtitleLanguage: textTrackId=${textTrackId} ended.`);
         return setLanguageError ? Promise.reject(setLanguageError) : Promise.resolve();
     }
-
 }
 /**
  *