@eluvio/elv-client-js 4.0.88 → 4.0.90

package/dist/src/client/NFT.js

@@ -1,8 +1,8 @@
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-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; }
 /**
  * Methods for creating and managing NFTs
  *

package/dist/src/walletClient/ClientMethods.js

@@ -1,8 +1,8 @@
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-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 Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var _require = require("./Utils"),

package/dist/src/walletClient/Profile.js

@@ -2,8 +2,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _typeof = require("@babel/runtime/helpers/typeof");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-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 Utils = require("../Utils");
 var UrlJoin = require("url-join");
 var StateStorePath = function StateStorePath(_ref) {

package/dist/src/walletClient/Utils.js

@@ -2,8 +2,8 @@ var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
-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 Utils = require("../Utils");
 var RarityToPercentage = function RarityToPercentage(rarity) {
   if (!rarity) {

package/dist/src/walletClient/index.js

@@ -5,8 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-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");
@@ -77,7 +77,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;
@@ -134,7 +134,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) {
@@ -263,7 +263,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }()
+    }())
   }, {
     key: "LogInURL",
     value: function () {
@@ -342,7 +342,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;
@@ -461,9 +461,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) {
@@ -506,7 +507,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }()
+    }())
   }, {
     key: "TokenStatus",
     value: function () {
@@ -546,7 +547,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) {
@@ -612,9 +613,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) {
@@ -741,9 +743,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;
@@ -812,6 +815,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
+    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1974,7 +1978,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) {
@@ -2092,9 +2096,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.88",
+  "version": "4.0.90",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/HttpClient.js

@@ -1,6 +1,7 @@
 const URI = require("urijs");
 const Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch").default;
 const {LogMessage} = require("./LogMessage");
+const Utils = require("./Utils");
 
 class HttpClient {
   Log(message, error=false) {
@@ -100,7 +101,10 @@ class HttpClient {
     }
 
     let response;
-    this.Log(`${method} - ${uri.toString()}`);
+    if(this.debug) {
+      this.Log(`${method} - ${uri.toString()}`);
+      this.Log(`fetchParameters: ${JSON.stringify(fetchParameters, null, 2)}`);
+    }
     try {
       response =
         await HttpClient.Fetch(
@@ -166,7 +170,7 @@ class HttpClient {
         requestParams: fetchParameters
       };
 
-      this.Log(
+      if(this.debug) this.Log(
         JSON.stringify(error, null, 2),
         true
       );
@@ -208,6 +212,16 @@ class HttpClient {
     );
   }
 
+  // Perform http request and then return response body parsed as JSON
+  // ResponseToJson() will log response if this.debug === true
+  async RequestJsonBody(params) {
+    return Utils.ResponseToJson(
+      this.Request(params),
+      this.debug,
+      this.Log.bind(this)
+    );
+  }
+
   URL({path, queryParams={}}) {
     let baseURI = this.BaseURI();
 

package/src/Utils.js

@@ -545,18 +545,40 @@ const Utils = {
     });
   },
 
-  ResponseToJson: async (response) => {
-    return Utils.ResponseToFormat("json", response);
+  /**
+   * Interprets an http response body obtained from an http call as JSON and returns result of parsing it.
+   *
+   * @param {Promise} response - An http response from node-fetch
+   * @param {boolean=} debug - Whether or not to log the body
+   * @param {Function} logFn - Log function to use if debug is truthy
+   * @return {*} - Result of parsing response body as JSON
+   */
+  ResponseToJson: async (response, debug = false, logFn) => {
+    return await Utils.ResponseToFormat("json", response, debug, logFn);
   },
 
