@eluvio/elv-client-js 4.0.18 → 4.0.20

package/dist/src/FrameClient.js

@@ -422,7 +422,7 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "FileMethods",
     value: function FileMethods() {
-      return ["DownloadFile", "DownloadPart", "UpdateContentObjectGraph", "UploadFiles", "UploadFilesFromS3", "UploadPart", "UploadPartChunk"];
+      return ["CreateFileUploadJob", "DownloadEncrypted", "DownloadFile", "DownloadPart", "FinalizeUploadJob", "UpdateContentObjectGraph", "UploadFileData", "UploadFiles", "UploadFilesFromS3", "UploadJobStatus", "UploadPart", "UploadPartChunk", "UploadStatus"];
     }
   }]);
   return FrameClient;

package/dist/src/client/Files.js

@@ -534,6 +534,7 @@ exports.UploadFiles = /*#__PURE__*/function () {
                       writeToken: writeToken,
                       uploadId: id,
                       jobId: jobId,
+                      filePath: _fileInfo2.path,
                       fileData: _fileInfo2.data
                     });
                   case 12:
@@ -558,8 +559,10 @@ exports.UploadFiles = /*#__PURE__*/function () {
             return function UploadJob(_x4, _x5) {
               return _ref8.apply(this, arguments);
             };
-          }(); // Preparing jobs is done asyncronously
-          PrepareJobs();
+          }(); // Preparing jobs is done asynchronously
+          PrepareJobs()["catch"](function (e) {
+            throw e;
+          });
 
           // Upload the first several chunks in sequence, to determine average upload rate
           rateTestJobs = Math.min(3, jobs.length);
@@ -726,7 +729,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, jobStatus;
     return _regeneratorRuntime.wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -736,16 +739,18 @@ 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
+        case 4:
+          _context9.prev = 4;
           _context9.t0 = this.utils;
           _context9.t1 = this.HttpClient;
-          _context9.next = 8;
+          _context9.next = 9;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 8:
+        case 9:
           _context9.t2 = _context9.sent;
           _context9.t3 = path;
           _context9.t4 = {
@@ -755,12 +760,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 17:
+          _context9.prev = 17;
+          _context9.t6 = _context9["catch"](4);
+          this.Log(_context9.t6, true);
+          retries += 1;
+          if (!(retries >= 5)) {
+            _context9.next = 23;
+            break;
+          }
+          throw _context9.t6;
+        case 23:
+          _context9.next = 25;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 10 * retries * 1000);
+          });
+        case 25:
+          if (retries < 5) {
+            _context9.next = 4;
+            break;
+          }
+        case 26:
         case "end":
           return _context9.stop();
       }
-    }, _callee9, this);
+    }, _callee9, this, [[4, 17]]);
   }));
   return function (_x10) {
     return _ref15.apply(this, arguments);
@@ -768,16 +794,43 @@ exports.UploadJobStatus = /*#__PURE__*/function () {
 }();
 exports.UploadFileData = /*#__PURE__*/function () {
   var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref16) {
-    var libraryId, objectId, writeToken, uploadId, jobId, fileData, path;
+    var libraryId, objectId, writeToken, 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, uploadId = _ref16.uploadId, jobId = _ref16.jobId, filePath = _ref16.filePath, fileData = _ref16.fileData;
           ValidateParameters({
             libraryId: libraryId,
             objectId: objectId
           });
           ValidateWriteToken(writeToken);
+          retries = 0;
+        case 4:
+          _context10.prev = 4;
+          _context10.next = 7;
+          return this.UploadJobStatus({
+            libraryId: libraryId,
+            objectId: objectId,
+            writeToken: writeToken,
+            uploadId: uploadId,
+            jobId: jobId
+          });
+        case 7:
+          jobStatus = _context10.sent;
+          // Find the status of this file
+          fileStatus = jobStatus.files.find(function (item) {
+            return item.path == filePath;
+          });
+          if (!(fileStatus.rem === 0)) {
+            _context10.next = 13;
+            break;
+          }
+          return _context10.abrupt("return");
+        case 13:
+          if (fileStatus.skip) {
+            fileData = fileData.slice(fileStatus.skip);
+          }
+        case 14:
           path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
           _context10.t0 = this.utils;
           _context10.t1 = this.HttpClient;
@@ -787,13 +840,13 @@ exports.UploadFileData = /*#__PURE__*/function () {
           _context10.t5 = {
             "Content-type": "application/octet-stream"
           };
-          _context10.next = 12;
+          _context10.next = 23;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 12:
+        case 23:
           _context10.t6 = _context10.sent;
           _context10.t7 = (0, _context10.t4)(_context10.t5, _context10.t6);
           _context10.t8 = {
@@ -805,13 +858,35 @@ exports.UploadFileData = /*#__PURE__*/function () {
             failover: false
           };
           _context10.t9 = _context10.t1.Request.call(_context10.t1, _context10.t8);
-          _context10.next = 18;
+          _context10.next = 29;
           return _context10.t0.ResponseToJson.call(_context10.t0, _context10.t9);
-        case 18:
+        case 29:
+          return _context10.abrupt("return", _context10.sent);
+        case 32:
+          _context10.prev = 32;
+          _context10.t10 = _context10["catch"](4);
+          this.Log(_context10.t10, true);
+          retries += 1;
+          if (!(retries >= 5)) {
+            _context10.next = 38;
+            break;
+          }
+          throw _context10.t10;
+        case 38:
+          _context10.next = 40;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 10 * retries * 1000);
+          });
+        case 40:
+          if (retries < 5) {
+            _context10.next = 4;
+            break;
+          }
+        case 41:
         case "end":
           return _context10.stop();
       }
