@eluvio/elv-client-js 4.0.89 → 4.0.91

package/dist/src/HttpClient.js

@@ -6,6 +6,7 @@ var URI = require("urijs");
 var _Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch")["default"];
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
+var Utils = require("./Utils");
 var HttpClient = /*#__PURE__*/function () {
   "use strict";
 
@@ -96,7 +97,10 @@ var HttpClient = /*#__PURE__*/function () {
                   fetchParameters.body = body;
                 }
               }
-              this.Log("".concat(method, " - ").concat(uri.toString()));
+              if (this.debug) {
+                this.Log("".concat(method, " - ").concat(uri.toString()));
+                this.Log("fetchParameters: ".concat(JSON.stringify(fetchParameters, null, 2)));
+              }
               _context.prev = 9;
               _context.next = 12;
               return HttpClient.Fetch(uri.toString(), fetchParameters);
@@ -189,7 +193,7 @@ var HttpClient = /*#__PURE__*/function () {
                 body: errorBody,
                 requestParams: fetchParameters
               };
-              this.Log(JSON.stringify(error, null, 2), true);
+              if (this.debug) this.Log(JSON.stringify(error, null, 2), true);
               throw error;
             case 47:
               this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
@@ -261,6 +265,26 @@ var HttpClient = /*#__PURE__*/function () {
         return _RequestAll.apply(this, arguments);
       }
       return RequestAll;
+    }() // Perform http request and then return response body parsed as JSON
+    // ResponseToJson() will log response if this.debug === true
+  }, {
+    key: "RequestJsonBody",
+    value: function () {
+      var _RequestJsonBody = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(params) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              return _context4.abrupt("return", Utils.ResponseToJson(this.Request(params), this.debug, this.Log.bind(this)));
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this);
+      }));
+      function RequestJsonBody(_x4) {
+        return _RequestJsonBody.apply(this, arguments);
+      }
+      return RequestJsonBody;
     }()
   }, {
     key: "URL",

package/dist/src/Utils.js

@@ -570,13 +570,29 @@ var Utils = {
     }
     return LimitedMap;
   }(),
+  /**
+   * 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: function () {
     var _ResponseToJson = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(response) {
+      var debug,
+        logFn,
+        _args4 = arguments;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            return _context4.abrupt("return", Utils.ResponseToFormat("json", response));
-          case 1:
+            debug = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : false;
+            logFn = _args4.length > 2 ? _args4[2] : undefined;
+            _context4.next = 4;
+            return Utils.ResponseToFormat("json", response, debug, logFn);
+          case 4:
+            return _context4.abrupt("return", _context4.sent);
+          case 5:
           case "end":
             return _context4.stop();
         }
@@ -587,51 +603,70 @@ var Utils = {
     }
     return ResponseToJson;
   }(),
+  /**
+   * 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: function () {
     var _ResponseToFormat = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(format, response) {
+      var debug,
+        logFn,
+        formattedBody,
+        _args5 = arguments;
       return _regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context5.next = 2;
+            debug = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : false;
+            logFn = _args5.length > 3 ? _args5[3] : undefined;
+            _context5.next = 4;
             return response;
-          case 2:
+          case 4:
             response = _context5.sent;
             _context5.t0 = format.toLowerCase();
-            _context5.next = _context5.t0 === "json" ? 6 : _context5.t0 === "text" ? 9 : _context5.t0 === "blob" ? 12 : _context5.t0 === "arraybuffer" ? 15 : _context5.t0 === "formdata" ? 18 : _context5.t0 === "buffer" ? 21 : 24;
+            _context5.next = _context5.t0 === "json" ? 8 : _context5.t0 === "text" ? 13 : _context5.t0 === "blob" ? 18 : _context5.t0 === "arraybuffer" ? 21 : _context5.t0 === "formdata" ? 24 : _context5.t0 === "buffer" ? 27 : 30;
             break;
-          case 6:
-            _context5.next = 8;
-            return response.json();
           case 8:
-            return _context5.abrupt("return", _context5.sent);
-          case 9:
-            _context5.next = 11;
+            _context5.next = 10;
+            return response.json();
+          case 10:
+            formattedBody = _context5.sent;
+            if (debug) logFn("response body: ".concat(JSON.stringify(formattedBody, null, 2)));
+            return _context5.abrupt("return", formattedBody);
+          case 13:
+            _context5.next = 15;
             return response.text();
-          case 11:
-            return _context5.abrupt("return", _context5.sent);
-          case 12:
-            _context5.next = 14;
-            return response.blob();
-          case 14:
-            return _context5.abrupt("return", _context5.sent);
           case 15:
-            _context5.next = 17;
-            return response.arrayBuffer();
-          case 17:
-            return _context5.abrupt("return", _context5.sent);
+            formattedBody = _context5.sent;
+            if (debug) logFn("response body: ".concat(formattedBody));
+            return _context5.abrupt("return", formattedBody);
           case 18:
             _context5.next = 20;
-            return response.formData();
+            return response.blob();
           case 20:
             return _context5.abrupt("return", _context5.sent);
           case 21:
             _context5.next = 23;
-            return response.buffer();
+            return response.arrayBuffer();
           case 23:
             return _context5.abrupt("return", _context5.sent);
           case 24:
+            _context5.next = 26;
+            return response.formData();
+          case 26:
+            return _context5.abrupt("return", _context5.sent);
+          case 27:
+            _context5.next = 29;
+            return response.buffer();
+          case 29:
+            return _context5.abrupt("return", _context5.sent);
+          case 30:
             return _context5.abrupt("return", response);
-          case 25:
+          case 31:
           case "end":
             return _context5.stop();
         }

package/dist/src/client/ContentAccess.js

@@ -693,29 +693,27 @@ exports.ContentLibrary = /*#__PURE__*/function () {
           libraryId = _ref15.libraryId;
           ValidateLibrary(libraryId);
           path = UrlJoin("qlibs", libraryId);
-          _context10.t0 = this.utils;
-          _context10.t1 = this.HttpClient;
-          _context10.next = 7;
+          _context10.t0 = this.HttpClient;
+          _context10.next = 6;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId
           });
