@eluvio/elv-client-js 4.0.104 → 4.0.105

package/dist/src/walletClient/index.js

@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  _createClass(ElvWalletClient, [{
+  return _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: function () {
+    value: (function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }()
+    }())
   }, {
     key: "LogInURL",
     value: function () {
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: function () {
+    value: (function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -463,9 +463,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
+    )
   }, {
     key: "LogOut",
-    value: function () {
+    value: (function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -508,7 +509,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }()
+    }())
   }, {
     key: "TokenStatus",
     value: function () {
@@ -548,7 +549,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: function () {
+    value: (function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -614,9 +615,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
+    )
   }, {
     key: "AuthenticateOAuth",
-    value: function () {
+    value: (function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
         var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
@@ -653,6 +655,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
               return this.client.signer.RetrieveCSAT({
                 email: email,
                 nonce: nonce,
+                tenantId: tenantId,
                 force: force
               });
             case 12:
@@ -743,9 +746,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
+    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: function () {
+    value: (function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -814,6 +818,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
+    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1114,8 +1119,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken,
                 noAuth: true,
-                select: ["info/marketplace_order", "tenants/*/.", "tenants/*/info/branding", "tenants/*/marketplaces/*/.", "tenants/*/marketplaces/*/info/tenant_id", "tenants/*/marketplaces/*/info/tenant_name", "tenants/*/marketplaces/*/info/branding", "tenants/*/marketplaces/*/info/storefront/background", "tenants/*/marketplaces/*/info/storefront/background_mobile"],
-                remove: ["tenants/*/info/branding/wallet_css", "tenants/*/marketplaces/*/info/branding/custom_css"]
+                select: ["info/marketplace_order", "tenants/*/.", "tenants/*/info/branding/show", "tenants/*/info/branding/name", "tenants/*/marketplaces/*/.", "tenants/*/marketplaces/*/info/tenant_id", "tenants/*/marketplaces/*/info/tenant_name", "tenants/*/marketplaces/*/info/branding/show", "tenants/*/marketplaces/*/info/branding/name"]
               });
             case 5:
               metadata = _context18.sent;
@@ -1978,7 +1982,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: function () {
+    value: (function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -2096,9 +2100,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }()
+    }())
   }]);
-  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.104",
+  "version": "4.0.105",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/abr_profiles/abr_profile_live_drm.js

@@ -1863,6 +1863,28 @@ const AbrProfileLiveDrm = {
     }
   },
   "playout_formats": {
+    "dash-playready-cenc": {
+      "drm": {
+        "enc_scheme_name": "cenc",
+        "type": "DrmPlayReady"
+      },
+      "protocol": {
+        "min_buffer_length": 2,
+        "type": "ProtoDash"
+      }
+    },
+    "dash-widevine": {
+      "drm": {
+        "content_id": "",
+        "enc_scheme_name": "cenc",
+        "license_servers": [],
+        "type": "DrmWidevine"
+      },
+      "protocol": {
+        "min_buffer_length": 2,
+        "type": "ProtoDash"
+      }
+    },
     "hls-fairplay": {
       "drm": {
         "enc_scheme_name": "cbcs",

package/src/client/LiveConf.js

@@ -1,53 +1,48 @@
-const LadderTemplate = {
-  "2160": {
-    bit_rate: 14000000,
-    codecs: "avc1.640028,mp4a.40.2",
-    height: 2160,
-    media_type: 1,
-    representation: "videovideo_3840x2160_h264@14000000",
-    stream_name: "video",
-    width: 3840
-  },
-  "1080": {
-    bit_rate: 9500000,
-    codecs: "avc1.640028,mp4a.40.2",
-    height: 1080,
-    media_type: 1,
-    representation: "videovideo_1920x1080_h264@9500000",
-    stream_name: "video",
-    stream_index: 0,
-    width: 1920
-  },
-  "720": {
-    bit_rate: 4500000,
-    codecs: "avc1.640028,mp4a.40.2",
-    height: 720,
-    media_type: 1,
-    representation: "videovideo_1280x720_h264@4500000",
-    stream_name: "video",
-    stream_index: 0,
-    width: 1280
-  },
-  "540": {
-    bit_rate: 2000000,
-    codecs: "avc1.640028,mp4a.40.2",
-    height: 540,
-    media_type: 1,
-    representation: "videovideo_960x540_h264@2000000",
-    stream_name: "video",
-    stream_index: 0,
-    width: 960
-  },
-  "540_low": {
-    bit_rate: 900000,
-    codecs: "avc1.640028,mp4a.40.2",
-    height: 540,
-    media_type: 1,
-    representation: "videovideo_960x540_h264@900000",
-    stream_name: "video",
-    stream_index: 0,
-    width: 960
-  }
+const DefaultABRLadder = {
+  "video" : [
+    {
+      bit_rate: 14000000,
+      codecs: "avc1.640028,mp4a.40.2",
+      height: 2160,
+      width: 3840
+    },
+    {
+      bit_rate: 9500000,
+      codecs: "avc1.640028,mp4a.40.2",
+      height: 1080,
+      width: 1920
+    },
+    {
+      bit_rate: 4500000,
+      codecs: "avc1.640028,mp4a.40.2",
+      height: 720,
+      width: 1280
+    },
+    {
+      bit_rate: 2000000,
+      codecs: "avc1.640028,mp4a.40.2",
+      height: 540,
+      width: 960
+    },
+    {
+      bit_rate: 900000,
+      codecs: "avc1.640028,mp4a.40.2",
+      height: 540,
+      width: 960
+    }
+  ],
+  "audio" : [
+    {
+      bit_rate: 192000,
+      channels: 2,
+      codecs: "mp4a.40.2",
+    },
+    {
+      bit_rate: 384000,
+      channels: 6,
+      codecs: "mp4a.40.2",
+    }
+  ]
 };
 
 const LiveconfTemplate = {
@@ -115,16 +110,6 @@ const LiveconfTemplate = {
   }
 };
 
-const LadderSpecAudio = {
-  bit_rate: 384000,
-  channels: 2,
-  codecs: "mp4a.40.2",
-  media_type: 2,
-  representation: "audioaudio_aac@384000",
-  stream_name: "audio",
-  stream_index: 0
-};
-
 class LiveConf {
   constructor(probeData, nodeId, nodeUrl, includeAVSegDurations, overwriteOriginUrl, syncAudioToVideo) {
     this.probeData = probeData;
@@ -390,7 +375,7 @@ class LiveConf {
   generateAudioStreamsConfig({customSettings}) {
 
     let audioStreams = {};
-    if(customSettings && customSettings.audio) {
+    if(customSettings && customSettings.audio && Object.keys(customSettings.audio).length > 0) {
       for(let i = 0; i < Object.keys(customSettings.audio).length; i ++) {
         let audioIdx = Object.keys(customSettings.audio)[i];
         let audio = customSettings.audio[audioIdx];
@@ -405,7 +390,7 @@ class LiveConf {
     }
 
     // If no audio streams specified in custom config, set up all the suitable audio streams in the probe
-    if(!customSettings.audio) {
+    if(!customSettings.audio || Object.keys(customSettings.audio).length == 0) {
       audioStreams = this.getAudioStreamsFromProbe();
     }
 
@@ -506,68 +491,57 @@ class LiveConf {
       conf.live_recording.recording_config.recording_params.xc_params.video_frame_duration_ts = segDurations.videoFrameDurationTs;
     }
 
-    switch(videoStream.height) {
-      case 2160:
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
-          LadderTemplate[2160],
-          LadderTemplate[1080],
-          LadderTemplate[720],
-          LadderTemplate[540],
-          LadderTemplate["540_low"]
-        );
-        conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[2160].bit_rate;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_height = 2160;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_width = 3840;
+    const ladderProfile = customSettings.ladder_profile || DefaultABRLadder;
 
-        break;
-      case 1080:
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
-          LadderTemplate[1080],
-          LadderTemplate[720],
-          LadderTemplate[540],
-          LadderTemplate["540_low"]
-        );
-        conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[1080].bit_rate;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_height = 1080;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_width = 1920;
-        break;
-      case 720:
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
-          LadderTemplate[720],
-          LadderTemplate[540],
-          LadderTemplate["540_low"]
-        );
-        conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[720].bit_rate;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_height = 720;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_width = 1280;
-        break;
-      case 540:
-        conf.live_recording.recording_config.recording_params.ladder_specs.unshift(
-          LadderTemplate[540],
-          LadderTemplate["540_low"]
-        );
-        conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[540].bit_rate;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_height = 540;
-        conf.live_recording.recording_config.recording_params.xc_params.enc_width = 960;
-        break;
-      default:
-        throw new Error("ERROR: Probed stream does not conform to one of the following built in resolution ladders [4096, 2160], [1920, 1080] [1280, 720], [960, 540]");
-    }
+    conf.live_recording.recording_config.recording_params.xc_params.enc_height = videoStream.height;
+    conf.live_recording.recording_config.recording_params.xc_params.enc_width = videoStream.width;
 
+    // Determine video recording bitrate and ABR ladder
+    let topLadderRate = 0
+    for (let i = 0; i < ladderProfile.video.length; i ++) {
+      let elem = ladderProfile.video[i];
+      if (elem.height > videoStream.height)
+        continue;
+      if (elem.bit_rate > topLadderRate) {
+        topLadderRate = elem.bit_rate
+      }
+      elem.media_type = 1;
+      elem.stream_name = "video";
+      elem.stream_index = 0;
+      elem.representation = "videovideo_" + videoStream.width + "x" + videoStream.height + "_h264@" + elem.bit_rate;
+      conf.live_recording.recording_config.recording_params.ladder_specs.push(elem);
+    }
+    // Currently the recording bitrate is the top bitrate of the ladder (it will be configurable separately in the future)
+    conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = topLadderRate;
 
+    // Determine audio recording bitrate and ABR ladder
     let globalAudioBitrate = 0;
     let nAudio = 0;
 
     for(let i = 0; i < Object.keys(audioStreams).length; i ++ ) {
-      let audioLadderSpec = {...LadderSpecAudio};
+      let audioLadderSpec = {};
       const audioIndex = Object.keys(audioStreams)[i];
       const audio = audioStreams[audioIndex];
-      audioLadderSpec.bit_rate = audio.recordingBitrate;
-      audioLadderSpec.representation = `audioaudio_aac@${audio.recordingBitrate}`;
+
+      // Find ladder rung for the specific channel layout (2 or 6 channels)
+      for (let j = 0; j < ladderProfile.audio.length; j ++) {
+        let elem = ladderProfile.audio[j];
+        if (elem.channels == audio.recordingChannels) {
+          audioLadderSpec = {...elem};
+          break;
+        }
+      }
+      if (Object.keys(audioLadderSpec).length === 0) {
+        // If no channels layout match, just use the first element in the ladder
+        audioLadderSpec = {...ladderProfile.audio[0]};
+      }
+
+      audioLadderSpec.representation = `audioaudio_aac@${audioLadderSpec.bit_rate}`;
       audioLadderSpec.channels = audio.recordingChannels;
       audioLadderSpec.stream_index = parseInt(audioIndex);
       audioLadderSpec.stream_name = `audio_${audioIndex}`;
       audioLadderSpec.stream_label = audio.playoutLabel ? audio.playoutLabel : null;
+      audioLadderSpec.media_type = 2;
 
       conf.live_recording.recording_config.recording_params.ladder_specs.push(audioLadderSpec);
       if(audio.recordingBitrate > globalAudioBitrate) {
@@ -583,4 +557,5 @@ class LiveConf {
     return conf;
   }
 }
+
 exports.LiveConf = LiveConf;

package/src/client/LiveStream.js

@@ -1030,6 +1030,18 @@ exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveS
         };
         continue;
       }
+      if(formats[i] === "dash-clear") {
+        abrProfile.drm_optional = true;
+        playoutFormats["dash-clear"] = {
+          "drm": null,
+          "protocol": {
+            "min_buffer_length": 2,
+            "type": "ProtoDash"
+          }
+        }
+        continue;
+      }
+
       playoutFormats[formats[i]] = abrProfile.playout_formats[formats[i]];
     }
   } else if(!drm) {
@@ -1040,6 +1052,13 @@ exports.StreamSetOfferingAndDRM = async function({name, typeAbrMaster, typeLiveS
         "protocol": {
           "type": "ProtoHls"
         }
+      },
+      "dash-clear": {
+        "drm": null,
+        "protocol": {
+          "min_buffer_length": 2,
+          "type": "ProtoDash"
+        }
       }
     };
   } else {