@eluvio/elv-client-js 4.0.18 → 4.0.19

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

@@ -558,8 +558,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);
@@ -768,7 +770,7 @@ 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, fileData, retries, jobStatus, path;
     return _regeneratorRuntime.wrap(function _callee10$(_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
@@ -778,6 +780,29 @@ exports.UploadFileData = /*#__PURE__*/function () {
             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;
+          if (!(jobStatus.rem === 0)) {
+            _context10.next = 12;
+            break;
+          }
+          return _context10.abrupt("return");
+        case 12:
+          if (jobStatus.skip) {
+            fileData = fileData.slice(jobStatus.skip);
+          }
+        case 13:
           path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
           _context10.t0 = this.utils;
           _context10.t1 = this.HttpClient;
@@ -787,13 +812,13 @@ exports.UploadFileData = /*#__PURE__*/function () {
           _context10.t5 = {
             "Content-type": "application/octet-stream"
           };
-          _context10.next = 12;
+          _context10.next = 22;
           return this.authClient.AuthorizationHeader({
             libraryId: libraryId,
             objectId: objectId,
             update: true
           });
-        case 12:
+        case 22:
           _context10.t6 = _context10.sent;
           _context10.t7 = (0, _context10.t4)(_context10.t5, _context10.t6);
           _context10.t8 = {
@@ -805,13 +830,35 @@ exports.UploadFileData = /*#__PURE__*/function () {
             failover: false
           };
           _context10.t9 = _context10.t1.Request.call(_context10.t1, _context10.t8);
-          _context10.next = 18;
+          _context10.next = 28;
           return _context10.t0.ResponseToJson.call(_context10.t0, _context10.t9);
-        case 18:
+        case 28:
+          return _context10.abrupt("return", _context10.sent);
+        case 31:
+          _context10.prev = 31;
+          _context10.t10 = _context10["catch"](4);
+          this.Log(_context10.t10, true);
+          retries += 1;
+          if (!(retries >= 5)) {
+            _context10.next = 37;
+            break;
+          }
+          throw _context10.t10;
+        case 37:
+          _context10.next = 39;
+          return new Promise(function (resolve) {
+            return setTimeout(resolve, 10 * retries * 1000);
+          });
+        case 39:
+          if (retries < 5) {
+            _context10.next = 4;
+            break;
+          }
+        case 40:
         case "end":
           return _context10.stop();
       }
-    }, _callee10, this);
+    }, _callee10, this, [[4, 31]]);
   }));
   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.19",
   "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

@@ -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);
@@ -499,21 +501,45 @@ exports.UploadFileData = async function({libraryId, objectId, writeToken, upload
   ValidateParameters({libraryId, objectId});
   ValidateWriteToken(writeToken);
 
-  let path = UrlJoin("q", writeToken, "file_jobs", uploadId, jobId);
+  let retries = 0;
+  do {
+    try {
+      const jobStatus = await this.UploadJobStatus({libraryId, objectId, writeToken, uploadId, jobId});
 
-  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
-    })
-  );
+      if(jobStatus.rem === 0) {
+        // Job is actually done
+        return;
+      } else if(jobStatus.skip) {
+        fileData = fileData.slice(jobStatus.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