-        case 7:
-          _context10.t2 = _context10.sent;
-          _context10.t3 = path;
-          _context10.t4 = {
-            headers: _context10.t2,
+        case 6:
+          _context10.t1 = _context10.sent;
+          _context10.t2 = path;
+          _context10.t3 = {
+            headers: _context10.t1,
             method: "GET",
-            path: _context10.t3
+            path: _context10.t2
           };
-          _context10.t5 = _context10.t1.Request.call(_context10.t1, _context10.t4);
-          _context10.next = 13;
-          return _context10.t0.ResponseToJson.call(_context10.t0, _context10.t5);
-        case 13:
+          _context10.next = 11;
+          return _context10.t0.RequestJsonBody.call(_context10.t0, _context10.t3);
+        case 11:
           library = _context10.sent;
           return _context10.abrupt("return", _objectSpread(_objectSpread({}, library), {}, {
             meta: library.meta || {}
           }));
-        case 15:
+        case 13:
         case "end":
           return _context10.stop();
       }
@@ -945,28 +943,26 @@ exports.ContentObjects = /*#__PURE__*/function () {
           }
           this.Log("Filter options:");
           this.Log(filterOptions);
-          _context14.t0 = this.utils;
-          _context14.t1 = this.HttpClient;
-          _context14.next = 19;
+          _context14.t0 = this.HttpClient;
+          _context14.next = 18;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId
           });
-        case 19:
-          _context14.t2 = _context14.sent;
-          _context14.t3 = path;
-          _context14.t4 = queryParams;
-          _context14.t5 = {
-            headers: _context14.t2,
+        case 18:
+          _context14.t1 = _context14.sent;
+          _context14.t2 = path;
+          _context14.t3 = queryParams;
+          _context14.t4 = {
+            headers: _context14.t1,
             method: "GET",
-            path: _context14.t3,
-            queryParams: _context14.t4
+            path: _context14.t2,
+            queryParams: _context14.t3
           };
-          _context14.t6 = _context14.t1.Request.call(_context14.t1, _context14.t5);
-          _context14.next = 26;
-          return _context14.t0.ResponseToJson.call(_context14.t0, _context14.t6);
-        case 26:
+          _context14.next = 24;
+          return _context14.t0.RequestJsonBody.call(_context14.t0, _context14.t4);
+        case 24:
           return _context14.abrupt("return", _context14.sent);
-        case 27:
+        case 25:
         case "end":
           return _context14.stop();
       }
@@ -1006,28 +1002,26 @@ exports.ContentObject = /*#__PURE__*/function () {
             objectId = this.utils.DecodeVersionHash(versionHash).objectId;
           }
           path = UrlJoin("q", writeToken || versionHash || objectId);
-          _context15.t0 = this.utils;
-          _context15.t1 = this.HttpClient;
-          _context15.next = 9;
+          _context15.t0 = this.HttpClient;
+          _context15.next = 8;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash
           });
