@eluvio/elv-client-js 4.0.0 → 4.0.1

package/dist/src/ElvClient.js

@@ -87,7 +87,8 @@ var ElvClient = /*#__PURE__*/function () {
    * @param {number} fabricVersion - The version of the target content fabric
    * @param {Array<string>} fabricURIs - A list of full URIs to content fabric nodes
    * @param {Array<string>} ethereumURIs - A list of full URIs to ethereum nodes
-   * @param {Array<string>} ethereumURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>} authServiceURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
    * @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
    * @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
@@ -104,6 +105,7 @@ var ElvClient = /*#__PURE__*/function () {
         fabricURIs = _ref.fabricURIs,
         ethereumURIs = _ref.ethereumURIs,
         authServiceURIs = _ref.authServiceURIs,
+        searchURIs = _ref.searchURIs,
         _ref$ethereumContract = _ref.ethereumContractTimeout,
         ethereumContractTimeout = _ref$ethereumContract === void 0 ? 10 : _ref$ethereumContract,
         trustAuthorityId = _ref.trustAuthorityId,
@@ -128,6 +130,7 @@ var ElvClient = /*#__PURE__*/function () {
     this.fabricURIs = fabricURIs;
     this.authServiceURIs = authServiceURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
     this.ethereumContractTimeout = ethereumContractTimeout;
     this.trustAuthorityId = trustAuthorityId;
     this.noCache = noCache;
@@ -364,7 +367,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "UseRegion",
     value: function () {
       var _UseRegion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
-        var region, _yield$ElvClient$Conf, fabricURIs, ethereumURIs, authServiceURIs;
+        var region, _yield$ElvClient$Conf, fabricURIs, ethereumURIs, authServiceURIs, searchURIs;
 
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
@@ -391,19 +394,22 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricURIs = _yield$ElvClient$Conf.fabricURIs;
                 ethereumURIs = _yield$ElvClient$Conf.ethereumURIs;
                 authServiceURIs = _yield$ElvClient$Conf.authServiceURIs;
+                searchURIs = _yield$ElvClient$Conf.searchURIs;
                 this.authServiceURIs = authServiceURIs;
                 this.fabricURIs = fabricURIs;
                 this.ethereumURIs = ethereumURIs;
+                this.searchURIs = searchURIs;
                 this.HttpClient.uris = fabricURIs;
                 this.HttpClient.uriIndex = 0;
                 this.ethClient.ethereumURIs = ethereumURIs;
                 this.ethClient.ethereumURIIndex = 0;
                 return _context3.abrupt("return", {
                   fabricURIs: fabricURIs,
-                  ethereumURIs: ethereumURIs
+                  ethereumURIs: ethereumURIs,
+                  searchURIs: searchURIs
                 });
 
-              case 17:
+              case 19:
               case "end":
                 return _context3.stop();
             }
@@ -1715,7 +1721,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "Configuration",
     value: function () {
       var _Configuration = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee21(_ref22) {
-        var configUrl, _ref22$kmsUrls, kmsUrls, region, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, fabricVersion;
+        var configUrl, _ref22$kmsUrls, kmsUrls, region, uri, fabricInfo, filterHTTPS, fabricURIs, ethereumURIs, authServiceURIs, searchURIs, fabricVersion;
 
         return _regeneratorRuntime.wrap(function _callee21$(_context21) {
           while (1) {
@@ -1759,6 +1765,7 @@ var ElvClient = /*#__PURE__*/function () {
                   authServiceURIs = authServiceURIs.filter(filterHTTPS);
                 }
 
+                searchURIs = fabricInfo.network.services.search || [];
                 fabricVersion = Math.max.apply(Math, _toConsumableArray(fabricInfo.network.api_versions || [2]));
                 return _context21.abrupt("return", {
                   nodeId: fabricInfo.node_id,
@@ -1769,11 +1776,12 @@ var ElvClient = /*#__PURE__*/function () {
                   ethereumURIs: ethereumURIs,
                   authServiceURIs: authServiceURIs,
                   kmsURIs: kmsUrls,
+                  searchURIs: searchURIs,
                   fabricVersion: fabricVersion
                 });
 
-              case 19:
-                _context21.prev = 19;
+              case 20:
+                _context21.prev = 20;
                 _context21.t0 = _context21["catch"](1);
                 // eslint-disable-next-line no-console
                 console.error("Error retrieving fabric configuration:"); // eslint-disable-next-line no-console
@@ -1781,12 +1789,12 @@ var ElvClient = /*#__PURE__*/function () {
                 console.error(_context21.t0);
                 throw _context21.t0;
 
-              case 24:
+              case 25:
               case "end":
                 return _context21.stop();
             }
           }
-        }, _callee21, null, [[1, 19]]);
+        }, _callee21, null, [[1, 20]]);
       }));
 
       function Configuration(_x18) {
@@ -1881,7 +1889,7 @@ var ElvClient = /*#__PURE__*/function () {
     key: "FromConfigurationUrl",
     value: function () {
       var _FromConfigurationUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee23(_ref24) {
-        var configUrl, region, trustAuthorityId, staticToken, _ref24$ethereumContra, ethereumContractTimeout, _ref24$noCache, noCache, _ref24$noAuth, noAuth, _ref24$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, fabricVersion, client;
+        var configUrl, region, trustAuthorityId, staticToken, _ref24$ethereumContra, ethereumContractTimeout, _ref24$noCache, noCache, _ref24$noAuth, noAuth, _ref24$assumeV, assumeV3, _yield$ElvClient$Conf3, contentSpaceId, networkId, networkName, fabricURIs, ethereumURIs, authServiceURIs, searchURIs, fabricVersion, client;
 
         return _regeneratorRuntime.wrap(function _callee23$(_context23) {
           while (1) {
@@ -1902,6 +1910,7 @@ var ElvClient = /*#__PURE__*/function () {
                 fabricURIs = _yield$ElvClient$Conf3.fabricURIs;
                 ethereumURIs = _yield$ElvClient$Conf3.ethereumURIs;
                 authServiceURIs = _yield$ElvClient$Conf3.authServiceURIs;
+                searchURIs = _yield$ElvClient$Conf3.searchURIs;
                 fabricVersion = _yield$ElvClient$Conf3.fabricVersion;
                 client = new ElvClient({
                   contentSpaceId: contentSpaceId,
@@ -1911,6 +1920,7 @@ var ElvClient = /*#__PURE__*/function () {
                   fabricURIs: fabricURIs,
                   ethereumURIs: ethereumURIs,
                   authServiceURIs: authServiceURIs,
+                  searchURIs: searchURIs,
                   ethereumContractTimeout: ethereumContractTimeout,
                   trustAuthorityId: trustAuthorityId,
                   staticToken: staticToken,
@@ -1921,7 +1931,7 @@ var ElvClient = /*#__PURE__*/function () {
                 client.configUrl = configUrl;
                 return _context23.abrupt("return", client);
 
-              case 14:
+              case 15:
               case "end":
                 return _context23.stop();
             }

package/dist/src/HttpClient.js

@@ -36,8 +36,8 @@ var HttpClient = /*#__PURE__*/function () {
     }
   }, {
     key: "BaseURI",
-    value: function BaseURI() {
-      return new URI(this.uris[this.uriIndex]);
+    value: function BaseURI(url) {
+      return new URI(url || this.uris[this.uriIndex]);
     }
   }, {
     key: "RecordWriteToken",
@@ -65,14 +65,15 @@ var HttpClient = /*#__PURE__*/function () {
     key: "Request",
     value: function () {
       var _Request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
-        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$failover, failover, _ref2$forceFailover, forceFailover, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
+        var method, path, _ref2$queryParams, queryParams, body, _ref2$bodyType, bodyType, _ref2$headers, headers, _ref2$attempts, attempts, _ref2$failover, failover, _ref2$forceFailover, forceFailover, nodeUrl, baseURI, writeTokenMatch, writeToken, uri, fetchParameters, response, responseType, errorBody, error;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$failover = _ref2.failover, failover = _ref2$failover === void 0 ? true : _ref2$failover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover;
-                baseURI = this.BaseURI(); // If URL contains a write token, it must go to the correct server and can not fail over
+                method = _ref2.method, path = _ref2.path, _ref2$queryParams = _ref2.queryParams, queryParams = _ref2$queryParams === void 0 ? {} : _ref2$queryParams, body = _ref2.body, _ref2$bodyType = _ref2.bodyType, bodyType = _ref2$bodyType === void 0 ? "JSON" : _ref2$bodyType, _ref2$headers = _ref2.headers, headers = _ref2$headers === void 0 ? {} : _ref2$headers, _ref2$attempts = _ref2.attempts, attempts = _ref2$attempts === void 0 ? 0 : _ref2$attempts, _ref2$failover = _ref2.failover, failover = _ref2$failover === void 0 ? true : _ref2$failover, _ref2$forceFailover = _ref2.forceFailover, forceFailover = _ref2$forceFailover === void 0 ? false : _ref2$forceFailover, nodeUrl = _ref2.nodeUrl;
+                // if nodeUrl passed in, restrict communication to that node only (unless previously recorded write token is found in next step)
+                baseURI = this.BaseURI(nodeUrl); // 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;
@@ -127,7 +128,7 @@ var HttpClient = /*#__PURE__*/function () {
                   break;
                 }
 
-                if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
+                if (!(!writeToken && !nodeUrl && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
                   _context.next = 24;
                   break;
                 }

package/dist/src/client/ContentManagement.js

@@ -1428,6 +1428,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
  * @param {object=} options -
  * meta: New metadata for the object - will be merged into existing metadata if specified
  * type: New type for the object - Object ID, version hash or name of type
+ * nodeUrl: Node URL to use in HTTP call
  *
  * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
@@ -1517,26 +1518,28 @@ exports.EditContentObject = /*#__PURE__*/function () {
             _context15.t1 = _context15.sent;
             _context15.t2 = path;
             _context15.t3 = options;
-            _context15.t4 = {
+            _context15.t4 = options.nodeUrl;
+            _context15.t5 = {
               headers: _context15.t1,
               method: "POST",
               path: _context15.t2,
-              body: _context15.t3
+              body: _context15.t3,
+              nodeUrl: _context15.t4
             };
-            _context15.next = 33;
-            return _context15.t0.Request.call(_context15.t0, _context15.t4);
+            _context15.next = 34;
+            return _context15.t0.Request.call(_context15.t0, _context15.t5);
 
-          case 33:
+          case 34:
             rawEditResponse = _context15.sent;
             actualUrl = new URL(rawEditResponse.url);
             actualUrl.pathname = "";
             actualUrl.search = "";
             actualUrl.hash = "";
             nodeUrl = actualUrl.href;
-            _context15.next = 41;
+            _context15.next = 42;
             return this.utils.ResponseToJson(rawEditResponse);
 
-          case 41:
+          case 42:
             editResponse = _context15.sent;
             // Record the node used in creating this write token
             this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);
@@ -1545,7 +1548,7 @@ exports.EditContentObject = /*#__PURE__*/function () {
             editResponse.nodeUrl = nodeUrl;
             return _context15.abrupt("return", editResponse);
 
-          case 47:
+          case 48:
           case "end":
             return _context15.stop();
         }

package/package.json

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

package/src/ElvClient.js

@@ -130,7 +130,8 @@ class ElvClient {
    * @param {number} fabricVersion - The version of the target content fabric
    * @param {Array<string>} fabricURIs - A list of full URIs to content fabric nodes
    * @param {Array<string>} ethereumURIs - A list of full URIs to ethereum nodes
-   * @param {Array<string>} ethereumURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>} authServiceURIs - A list of full URIs to auth service endpoints
+   * @param {Array<string>=} searchURIs - A list of full URIs to search service endpoints
    * @param {number=} ethereumContractTimeout=10 - Number of seconds to wait for contract calls
    * @param {string=} trustAuthorityId - (OAuth) The ID of the trust authority to use for OAuth authentication
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
@@ -147,6 +148,7 @@ class ElvClient {
     fabricURIs,
     ethereumURIs,
     authServiceURIs,
+    searchURIs,
     ethereumContractTimeout = 10,
     trustAuthorityId,
     staticToken,
@@ -169,6 +171,7 @@ class ElvClient {
     this.fabricURIs = fabricURIs;
     this.authServiceURIs = authServiceURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
     this.ethereumContractTimeout = ethereumContractTimeout;
 
     this.trustAuthorityId = trustAuthorityId;
@@ -230,6 +233,8 @@ class ElvClient {
         authServiceURIs = authServiceURIs.filter(filterHTTPS);
       }
 
+      const searchURIs = fabricInfo.network.services.search || [];
+
       const fabricVersion = Math.max(...(fabricInfo.network.api_versions || [2]));
 
       return {
@@ -241,6 +246,7 @@ class ElvClient {
         ethereumURIs,
         authServiceURIs,
         kmsURIs: kmsUrls,
+        searchURIs,
         fabricVersion
       };
     } catch(error) {
@@ -326,6 +332,7 @@ class ElvClient {
       fabricURIs,
       ethereumURIs,
       authServiceURIs,
+      searchURIs,
       fabricVersion
     } = await ElvClient.Configuration({
       configUrl,
@@ -340,6 +347,7 @@ class ElvClient {
       fabricURIs,
       ethereumURIs,
       authServiceURIs,
+      searchURIs,
       ethereumContractTimeout,
       trustAuthorityId,
       staticToken,
@@ -421,7 +429,7 @@ class ElvClient {
       throw Error("Unable to change region: Configuration URL not set");
     }
 
-    const {fabricURIs, ethereumURIs, authServiceURIs} = await ElvClient.Configuration({
+    const {fabricURIs, ethereumURIs, authServiceURIs, searchURIs} = await ElvClient.Configuration({
       configUrl: this.configUrl,
       region
     });
@@ -429,6 +437,7 @@ class ElvClient {
     this.authServiceURIs = authServiceURIs;
     this.fabricURIs = fabricURIs;
     this.ethereumURIs = ethereumURIs;
+    this.searchURIs = searchURIs;
 
     this.HttpClient.uris = fabricURIs;
     this.HttpClient.uriIndex = 0;
@@ -438,7 +447,8 @@ class ElvClient {
 
     return {
       fabricURIs,
-      ethereumURIs
+      ethereumURIs,
+      searchURIs
     };
   }
 

package/src/HttpClient.js

@@ -14,8 +14,8 @@ class HttpClient {
     this.draftURIs = {};
   }
 
-  BaseURI() {
-    return new URI(this.uris[this.uriIndex]);
+  BaseURI(url) {
+    return new URI(url || this.uris[this.uriIndex]);
   }
 
   static Fetch(url, params={}) {
@@ -49,9 +49,11 @@ class HttpClient {
     headers={},
     attempts=0,
     failover=true,
-    forceFailover=false
+    forceFailover=false,
+    nodeUrl
   }) {
-    let baseURI = this.BaseURI();
+    // if nodeUrl passed in, restrict communication to that node only (unless previously recorded write token is found in next step)
+    let baseURI = this.BaseURI(nodeUrl);
 
     // If URL contains a write token, it must go to the correct server and can not fail over
     const writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
@@ -105,7 +107,7 @@ class HttpClient {
 
     if(!response.ok) {
       // Fail over if not a write token request, the response was a server error, and we haven't tried all available nodes
-      if(!writeToken && ((failover && parseInt(response.status) >= 500) || forceFailover) && attempts < this.uris.length) {
+      if(!writeToken && !nodeUrl && ((failover && parseInt(response.status) >= 500) || forceFailover) && attempts < this.uris.length) {
         // Server error - Try next node
         this.Log(`HttpClient failing over from ${this.BaseURI()}: ${attempts + 1} attempts`, true);
         this.uriIndex = (this.uriIndex + 1) % this.uris.length;

package/src/client/ContentManagement.js

@@ -749,6 +749,7 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writ
  * @param {object=} options -
  * meta: New metadata for the object - will be merged into existing metadata if specified
  * type: New type for the object - Object ID, version hash or name of type
+ * nodeUrl: Node URL to use in HTTP call
  *
  * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
@@ -778,7 +779,8 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
     method: "POST",
     path: path,
-    body: options
+    body: options,
+    nodeUrl: options.nodeUrl
   });
 
   const actualUrl = new URL(rawEditResponse.url);

package/testScripts/abr_profile_both.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_clear_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_clear_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/testScripts/abr_profile_drm.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_both.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_hls_only_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_hls_only_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_store_encrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_clear_store_unencrypted.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_drm.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },

package/utilities/example_files/abr_profile_drm_hls_only.json

@@ -660,17 +660,17 @@
         },
         {
           "bit_rate": 810000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         },
         {
           "bit_rate": 520000,
-          "height": 360,
+          "height": 640,
           "media_type": "video",
           "pregenerate": false,
-          "width": 640
+          "width": 360
         }
       ]
     },