-    }, _callee10, this);
+    }, _callee10, this, [[4, 32]]);
   }));
   return function (_x11) {
     return _ref17.apply(this, arguments);

package/dist/src/walletClient/ClientMethods.js

@@ -2482,8 +2482,6 @@ exports.RejectMarketplaceOffer = /*#__PURE__*/function () {
 /* Voting */
 
 /**
- * <b><i>Requires login</i></b>
- *
  * Retrieve the current status of the specified voting event
  *
  * @methodGroup Voting

package/package.json

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

package/src/FrameClient.js

@@ -54,7 +54,6 @@ class FrameClient {
     this.Crypto = Crypto;
     this.Crypto.ElvCrypto();
 
-
     // Dynamically defined methods defined in AllowedMethods
     for(const methodName of this.AllowedMethods()){
       this[methodName] = async (args) => {
@@ -258,13 +257,19 @@ class FrameClient {
 
   static FileMethods() {
     return [
+      "CreateFileUploadJob",
+      "DownloadEncrypted",
       "DownloadFile",
       "DownloadPart",
+      "FinalizeUploadJob",
       "UpdateContentObjectGraph",
+      "UploadFileData",
       "UploadFiles",
       "UploadFilesFromS3",
+      "UploadJobStatus",
       "UploadPart",
-      "UploadPartChunk"
+      "UploadPartChunk",
+      "UploadStatus"
     ];
   }
 

package/src/client/Files.js

@@ -387,7 +387,7 @@ 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});
 
       delete jobSpecs[j].files[f].data;
       uploaded += fileInfo.len;
@@ -403,8 +403,10 @@ exports.UploadFiles = async function({libraryId, objectId, writeToken, fileInfo,
     }
   };
 
-  // Preparing jobs is done asyncronously
-  PrepareJobs();
+  // Preparing jobs is done asynchronously
+  PrepareJobs().catch(e => {
+    throw e;
+  });
 
   // Upload the first several chunks in sequence, to determine average upload rate
   const rateTestJobs = Math.min(3, jobs.length);
@@ -485,35 +487,80 @@ 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
+  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, uploadId, jobId, filePath, fileData}) {
   ValidateParameters({libraryId, objectId});
   ValidateWriteToken(writeToken);
 
-  let path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
+  let retries = 0;
+  do {
+    try {
 
-  await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      method: "POST",
-      path: path,
-      body: fileData,
-      bodyType: "BINARY",
-      headers: {
-        "Content-type": "application/octet-stream",
-        ...(await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}))
-      },
-      failover: false
-    })
-  );
+      const jobStatus = await this.UploadJobStatus({libraryId, objectId, writeToken, uploadId, jobId});
+
+      // Find the status of this file
+      const fileStatus = jobStatus.files.find(item => {
+        return item.path == filePath
+      });
+
+      if(fileStatus.rem === 0) {
+        // Job is actually done
+        return;
+      } else if(fileStatus.skip) {
+        fileData = fileData.slice(fileStatus.skip);
+      }
+
+      let path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
+
+      return await this.utils.ResponseToJson(
+        this.HttpClient.Request({
+          method: "POST",
+          path: path,
+          body: fileData,
+          bodyType: "BINARY",
+          headers: {
+            "Content-type": "application/octet-stream",
+            ...(await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}))
+          },
+          failover: false
+        })
+      );
+    } 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.FinalizeUploadJob = async function({libraryId, objectId, writeToken}) {

package/src/walletClient/ClientMethods.js

@@ -1481,8 +1481,6 @@ exports.RejectMarketplaceOffer = async function({offerId}) {
 /* Voting */
 
 /**
- * <b><i>Requires login</i></b>
- *
  * Retrieve the current status of the specified voting event
  *
  * @methodGroup Voting