-        case 9:
-          _context15.t2 = _context15.sent;
-          _context15.t3 = path;
-          _context15.t4 = {
-            headers: _context15.t2,
+        case 8:
+          _context15.t1 = _context15.sent;
+          _context15.t2 = path;
+          _context15.t3 = {
+            headers: _context15.t1,
             method: "GET",
-            path: _context15.t3
+            path: _context15.t2
           };
-          _context15.t5 = _context15.t1.Request.call(_context15.t1, _context15.t4);
-          _context15.next = 15;
-          return _context15.t0.ResponseToJson.call(_context15.t0, _context15.t5);
-        case 15:
+          _context15.next = 13;
+          return _context15.t0.RequestJsonBody.call(_context15.t0, _context15.t3);
+        case 13:
           return _context15.abrupt("return", _context15.sent);
-        case 16:
+        case 14:
         case "end":
           return _context15.stop();
       }
@@ -1588,7 +1582,7 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
           delete queryParams.authorization;
           _context24.prev = 17;
           _context24.next = 20;
-          return this.utils.ResponseToJson(this.HttpClient.Request({
+          return this.HttpClient.RequestJsonBody({
             headers: {
               "Authorization": authTokens.map(function (token) {
                 return "Bearer ".concat(token);
@@ -1604,7 +1598,7 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
             }),
             method: "GET",
             path: path
-          }));
+          });
         case 20:
           metadata = _context24.sent;
           _context24.next = 33;
@@ -1811,24 +1805,22 @@ exports.ContentObjectVersions = /*#__PURE__*/function () {
           });
           this.Log("Retrieving content object versions: ".concat(libraryId || "", " ").concat(objectId));
           path = UrlJoin("qid", objectId);
-          _context26.t0 = this.utils;
-          _context26.t1 = this.HttpClient;
-          _context26.next = 8;
+          _context26.t0 = this.HttpClient;
+          _context26.next = 7;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 8:
-          _context26.t2 = _context26.sent;
-          _context26.t3 = path;
-          _context26.t4 = {
-            headers: _context26.t2,
+        case 7:
+          _context26.t1 = _context26.sent;
+          _context26.t2 = path;
+          _context26.t3 = {
+            headers: _context26.t1,
             method: "GET",
-            path: _context26.t3
+            path: _context26.t2
           };
-          _context26.t5 = _context26.t1.Request.call(_context26.t1, _context26.t4);
-          return _context26.abrupt("return", _context26.t0.ResponseToJson.call(_context26.t0, _context26.t5));
-        case 13:
+          return _context26.abrupt("return", _context26.t0.RequestJsonBody.call(_context26.t0, _context26.t3));
+        case 11:
         case "end":
           return _context26.stop();
       }
@@ -1943,40 +1935,38 @@ exports.LatestVersionHashV2 = /*#__PURE__*/function () {
           ValidateObject(objectId);
           _context28.prev = 3;
           path = UrlJoin("q", objectId);
-          _context28.t0 = this.utils;
-          _context28.t1 = this.HttpClient;
-          _context28.next = 9;
+          _context28.t0 = this.HttpClient;
+          _context28.next = 8;
           return this.authClient.AuthorizationHeader({
             objectId: objectId
           });
-        case 9:
-          _context28.t2 = _context28.sent;
-          _context28.t3 = path;
-          _context28.t4 = {
-            headers: _context28.t2,
+        case 8:
+          _context28.t1 = _context28.sent;
+          _context28.t2 = path;
+          _context28.t3 = {
+            headers: _context28.t1,
             method: "GET",
-            path: _context28.t3
+            path: _context28.t2
           };
-          _context28.t5 = _context28.t1.Request.call(_context28.t1, _context28.t4);
-          _context28.next = 15;
-          return _context28.t0.ResponseToJson.call(_context28.t0, _context28.t5);
-        case 15:
+          _context28.next = 13;
+          return _context28.t0.RequestJsonBody.call(_context28.t0, _context28.t3);
+        case 13:
           q = _context28.sent;
           latestHash = q.hash;
-          _context28.next = 23;
+          _context28.next = 21;
           break;
-        case 19:
-          _context28.prev = 19;
-          _context28.t6 = _context28["catch"](3);
-          _context28.t6.message = "Unable to determine latest version hash for ".concat(versionHash || objectId);
-          throw _context28.t6;
-        case 23:
+        case 17:
+          _context28.prev = 17;
+          _context28.t4 = _context28["catch"](3);
+          _context28.t4.message = "Unable to determine latest version hash for ".concat(versionHash || objectId);
+          throw _context28.t4;
+        case 21:
           return _context28.abrupt("return", latestHash);
-        case 24:
+        case 22:
         case "end":
           return _context28.stop();
       }
-    }, _callee28, this, [[3, 19]]);
+    }, _callee28, this, [[3, 17]]);
   }));
   return function (_x29) {
     return _ref49.apply(this, arguments);
@@ -2036,7 +2026,6 @@ exports.AvailableDRMs = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regenerato
         }
         return _context29.abrupt("return", availableDRMs);
       case 6:
