@eluvio/elv-client-js 4.2.15 → 4.2.17

package/dist/src/client/ContentAccess.js

@@ -2375,7 +2375,7 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           i = 0;
         case 70:
           if (!(i < playoutOptions.length)) {
-            _context32.next = 135;
+            _context32.next = 136;
             break;
           }
           option = playoutOptions[i];
@@ -2409,11 +2409,12 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           _context32.t21 = _defineProperty;
           _context32.t22 = {};
           _context32.t23 = drm || "clear";
+          _context32.t24 = option.properties || {};
           if (!signedLink) {
-            _context32.next = 98;
+            _context32.next = 99;
             break;
           }
-          _context32.next = 95;
+          _context32.next = 96;
           return this.LinkUrl({
             versionHash: versionHash,
             writeToken: writeToken,
@@ -2421,12 +2422,12 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             queryParams: queryParams,
             noAuth: true
           });
-        case 95:
-          _context32.t24 = _context32.sent;
-          _context32.next = 101;
+        case 96:
+          _context32.t25 = _context32.sent;
+          _context32.next = 102;
           break;
-        case 98:
-          _context32.next = 100;
+        case 99:
+          _context32.next = 101;
           return this.Rep({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2436,26 +2437,26 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             noAuth: true,
             queryParams: queryParams
           });
-        case 100:
-          _context32.t24 = _context32.sent;
         case 101:
-          _context32.t25 = _context32.t24;
+          _context32.t25 = _context32.sent;
+        case 102:
+          _context32.t26 = _context32.t25;
           if (!signedLink) {
-            _context32.next = 108;
+            _context32.next = 109;
             break;
           }
-          _context32.next = 105;
+          _context32.next = 106;
           return this.GlobalUrl({
             versionHash: versionHash,
             path: UrlJoin(linkPath, offering, playoutPath),
             queryParams: queryParams
           });
-        case 105:
-          _context32.t26 = _context32.sent;
-          _context32.next = 111;
+        case 106:
+          _context32.t27 = _context32.sent;
+          _context32.next = 112;
           break;
-        case 108:
-          _context32.next = 110;
+        case 109:
+          _context32.next = 111;
           return this.GlobalUrl({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2463,23 +2464,23 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             path: UrlJoin("rep", handler, offering, playoutPath),
             queryParams: queryParams
           });
-        case 110:
-          _context32.t26 = _context32.sent;
         case 111:
