@eluvio/elv-player-js 1.0.90 → 1.0.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-player-js",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "![Eluvio Logo](src/static/images/Logo.png \"Eluvio Logo\")",
   "main": "src/index.js",
   "license": "MIT",

package/src/PlayerControls.js

@@ -108,7 +108,7 @@ const Time = (time, total) => {
 };
 
 class PlayerControls {
-  constructor(target, video, playerOptions, posterUrl, className) {
+  constructor({target, video, playerOptions, posterUrl, className}) {
     this.target = target;
     this.video = video;
     this.playerOptions = playerOptions;

package/src/index.js

@@ -119,7 +119,8 @@ const DefaultParameters = {
     dashjsOptions: undefined,
     // eslint-disable-next-line no-unused-vars
     playerCallback: ({player, videoElement, hlsPlayer, dashPlayer, posterUrl}) => {},
-    errorCallback: (error) => {
+    // eslint-disable-next-line no-unused-vars
+    errorCallback: (error, player) => {
       // eslint-disable-next-line no-console
       console.error("ELUVIO PLAYER: Error");
       // eslint-disable-next-line no-console
@@ -333,9 +334,21 @@ export class EluvioPlayer {
     }
 
     let availableDRMs = (await client.AvailableDRMs()).filter(drm => (this.sourceOptions.drms || []).includes(drm));
+    let availableProtocols = this.sourceOptions.protocols;
+
+    let protocol, drm;
+    while(!(protocol && drm)) {
+      protocol = availableProtocols.find(protocol => this.sourceOptions.playoutOptions[protocol]);
+      drm = this.sourceOptions.drms.find(drm => availableDRMs.includes(drm) && this.sourceOptions.playoutOptions[protocol].playoutMethods[drm]);
 
-    const protocol = this.sourceOptions.protocols.find(protocol => this.sourceOptions.playoutOptions[protocol]);
-    const drm = this.sourceOptions.drms.find(drm => availableDRMs.includes(drm) && this.sourceOptions.playoutOptions[protocol].playoutMethods[drm]);
+      if(!drm) {
+        availableProtocols = availableProtocols.filter(p => p !== protocol);
+
+        if(availableProtocols.length === 0) {
+          throw Error("No valid protocol / DRM combination available");
+        }
+      }
+    }
 
     const { playoutUrl, drms } = this.sourceOptions.playoutOptions[protocol].playoutMethods[drm];
 
@@ -577,7 +590,13 @@ export class EluvioPlayer {
         }
       }
 
-      this.controls = new PlayerControls(this.target, this.video, this.playerOptions, this.playerOptions.controlsClassName);
+      this.controls = new PlayerControls({
+        target: this.target,
+        video: this.video,
+        playerOptions: this.playerOptions,
+        className: this.playerOptions.controlsClassName
+      });
+
       this.PosterUrl().then(posterUrl => this.controls.SetPosterUrl(posterUrl));
 
       multiviewOptions.target = this.target;
@@ -621,7 +640,9 @@ export class EluvioPlayer {
         this.Destroy();
       }
     } catch (error) {
-      this.playerOptions.errorCallback(error);
+      if(this.playerOptions.errorCallback) {
+        this.playerOptions.errorCallback(error, this);
+      }
 
       if(error.status === 500) {
         this.HardReload(error, 10000);