rx-player 4.0.0-dev.2023110700 → 4.0.0-dev.2023120600

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rx-player",
   "author": "Canal+",
-  "version": "4.0.0-dev.2023110700",
+  "version": "4.0.0-dev.2023120600",
   "description": "Canal+ HTML5 Video Player",
   "main": "./dist/commonjs/index.js",
   "module": "./dist/es2017/index.js",
@@ -138,7 +138,7 @@
     "demo": "node ./scripts/build_demo.mjs --production-mode",
     "demo:min": "node ./scripts/build_demo.mjs --production-mode --minify",
     "demo:watch": "node ./scripts/build_demo.mjs --watch --production-mode",
-    "doc": "docgen.ico doc/ doc/generated \"$(cat VERSION)\"",
+    "doc": "readme.doc doc/ doc/generated \"$(cat VERSION)\"",
     "lint": "eslint src -c .eslintrc.js",
     "lint:demo": "eslint -c demo/full/.eslintrc.js demo/full/scripts",
     "lint:tests": "eslint tests/**/*.js --ignore-pattern '/tests/performance/bundle*'",
@@ -167,14 +167,12 @@
     "type": "git",
     "url": "git://github.com/canalplus/rx-player.git"
   },
-  "dependencies": {
-    "next-tick": "1.1.0"
-  },
   "devDependencies": {
     "@babel/core": "7.23.0",
     "@babel/plugin-transform-runtime": "7.22.15",
     "@babel/preset-env": "7.22.20",
     "@babel/preset-react": "7.22.15",
+    "@canalplus/readme.doc": "^0.3.0",
     "@types/chai": "4.3.6",
     "@types/jest": "29.5.5",
     "@types/mocha": "10.0.1",
@@ -188,7 +186,6 @@
     "babel-loader": "9.1.3",
     "chai": "4.3.8",
     "core-js": "3.32.2",
-    "docgen.ico": "^0.2.3",
     "esbuild": "0.19.3",
     "eslint": "8.50.0",
     "eslint-plugin-ban": "1.6.0",
@@ -218,7 +215,6 @@
     "terser-webpack-plugin": "5.3.9",
     "ts-jest": "29.1.1",
     "ts-loader": "9.4.4",
-    "tslint": "6.1.3",
     "typescript": "5.2.2",
     "webpack": "5.88.2",
     "webpack-cli": "5.1.4"

package/scripts/update-version

@@ -22,7 +22,9 @@
 set -e
 
 version=$1
+date_iso=$(date "+%Y-%m-%d")
 
+sed -i.bak -e "s/^\#\# Unreleased/\#\# v${version} \(${date_iso}\)/gi" CHANGELOG.md && rm CHANGELOG.md.bak
 sed -i.bak -e "s/\/\\* PLAYER_VERSION \\*\/\"\(.*\)\";/\/* PLAYER_VERSION *\/\"${version}\";/g" src/core/api/public_api.ts && rm src/core/api/public_api.ts.bak
 sed -i.bak -e "s/\"version\":\s*\"[0-9]\+\.[0-9]\+\.[0-9]\+[^\"]*\"/\"version\": \"${version}\"/g" package.json && rm package.json.bak
 sed -i.bak -e "s/sonar\.projectVersion= *.*/sonar.projectVersion=${version}/g" sonar-project.properties && rm sonar-project.properties.bak

package/sonar-project.properties

@@ -1,7 +1,7 @@
 sonar.projectKey=rx-player
 sonar.organization=rx-player
 sonar.projectName=rx-player
-sonar.projectVersion=4.0.0-dev.2023110700
+sonar.projectVersion=4.0.0-dev.2023120600
 sonar.sources=./src,./demo,./tests
 sonar.exclusions=demo/full/bundle.js,demo/standalone/lib.js,demo/bundle.js
 sonar.host.url=https://sonarcloud.io

package/src/compat/is_codec_supported.ts

@@ -16,6 +16,17 @@
 
 import { MediaSource_ } from "./browser_compatibility_types";
 
+/**
+ * Setting this value limit the number of entries in the support map
+ * preventing important memory usage, value is arbitrary
+ */
+const MAX_SUPPORT_MAP_ENTRIES = 200;
+
+/**
+ * caching the codec support reduce the amount of call to `isTypeSupported`
+ * and help for performance especially on low-end devices.
+ */
+const supportMap: Map<string, boolean> = new Map();
 /**
  * Returns true if the given codec is supported by the browser's MediaSource
  * implementation.
@@ -33,7 +44,18 @@ export default function isCodecSupported(mimeType : string) : boolean {
   /* eslint-disable @typescript-eslint/unbound-method */
   if (typeof MediaSource_.isTypeSupported === "function") {
   /* eslint-enable @typescript-eslint/unbound-method */
-    return MediaSource_.isTypeSupported(mimeType);
+    const cachedSupport = supportMap.get(mimeType);
+    if (cachedSupport !== undefined) {
+      return cachedSupport;
+    } else {
+      const isSupported = MediaSource_.isTypeSupported(mimeType);
+      if (supportMap.size >= MAX_SUPPORT_MAP_ENTRIES) {
+        supportMap.clear();
+      }
+      supportMap.set(mimeType, isSupported);
+      return isSupported;
+    }
+
   }
 
   return true;

package/src/compat/patch_webkit_source_buffer.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import nextTick from "next-tick";
 import EventEmitter from "../utils/event_emitter";
+import queueMicrotask from "../utils/queue_microtask";
 import globalScope from "./global_scope";
 import isNode from "./is_node";
 
@@ -57,7 +57,7 @@ export default function patchWebkitSourceBuffer() : void {
 
     sourceBufferWebkitProto._emitUpdate =
       function(eventName : string, val : unknown) {
-        nextTick(() => {
+        queueMicrotask(() => {
           /* eslint-disable no-invalid-this */
           this.trigger(eventName, val);
           this.updating = false;

package/src/core/api/debug/buffer_graph.ts

@@ -1,7 +1,7 @@
 import { Representation } from "../../../manifest";
 import { IBufferedChunk } from "../../segment_buffers";
 
-const BUFFER_WIDTH_IN_SECONDS = 10000;
+const BUFFER_WIDTH_IN_SECONDS = 30 * 60;
 
 const COLORS = [
   "#2ab7ca",
@@ -95,10 +95,7 @@ export default class SegmentBufferGraph {
     let minimumPosition;
     let maximumPosition;
     if (maximumPoint - minimumPoint > BUFFER_WIDTH_IN_SECONDS) {
-      if (currentTime === undefined) {
-        minimumPosition = minimumPoint;
-        maximumPosition = maximumPoint;
-      } else if (maximumPoint - currentTime < BUFFER_WIDTH_IN_SECONDS / 2) {
+      if (maximumPoint - currentTime < BUFFER_WIDTH_IN_SECONDS / 2) {
         maximumPosition = maximumPoint;
         minimumPosition = maximumPoint - BUFFER_WIDTH_IN_SECONDS;
       } else if (currentTime - minimumPoint < BUFFER_WIDTH_IN_SECONDS / 2) {

package/src/core/api/debug/modules/general_info.ts

@@ -157,23 +157,28 @@ export default function constructDebugGeneralInfo(
         ]);
         adaptationsElt.appendChild(textAdaps);
       }
-      const videoBitrates = instance.getVideoTrack()?.representations.map(r => {
-        return r.bitrate;
-      }).filter(bitrate => bitrate !== undefined) ?? [];
-      const audioBitrates = instance.getAudioTrack()?.representations.map(r => {
-        return r.bitrate;
-      }).filter(bitrate => bitrate !== undefined) ?? [];
+      const adaptations = instance.__priv_getCurrentAdaptation();
+      const videoBitratesStr = adaptations?.video?.representations.map((r) => {
+        return String(r.bitrate ?? "N/A") +
+               (r.isSupported ? "" : " U!") +
+               (r.decipherable !== false ? "" : " E!");
+      }) ?? [];
+      const audioBitratesStr = adaptations?.video?.representations.map((r) => {
+        return String(r.bitrate ?? "N/A") +
+               (r.isSupported ? "" : " U!") +
+               (r.decipherable !== false ? "" : " E!");
+      }) ?? [];
       representationsElt.innerHTML = "";
-      if (videoBitrates.length > 0) {
+      if (videoBitratesStr.length > 0) {
         representationsElt.appendChild(createMetricTitle("vb"));
         representationsElt.appendChild(createElement("span", {
-          textContent: videoBitrates.join(" ") + " ",
+          textContent: videoBitratesStr.join(" ") + " ",
         }));
       }
-      if (audioBitrates.length > 0) {
+      if (audioBitratesStr.length > 0) {
         representationsElt.appendChild(createMetricTitle("ab"));
         representationsElt.appendChild(createElement("span", {
-          textContent: audioBitrates.join(" ") + " ",
+          textContent: audioBitratesStr.join(" ") + " ",
         }));
       }
     } else {

package/src/core/api/option_utils.ts

@@ -42,6 +42,7 @@ export type IParsedStartAtOption = { position : number } |
                                    { wallClockTime : number } |
                                    { percentage : number } |
                                    { fromLastPosition : number } |
+                                   { fromLivePosition : number } |
                                    { fromFirstPosition : number };
 
 /** Options of the RxPlayer's constructor once parsed. */
@@ -226,6 +227,8 @@ function parseConstructorOptions(
  */
 function checkReloadOptions(options?: {
   reloadAt?: { position?: number; relative?: number };
+  keySystems?: IKeySystemOption[];
+  autoPlay?: boolean;
 }): void {
   if (options === null ||
       (typeof options !== "object" && options !== undefined)) {
@@ -243,6 +246,12 @@ function checkReloadOptions(options?: {
       options?.reloadAt?.relative !== undefined) {
     throw new Error("API: reload - Invalid 'reloadAt.relative' option format.");
   }
+  if (!Array.isArray(options?.keySystems) && options?.keySystems !== undefined) {
+    throw new Error("API: reload - Invalid 'keySystems' option format.");
+  }
+  if (options?.autoPlay !== undefined && typeof options.autoPlay !== "boolean") {
+    throw new Error("API: reload - Invalid 'autoPlay' option format.");
+  }
 }
 
 /**
@@ -375,9 +384,8 @@ function parseLoadVideoOptions(
   }
 
   if (!isNullOrUndefined(options.startAt)) {
-    // TODO Better way to express that in TypeScript?
-    if ((options.startAt as { wallClockTime? : Date|number }).wallClockTime
-           instanceof Date
+    if ("wallClockTime" in options.startAt
+    && options.startAt.wallClockTime instanceof Date
     ) {
       const wallClockTime = (options.startAt as { wallClockTime : Date })
         .wallClockTime.getTime() / 1000;

package/src/core/api/public_api.ts

@@ -56,6 +56,7 @@ import {
   IBrokenRepresentationsLockContext,
   IConstructorOptions,
   IKeySystemConfigurationOutput,
+  IKeySystemOption,
   ILoadVideoOptions,
   ILockedAudioRepresentationsSettings,
   ILockedVideoRepresentationsSettings,
@@ -345,7 +346,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */"4.0.0-dev.2023110700";
+    this.version = /* PLAYER_VERSION */"4.0.0-dev.2023120600";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -471,6 +472,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    */
   reload(reloadOpts?: {
     reloadAt?: { position?: number; relative?: number };
+    keySystems?: IKeySystemOption[];
     autoPlay?: boolean;
   }): void {
     const { options,
@@ -503,6 +505,13 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       autoPlay = !reloadInPause;
     }
 
+    let keySystems : IKeySystemOption[] | undefined;
+    if (reloadOpts?.keySystems !== undefined) {
+      keySystems = reloadOpts.keySystems;
+    } else if (this._priv_reloadingMetadata.options?.keySystems !== undefined) {
+      keySystems = this._priv_reloadingMetadata.options.keySystems;
+    }
+
     const newOptions = { ...options,
                          initialManifest: manifest };
     if (startAt !== undefined) {
@@ -511,6 +520,9 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     if (autoPlay !== undefined) {
       newOptions.autoPlay = autoPlay;
     }
+    if (keySystems !== undefined) {
+      newOptions.keySystems = keySystems;
+    }
     this._priv_initializeContentPlayback(newOptions);
   }
 
@@ -520,7 +532,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     if (features.createDebugElement === null) {
       throw new Error("Feature `DEBUG_ELEMENT` not added to the RxPlayer");
     }
-    const canceller = new TaskCanceller() ;
+    const canceller = new TaskCanceller();
     features.createDebugElement(element, this, canceller.signal);
     return {
       dispose() {
@@ -598,6 +610,8 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       const manifestRequestSettings = { lowLatencyMode,
                                         maxRetry : requestConfig.manifest?.maxRetry,
                                         requestTimeout:  requestConfig.manifest?.timeout,
+                                        connectionTimeout:
+                                          requestConfig.manifest?.connectionTimeout,
                                         minimumManifestUpdateInterval,
                                         initialManifest };
 
@@ -655,8 +669,9 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
       const segmentRequestOptions = { lowLatencyMode,
                                       maxRetry: requestConfig.segment?.maxRetry,
-                                      requestTimeout: requestConfig.segment?.timeout };
-
+                                      requestTimeout: requestConfig.segment?.timeout,
+                                      connectionTimeout:
+                                        requestConfig.segment?.connectionTimeout };
       initializer = new features.mediaSourceInit({
         adaptiveOptions,
         autoPlay,
@@ -1946,6 +1961,29 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     return null;
   }
 
+  /**
+   * Returns the current position for live contents.
+   *
+   * Returns `null` if no content is loaded or if the current loaded content is
+   * not considered as a live content.
+   * Returns `undefined` if that live position is currently unknown.
+   * @returns {number}
+   */
+  getLivePosition() : number | undefined |null {
+    if (this._priv_contentInfos === null) {
+      return null;
+    }
+
+    const { isDirectFile, manifest } = this._priv_contentInfos;
+    if (isDirectFile) {
+      return undefined;
+    }
+    if (manifest?.isLive !== true) {
+      return null;
+    }
+    return manifest.getLivePosition();
+  }
+
   /**
    * Get maximum seek-able position.
    * @returns {number}
@@ -1996,9 +2034,11 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
     const segmentBufferStatus = this._priv_contentInfos
       .segmentBuffersStore.getStatus(bufferType);
-    return segmentBufferStatus.type === "initialized" ?
-      segmentBufferStatus.value.getInventory() :
-      null;
+    if (segmentBufferStatus.type === "initialized") {
+      segmentBufferStatus.value.synchronizeInventory();
+      return segmentBufferStatus.value.getInventory();
+    }
+    return null;
   }
 
   /**
@@ -2772,7 +2812,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
   }
 }
-Player.version = /* PLAYER_VERSION */"4.0.0-dev.2023110700";
+Player.version = /* PLAYER_VERSION */"4.0.0-dev.2023120600";
 
 /** Every events sent by the RxPlayer's public API. */
 interface IPublicAPIEvent {

package/src/core/fetchers/manifest/manifest_fetcher.ts

@@ -29,7 +29,6 @@ import {
   ITransportPipelines,
 } from "../../../transports";
 import EventEmitter from "../../../utils/event_emitter";
-import isNullOrUndefined from "../../../utils/is_null_or_undefined";
 import getMonotonicTimeStamp from "../../../utils/monotonic_timestamp";
 import noop from "../../../utils/noop";
 import TaskCanceller from "../../../utils/task_canceller";
@@ -231,14 +230,27 @@ export default class ManifestFetcher extends EventEmitter<IManifestFetcherEvent>
     ) : Promise<IRequestedData<ILoadedManifestFormat>> {
       const { loadManifest } = pipelines;
       let requestTimeout : number | undefined =
-        isNullOrUndefined(settings.requestTimeout) ?
+        (settings.requestTimeout === undefined) ?
           config.getCurrent().DEFAULT_REQUEST_TIMEOUT :
           settings.requestTimeout;
+
+      let connectionTimeout: number | undefined =
+      (settings.connectionTimeout === undefined) ?
+        config.getCurrent().DEFAULT_CONNECTION_TIMEOUT :
+        settings.connectionTimeout;
+
       if (requestTimeout < 0) {
         requestTimeout = undefined;
       }
+
+      if (connectionTimeout < 0) {
+        connectionTimeout = undefined;
+      }
       const callLoader = () => loadManifest(manifestUrl,
-                                            { timeout: requestTimeout },
+                                            {
+                                              timeout: requestTimeout,
+                                              connectionTimeout,
+                                            },
                                             cancelSignal);
       return scheduleRequestPromise(callLoader, backoffSettings, cancelSignal);
     }
@@ -722,6 +734,12 @@ export interface IManifestFetcherSettings {
    * `undefined` will lead to a default, large, timeout being used.
    */
   requestTimeout : number | undefined;
+  /**
+   * Connection timeout, in milliseconds, after which the request is canceled
+   * if the responses headers has not being received.
+   * Do not set or set to "undefined" to disable it.
+   */
+  connectionTimeout: number | undefined;
   /** Limit the frequency of Manifest updates. */
   minimumManifestUpdateInterval : number;
   /**

package/src/core/fetchers/segment/segment_fetcher.ts

@@ -93,6 +93,8 @@ export default function createSegmentFetcher<TLoadedFormat, TSegmentDataType>(
   const requestOptions = {
     timeout: options.requestTimeout < 0 ? undefined :
                                           options.requestTimeout,
+    connectionTimeout: options.connectionTimeout === undefined ? undefined :
+                  options.connectionTimeout < 0 ? undefined : options.connectionTimeout,
   };
 
   /**
@@ -457,6 +459,12 @@ export interface ISegmentFetcherOptions {
    * To set to `-1` for no timeout.
    */
   requestTimeout : number;
+  /**
+   * Connection timeout, in milliseconds, after which the request is canceled
+   * if the responses headers has not being received.
+   * Do not set or set to "undefined" to disable it.
+   */
+  connectionTimeout: number | undefined;
 }
 
 /**
@@ -467,12 +475,15 @@ export interface ISegmentFetcherOptions {
 export function getSegmentFetcherOptions(
   { maxRetry,
     lowLatencyMode,
-    requestTimeout } : { maxRetry? : number | undefined;
-                         requestTimeout? : number | undefined;
-                         lowLatencyMode : boolean; }
+    requestTimeout,
+    connectionTimeout } : { maxRetry? : number | undefined;
+                            requestTimeout? : number | undefined;
+                            connectionTimeout? : number | undefined;
+                            lowLatencyMode : boolean; }
 ) : ISegmentFetcherOptions {
   const { DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR,
           DEFAULT_REQUEST_TIMEOUT,
+          DEFAULT_CONNECTION_TIMEOUT,
           INITIAL_BACKOFF_DELAY_BASE,
           MAX_BACKOFF_DELAY_BASE } = config.getCurrent();
   return { maxRetry: maxRetry ?? DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR,
@@ -480,6 +491,9 @@ export function getSegmentFetcherOptions(
                                        INITIAL_BACKOFF_DELAY_BASE.REGULAR,
            maxDelay: lowLatencyMode ? MAX_BACKOFF_DELAY_BASE.LOW_LATENCY :
                                       MAX_BACKOFF_DELAY_BASE.REGULAR,
-           requestTimeout: isNullOrUndefined(requestTimeout) ? DEFAULT_REQUEST_TIMEOUT :
-                                                               requestTimeout };
+           requestTimeout: (requestTimeout === undefined) ? DEFAULT_REQUEST_TIMEOUT :
+                                                            requestTimeout,
+           connectionTimeout: (connectionTimeout === undefined) ?
+              DEFAULT_CONNECTION_TIMEOUT : connectionTimeout,
+  };
 }

package/src/core/fetchers/segment/segment_fetcher_creator.ts

@@ -124,4 +124,5 @@ export interface ISegmentFetcherCreatorBackoffOptions {
    * `undefined` will lead to a default, large, timeout being used.
    */
   requestTimeout : number | undefined;
+  connectionTimeout : number | undefined;
 }

package/src/core/fetchers/utils/schedule_request.ts

@@ -352,7 +352,7 @@ export async function scheduleRequestWithCdns<T>(
    * attempts already done for that resource.
    *
    * Returns `undefined` if there's no Cdn left to request the resource.
-   * @param {Array.<Object>}
+   * @param {Array.<Object>} sortedCdns
    * @returns {Object|undefined}
    */
   function getPrioritaryRequestableCdnFromSortedList(

package/src/core/init/directfile_content_initializer.ts

@@ -27,6 +27,7 @@ import {
   IPlayerError,
 } from "../../public_types";
 import assert from "../../utils/assert";
+import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import SharedReference, {
   IReadOnlySharedReference,
 } from "../../utils/reference";
@@ -241,11 +242,11 @@ function getDirectFileInitialTime(
   mediaElement : HTMLMediaElement,
   startAt? : IInitialTimeOptions
 ) : number {
-  if (startAt == null) {
+  if (isNullOrUndefined(startAt)) {
     return 0;
   }
 
-  if (startAt.position != null) {
+  if (!isNullOrUndefined(startAt.position)) {
     return startAt.position;
   } else if (startAt.wallClockTime != null) {
     return startAt.wallClockTime;
@@ -254,15 +255,30 @@ function getDirectFileInitialTime(
   }
 
   const duration = mediaElement.duration;
-  if (duration == null || !isFinite(duration)) {
-    log.warn("startAt.fromLastPosition set but no known duration, " +
-             "beginning at 0.");
-    return 0;
-  }
 
   if (typeof startAt.fromLastPosition === "number") {
+    if (isNullOrUndefined(duration) || !isFinite(duration)) {
+      log.warn("startAt.fromLastPosition set but no known duration, " +
+               "beginning at 0.");
+      return 0;
+    }
     return Math.max(0, duration + startAt.fromLastPosition);
+  } else if (typeof startAt.fromLivePosition === "number") {
+    const livePosition = mediaElement.seekable.length > 0 ?
+      mediaElement.seekable.end(0) :
+      duration;
+    if (isNullOrUndefined(livePosition)) {
+      log.warn("startAt.fromLivePosition set but no known live position, " +
+               "beginning at 0.");
+      return 0;
+    }
+    return Math.max(0, livePosition + startAt.fromLivePosition);
   } else if (startAt.percentage != null) {
+    if (isNullOrUndefined(duration) || !isFinite(duration)) {
+      log.warn("startAt.percentage set but no known duration, " +
+               "beginning at 0.");
+      return 0;
+    }
     const { percentage } = startAt;
     if (percentage >= 100) {
       return duration;

package/src/core/init/media_source_content_initializer.ts

@@ -541,7 +541,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
             if (
               // Data is buffered around the current position
               obs.currentRange !== null ||
-              // Or, for whatever reason, playback is already advancing
+              // Or, for whatever reason, we have no buffer but we're already advancing
               obs.position > seekedTime + 0.1
             ) {
               stopListening();
@@ -728,9 +728,10 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
     contentTimeBoundariesObserver.addEventListener("periodChange", (period) => {
       this.trigger("activePeriodChanged", { period });
     });
-    contentTimeBoundariesObserver.addEventListener("durationUpdate", (newDuration) => {
-      mediaSourceDurationUpdater.updateDuration(newDuration.duration, newDuration.isEnd);
-    });
+    contentTimeBoundariesObserver.addEventListener(
+      "endingPositionChange",
+      (x) => mediaSourceDurationUpdater.updateDuration(x.endingPosition, x.isEnd)
+    );
     contentTimeBoundariesObserver.addEventListener("endOfStream", () => {
       if (endOfStreamCanceller === null) {
         endOfStreamCanceller = new TaskCanceller();
@@ -746,9 +747,8 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
         endOfStreamCanceller = null;
       }
     });
-    const currentDuration = contentTimeBoundariesObserver.getCurrentDuration();
-    mediaSourceDurationUpdater.updateDuration(currentDuration.duration,
-                                              currentDuration.isEnd);
+    const endInfo = contentTimeBoundariesObserver.getCurrentEndingTime();
+    mediaSourceDurationUpdater.updateDuration(endInfo.endingPosition, endInfo.isEnd);
     return contentTimeBoundariesObserver;
   }
 
@@ -835,6 +835,12 @@ export interface IInitializeArguments {
      * `-1` indicates no timeout.
      */
     requestTimeout : number | undefined;
+    /**
+     * Amount of time, in milliseconds, after which a request that hasn't receive
+     * the headers and status code should be aborted and optionnaly retried,
+     * depending on the maxRetry configuration.
+     */
+    connectionTimeout : number | undefined;
     /** Maximum number of time a request on error will be retried. */
     maxRetry : number | undefined;
   };