@eluvio/elv-client-js 4.0.1 → 4.0.3

package/dist/src/ElvClient.js

@@ -83,7 +83,8 @@ var ElvClient = /*#__PURE__*/function () {
    *
    * @namedParams
    * @param {string} contentSpaceId - ID of the content space
-   * @param {string} contentSpaceId - ID of the blockchain network
+   * @param {string} networkId - ID of the blockchain network
+   * @param {string} networkName - Name of the blockchain network
    * @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
@@ -94,6 +95,9 @@ var ElvClient = /*#__PURE__*/function () {
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
    * @param {boolean=} noCache=false - If enabled, blockchain transactions will not be cached
    * @param {boolean=} noAuth=false - If enabled, blockchain authorization will not be performed
+   * @param {boolean=} assumeV3=false - If enabled, V3 fabric will be assumed
+   * @param {string=} service=default - The mode that determines how HttpClient will be initialized.
+   * If 'default' is set, HttpClient uris will use fabricUris. If 'search' is used, searchUris will be used
    *
    * @return {ElvClient} - New ElvClient connected to the specified content fabric and blockchain
    */
@@ -115,7 +119,9 @@ var ElvClient = /*#__PURE__*/function () {
         _ref$noAuth = _ref.noAuth,
         noAuth = _ref$noAuth === void 0 ? false : _ref$noAuth,
         _ref$assumeV = _ref.assumeV3,
-        assumeV3 = _ref$assumeV === void 0 ? false : _ref$assumeV;
+        assumeV3 = _ref$assumeV === void 0 ? false : _ref$assumeV,
+        _ref$service = _ref.service,
+        service = _ref$service === void 0 ? "default" : _ref$service;
 
     _classCallCheck(this, ElvClient);
 
@@ -136,6 +142,12 @@ var ElvClient = /*#__PURE__*/function () {
     this.noCache = noCache;
     this.noAuth = noAuth;
     this.assumeV3 = assumeV3;
+
+    if (!["search", "default"].includes(this.service)) {
+      throw Error("Invalid service: ".concat(this.service));
+    }
+
+    this.service = service;
     this.debug = false;
     this.InitializeClients({
       staticToken: staticToken
@@ -261,6 +273,7 @@ var ElvClient = /*#__PURE__*/function () {
       var _InitializeClients = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var _ref3,
             staticToken,
+            uris,
             wallet,
             signer,
             _args2 = arguments;
@@ -279,8 +292,9 @@ var ElvClient = /*#__PURE__*/function () {
                 this.objectImageUrls = {};
                 this.visibilityInfo = {};
                 this.inaccessibleLibraries = {};
+                uris = this.service === "search" ? this.searchURIs : this.fabricURIs;
                 this.HttpClient = new HttpClient({
-                  uris: this.fabricURIs,
+                  uris: uris,
                   debug: this.debug
                 });
                 this.AuthHttpClient = new HttpClient({
@@ -325,7 +339,7 @@ var ElvClient = /*#__PURE__*/function () {
                 this.Crypto = Crypto;
                 this.Crypto.ElvCrypto();
 
-              case 17:
+              case 18:
               case "end":
                 return _context2.stop();
             }
@@ -360,7 +374,7 @@ var ElvClient = /*#__PURE__*/function () {
      * @param {string} region - Preferred region - the fabric will auto-detect the best region if not specified
      * - Available regions: as-east au-east eu-east-north eu-west-north na-east-north na-east-south na-west-north na-west-south eu-east-south eu-west-south
      *
-     * @return {Promise<Object>} - An object containing the updated fabric and ethereum URLs in order of preference
+     * @return {Promise<Object>} - An object containing the updated fabric, ethereum, auth service, and search URLs in order of preference
      */
 
   }, {
@@ -521,11 +535,11 @@ var ElvClient = /*#__PURE__*/function () {
       return NodeId;
     }()
     /**
-     * Retrieve the fabric and ethereum nodes currently used by the client, in preference order
+     * Retrieve the fabric, ethereum, auth service, and search nodes currently used by the client, in preference order
      *
      * @methodGroup Nodes
      *
-     * @return {Promise<Object>} - An object containing the lists of fabric and ethereum urls in use by the client
+     * @return {Promise<Object>} - An object containing the lists of fabric, ethereum, auth service, and search urls in use by the client
      */
 
   }, {
@@ -534,16 +548,18 @@ var ElvClient = /*#__PURE__*/function () {
       return {
         fabricURIs: this.fabricURIs,
         ethereumURIs: this.ethereumURIs,
-        authServiceURIs: this.authServiceURIs
+        authServiceURIs: this.authServiceURIs,
+        searchURIs: this.searchURIs
       };
     }
     /**
-     * Set the client to use the specified fabric and ethereum nodes, in preference order
+     * Set the client to use the specified fabric, ethereum, auth service, and search nodes, in preference order
      *
      * @namedParams
      * @param {Array<string>=} fabricURIs - A list of URLs for the fabric, in preference order
      * @param {Array<string>=} ethereumURIs - A list of URLs for the blockchain, in preference order
      * @param {Array<string>=} authServiceURIs - A list of URLs for the auth service, in preference order
+     * @param {Array<string>=} searchURIs - A list of URLs for the search nodes, in preference order
      *
      * @methodGroup Nodes
      */
@@ -553,7 +569,8 @@ var ElvClient = /*#__PURE__*/function () {
     value: function SetNodes(_ref6) {
       var fabricURIs = _ref6.fabricURIs,
           ethereumURIs = _ref6.ethereumURIs,
-          authServiceURIs = _ref6.authServiceURIs;
+          authServiceURIs = _ref6.authServiceURIs,
+          searchURIs = _ref6.searchURIs;
 
       if (fabricURIs) {
         this.fabricURIs = fabricURIs;
@@ -572,6 +589,10 @@ var ElvClient = /*#__PURE__*/function () {
         this.AuthHttpClient.uris = authServiceURIs;
         this.AuthHttpClient.uriIndex = 0;
       }
+
+      if (searchURIs) {
+        this.searchURIs = searchURIs;
+      }
     }
     /**
      * Return information about how the client was connected to the network

package/dist/src/HttpClient.js

@@ -36,8 +36,8 @@ var HttpClient = /*#__PURE__*/function () {
     }
   }, {
     key: "BaseURI",
-    value: function BaseURI(url) {
-      return new URI(url || this.uris[this.uriIndex]);
+    value: function BaseURI() {
+      return new URI(this.uris[this.uriIndex]);
     }
   }, {
     key: "RecordWriteToken",
@@ -65,15 +65,14 @@ 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, nodeUrl, 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, 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, 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
+                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
 
                 writeTokenMatch = path.replace(/^\//, "").match(/(qlibs\/ilib[a-zA-Z0-9]+|q|qid)\/(tqw__[a-zA-Z0-9]+)/);
                 writeToken = writeTokenMatch ? writeTokenMatch[2] : undefined;
@@ -128,7 +127,7 @@ var HttpClient = /*#__PURE__*/function () {
                   break;
                 }
 
-                if (!(!writeToken && !nodeUrl && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
+                if (!(!writeToken && (failover && parseInt(response.status) >= 500 || forceFailover) && attempts < this.uris.length)) {
                   _context.next = 24;
                   break;
                 }

package/dist/src/client/ContentManagement.js

@@ -1428,7 +1428,6 @@ 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
  */
@@ -1518,28 +1517,26 @@ exports.EditContentObject = /*#__PURE__*/function () {
             _context15.t1 = _context15.sent;
             _context15.t2 = path;
             _context15.t3 = options;
-            _context15.t4 = options.nodeUrl;
-            _context15.t5 = {
+            _context15.t4 = {
               headers: _context15.t1,
               method: "POST",
               path: _context15.t2,
-              body: _context15.t3,
-              nodeUrl: _context15.t4
+              body: _context15.t3
             };
-            _context15.next = 34;
-            return _context15.t0.Request.call(_context15.t0, _context15.t5);
+            _context15.next = 33;
+            return _context15.t0.Request.call(_context15.t0, _context15.t4);
 
-          case 34:
+          case 33:
             rawEditResponse = _context15.sent;
             actualUrl = new URL(rawEditResponse.url);
             actualUrl.pathname = "";
             actualUrl.search = "";
             actualUrl.hash = "";
             nodeUrl = actualUrl.href;
-            _context15.next = 42;
+            _context15.next = 41;
             return this.utils.ResponseToJson(rawEditResponse);
 
-          case 42:
+          case 41:
             editResponse = _context15.sent;
             // Record the node used in creating this write token
             this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);
@@ -1548,7 +1545,7 @@ exports.EditContentObject = /*#__PURE__*/function () {
             editResponse.nodeUrl = nodeUrl;
             return _context15.abrupt("return", editResponse);
 
-          case 48:
+          case 47:
           case "end":
             return _context15.stop();
         }

package/package.json

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

package/src/ElvClient.js

@@ -126,7 +126,8 @@ class ElvClient {
    *
    * @namedParams
    * @param {string} contentSpaceId - ID of the content space
-   * @param {string} contentSpaceId - ID of the blockchain network
+   * @param {string} networkId - ID of the blockchain network
+   * @param {string} networkName - Name of the blockchain network
    * @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
@@ -137,6 +138,9 @@ class ElvClient {
    * @param {string=} staticToken - Static token that will be used for all authorization in place of normal auth
    * @param {boolean=} noCache=false - If enabled, blockchain transactions will not be cached
    * @param {boolean=} noAuth=false - If enabled, blockchain authorization will not be performed
+   * @param {boolean=} assumeV3=false - If enabled, V3 fabric will be assumed
+   * @param {string=} service=default - The mode that determines how HttpClient will be initialized.
+   * If 'default' is set, HttpClient uris will use fabricUris. If 'search' is used, searchUris will be used
    *
    * @return {ElvClient} - New ElvClient connected to the specified content fabric and blockchain
    */
@@ -154,7 +158,8 @@ class ElvClient {
     staticToken,
     noCache=false,
     noAuth=false,
-    assumeV3=false
+    assumeV3=false,
+    service="default"
   }) {
     this.utils = Utils;
 
@@ -180,6 +185,12 @@ class ElvClient {
     this.noAuth = noAuth;
     this.assumeV3 = assumeV3;
 
+    if(!["search", "default"].includes(this.service)) {
+      throw Error(`Invalid service: ${this.service}`);
+    }
+
+    this.service = service;
+
     this.debug = false;
 
     this.InitializeClients({staticToken});
@@ -372,7 +383,8 @@ class ElvClient {
     this.visibilityInfo = {};
     this.inaccessibleLibraries = {};
 
-    this.HttpClient = new HttpClient({uris: this.fabricURIs, debug: this.debug});
+    const uris = this.service === "search" ? this.searchURIs : this.fabricURIs;
+    this.HttpClient = new HttpClient({uris, debug: this.debug});
     this.AuthHttpClient = new HttpClient({uris: this.authServiceURIs, debug: this.debug});
     this.ethClient = new EthClient({client: this, uris: this.ethereumURIs, networkId: this.networkId, debug: this.debug, timeout: this.ethereumContractTimeout});
 
@@ -422,7 +434,7 @@ class ElvClient {
    * @param {string} region - Preferred region - the fabric will auto-detect the best region if not specified
    * - Available regions: as-east au-east eu-east-north eu-west-north na-east-north na-east-south na-west-north na-west-south eu-east-south eu-west-south
    *
-   * @return {Promise<Object>} - An object containing the updated fabric and ethereum URLs in order of preference
+   * @return {Promise<Object>} - An object containing the updated fabric, ethereum, auth service, and search URLs in order of preference
    */
   async UseRegion({region}) {
     if(!this.configUrl) {
@@ -491,31 +503,33 @@ class ElvClient {
   }
 
   /**
-   * Retrieve the fabric and ethereum nodes currently used by the client, in preference order
+   * Retrieve the fabric, ethereum, auth service, and search nodes currently used by the client, in preference order
    *
    * @methodGroup Nodes
    *
-   * @return {Promise<Object>} - An object containing the lists of fabric and ethereum urls in use by the client
+   * @return {Promise<Object>} - An object containing the lists of fabric, ethereum, auth service, and search urls in use by the client
    */
   Nodes() {
     return {
       fabricURIs: this.fabricURIs,
       ethereumURIs: this.ethereumURIs,
-      authServiceURIs: this.authServiceURIs
+      authServiceURIs: this.authServiceURIs,
+      searchURIs: this.searchURIs
     };
   }
 
   /**
-   * Set the client to use the specified fabric and ethereum nodes, in preference order
+   * Set the client to use the specified fabric, ethereum, auth service, and search nodes, in preference order
    *
    * @namedParams
    * @param {Array<string>=} fabricURIs - A list of URLs for the fabric, in preference order
    * @param {Array<string>=} ethereumURIs - A list of URLs for the blockchain, in preference order
    * @param {Array<string>=} authServiceURIs - A list of URLs for the auth service, in preference order
+   * @param {Array<string>=} searchURIs - A list of URLs for the search nodes, in preference order
    *
    * @methodGroup Nodes
    */
-  SetNodes({fabricURIs, ethereumURIs, authServiceURIs}) {
+  SetNodes({fabricURIs, ethereumURIs, authServiceURIs, searchURIs}) {
     if(fabricURIs) {
       this.fabricURIs = fabricURIs;
 
@@ -535,6 +549,10 @@ class ElvClient {
       this.AuthHttpClient.uris = authServiceURIs;
       this.AuthHttpClient.uriIndex = 0;
     }
+
+    if(searchURIs) {
+      this.searchURIs = searchURIs;
+    }
   }
 
   /**

package/src/FrameClient.js

@@ -480,6 +480,6 @@ class FrameClient {
 }
 
 const { UploadFiles } = require("./client/Files");
-FrameClient.prototype.UploadFiles=UploadFiles;
+FrameClient.prototype.UploadFiles = UploadFiles;
 
 exports.FrameClient = FrameClient;

package/src/HttpClient.js

@@ -14,8 +14,8 @@ class HttpClient {
     this.draftURIs = {};
   }
 
-  BaseURI(url) {
-    return new URI(url || this.uris[this.uriIndex]);
+  BaseURI() {
+    return new URI(this.uris[this.uriIndex]);
   }
 
   static Fetch(url, params={}) {
@@ -49,11 +49,9 @@ class HttpClient {
     headers={},
     attempts=0,
     failover=true,
-    forceFailover=false,
-    nodeUrl
+    forceFailover=false
   }) {
-    // 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);
+    let baseURI = this.BaseURI();
 
     // 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]+)/);
@@ -107,7 +105,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 && !nodeUrl && ((failover && parseInt(response.status) >= 500) || forceFailover) && attempts < this.uris.length) {
+      if(!writeToken && ((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,7 +749,6 @@ 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
  */
@@ -779,8 +778,7 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
     method: "POST",
     path: path,
-    body: options,
-    nodeUrl: options.nodeUrl
+    body: options
   });
 
   const actualUrl = new URL(rawEditResponse.url);