@eluvio/elv-client-js 4.2.17 → 4.2.19

package/dist/src/AuthorizationClient.js

@@ -1775,8 +1775,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
               throw Error("No KMS info set for ".concat(versionHash || objectId || "default KMS"));
             case 15:
               kmsHttpClient = new HttpClient({
-                uris: kmsUrls,
-                networkName: this.client.networkName
+                uris: kmsUrls
               });
               _context24.next = 18;
               return kmsHttpClient.Request({

package/dist/src/ContentObjectAudit.js

@@ -69,8 +69,7 @@ var ContentObjectAudit = {
               return s.indexOf(v) === i;
             });
             httpClient = new HttpClient({
-              uris: uris,
-              networkName: client.networkName
+              uris: uris
             });
             path = UrlJoin("qlibs", libraryId, "q", versionHash || objectId, live ? "call/live/audit" : "audit");
             _context.t4 = httpClient;

package/dist/src/ElvClient.js

@@ -20,7 +20,6 @@ var HttpClient = require("./HttpClient");
 var RemoteSigner = require("./RemoteSigner");
 var Utils = require("./Utils");
 var Crypto = require("./Crypto");
-var NetworkUrls = require("./NetworkUrls");
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Pako = require("pako");
@@ -28,6 +27,13 @@ var _require2 = require("./Validation"),
   ValidatePresence = _require2.ValidatePresence,
   ValidateWriteToken = _require2.ValidateWriteToken;
 var UrlJoin = require("url-join");
+var networks = {
+  "main": "https://main.net955305.contentfabric.io",
+  "demo": "https://demov3.net955210.contentfabric.io",
+  "demov3": "https://demov3.net955210.contentfabric.io",
+  "local": "http://127.0.0.1:8008/config?qspace=dev&self",
+  "test": "https://test.net955203.contentfabric.io"
+};
 if (Utils.Platform() === Utils.PLATFORM_NODE) {
   // Define Response in node
   // eslint-disable-next-line no-global-assign
@@ -254,22 +260,18 @@ var ElvClient = /*#__PURE__*/function () {
               uris = this.service === "search" ? this.searchURIs : this.fabricURIs;
               this.HttpClient = new HttpClient({
                 uris: uris,
-                networkName: this.networkName,
                 debug: this.debug
               });
               this.AuthHttpClient = new HttpClient({
                 uris: this.authServiceURIs,
-                networkName: this.networkName,
                 debug: this.debug
               });
               this.FileServiceHttpClient = new HttpClient({
                 uris: this.fileServiceURIs,
-                networkName: this.networkName,
                 debug: this.debug
               });
               this.SearchHttpClient = new HttpClient({
                 uris: this.searchURIs || [],
-                networkName: this.networkName,
                 debug: this.debug
               });
               this.ethClient = new EthClient({
@@ -1487,7 +1489,6 @@ var ElvClient = /*#__PURE__*/function () {
               path = "/ks/jwt/wlt";
               httpClient = new HttpClient({
                 uris: this.kmsURIs,
-                networkName: this.networkName,
                 debug: this.debug
               });
               _context19.next = 22;
@@ -2018,7 +2019,7 @@ var ElvClient = /*#__PURE__*/function () {
   }, {
     key: "Networks",
     value: function Networks() {
-      return Object.assign({}, NetworkUrls);
+      return Object.assign({}, networks);
     }
 
     /**
@@ -2046,7 +2047,7 @@ var ElvClient = /*#__PURE__*/function () {
           while (1) switch (_context28.prev = _context28.next) {
             case 0:
               networkName = _ref31.networkName, region = _ref31.region, clientIP = _ref31.clientIP, trustAuthorityId = _ref31.trustAuthorityId, staticToken = _ref31.staticToken, _ref31$ethereumContra = _ref31.ethereumContractTimeout, ethereumContractTimeout = _ref31$ethereumContra === void 0 ? 10 : _ref31$ethereumContra, _ref31$noCache = _ref31.noCache, noCache = _ref31$noCache === void 0 ? false : _ref31$noCache, _ref31$noAuth = _ref31.noAuth, noAuth = _ref31$noAuth === void 0 ? false : _ref31$noAuth, assumeV3 = _ref31.assumeV3;
-              configUrl = this.Networks()[networkName];
+              configUrl = networks[networkName];
               if (configUrl) {
                 _context28.next = 4;
                 break;

package/dist/src/FrameClient.js

@@ -449,7 +449,7 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "AllowedMethods",
     value: function AllowedMethods() {
-      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AuditContentObject", "AuditStream", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractInfo", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateAuthorizationToken", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFabricToken", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateShare", "CreateSignedMessageJSON", "CreateSignedToken", "CreateStaticToken", "CurrentAccountAddress", "CustomContractAddress", "DecodeSignedMessageJSON", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeleteWriteToken", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "EmbedUrl", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GenerateSignedLinkToken", "GetBalance", "GlobalUrl", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LRODraftInfo", "LROStatus", "MakeAuthServiceRequest", "MakeFileServiceRequest", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "MoveFiles", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "ObjectCleanup", "OutputsCreate", "OutputsDelete", "OutputsList", "OutputsListItem", "OutputsModify", "OutputsModifyBatch", "OutputsResolveSrtPullUrls", "OutputsState", "OutputsStop", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RecordWriteToken", "RedeemCode", "RedeemShareToken", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "ResetTenantId", "RevokeShare", "SendFunds", "SetAccessCharge", "StreamApplyProfile", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetTenantContractId", "SetTenantId", "TenantAdminGroup", "ContentAdminGroup", "TenantUsersGroup", "SetVisibility", "SetPermission", "ShareInfo", "Shares", "SpaceNodes", "StartABRMezzanineJobs", "StreamAddWatermark", "StreamApplyProfile", "StreamAssignProfile", "StreamConfig", "StreamConfigProfile", "StreamConfigProfiles", "StreamCopyToVod", "StreamCreate", "StreamInitialize", "StreamInsertion", "StreamLinkToSite", "StreamListUrls", "StreamRemoveLinkToSite", "StreamRemoveWatermark", "StreamSaveConfigProfile", "StreamSetOfferingAndDRM", "StreamSiteSettings", "StreamStartRecording", "StreamStartOrStopOrReset", "StreamStatus", "StreamStopRecording", "StreamUnassignProfile", "StreamUpdateConfig", "SuspendNTPInstance", "TenantContractId", "TenantId", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UpdateShare", "UploadFileData", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "Visibility", "WriteTokenNodeUrlLocal", "WriteTokenNodeUrlNetwork"];
+      return ["AccessGroupManagers", "AccessGroupMembers", "AccessGroupOwner", "AccessInfo", "AccessRequest", "AccessType", "AddAccessGroupManager", "AddAccessGroupMember", "AddContentLibraryGroup", "AddContentObjectGroupPermission", "AddLibraryContentType", "AssetMetadata", "AuditContentObject", "AuditStream", "AvailableDRMs", "AvailableOfferings", "AwaitPending", "BitmovinPlayoutOptions", "BlockNumber", "CallBitcodeMethod", "CallContractMethod", "CallContractMethodAndWait", "ClearCache", "ClearStaticToken", "Collection", "CollectionTransactions", "ConfigUrl", "ContentLibraries", "ContentLibrary", "ContentLibraryGroupPermissions", "ContentLibraryOwner", "ContentObject", "ContentObjectAccessComplete", "ContentObjectGraph", "ContentObjectGroupPermissions", "ContentObjectImageUrl", "ContentObjectLibraryId", "ContentObjectMetadata", "ContentObjectOwner", "ContentObjectTenantId", "ContentObjectVersions", "ContentObjects", "ContentPart", "ContentParts", "ContentSpaceId", "ContentType", "ContentTypeOwner", "ContentTypes", "ContractAbi", "ContractEvents", "ContractInfo", "ContractMetadata", "ContractName", "CopyContentObject", "CreateABRMezzanine", "CreateAccessGroup", "CreateAndFinalizeContentObject", "CreateAuthorizationToken", "CreateContentLibrary", "CreateContentObject", "CreateContentType", "CreateEncryptionConk", "CreateFabricToken", "CreateFileDirectories", "CreateFileUploadJob", "CreateLinks", "CreateNTPInstance", "CreateNonOwnerCap", "CreatePart", "CreateProductionMaster", "CreateShare", "CreateSignedMessageJSON", "CreateSignedToken", "CreateStaticToken", "CurrentAccountAddress", "CustomContractAddress", "DecodeSignedMessageJSON", "Decrypt", "DecryptECIES", "DefaultKMSAddress", "DeleteAccessGroup", "DeleteContentLibrary", "DeleteContentObject", "DeleteContentVersion", "DeleteFiles", "DeleteMetadata", "DeleteNTPInstance", "DeletePart", "DeleteWriteToken", "DeployContract", "Download", "DownloadEncrypted", "DownloadFile", "DownloadPart", "EditAndFinalizeContentObject", "EditContentObject", "EmbedUrl", "Encrypt", "EncryptECIES", "EncryptionConk", "Events", "ExtractEventFromLogs", "ExtractValueFromEvent", "FabricUrl", "FileUrl", "FinalizeABRMezzanine", "FinalizeContentObject", "FinalizePart", "FinalizeStateChannelAccess", "FinalizeUploadJob", "FormatContractArguments", "GenerateStateChannelToken", "GenerateSignedLinkToken", "GetBalance", "GlobalUrl", "InitializeAuthPolicy", "IssueNTPCode", "IssueSignedNTPCode", "LatestVersionHash", "LibraryContentTypes", "LinkAccessGroupToOauth", "LinkData", "LinkTarget", "LinkUrl", "ListAccessGroups", "ListFiles", "ListNTPInstances", "LRODraftInfo", "LROStatus", "MakeAuthServiceRequest", "MakeFileServiceRequest", "MergeContractMetadata", "MergeMetadata", "MetadataAuth", "MintNFT", "MoveFiles", "NetworkInfo", "NodeId", "Nodes", "NTPInstance", "ObjectCleanup", "Permission", "PlayoutOptions", "PlayoutPathResolution", "ProduceMetadataLinks", "Proofs", "PublicRep", "PublishContentVersion", "QParts", "RecordWriteToken", "RedeemCode", "RedeemShareToken", "RemoveAccessGroupManager", "RemoveAccessGroupMember", "RemoveContentObjectGroupPermission", "RemoveContentLibraryGroup", "RemoveLibraryContentType", "Rep", "ReplaceContractMetadata", "ReplaceMetadata", "Request", "ResetRegion", "ResetTenantId", "RevokeShare", "SendFunds", "SetAccessCharge", "SetAuth", "SetAuthContext", "SetAuthPolicy", "SetContentLibraryImage", "SetContentObjectImage", "SetCustomContentContract", "SetGroupPermission", "SetNodes", "SetOauthToken", "SetPolicyAuthorization", "SetSignerFromOauthToken", "SetStaticToken", "SetTenantContractId", "SetTenantId", "TenantAdminGroup", "ContentAdminGroup", "TenantUsersGroup", "SetVisibility", "SetPermission", "ShareInfo", "Shares", "SpaceNodes", "StartABRMezzanineJobs", "StreamAddWatermark", "StreamConfig", "StreamCopyToVod", "StreamCreate", "StreamInitialize", "StreamInsertion", "StreamListUrls", "StreamRemoveWatermark", "StreamSetOfferingAndDRM", "StreamStatus", "StreamStartOrStopOrReset", "StreamStopSession", "SuspendNTPInstance", "TenantContractId", "TenantId", "UnlinkAccessGroupFromOauth", "UpdateContentObjectGraph", "UpdateNTPInstance", "UpdateShare", "UploadFileData", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus", "UseRegion", "Visibility", "WriteTokenNodeUrlLocal", "WriteTokenNodeUrlNetwork"];
     }
   }, {
     key: "AllowedUserProfileMethods",

package/dist/src/HttpClient.js

@@ -7,21 +7,17 @@ var _Fetch = typeof fetch !== "undefined" ? fetch : require("node-fetch")["defau
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Utils = require("./Utils");
-var UrlJoin = require("url-join");
-var NetworkUrls = require("./NetworkUrls");
 var HttpClient = /*#__PURE__*/function () {
   "use strict";
 
   function HttpClient(_ref) {
     var uris = _ref.uris,
-      networkName = _ref.networkName,
       debug = _ref.debug;
     _classCallCheck(this, HttpClient);
     this.uris = uris;
     this.uriIndex = 0;
     this.debug = debug;
     this.draftURIs = {};
-    this.networkName = networkName;
     this.retries = Math.max(3, uris.length);
   }
   _createClass(HttpClient, [{
@@ -71,7 +67,7 @@ var HttpClient = /*#__PURE__*/function () {
     key: "Request",
     value: function () {
       var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref3) {
-        var method, path, _ref3$queryParams, queryParams, body, _ref3$bodyType, bodyType, _ref3$headers, headers, _ref3$attempts, attempts, _ref3$allowFailover, allowFailover, _ref3$forceFailover, forceFailover, _ref3$allowRetry, allowRetry, uriIndex, baseURI, writeTokenMatch, writeToken, configUrl, uri, fetchParameters, response, responseType, errorBody, error;
+        var method, path, _ref3$queryParams, queryParams, body, _ref3$bodyType, bodyType, _ref3$headers, headers, _ref3$attempts, attempts, _ref3$allowFailover, allowFailover, _ref3$forceFailover, forceFailover, _ref3$allowRetry, allowRetry, uriIndex, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -79,48 +75,16 @@ var HttpClient = /*#__PURE__*/function () {
               baseURI = this.BaseURI(uriIndex); // If URL contains a write token, it must go to the correct server and can not fail over
               writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
               writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
-              if (!writeToken) {
-                _context.next = 29;
-                break;
-              }
-              allowFailover = false;
-              if (!this.draftURIs[writeToken]) {
-                _context.next = 10;
-                break;
-              }
-              // Use saved write token URI
-              baseURI = this.draftURIs[writeToken];
-              _context.next = 29;
-              break;
-            case 10:
-              if (!this.networkName) {
-                _context.next = 28;
-                break;
+              if (writeToken) {
+                allowFailover = false;
+                if (this.draftURIs[writeToken]) {
+                  // Use saved write token URI
+                  baseURI = this.draftURIs[writeToken];
+                } else {
+                  // Save current URI for all future requests involving this write token
+                  this.draftURIs[writeToken] = baseURI;
+                }
               }
-              _context.prev = 11;
-              configUrl = new URL(NetworkUrls[this.networkName]);
-              configUrl.pathname = UrlJoin("/s", this.networkName, "nodes");
-              configUrl.searchParams.set("token", writeToken);
-              _context.t0 = URI;
-              _context.next = 18;
-              return fetch(configUrl);
-            case 18:
-              _context.next = 20;
-              return _context.sent.json();
-            case 20:
-              _context.t1 = _context.sent.nodes[0].services.fabric_api.urls[0];
-              baseURI = new _context.t0(_context.t1);
-              _context.next = 28;
-              break;
-            case 24:
-              _context.prev = 24;
-              _context.t2 = _context["catch"](11);
-              this.Log("Failed to retrieve write token node for " + writeToken);
-              this.Log(_context.t2);
-            case 28:
-              // Save current URI for all future requests involving this write token
-              this.draftURIs[writeToken] = baseURI;
-            case 29:
               uri = baseURI.path(path).query(queryParams).hash("");
               fetchParameters = {
                 method: method,
@@ -137,50 +101,50 @@ var HttpClient = /*#__PURE__*/function () {
                 this.Log("".concat(method, " - ").concat(uri.toString()));
                 this.Log("fetchParameters: ".concat(JSON.stringify(fetchParameters, null, 2)));
               }
-              _context.prev = 33;
-              _context.next = 36;
+              _context.prev = 9;
+              _context.next = 12;
               return HttpClient.Fetch(uri.toString(), fetchParameters);
-            case 36:
+            case 12:
               response = _context.sent;
-              _context.next = 42;
+              _context.next = 18;
               break;
-            case 39:
-              _context.prev = 39;
-              _context.t3 = _context["catch"](33);
+            case 15:
+              _context.prev = 15;
+              _context.t0 = _context["catch"](9);
               response = {
                 ok: false,
-                status: _context.t3 && _context.t3.status || 500,
-                statusText: "ElvClient Error: " + _context.t3.message,
+                status: _context.t0 && _context.t0.status || 500,
+                statusText: "ElvClient Error: " + _context.t0.message,
                 url: uri.toString(),
-                error: _context.t3
+                error: _context.t0
               };
-            case 42:
+            case 18:
               if (response.ok) {
-                _context.next = 71;
+                _context.next = 47;
                 break;
               }
               if (!((parseInt(response.status) >= 500 || forceFailover) && allowRetry && attempts < this.retries)) {
-                _context.next = 55;
+                _context.next = 31;
                 break;
               }
               if (!allowFailover) {
-                _context.next = 49;
+                _context.next = 25;
                 break;
               }
               // Fail over to alternate node
               this.uriIndex = (this.uriIndex + 1) % this.uris.length;
               this.Log("HttpClient failing over from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
-              _context.next = 52;
+              _context.next = 28;
               break;
-            case 49:
+            case 25:
               // Wait and retry
               this.Log("HttpClient retrying request from ".concat(baseURI.toString(), ": ").concat(attempts + 1, " attempts"), true);
-              _context.next = 52;
+              _context.next = 28;
               return new Promise(function (resolve) {
                 return setTimeout(resolve, 1000);
               });
-            case 52:
-              _context.next = 54;
+            case 28:
+              _context.next = 30;
               return this.Request({
                 method: method,
                 path: path,
@@ -192,34 +156,34 @@ var HttpClient = /*#__PURE__*/function () {
                 uriIndex: uriIndex,
                 forceFailover: forceFailover
               });
-            case 54:
+            case 30:
               return _context.abrupt("return", _context.sent);
-            case 55:
+            case 31:
               // Parse JSON error if headers indicate JSON
               responseType = response.headers ? response.headers.get("content-type") || "" : "";
               errorBody = "";
               if (!(response.text && response.json)) {
-                _context.next = 68;
+                _context.next = 44;
                 break;
               }
               if (!responseType.includes("application/json")) {
-                _context.next = 64;
+                _context.next = 40;
                 break;
               }
-              _context.next = 61;
+              _context.next = 37;
               return response.json();
-            case 61:
-              _context.t4 = _context.sent;
-              _context.next = 67;
+            case 37:
+              _context.t1 = _context.sent;
+              _context.next = 43;
               break;
-            case 64:
-              _context.next = 66;
+            case 40:
+              _context.next = 42;
               return response.text();
-            case 66:
-              _context.t4 = _context.sent;
-            case 67:
-              errorBody = _context.t4;
-            case 68:
+            case 42:
+              _context.t1 = _context.sent;
+            case 43:
+              errorBody = _context.t1;
+            case 44:
               error = {
                 name: "ElvHttpClientError",
                 status: response.status,
@@ -232,14 +196,14 @@ var HttpClient = /*#__PURE__*/function () {
               };
               if (this.debug) this.Log(JSON.stringify(error, null, 2), true);
               throw error;
-            case 71:
+            case 47:
               this.Log("".concat(response.status, " - ").concat(method, " ").concat(uri.toString()));
               return _context.abrupt("return", response);
-            case 73:
+            case 49:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[11, 24], [33, 39]]);
+        }, _callee, this, [[9, 15]]);
       }));
       function Request(_x) {
         return _Request.apply(this, arguments);

package/dist/src/abr_profiles/abr_profile_live_drm.js

@@ -1578,6 +1578,16 @@ var 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": "",

package/dist/src/client/ContentAccess.js

@@ -2375,7 +2375,7 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           i = 0;
         case 70:
           if (!(i < playoutOptions.length)) {
-            _context32.next = 136;
+            _context32.next = 135;
             break;
           }
           option = playoutOptions[i];
@@ -2409,12 +2409,11 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           _context32.t21 = _defineProperty;
           _context32.t22 = {};
           _context32.t23 = drm || "clear";
-          _context32.t24 = option.properties || {};
           if (!signedLink) {
-            _context32.next = 99;
+            _context32.next = 98;
             break;
           }
-          _context32.next = 96;
+          _context32.next = 95;
           return this.LinkUrl({
             versionHash: versionHash,
             writeToken: writeToken,
@@ -2422,12 +2421,12 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             queryParams: queryParams,
             noAuth: true
           });
-        case 96:
-          _context32.t25 = _context32.sent;
-          _context32.next = 102;
-          break;
-        case 99:
+        case 95:
+          _context32.t24 = _context32.sent;
           _context32.next = 101;
+          break;
+        case 98:
+          _context32.next = 100;
           return this.Rep({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2437,26 +2436,26 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             noAuth: true,
             queryParams: queryParams
           });
+        case 100:
+          _context32.t24 = _context32.sent;
         case 101:
-          _context32.t25 = _context32.sent;
-        case 102:
-          _context32.t26 = _context32.t25;
+          _context32.t25 = _context32.t24;
           if (!signedLink) {
-            _context32.next = 109;
+            _context32.next = 108;
             break;
           }
-          _context32.next = 106;
+          _context32.next = 105;
           return this.GlobalUrl({
             versionHash: versionHash,
             path: UrlJoin(linkPath, offering, playoutPath),
             queryParams: queryParams
           });
-        case 106:
-          _context32.t27 = _context32.sent;
-          _context32.next = 112;
-          break;
-        case 109:
+        case 105:
+          _context32.t26 = _context32.sent;
           _context32.next = 111;
+          break;
+        case 108:
+          _context32.next = 110;
           return this.GlobalUrl({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2464,23 +2463,23 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             path: UrlJoin("rep", handler, offering, playoutPath),
             queryParams: queryParams
           });
+        case 110:
+          _context32.t26 = _context32.sent;
         case 111:
-          _context32.t27 = _context32.sent;
-        case 112:
-          _context32.t28 = _context32.t27;
-          _context32.t29 = drm ? _defineProperty({}, drm, {
+          _context32.t27 = _context32.t26;
+          _context32.t28 = drm ? _defineProperty({}, drm, {
             licenseServers: licenseServers,
             cert: cert
           }) : undefined;
           if (thumbnailTrackUri) {
-            _context32.next = 118;
+            _context32.next = 117;
             break;
           }
-          _context32.t30 = undefined;
-          _context32.next = 121;
-          break;
-        case 118:
+          _context32.t29 = undefined;
           _context32.next = 120;
+          break;
+        case 117:
+          _context32.next = 119;
           return this.Rep({
             libraryId: linkTarget.libraryId || libraryId,
             objectId: linkTarget.objectId || objectId,
@@ -2488,23 +2487,22 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
             rep: UrlJoin(handler, offering, thumbnailTrackUri),
             queryParams: queryParams
           });
+        case 119:
+          _context32.t29 = _context32.sent;
         case 120:
-          _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.t30 = _context32.t29;
+          _context32.t31 = {
+            playoutUrl: _context32.t25,
+            globalPlayoutUrl: _context32.t27,
+            drms: _context32.t28,
+            thumbnailTrack: _context32.t30
           };
-          _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
+          _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
           };
-          playoutMap[protocol] = (0, _context32.t15)(_context32.t16, _context32.t17, _context32.t35);
+          playoutMap[protocol] = (0, _context32.t15)(_context32.t16, _context32.t17, _context32.t34);
           // 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) {
@@ -2520,21 +2518,21 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           protocolMatch = protocols.includes(protocol);
           drmMatch = drms.includes(drm || "clear") || drms.length === 0 && !drm;
           if (!(!protocolMatch || !drmMatch)) {
-            _context32.next = 132;
+            _context32.next = 131;
             break;
           }
-          return _context32.abrupt("continue", 133);
-        case 132:
+          return _context32.abrupt("continue", 132);
+        case 131:
           // 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 133:
+        case 132:
           i++;
           _context32.next = 70;
           break;
-        case 136:
+        case 135:
           // Callbacks for retrieving and setting multiview views
           if (multiview && sessionId) {
             playoutMap.sessionId = sessionId;
@@ -2590,7 +2588,7 @@ exports.PlayoutOptions = /*#__PURE__*/function () {
           }
           this.Log(playoutMap);
           return _context32.abrupt("return", playoutMap);
-        case 139:
+        case 138:
         case "end":
           return _context32.stop();
       }
@@ -2782,21 +2780,10 @@ 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) {
-            _context34.next = 8;
-            break;
+          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];
           }
-          queryParams = _objectSpread({}, queryParams);
-          _context34.next = 7;
-          return this.authClient.AuthorizationToken({
-            libraryId: libraryId,
-            objectId: objectId,
-            versionHash: versionHash,
-            noAuth: noAuth
-          });
-        case 7:
-          queryParams.authorization = _context34.sent;
-        case 8:
           if (writeToken) {
             fabricNodeUrl = this.HttpClient.draftURIs[writeToken];
             if (fabricNodeUrl) {
@@ -2804,28 +2791,51 @@ exports.GlobalUrl = /*#__PURE__*/function () {
             }
           }
           urlPath = UrlJoin("s", network);
+          if (!(!noAuth || authorizationToken)) {
+            _context34.next = 15;
+            break;
+          }
+          _context34.t0 = UrlJoin;
+          _context34.t1 = authorizationToken;
+          if (_context34.t1) {
+            _context34.next = 13;
+            break;
+          }
+          _context34.next = 12;
+          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:
           if (!versionHash) {
-            _context34.next = 14;
+            _context34.next = 19;
             break;
           }
           objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-          _context34.next = 20;
+          _context34.next = 25;
           break;
-        case 14:
-          _context34.t0 = libraryId;
-          if (_context34.t0) {
-            _context34.next = 19;
+        case 19:
+          _context34.t3 = libraryId;
+          if (_context34.t3) {
+            _context34.next = 24;
             break;
           }
-          _context34.next = 18;
+          _context34.next = 23;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
-        case 18:
-          _context34.t0 = _context34.sent;
-        case 19:
-          libraryId = _context34.t0;
-        case 20:
+        case 23:
+          _context34.t3 = _context34.sent;
+        case 24:
+          libraryId = _context34.t3;
+        case 25:
           if (path.startsWith("/qfab")) {
             urlPath = UrlJoin(urlPath, path.replace(/^\/qfab/, "q"));
           } else if (versionHash) {
@@ -2841,7 +2851,7 @@ exports.GlobalUrl = /*#__PURE__*/function () {
             return url.searchParams.set(key, queryParams[key]);
           });
           return _context34.abrupt("return", url.toString());
-        case 25:
+        case 30:
         case "end":
           return _context34.stop();
       }
@@ -4329,7 +4339,6 @@ exports.EncryptionConk = /*#__PURE__*/function () {
             libraryId: libraryId,
             objectId: objectId,
             versionHash: versionHash,
-            writeToken: writeToken,
             metadataSubtree: ownerCapKey
           });
         case 10: