@eluvio/elv-player-js 2.0.35 → 2.0.37

package/lib/player/Analytics.js

@@ -17,7 +17,8 @@ export const InitializeMuxMonitoring = async ({
 
   const versionHash = playoutUrl.pathname.split("/").find(token => token.startsWith("hq__"));
   const objectId = client.utils.DecodeVersionHash(versionHash).objectId;
-  const offering = playoutUrl.toString().match(/\/rep\/playout\/([^/]+)/)[1] || "default";
+
+  const offering = (playoutUrl.toString().match(/\/rep\/playout|channel\/([^/]+)/) || [])[1] || "default";
   const sessionId = playoutUrl.searchParams.get("sid");
 
   let name = versionHash;

package/lib/player/Player.js

@@ -145,7 +145,12 @@ export class EluvioPlayer {
       this.sourceOptions.playoutOptions = undefined;
     }
 
-    let offeringId, offeringURI, options = {};
+    let offeringId, offeringURI;
+    let options = {
+      ignore_trimming: playoutParameters.ignoreTrimming,
+      resolve: playoutParameters.resolve
+    };
+
     if(playoutParameters.clipStart || playoutParameters.clipEnd) {
       options.clip_start = parseFloat(playoutParameters.clipStart || 0);
 
@@ -153,48 +158,46 @@ export class EluvioPlayer {
         options.clip_end = parseFloat(playoutParameters.clipEnd);
       }
     }
-    
-    let availableOfferings = (await client.AvailableOfferings({
-      objectId: playoutParameters.objectId,
-      versionHash: playoutParameters.versionHash,
-      writeToken: playoutParameters.writeToken,
-      linkPath: playoutParameters.linkPath,
-      directLink: playoutParameters.directLink,
-      resolveIncludeSource: true,
-      authorizationToken: playoutParameters.authorizationToken
-    })) || {};
-
-    offeringId = availableOfferings.default ? "default" :Object.keys(availableOfferings)[0];
-    if(playoutParameters.offering) {
-      offeringId = availableOfferings[playoutParameters.offering] ? playoutParameters.offering : undefined;
-    } else if((playoutParameters.offerings || []).length > 0) {
-      offeringId = playoutParameters.offerings.find(offeringId => availableOfferings[offeringId]);
-    } else if(playoutParameters.offerings && playoutParameters.offerings.length > 0) {
-      offeringId = playoutParameters.offerings.find(offeringId => availableOfferings[offeringId]);
-    }
 
-    if(!offeringId) {
-      throw new Error(`Unable to find offering from '${playoutParameters.offering || playoutParameters.offerings}'`);
-    }
+    if(!playoutParameters.channel) {
+      // Determine offering
+      let availableOfferings = (await client.AvailableOfferings({
+        objectId: playoutParameters.objectId,
+        versionHash: playoutParameters.versionHash,
+        writeToken: playoutParameters.writeToken,
+        linkPath: playoutParameters.linkPath,
+        directLink: playoutParameters.directLink,
+        resolveIncludeSource: true,
+        authorizationToken: playoutParameters.authorizationToken
+      })) || {};
+
+      offeringId = availableOfferings.default ? "default" : Object.keys(availableOfferings)[0];
+      if(playoutParameters.offering) {
+        offeringId = availableOfferings[playoutParameters.offering] ? playoutParameters.offering : undefined;
+      } else if((playoutParameters.offerings || []).length > 0) {
+        offeringId = playoutParameters.offerings.find(offeringId => availableOfferings[offeringId]);
+      } else if(playoutParameters.offerings && playoutParameters.offerings.length > 0) {
+        offeringId = playoutParameters.offerings.find(offeringId => availableOfferings[offeringId]);
+      }
 
-    const offeringProperties = availableOfferings[offeringId] && availableOfferings[offeringId].properties || {};
+      if(!offeringId) {
+        throw new Error(`Unable to find offering from '${playoutParameters.offering || playoutParameters.offerings}'`);
+      }
 
-    offeringURI = availableOfferings[offeringId].uri;
+      const offeringProperties = availableOfferings[offeringId] && availableOfferings[offeringId].properties || {};
 
-    options.ignore_trimming = playoutParameters.ignoreTrimming;
-    options.resolve = playoutParameters.resolve;
+      offeringURI = availableOfferings[offeringId].uri;
 
-    if(this.sourceOptions.contentInfo.liveDVR === EluvioPlayerParameters.liveDVR.ON && offeringProperties.dvr_available) {
-      options.dvr = 1;
-      this.dvrAvailable = true;
-    } else {
-      this.dvrAvailable = false;
-    }
 
-    if(offeringProperties.live) {
-      this.isLive = true;
-    } else {
-      this.isLive = false;
+
+      if(this.sourceOptions.contentInfo.liveDVR === EluvioPlayerParameters.liveDVR.ON && offeringProperties.dvr_available) {
+        options.dvr = 1;
+        this.dvrAvailable = true;
+      } else {
+        this.dvrAvailable = false;
+      }
+
+      this.isLive = offeringProperties.live;
     }
 
     if(playoutParameters.directLink) {
@@ -208,7 +211,8 @@ export class EluvioPlayer {
       if(!this.sourceOptions.playoutOptions) {
         this.sourceOptions.playoutOptions = await client.PlayoutOptions({
           ...playoutParameters,
-          offering: offeringId,
+          handler: playoutParameters.channel ? "channel" : "playout",
+          offering: playoutParameters.channel || offeringId,
           options
         });
       }
@@ -224,7 +228,11 @@ export class EluvioPlayer {
 
       drm =
         (this.sourceOptions.drms || []).length === 0 ? (protocolDRMs.find(drm => drm !== "clear")) || protocolDRMs[0] :
-          this.sourceOptions.drms.find(drm => availableDRMs.includes(drm) && this.sourceOptions.playoutOptions[protocol].playoutMethods[drm]);
+          this.sourceOptions.drms
+            .sort()
+            // Prefer widevine if available
+            .reverse()
+            .find(drm => availableDRMs.includes(drm) && this.sourceOptions.playoutOptions[protocol].playoutMethods[drm]);
 
       if(!drm) {
         availableProtocols = availableProtocols.filter(p => p !== protocol);
@@ -564,7 +572,11 @@ export class EluvioPlayer {
     this.HLS = (await import("hls.js")).default;
 
     const nativeHLSSupported = this.video.canPlayType("application/vnd.apple.mpegURL");
-    if((nativeHLSSupported && isIOS) || [EluvioPlayerParameters.drms.FAIRPLAY, EluvioPlayerParameters.drms.SAMPLE_AES].includes(drm) || !this.HLS.isSupported()) {
+    if(
+      (nativeHLSSupported && isIOS && this.playerOptions.preferNativeHLS) ||
+      [EluvioPlayerParameters.drms.FAIRPLAY, EluvioPlayerParameters.drms.SAMPLE_AES].includes(drm) ||
+      !this.HLS.isSupported()
+    ) {
       // HLS JS NOT SUPPORTED - Handle native player
       this.nativeHLS = true;
 
@@ -1006,6 +1018,7 @@ export class EluvioPlayer {
 
     const objectId = client.utils.DecodeVersionHash(this.contentHash).objectId;
     const tenantId = await client.ContentObjectTenantId({objectId});
+    const contentSpaceId = await client.ContentSpaceId();
 
     let tenantName, lastCommittedAt, versionCount;
     try {
@@ -1032,7 +1045,7 @@ export class EluvioPlayer {
 
     try {
       tenantName = await client.ContentObjectMetadata({
-        libraryId: client.contentSpaceLibraryId,
+        libraryId: contentSpaceId.replace("ispc", "ilib"),
         objectId: tenantId.replace("iten", "iq__"),
         metadataSubtree: "/public/name"
       });

package/lib/player/PlayerParameters.js

@@ -100,6 +100,10 @@ export const PlayerParameters = {
   allowCasting: {
     OFF: false,
     ON: true
+  },
+  preferNativeHLS: {
+    OFF: false,
+    ON: true
   }
 };
 
@@ -149,6 +153,7 @@ export const DefaultParameters = {
       handler: "playout",
       offering: undefined,
       offerings: [],
+      channel: undefined,
       playoutType: undefined,
       context: undefined,
       hlsjsProfile: true,
@@ -176,6 +181,7 @@ export const DefaultParameters = {
     showLoader: PlayerParameters.showLoader.ON,
     permanentPoster: PlayerParameters.permanentPoster.OFF,
     allowCasting: PlayerParameters.allowCasting.ON,
+    preferNativeHLS: PlayerParameters.preferNativeHLS.ON,
     startTime: undefined,
     startProgress: undefined,
     hlsjsOptions: undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-player-js",
-  "version": "2.0.35",
+  "version": "2.0.37",
   "description": "![Eluvio Logo](lib/static/images/Logo.png \"Eluvio Logo\")",
   "main": "dist/elv-player-js.es.js",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "package-lock.json"
   ],
   "dependencies": {
-    "@eluvio/elv-client-js": "^4.0.111",
+    "@eluvio/elv-client-js": "^4.0.123",
     "dashjs": "~4.7.0",
     "focus-visible": "^5.2.0",
     "hls.js": "~1.5.12",