-  ResponseToFormat: async (format, response) => {
+  /**
+   * Interprets an http response body obtained from an http call as a requested format and returns result of converting/formatting.
+   *
+   * @param {string} format - The format to use when interpreting response body (e.g. "json", "text" et. al.)
+   * @param {Promise} response - An http response from node-fetch
+   * @param {boolean=} debug - Whether or not to log a debug statement containing the body (ignored for formats other than "json" and "text")
+   * @param {Function} logFn - Log function to use if debug is truthy
+   * @return {*} - Result of converting response body into the requested format
+   */
+  ResponseToFormat: async (format, response, debug = false, logFn) => {
     response = await response;
+    let formattedBody;
 
     switch(format.toLowerCase()) {
       case "json":
-        return await response.json();
+        formattedBody = await response.json();
+        if(debug) logFn(`response body: ${JSON.stringify(formattedBody, null, 2)}`);
+        return formattedBody;
       case "text":
-        return await response.text();
+        formattedBody = await response.text();
+        if(debug) logFn(`response body: ${formattedBody}`);
+        return formattedBody;
       case "blob":
         return await response.blob();
       case "arraybuffer":

package/src/client/ContentAccess.js

@@ -390,13 +390,11 @@ exports.ContentLibrary = async function({libraryId}) {
 
   const path = UrlJoin("qlibs", libraryId);
 
-  const library = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId}),
-      method: "GET",
-      path: path
-    })
-  );
+  const library = await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId}),
+    method: "GET",
+    path: path
+  });
 
   return {
     ...library,
@@ -566,14 +564,12 @@ exports.ContentObjects = async function({libraryId, filterOptions={}}) {
   this.Log("Filter options:");
   this.Log(filterOptions);
 
-  return await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId}),
-      method: "GET",
-      path: path,
-      queryParams
-    })
-  );
+  return await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId}),
+    method: "GET",
+    path: path,
+    queryParams
+  });
 };
 
 /**
@@ -597,13 +593,11 @@ exports.ContentObject = async function({libraryId, objectId, versionHash, writeT
 
   let path = UrlJoin("q", writeToken || versionHash || objectId);
 
-  return await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
-      method: "GET",
-      path: path
-    })
-  );
+  return await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash}),
+    method: "GET",
+    path: path
+  });
 };
 
 /**
@@ -919,22 +913,20 @@ exports.ContentObjectMetadata = async function({
 
   let metadata;
   try {
-    metadata = await this.utils.ResponseToJson(
-      this.HttpClient.Request({
-        headers: { "Authorization": authTokens.map(token => `Bearer ${token}`) },
-        queryParams: {
-          ...queryParams,
-          select,
-          remove,
-          link_depth: linkDepthLimit,
-          resolve: resolveLinks,
-          resolve_include_source: resolveIncludeSource,
-          resolve_ignore_errors: resolveIgnoreErrors,
-        },
-        method: "GET",
-        path: path
-      })
-    );
+    metadata = await this.HttpClient.RequestJsonBody({
+      headers: { "Authorization": authTokens.map(token => `Bearer ${token}`) },
+      queryParams: {
+        ...queryParams,
+        select,
+        remove,
+        link_depth: linkDepthLimit,
+        resolve: resolveLinks,
+        resolve_include_source: resolveIncludeSource,
+        resolve_ignore_errors: resolveIgnoreErrors,
+      },
+      method: "GET",
+      path: path
+    });
   } catch(error) {
     if(error.status !== 404) {
       throw error;
@@ -1066,13 +1058,11 @@ exports.ContentObjectVersions = async function({libraryId, objectId}) {
 
   let path = UrlJoin("qid", objectId);
 
-  return this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId}),
-      method: "GET",
-      path: path
-    })
-  );
+  return this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId}),
+    method: "GET",
+    path: path
+  });
 };
 
 /**
@@ -1143,13 +1133,11 @@ exports.LatestVersionHashV2 = async function({objectId, versionHash}) {
   try {
     let path = UrlJoin("q", objectId);
 
-    let q = await this.utils.ResponseToJson(
-      this.HttpClient.Request({
-        headers: await this.authClient.AuthorizationHeader({objectId}),
-        method: "GET",
-        path: path
-      })
-    );
+    let q = await this.HttpClient.RequestJsonBody({
+      headers: await this.authClient.AuthorizationHeader({objectId}),
+      method: "GET",
+      path: path
+    });
     latestHash = q.hash;
 
   } catch(error) {
@@ -1210,20 +1198,29 @@ exports.AvailableDRMs = async function() {
     return availableDRMs;
   }
 
-  try {
-    const config = [{
-      initDataTypes: ["cenc"],
-      audioCapabilities: [{
-        contentType: "audio/mp4;codecs=\"mp4a.40.2\""
-      }],
-      videoCapabilities: [{
-        contentType: "video/mp4;codecs=\"avc1.42E01E\""
-      }]
-    }];
+  const config = [{
+    initDataTypes: ["cenc"],
+    audioCapabilities: [{
+      contentType: "audio/mp4;codecs=\"mp4a.40.2\""
+    }],
+    videoCapabilities: [{
+      contentType: "video/mp4;codecs=\"avc1.42E01E\""
+    }]
+  }];
 
+  try {
     await navigator.requestMediaKeySystemAccess("com.widevine.alpha", config);
-
     availableDRMs.push("widevine");
+    // console.log("widevine detected");
+    // eslint-disable-next-line no-empty
+  } catch(e) {}
+
+  try {
+    // unused parameters:
+    //   robustness: "2000" // 150, 2000, or 3000 if we know the secruity level
+    await navigator.requestMediaKeySystemAccess("com.microsoft.playready", config);
+    availableDRMs.push("playready");
+    // console.log("playready detected");
     // eslint-disable-next-line no-empty
   } catch(e) {}
 
@@ -1370,15 +1367,13 @@ exports.AvailableOfferings = async function({
       .flat()
       .filter(token => token);
 
-    return await this.utils.ResponseToJson(
-      this.HttpClient.Request({
-        path: path,
-        method: "GET",
-        headers: {
-          Authorization: `Bearer ${authorization.join(",")}`
-        }
-      })
-    );
+    return await this.HttpClient.RequestJsonBody({
+      path: path,
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${authorization.join(",")}`
+      }
+    });
   } catch(error) {
     if(error.status && parseInt(error.status) === 500) {
       return {};
@@ -1407,7 +1402,7 @@ exports.AvailableOfferings = async function({
  * @param {string=} linkPath - If playing from a link, the path to the link
  * @param {boolean=} signedLink - Specify if linkPath is referring to a signed link
  * @param {Array<string>} protocols=["dash","hls"]] - Acceptable playout protocols ("dash", "hls")
- * @param {Array<string>} drms - Acceptable DRM formats ("clear", "aes-128", "widevine")
+ * @param {Array<string>} drms - Acceptable DRM formats ("aes-128", "clear", "fairplay", "playready", "sample-aes", "widevine")
  * @param {string=} handler=playout - The handler to use for playout (not used with links)
  * @param {string=} offering=default - The offering to play
  * @param {string=} playoutType - The type of playout
@@ -1517,13 +1512,11 @@ exports.PlayoutOptions = async function({
   };
 
   const playoutOptions = Object.values(
-    await this.utils.ResponseToJson(
-      this.HttpClient.Request({
-        path,
-        method: "GET",
-        queryParams
-      })
-    )
+    await this.HttpClient.RequestJsonBody({
+      path,
+      method: "GET",
+      queryParams
+    })
   );
 
   if(!signedLink && linkTarget.versionHash) {
@@ -1629,17 +1622,14 @@ exports.PlayoutOptions = async function({
     playoutMap.multiview = true;
 
     playoutMap.AvailableViews = async () => {
-      return await this.utils.ResponseToFormat(
-        "json",
-        await this.HttpClient.Request({
-          path: UrlJoin("q", linkTarget.versionHash || versionHash, "rep", handler, offering, "views.json"),
-          method: "GET",
-          queryParams: {
-            sid: sessionId,
-            authorization
-          }
-        })
-      );
+      return await this.HttpClient.RequestJsonBody({
+        path: UrlJoin("q", linkTarget.versionHash || versionHash, "rep", handler, offering, "views.json"),
+        method: "GET",
+        queryParams: {
+          sid: sessionId,
+          authorization
+        }
+      });
     };
 
     playoutMap.SwitchView = async (view) => {
@@ -1675,7 +1665,7 @@ exports.PlayoutOptions = async function({
  * @param {string=} linkPath - If playing from a link, the path to the link
  * @param {boolean=} signedLink - Specify if linkPath is referring to a signed link
  * @param {Array<string>} protocols=["dash","hls"]] - Acceptable playout protocols ("dash", "hls")
- * @param {Array<string>} drms - Acceptable DRM formats ("clear", "aes-128", "sample-aes", "widevine")
+ * @param {Array<string>} drms - Acceptable DRM formats ("aes-128", "clear", "fairplay", "playready", "sample-aes", "widevine")
  * @param {string=} handler=playout - The handler to use for playout
  * @param {string=} offering=default - The offering to play
  * @param {string=} playoutType - The type of playout
@@ -1873,7 +1863,9 @@ exports.CallBitcodeMethod = async function({
       path,
       queryParams,
       allowFailover: false
-    })
+    }),
+    this.HttpClient.debug,
+    this.HttpClient.Log.bind(this.HttpClient)
   );
 };
 

package/src/client/ContentManagement.js

@@ -183,8 +183,13 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
     path: path
   });
   // extract the url for the node that handled the request
+  // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
   const nodeUrl = (new URL(rawCreateResponse.url)).origin;
-  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
+  const createResponse = await this.utils.ResponseToJson(
+    rawCreateResponse,
+    this.HttpClient.debug,
+    this.HttpClient.Log.bind(this.HttpClient)
+  );
 
   // Record the node used in creating this write token
   this.RecordWriteToken({writeToken: createResponse.write_token, fabricNodeUrl: nodeUrl});
@@ -602,8 +607,14 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
     path: path,
     body: options
   });
+  // extract the url for the node that handled the request
+  // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
   const nodeUrl = (new URL(rawCreateResponse.url)).origin;
-  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
+  const createResponse = await this.utils.ResponseToJson(
+    rawCreateResponse,
+    this.HttpClient.debug,
+    this.HttpClient.Log.bind(this.HttpClient)
+  );
 
   // Record the node used in creating this write token
   this.RecordWriteToken({writeToken: createResponse.write_token, fabricNodeUrl: nodeUrl});
@@ -773,8 +784,13 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     body: options
   });
   // extract the url for the node that handled the request
+  // TODO: remove/simplify after we start using /nodes API call to get node URLs for write tokens
   const nodeUrl = (new URL(rawEditResponse.url)).origin;
-  const editResponse = await this.utils.ResponseToJson(rawEditResponse);
+  const editResponse = await this.utils.ResponseToJson(
+    rawEditResponse,
+    this.HttpClient.debug,
+    this.HttpClient.Log.bind(this.HttpClient)
+  );
 
   // Record the node used in creating this write token
   this.RecordWriteToken({writeToken: editResponse.write_token, fabricNodeUrl: nodeUrl});
@@ -957,14 +973,12 @@ exports.FinalizeContentObject = async function({
 
   let path = UrlJoin("q", writeToken);
 
-  const finalizeResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
-      method: "POST",
-      path: path,
-      allowFailover: false
-    })
-  );
+  const finalizeResponse = await this.HttpClient.RequestJsonBody({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
+    method: "POST",
+    path: path,
+    allowFailover: false
+  });
 
   this.Log(`Finalized: ${finalizeResponse.hash}`);