Dynamically read out request timeout in case settings are updated during runtime (Dash-Industry-Forum#4997)

* Dynamically read out request timeout in case settings are updated during runtime

* Add an additional test to validate timeouts are updated

Author: dsilhavy

src/streaming/FragmentLoader.js

@@ -57,7 +57,6 @@ function FragmentLoader(config) {
             constants: Constants,
             boxParser: config.boxParser,
             dashConstants: config.dashConstants,
-            requestTimeout: config.settings.get().streaming.fragmentRequestTimeout
         });
     }
 

src/streaming/ManifestLoader.js

@@ -72,7 +72,6 @@ function ManifestLoader(config) {
             constants: Constants,
             dashConstants: DashConstants,
             errors: Errors,
-            requestTimeout: config.settings.get().streaming.manifestRequestTimeout
         });
 
         xlinkController = XlinkController(context).create({

src/streaming/net/HTTPLoader.js

@@ -64,7 +64,6 @@ function HTTPLoader(cfg) {
     const mediaPlayerModel = cfg.mediaPlayerModel;
     const boxParser = cfg.boxParser;
     const errors = cfg.errors;
-    const requestTimeout = cfg.requestTimeout || 0;
     const eventBus = EventBus(context).getInstance();
     const settings = Settings(context).getInstance();
 
@@ -367,6 +366,25 @@ function HTTPLoader(cfg) {
             }
         }
 
+        /**
+         * Returns the request timeout value from Settings based on the request type.
+         * This reads the value dynamically so that runtime changes via updateSettings() take effect.
+         * @param {Object} requestObject
+         * @returns {number}
+         * @private
+         */
+        function _getRequestTimeout(requestObject) {
+            if (requestObject.type === HTTPRequest.MPD_TYPE) {
+                return settings.get().streaming.manifestRequestTimeout || 0;
+            }
+
+            if (_isFragmentRequest(requestObject)) {
+                return settings.get().streaming.fragmentRequestTimeout || 0;
+            }
+
+            return 0;
+        }
+
         // Main code after inline functions
         const requestObject = config.request;
         const traces = [];
@@ -407,7 +425,7 @@ function HTTPLoader(cfg) {
             responseType: requestObject.responseType,
             headers: requestObject.headers,
             credentials: withCredentials ? 'include' : 'omit',
-            timeout: requestTimeout,
+            timeout: _getRequestTimeout(requestObject),
             cmcd: cmcdModel.getCmcdData(requestObject),
             customData: { request: requestObject }
         });
@@ -454,6 +472,15 @@ function HTTPLoader(cfg) {
         }
     }
 
+
+    function _isFragmentRequest(request) {
+        return request && request.type === HTTPRequest.INIT_SEGMENT_TYPE ||
+            request.type === HTTPRequest.INDEX_SEGMENT_TYPE ||
+            request.type === HTTPRequest.MEDIA_SEGMENT_TYPE ||
+            request.type === HTTPRequest.BITSTREAM_SWITCHING_SEGMENT_TYPE ||
+            request.type === HTTPRequest.MSS_FRAGMENT_INFO_SEGMENT_TYPE;
+    }
+
     function _applyRequestInterceptors(httpRequest) {
         const interceptors = customParametersModel.getRequestInterceptors();
         if (!interceptors) {

src/streaming/net/URLLoader.js

@@ -59,7 +59,6 @@ function URLLoader(cfg) {
                 constants: cfg.constants ? cfg.constants : null,
                 dashConstants: cfg.dashConstants ? cfg.dashConstants : null,
                 urlUtils: cfg.urlUtils ? cfg.urlUtils : null,
-                requestTimeout: !isNaN(cfg.requestTimeout) ? cfg.requestTimeout : 0,
                 errors: cfg.errors
             });
         }