-          _context32.t27 = _context32.t26;
-          _context32.t28 = drm ? _defineProperty({}, drm, {
+          _context32.t27 = _context32.sent;
+        case 112:
+          _context32.t28 = _context32.t27;
+          _context32.t29 = drm ? _defineProperty({}, drm, {
             licenseServers: licenseServers,
             cert: cert
           }) : undefined;
           if (thumbnailTrackUri) {
-            _context32.next = 117;
+            _context32.next = 118;
             break;
           }
-          _context32.t29 = undefined;
-          _context32.next = 120;
+          _context32.t30 = undefined;
+          _context32.next = 121;
           break;
-        case 117:
-          _context32.next = 119;
+        case 118:
+          _context32.next = 120;
           return this.Rep({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2487,22 +2488,23 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             rep: UrlJoin(handler, offering, thumbnailTrackUri),
             queryParams: queryParams
           });
-        case 119:
-          _context32.t29 = _context32.sent;
         case 120:
-          _context32.t30 = _context32.t29;
-          _context32.t31 = {
-            playoutUrl: _context32.t25,
-            globalPlayoutUrl: _context32.t27,
-            drms: _context32.t28,
-            thumbnailTrack: _context32.t30
+          _context32.t30 = _context32.sent;
+        case 121:
+          _context32.t31 = _context32.t30;
+          _context32.t32 = {
+            properties: _context32.t24,
+            playoutUrl: _context32.t26,
+            globalPlayoutUrl: _context32.t28,
+            drms: _context32.t29,
+            thumbnailTrack: _context32.t31
           };
-          _context32.t32 = (0, _context32.t21)(_context32.t22, _context32.t23, _context32.t31);
-          _context32.t33 = (0, _context32.t18)(_context32.t19, _context32.t20, _context32.t32);
-          _context32.t34 = {
-            playoutMethods: _context32.t33
+          _context32.t33 = (0, _context32.t21)(_context32.t22, _context32.t23, _context32.t32);
+          _context32.t34 = (0, _context32.t18)(_context32.t19, _context32.t20, _context32.t33);
+          _context32.t35 = {
+            playoutMethods: _context32.t34
           };
-          playoutMap[protocol] = (0, _context32.t15)(_context32.t16, _context32.t17, _context32.t34);
+          playoutMap[protocol] = (0, _context32.t15)(_context32.t16, _context32.t17, _context32.t35);
           // Add .cert_url if playoutMap[protocol].playoutMethods[].drms[].cert is present
           // (for clients that need cert supplied as a URL reference rather than as a string literal)
           for (method in playoutMap[protocol].playoutMethods) {
@@ -2518,21 +2520,21 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           protocolMatch = protocols.includes(protocol);
           drmMatch = drms.includes(drm || "clear") || drms.length === 0 && !drm;
           if (!(!protocolMatch || !drmMatch)) {
-            _context32.next = 131;
+            _context32.next = 132;
             break;
           }
-          return _context32.abrupt("continue", 132);
-        case 131:
+          return _context32.abrupt("continue", 133);
+        case 132:
           // This protocol / DRM satisfies the specifications (prefer DRM over clear, if available)
           if (!playoutMap[protocol].playoutUrl || drm && drm !== "clear") {
             playoutMap[protocol].playoutUrl = playoutMap[protocol].playoutMethods[drm || "clear"].playoutUrl;
             playoutMap[protocol].drms = playoutMap[protocol].playoutMethods[drm || "clear"].drms;
           }
-        case 132:
+        case 133:
           i++;
           _context32.next = 70;
           break;
-        case 135:
+        case 136:
           // Callbacks for retrieving and setting multiview views
           if (multiview && sessionId) {
             playoutMap.sessionId = sessionId;
@@ -2588,7 +2590,7 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           }
           this.Log(playoutMap);
           return _context32.abrupt("return", playoutMap);
-        case 138:
+        case 139:
         case "end":
           return _context32.stop();
       }
@@ -2780,62 +2782,50 @@ exports.GlobalUrl = /*#__PURE__*/function () {
           libraryId = _ref59.libraryId, objectId = _ref59.objectId, writeToken = _ref59.writeToken, versionHash = _ref59.versionHash, _ref59$path = _ref59.path, path = _ref59$path === void 0 ? "/" : _ref59$path, authorizationToken = _ref59.authorizationToken, _ref59$noAuth = _ref59.noAuth, noAuth = _ref59$noAuth === void 0 ? false : _ref59$noAuth, _ref59$resolve = _ref59.resolve, resolve = _ref59$resolve === void 0 ? true : _ref59$resolve, _ref59$queryParams = _ref59.queryParams, queryParams = _ref59$queryParams === void 0 ? {} : _ref59$queryParams;
           network = this.NetworkInfo().name;
           url = new URL(network === "main" ? "https://main.net955305.contentfabric.io" : "https://demov3.net955210.contentfabric.io"); // Pull auth out of query params
-          if (queryParams.authorization && (typeof queryParams.authorization === "string" || Array.isArray(queryParams.authorization) && queryParams.authorization.length === 1)) {
-            queryParams = _objectSpread({}, queryParams);
-            authorizationToken = typeof queryParams.authorization === "string" ? queryParams.authorization : queryParams.authorization[0];
-          }
-          if (writeToken) {
-            fabricNodeUrl = this.HttpClient.draftURIs[writeToken];
-            if (fabricNodeUrl) {
-              url = new URL(fabricNodeUrl);
-            }
-          }
-          urlPath = UrlJoin("s", network);
-          if (!(!noAuth || authorizationToken)) {
-            _context34.next = 15;
-            break;
-          }
-          _context34.t0 = UrlJoin;
-          _context34.t1 = authorizationToken;
-          if (_context34.t1) {
-            _context34.next = 13;
+          if (queryParams.authorization) {
+            _context34.next = 8;
             break;
           }
-          _context34.next = 12;
+          queryParams = _objectSpread({}, queryParams);
+          _context34.next = 7;
           return this.authClient.AuthorizationToken({
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash,
             noAuth: noAuth
           });
-        case 12:
-          _context34.t1 = _context34.sent;
-        case 13:
-          _context34.t2 = _context34.t1;
-          urlPath = (0, _context34.t0)("t", _context34.t2);
-        case 15:
+        case 7:
+          queryParams.authorization = _context34.sent;
+        case 8:
+          if (writeToken) {
+            fabricNodeUrl = this.HttpClient.draftURIs[writeToken];
+            if (fabricNodeUrl) {
+              url = new URL(fabricNodeUrl);
+            }
+          }
+          urlPath = UrlJoin("s", network);
           if (!versionHash) {
-            _context34.next = 19;
+            _context34.next = 14;
             break;
           }
           objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-          _context34.next = 25;
+          _context34.next = 20;
           break;
-        case 19:
-          _context34.t3 = libraryId;
-          if (_context34.t3) {
-            _context34.next = 24;
+        case 14:
+          _context34.t0 = libraryId;
+          if (_context34.t0) {
+            _context34.next = 19;
             break;
           }
-          _context34.next = 23;
+          _context34.next = 18;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 23:
-          _context34.t3 = _context34.sent;
-        case 24:
-          libraryId = _context34.t3;
-        case 25:
+        case 18:
+          _context34.t0 = _context34.sent;
+        case 19:
+          libraryId = _context34.t0;
+        case 20:
           if (path.startsWith("/qfab")) {
             urlPath = UrlJoin(urlPath, path.replace(/^\/qfab/, "q"));
           } else if (versionHash) {
@@ -2851,7 +2841,7 @@ exports.GlobalUrl = /*#__PURE__*/function () {
             return url.searchParams.set(key, queryParams[key]);
           });
           return _context34.abrupt("return", url.toString());
-        case 30:
+        case 25:
         case "end":
           return _context34.stop();
       }
@@ -4339,6 +4329,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash,
+            writeToken: writeToken,
             metadataSubtree: ownerCapKey
           });
         case 10: