@eluvio/elv-client-js 4.0.19 → 4.0.21

package/dist/src/AuthorizationClient.js

@@ -265,6 +265,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
               return this.client.ContentObjectMetadata({
                 libraryId: libraryId,
                 objectId: objectId,
+                versionHash: versionHash,
                 metadataSubtree: ownerCapKey
               });
             case 16:

package/dist/src/client/ContentAccess.js

@@ -3904,6 +3904,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
+            versionHash: versionHash,
             metadataSubtree: ownerCapKey
           });
         case 10:

package/dist/src/client/Files.js

@@ -534,7 +534,9 @@ exports.UploadFiles = /*#__PURE__*/function () {
                       writeToken: writeToken,
                       uploadId: id,
                       jobId: jobId,
-                      fileData: _fileInfo2.data
+                      filePath: _fileInfo2.path,
+                      fileData: _fileInfo2.data,
+                      encryption: encryption
                     });
                   case 12:
                     delete jobSpecs[j].files[f].data;
@@ -728,7 +730,7 @@ exports.UploadStatus = /*#__PURE__*/function () {
 }();
 exports.UploadJobStatus = /*#__PURE__*/function () {
   var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref14) {
-    var libraryId, objectId, writeToken, uploadId, jobId, path;
+    var libraryId, objectId, writeToken, uploadId, jobId, path, retries, jobStatus;
     return _regeneratorRuntime.wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -738,16 +740,19 @@ exports.UploadJobStatus = /*#__PURE__*/function () {
             objectId: objectId
           });
           ValidateWriteToken(writeToken);
-          path = UrlJoin("q", writeToken, "file_jobs", uploadId, "uploads", jobId);
+          path = UrlJoin("q", writeToken, "file_jobs", uploadId, "uploads", jobId); // This request is sent during file data upload and might fail due to congestion
+          retries = 0;
+        case 5:
+          _context9.prev = 5;
           _context9.t0 = this.utils;
           _context9.t1 = this.HttpClient;
-          _context9.next = 8;
+          _context9.next = 10;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 8:
+        case 10:
           _context9.t2 = _context9.sent;
           _context9.t3 = path;
           _context9.t4 = {
@@ -757,12 +762,33 @@ exports.UploadJobStatus = /*#__PURE__*/function () {
             failover: false
           };
           _context9.t5 = _context9.t1.Request.call(_context9.t1, _context9.t4);
-          return _context9.abrupt("return", _context9.t0.ResponseToJson.call(_context9.t0, _context9.t5));
-        case 13:
+          jobStatus = _context9.t0.ResponseToJson.call(_context9.t0, _context9.t5);
+          return _context9.abrupt("return", jobStatus);
+        case 18:
+          _context9.prev = 18;
+          _context9.t6 = _context9["catch"](5);
+          this.Log(_context9.t6, true);
+          retries += 1;
+          if (!(retries >= 5)) {
+            _context9.next = 24;
+            break;
+          }
+          throw _context9.t6;
+        case 24:
+          _context9.next = 26;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 10 * retries * 1000);
+          });
+        case 26:
+          if (retries < 5) {
+            _context9.next = 5;
+            break;
+          }
+        case 27:
         case "end":
           return _context9.stop();
       }
-    }, _callee9, this);
+    }, _callee9, this, [[5, 18]]);
   }));
   return function (_x10) {
     return _ref15.apply(this, arguments);
@@ -770,11 +796,11 @@ exports.UploadJobStatus = /*#__PURE__*/function () {
 }();
 exports.UploadFileData = /*#__PURE__*/function () {
   var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref16) {
-    var libraryId, objectId, writeToken, uploadId, jobId, fileData, retries, jobStatus, path;
+    var libraryId, objectId, writeToken, encryption, uploadId, jobId, filePath, fileData, retries, jobStatus, fileStatus, path;
     return _regeneratorRuntime.wrap(function _callee10$(_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
-          libraryId = _ref16.libraryId, objectId = _ref16.objectId, writeToken = _ref16.writeToken, uploadId = _ref16.uploadId, jobId = _ref16.jobId, fileData = _ref16.fileData;
+          libraryId = _ref16.libraryId, objectId = _ref16.objectId, writeToken = _ref16.writeToken, encryption = _ref16.encryption, uploadId = _ref16.uploadId, jobId = _ref16.jobId, filePath = _ref16.filePath, fileData = _ref16.fileData;
           ValidateParameters({
             libraryId: libraryId,
             objectId: objectId
@@ -793,16 +819,23 @@ exports.UploadFileData = /*#__PURE__*/function () {
           });
         case 7:
           jobStatus = _context10.sent;
-          if (!(jobStatus.rem === 0)) {
-            _context10.next = 12;
+          // Find the status of this file
+          fileStatus = jobStatus.files.find(function (item) {
+            return item.path == filePath;
+          });
+          if (encryption && encryption !== "none") {
+            fileStatus = fileStatus.encrypted;
+          }
+          if (!(fileStatus.rem === 0)) {
+            _context10.next = 14;
             break;
           }
           return _context10.abrupt("return");
-        case 12:
-          if (jobStatus.skip) {
-            fileData = fileData.slice(jobStatus.skip);
+        case 14:
+          if (fileStatus.skip) {
+            fileData = fileData.slice(fileStatus.skip);
           }
-        case 13:
+        case 15:
           path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
           _context10.t0 = this.utils;
           _context10.t1 = this.HttpClient;
@@ -812,13 +845,13 @@ exports.UploadFileData = /*#__PURE__*/function () {
           _context10.t5 = {
             "Content-type": "application/octet-stream"
           };
-          _context10.next = 22;
+          _context10.next = 24;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 22:
+        case 24:
           _context10.t6 = _context10.sent;
           _context10.t7 = (0, _context10.t4)(_context10.t5, _context10.t6);
           _context10.t8 = {
@@ -830,35 +863,35 @@ exports.UploadFileData = /*#__PURE__*/function () {
             failover: false
           };
           _context10.t9 = _context10.t1.Request.call(_context10.t1, _context10.t8);
-          _context10.next = 28;
+          _context10.next = 30;
           return _context10.t0.ResponseToJson.call(_context10.t0, _context10.t9);
-        case 28:
+        case 30:
           return _context10.abrupt("return", _context10.sent);
-        case 31:
-          _context10.prev = 31;
+        case 33:
+          _context10.prev = 33;
           _context10.t10 = _context10["catch"](4);
           this.Log(_context10.t10, true);
           retries += 1;
           if (!(retries >= 5)) {
-            _context10.next = 37;
+            _context10.next = 39;
             break;
           }
           throw _context10.t10;
-        case 37:
-          _context10.next = 39;
+        case 39:
+          _context10.next = 41;
           return new Promise(function (resolve) {
             return setTimeout(resolve, 10 * retries * 1000);
           });
-        case 39:
+        case 41:
           if (retries < 5) {
             _context10.next = 4;
             break;
           }
-        case 40:
+        case 42:
         case "end":
           return _context10.stop();
       }
-    }, _callee10, this, [[4, 31]]);
+    }, _callee10, this, [[4, 33]]);
   }));
   return function (_x11) {
     return _ref17.apply(this, arguments);
@@ -1018,7 +1051,7 @@ exports.DeleteFiles = /*#__PURE__*/function () {
  * @param {string=} versionHash - Hash of the object version - if not specified, latest version will be used
  * @param {string=} writeToken - Write token for the draft from which to download the file
  * @param {string} filePath - Path to the file to download
- * @param {string=} format="blob" - Format in which to return the data ("blob" | "arraybuffer" | "buffer)
+ * @param {string=} format="arrayBuffer" - Format in which to return the data ("blob" | "arraybuffer" | "buffer")
  * @param {boolean=} chunked=false - If specified, file will be downloaded and decrypted in chunks. The
  * specified callback will be invoked on completion of each chunk. This is recommended for large files.
  * @param {number=} chunkSize=1000000 - Size of file chunks to request for download
@@ -1098,6 +1131,7 @@ exports.DownloadFile = /*#__PURE__*/function () {
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
+            versionHash: versionHash,
             metadataSubtree: ownerCapKey
           });
         case 17:

package/package.json

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

package/src/AuthorizationClient.js

@@ -192,7 +192,7 @@ class AuthorizationClient {
     if(encryption && encryption !== "none" && objectId && await this.AccessType(objectId) === ACCESS_TYPES.OBJECT) {
       const owner = await this.Owner({id: objectId});
       const ownerCapKey = `eluv.caps.iusr${Utils.AddressToHash(this.client.signer.address)}`;
-      const ownerCap = await this.client.ContentObjectMetadata({libraryId, objectId, metadataSubtree: ownerCapKey});
+      const ownerCap = await this.client.ContentObjectMetadata({libraryId, objectId, versionHash, metadataSubtree: ownerCapKey});
 
       if(!Utils.EqualAddress(owner, this.client.signer.address) && !ownerCap) {
         const cap = await this.ReEncryptionConk({libraryId, objectId});

package/src/client/ContentAccess.js

@@ -2477,7 +2477,7 @@ exports.EncryptionConk = async function({libraryId, objectId, versionHash, write
   const owner = await this.authClient.Owner({id: objectId});
 
   const ownerCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
-  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, metadataSubtree: ownerCapKey});
+  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, metadataSubtree: ownerCapKey});
 
   if(!this.utils.EqualAddress(owner, this.signer.address) && !ownerCap) {
     if(download) {

package/src/client/Files.js

@@ -387,7 +387,16 @@ exports.UploadFiles = async function({libraryId, objectId, writeToken, fileInfo,
     for(let f = 0; f < files.length; f++) {
       const fileInfo = files[f];
 
-      await this.UploadFileData({libraryId, objectId, writeToken, uploadId: id, jobId, fileData: fileInfo.data});
+      await this.UploadFileData({
+        libraryId,
+        objectId,
+        writeToken,
+        uploadId: id,
+        jobId,
+        filePath: fileInfo.path,
+        fileData: fileInfo.data,
+        encryption
+      });
 
       delete jobSpecs[j].files[f].data;
       uploaded += fileInfo.len;
@@ -487,30 +496,53 @@ exports.UploadJobStatus = async function({libraryId, objectId, writeToken, uploa
 
   const path = UrlJoin("q", writeToken, "file_jobs", uploadId, "uploads", jobId);
 
-  return this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
-      method: "GET",
-      path: path,
-      failover: false
-    })
-  );
+  // This request is sent during file data upload and might fail due to congestion
+  let retries = 0;
+  do {
+    try {
+      let jobStatus = this.utils.ResponseToJson(
+        this.HttpClient.Request({
+          headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
+          method: "GET",
+          path: path,
+          failover: false
+        })
+      );
+      return jobStatus;
+    } catch(error) {
+      this.Log(error, true);
+
+      retries += 1;
+      if(retries >= 5) {
+        throw error;
+      }
+      await new Promise(resolve => setTimeout(resolve, 10 * retries * 1000));
+    }
+  } while(retries < 5);
+
 };
 
-exports.UploadFileData = async function({libraryId, objectId, writeToken, uploadId, jobId, fileData}) {
+exports.UploadFileData = async function({libraryId, objectId, writeToken, encryption, uploadId, jobId, filePath, fileData}) {
   ValidateParameters({libraryId, objectId});
   ValidateWriteToken(writeToken);
 
   let retries = 0;
   do {
     try {
+
       const jobStatus = await this.UploadJobStatus({libraryId, objectId, writeToken, uploadId, jobId});
 
-      if(jobStatus.rem === 0) {
+      // Find the status of this file
+      let fileStatus = jobStatus.files.find(item => item.path == filePath);
+      if(encryption && encryption !== "none") {
+        fileStatus = fileStatus.encrypted;
+      }
+
+      if(fileStatus.rem === 0) {
         // Job is actually done
         return;
-      } else if(jobStatus.skip) {
-        fileData = fileData.slice(jobStatus.skip);
+      } else if(fileStatus.skip) {
+        fileData = fileData.slice(fileStatus.skip);
       }
 
       let path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
@@ -616,7 +648,7 @@ exports.DeleteFiles = async function({libraryId, objectId, writeToken, filePaths
  * @param {string=} versionHash - Hash of the object version - if not specified, latest version will be used
  * @param {string=} writeToken - Write token for the draft from which to download the file
  * @param {string} filePath - Path to the file to download
- * @param {string=} format="blob" - Format in which to return the data ("blob" | "arraybuffer" | "buffer)
+ * @param {string=} format="arrayBuffer" - Format in which to return the data ("blob" | "arraybuffer" | "buffer")
  * @param {boolean=} chunked=false - If specified, file will be downloaded and decrypted in chunks. The
  * specified callback will be invoked on completion of each chunk. This is recommended for large files.
  * @param {number=} chunkSize=1000000 - Size of file chunks to request for download
@@ -668,7 +700,7 @@ exports.DownloadFile = async function({
 
   // If not owner, indicate re-encryption
   const ownerCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
-  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, metadataSubtree: ownerCapKey});
+  const ownerCap = await this.ContentObjectMetadata({libraryId, objectId, versionHash, metadataSubtree: ownerCapKey});
 
   if(encrypted && !this.utils.EqualAddress(this.signer.address, await this.ContentObjectOwner({objectId})) && !ownerCap) {
     headers["X-Content-Fabric-Decryption-Mode"] = "reencrypt";