-        _context29.prev = 6;
         config = [{
           initDataTypes: ["cenc"],
           audioCapabilities: [{
@@ -2046,23 +2035,38 @@ exports.AvailableDRMs = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regenerato
             contentType: "video/mp4;codecs=\"avc1.42E01E\""
           }]
         }];
+        _context29.prev = 7;
         _context29.next = 10;
         return navigator.requestMediaKeySystemAccess("com.widevine.alpha", config);
       case 10:
         availableDRMs.push("widevine");
+        // console.log("widevine detected");
         // eslint-disable-next-line no-empty
         _context29.next = 15;
         break;
       case 13:
         _context29.prev = 13;
-        _context29.t0 = _context29["catch"](6);
+        _context29.t0 = _context29["catch"](7);
       case 15:
+        _context29.prev = 15;
+        _context29.next = 18;
+        return navigator.requestMediaKeySystemAccess("com.microsoft.playready", config);
+      case 18:
+        availableDRMs.push("playready");
+        // console.log("playready detected");
+        // eslint-disable-next-line no-empty
+        _context29.next = 23;
+        break;
+      case 21:
+        _context29.prev = 21;
+        _context29.t1 = _context29["catch"](15);
+      case 23:
         return _context29.abrupt("return", availableDRMs);
-      case 16:
+      case 24:
       case "end":
         return _context29.stop();
     }
-  }, _callee29, null, [[6, 13]]);
+  }, _callee29, null, [[7, 13], [15, 21]]);
 }));
 exports.PlayoutPathResolution = /*#__PURE__*/function () {
   var _ref52 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee30(_ref51) {
@@ -2250,13 +2254,13 @@ exports.AvailableOfferings = /*#__PURE__*/function () {
             return token;
           });
           _context31.next = 27;
-          return this.utils.ResponseToJson(this.HttpClient.Request({
+          return this.HttpClient.RequestJsonBody({
             path: path,
             method: "GET",
             headers: {
               Authorization: "Bearer ".concat(authorization.join(","))
             }
-          }));
+          });
         case 27:
           return _context31.abrupt("return", _context31.sent);
         case 30:
@@ -2299,7 +2303,7 @@ exports.AvailableOfferings = /*#__PURE__*/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
@@ -2450,11 +2454,11 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           }, options);
           _context34.t11 = Object;
           _context34.next = 60;
-          return this.utils.ResponseToJson(this.HttpClient.Request({
+          return this.HttpClient.RequestJsonBody({
             path: path,
             method: "GET",
             queryParams: queryParams
-          }));
+          });
         case 60:
           _context34.t12 = _context34.sent;
           playoutOptions = _context34.t11.values.call(_context34.t11, _context34.t12);
@@ -2595,9 +2599,8 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
               return _regeneratorRuntime.wrap(function _callee32$(_context32) {
                 while (1) switch (_context32.prev = _context32.next) {
                   case 0:
-                    _context32.t0 = _this9.utils;
-                    _context32.next = 3;
-                    return _this9.HttpClient.Request({
+                    _context32.next = 2;
+                    return _this9.HttpClient.RequestJsonBody({
                       path: UrlJoin("q", linkTarget.versionHash || versionHash, "rep", handler, offering, "views.json"),
                       method: "GET",
                       queryParams: {
@@ -2605,13 +2608,9 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
                         authorization: authorization
                       }
                     });
-                  case 3:
-                    _context32.t1 = _context32.sent;
-                    _context32.next = 6;
-                    return _context32.t0.ResponseToFormat.call(_context32.t0, "json", _context32.t1);
-                  case 6:
+                  case 2:
                     return _context32.abrupt("return", _context32.sent);
-                  case 7:
+                  case 3:
                   case "end":
                     return _context32.stop();
                 }
@@ -2673,7 +2672,7 @@ exports.PlayoutOptions = /*#__PURE__*/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
@@ -2883,8 +2882,10 @@ exports.CallBitcodeMethod = /*#__PURE__*/function () {
           });
         case 17:
           _context36.t2 = _context36.sent;
-          return _context36.abrupt("return", _context36.t0.ResponseToFormat.call(_context36.t0, _context36.t1, _context36.t2));
-        case 19:
+          _context36.t3 = this.HttpClient.debug;
+          _context36.t4 = this.HttpClient.Log.bind(this.HttpClient);
+          return _context36.abrupt("return", _context36.t0.ResponseToFormat.call(_context36.t0, _context36.t1, _context36.t2, _context36.t3, _context36.t4));
+        case 21:
         case "end":
           return _context36.stop();
       }