From 8945dc459b5e7eac33cbd08f7b5d6f1c94e3f435 Mon Sep 17 00:00:00 2001
From: markveronich <markveronich@gmail.com>
Date: Sat, 17 Nov 2018 19:35:49 +0000
Subject: [PATCH] Add hlsVersion and dashVersion file config

Also bump to latest versions
Closes https://github.com/CookPete/react-player/pull/513
---
 README.md                 | 2 +-
 index.d.ts                | 2 ++
 src/players/FilePlayer.js | 9 +++++----
 src/props.js              | 8 ++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index f9da9b5..585c6f4 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ Key | Options
 `mixcloud` | `options`: Override the [default player options](https://www.mixcloud.com/developers/widget/#methods)
 `dailymotion` | `params`: Override the [default player vars](https://developer.dailymotion.com/player#player-parameters)<br />`preload`: Used for [preloading](#preloading)
 `twitch` | `options`: Override the [default player options](https://dev.twitch.tv/docs/embed)
-`file` | `attributes`: Apply [element attributes](https://developer.mozilla.org/en/docs/Web/HTML/Element/video#Attributes)<br />`forceVideo`: Always render a `<video>` element<br />`forceAudio`: Always render an `<audio>` element<br />`forceHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams<br />`forceDASH`: Always use [dash.js](https://github.com/Dash-Industry-Forum/dash.js) for DASH streams<br />`hlsOptions`: Override the [default `hls.js` options](https://github.com/video-dev/hls.js/blob/master/docs/API.md#fine-tuning)
+`file` | `attributes`: Apply [element attributes](https://developer.mozilla.org/en/docs/Web/HTML/Element/video#Attributes)<br />`forceVideo`: Always render a `<video>` element<br />`forceAudio`: Always render an `<audio>` element<br />`forceHLS`: Use [hls.js](https://github.com/video-dev/hls.js) for HLS streams<br />`forceDASH`: Always use [dash.js](https://github.com/Dash-Industry-Forum/dash.js) for DASH streams<br />`hlsOptions`: Override the [default `hls.js` options](https://github.com/video-dev/hls.js/blob/master/docs/API.md#fine-tuning)<br />`hlsVersion`: Override the [`hls.js`](https://github.com/video-dev/hls.js) version loaded from [`cdnjs`](https://cdnjs.com/libraries/hls.js), default: `0.10.1`<br />`dashVersion`: Override the [`dash.js`](https://github.com/Dash-Industry-Forum/dash.js) version loaded from [`cdnjs`](https://cdnjs.com/libraries/dashjs), default: `2.9.2`
 
 ##### Preloading
 
diff --git a/index.d.ts b/index.d.ts
index f7a4e17..6e0bb8e 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -52,6 +52,8 @@ export interface FileConfig {
   forceHLS?: boolean;
   forceDASH?: boolean;
   hlsOptions?: Object;
+  hlsVersion?: string;
+  dashVersion?: string;
 }
 
 export interface Config {
diff --git a/src/players/FilePlayer.js b/src/players/FilePlayer.js
index 6cd8865..f9e0d44 100644
--- a/src/players/FilePlayer.js
+++ b/src/players/FilePlayer.js
@@ -7,10 +7,10 @@ const IOS = typeof navigator !== 'undefined' && /iPad|iPhone|iPod/.test(navigato
 const AUDIO_EXTENSIONS = /\.(m4a|mp4a|mpga|mp2|mp2a|mp3|m2a|m3a|wav|weba|aac|oga|spx)($|\?)/i
 const VIDEO_EXTENSIONS = /\.(mp4|og[gv]|webm|mov|m4v)($|\?)/i
 const HLS_EXTENSIONS = /\.(m3u8)($|\?)/i
-const HLS_SDK_URL = 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/0.9.1/hls.min.js'
+const HLS_SDK_URL = 'https://cdnjs.cloudflare.com/ajax/libs/hls.js/VERSION/hls.min.js'
 const HLS_GLOBAL = 'Hls'
 const DASH_EXTENSIONS = /\.(mpd)($|\?)/i
-const DASH_SDK_URL = 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.6.5/dash.all.min.js'
+const DASH_SDK_URL = 'https://cdnjs.cloudflare.com/ajax/libs/dashjs/VERSION/dash.all.min.js'
 const DASH_GLOBAL = 'dashjs'
 const MATCH_DROPBOX_URL = /www\.dropbox\.com\/.+/
 
@@ -117,8 +117,9 @@ export class FilePlayer extends Component {
     return DASH_EXTENSIONS.test(url) || this.props.config.file.forceDASH
   }
   load (url) {
+    const { hlsVersion, dashVersion } = this.props.config.file
     if (this.shouldUseHLS(url)) {
-      getSDK(HLS_SDK_URL, HLS_GLOBAL).then(Hls => {
+      getSDK(HLS_SDK_URL.replace('VERSION', hlsVersion), HLS_GLOBAL).then(Hls => {
         this.hls = new Hls(this.props.config.file.hlsOptions)
         this.hls.on(Hls.Events.ERROR, (e, data) => {
           this.props.onError(e, data, this.hls, Hls)
@@ -128,7 +129,7 @@ export class FilePlayer extends Component {
       })
     }
     if (this.shouldUseDASH(url)) {
-      getSDK(DASH_SDK_URL, DASH_GLOBAL).then(dashjs => {
+      getSDK(DASH_SDK_URL.replace('VERSION', dashVersion), DASH_GLOBAL).then(dashjs => {
         this.dash = dashjs.MediaPlayer().create()
         this.dash.initialize(this.player, url, this.props.playing)
         this.dash.getDebug().setLogToBrowserConsole(false)
diff --git a/src/props.js b/src/props.js
index 1fd80d5..50b4855 100644
--- a/src/props.js
+++ b/src/props.js
@@ -43,7 +43,9 @@ export const propTypes = {
       forceAudio: bool,
       forceHLS: bool,
       forceDASH: bool,
-      hlsOptions: object
+      hlsOptions: object,
+      hlsVersion: string,
+      dashVersion: string
     }),
     wistia: shape({
       options: object
@@ -131,7 +133,9 @@ export const defaultProps = {
       forceAudio: false,
       forceHLS: false,
       forceDASH: false,
-      hlsOptions: {}
+      hlsOptions: {},
+      hlsVersion: '0.10.1',
+      dashVersion: '2.9.2'
     },
     wistia: {
       options: {}