@aws-amplify/storage 4.4.23 → 4.4.24-unstable.4

package/dist/aws-amplify-storage.js

@@ -49533,7 +49533,7 @@ function () {
     this.params = null;
     this.opts = null;
     this.completedParts = [];
-    this.cancel = false; // Progress reporting
+    this.uploadId = null; // Progress reporting
 
     this.bytesUploaded = 0;
     this.totalBytesToUpload = 0;
@@ -49546,20 +49546,22 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.upload = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var _a, putObjectCommand, uploadId, numberOfPartsToUpload, parts, start;
+      var _a, putObjectCommand, _b, numberOfPartsToUpload, parts, start, error_1;
 
       var _this = this;
 
-      return __generator(this, function (_b) {
-        switch (_b.label) {
+      return __generator(this, function (_c) {
+        switch (_c.label) {
           case 0:
+            _c.trys.push([0, 10,, 12]);
+
             _a = this;
             return [4
             /*yield*/
             , this.validateAndSanitizeBody(this.params.Body)];
 
           case 1:
-            _a.body = _b.sent();
+            _a.body = _c.sent();
             this.totalBytesToUpload = this.byteLength(this.body);
             if (!(this.totalBytesToUpload <= this.minPartSize)) return [3
             /*break*/
@@ -49572,107 +49574,113 @@ function () {
             , this.s3client.send(putObjectCommand)];
 
           case 2:
+            // Step 1: Initiate the multi part upload
+            _b = this;
             return [4
             /*yield*/
             , this.createMultiPartUpload()];
 
           case 3:
-            uploadId = _b.sent();
+            // Step 1: Initiate the multi part upload
+            _b.uploadId = _c.sent();
             numberOfPartsToUpload = Math.ceil(this.totalBytesToUpload / this.minPartSize);
             parts = this.createParts();
             start = 0;
-            _b.label = 4;
+            _c.label = 4;
 
           case 4:
             if (!(start < numberOfPartsToUpload)) return [3
             /*break*/
-            , 9];
-            /** This first block will try to cancel the upload if the cancel
-             *	request came before any parts uploads have started.
-             **/
+            , 7]; // Upload as many as `queueSize` parts simultaneously
 
             return [4
             /*yield*/
-            , this.checkIfUploadCancelled(uploadId)];
+            , this.uploadParts(this.uploadId, parts.slice(start, start + this.queueSize))];
 
           case 5:
-            /** This first block will try to cancel the upload if the cancel
-             *	request came before any parts uploads have started.
-             **/
-            _b.sent(); // Upload as many as `queueSize` parts simultaneously
-
-
-            return [4
-            /*yield*/
-            , this.uploadParts(uploadId, parts.slice(start, start + this.queueSize))];
-
-          case 6:
             // Upload as many as `queueSize` parts simultaneously
-            _b.sent();
-            /** Call cleanup a second time in case there were part upload requests
-             *  in flight. This is to ensure that all parts are cleaned up.
-             */
-
-
-            return [4
-            /*yield*/
-            , this.checkIfUploadCancelled(uploadId)];
-
-          case 7:
-            /** Call cleanup a second time in case there were part upload requests
-             *  in flight. This is to ensure that all parts are cleaned up.
-             */
-            _b.sent();
+            _c.sent();
 
-            _b.label = 8;
+            _c.label = 6;
 
-          case 8:
+          case 6:
             start += this.queueSize;
             return [3
             /*break*/
             , 4];
 
-          case 9:
+          case 7:
             parts.map(function (part) {
               _this.removeEventListener(part);
             });
             return [4
             /*yield*/
-            , this.finishMultiPartUpload(uploadId)];
+            , this.finishMultiPartUpload(this.uploadId)];
 
-          case 10:
+          case 8:
             // Step 3: Finalize the upload such that S3 can recreate the file
             return [2
             /*return*/
-            , _b.sent()];
+            , _c.sent()];
+
+          case 9:
+            return [3
+            /*break*/
+            , 12];
+
+          case 10:
+            error_1 = _c.sent(); // if any error is thrown, call cleanup
+
+            return [4
+            /*yield*/
+            , this.cleanup(this.uploadId)];
+
+          case 11:
+            // if any error is thrown, call cleanup
+            _c.sent();
+
+            logger.error('Error. Cancelling the multipart upload.');
+            throw error_1;
+
+          case 12:
+            return [2
+            /*return*/
+            ];
         }
       });
     });
   };
 
   AWSS3ProviderManagedUpload.prototype.createParts = function () {
-    var parts = [];
+    try {
+      var parts = [];
+
+      for (var bodyStart = 0; bodyStart < this.totalBytesToUpload;) {
+        var bodyEnd = Math.min(bodyStart + this.minPartSize, this.totalBytesToUpload);
+        parts.push({
+          bodyPart: this.body.slice(bodyStart, bodyEnd),
+          partNumber: parts.length + 1,
+          emitter: new events__WEBPACK_IMPORTED_MODULE_3__["EventEmitter"](),
+          _lastUploadedBytes: 0
+        });
+        bodyStart += this.minPartSize;
+      }
 
-    for (var bodyStart = 0; bodyStart < this.totalBytesToUpload;) {
-      var bodyEnd = Math.min(bodyStart + this.minPartSize, this.totalBytesToUpload);
-      parts.push({
-        bodyPart: this.body.slice(bodyStart, bodyEnd),
-        partNumber: parts.length + 1,
-        emitter: new events__WEBPACK_IMPORTED_MODULE_3__["EventEmitter"](),
-        _lastUploadedBytes: 0
-      });
-      bodyStart += this.minPartSize;
+      return parts;
+    } catch (error) {
+      logger.error(error);
+      throw error;
     }
-
-    return parts;
   };
 
   AWSS3ProviderManagedUpload.prototype.createMultiPartUpload = function () {
     return __awaiter(this, void 0, void 0, function () {
-      var createMultiPartUploadCommand, response;
+      var createMultiPartUploadCommand, response, error_2;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
+            _a.trys.push([0, 2,, 3]);
+
             createMultiPartUploadCommand = new _aws_sdk_client_s3__WEBPACK_IMPORTED_MODULE_1__["CreateMultipartUploadCommand"](this.params);
             return [4
             /*yield*/
@@ -49684,6 +49692,16 @@ function () {
             return [2
             /*return*/
             , response.UploadId];
+
+          case 2:
+            error_2 = _a.sent();
+            logger.error(error_2);
+            throw error_2;
+
+          case 3:
+            return [2
+            /*return*/
+            ];
         }
       });
     });
@@ -49696,7 +49714,7 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.uploadParts = function (uploadId, parts) {
     return __awaiter(this, void 0, void 0, function () {
-      var allResults, i, error_1;
+      var allResults, i, error_3;
 
       var _this = this;
 
@@ -49760,12 +49778,9 @@ function () {
             , 3];
 
           case 2:
-            error_1 = _a.sent();
-            logger.error('error happened while uploading a part. Cancelling the multipart upload', error_1);
-            this.cancelUpload();
-            return [2
-            /*return*/
-            ];
+            error_3 = _a.sent();
+            logger.error('Error happened while uploading a part. Cancelling the multipart upload');
+            throw error_3;
 
           case 3:
             return [2
@@ -49778,7 +49793,7 @@ function () {
 
   AWSS3ProviderManagedUpload.prototype.finishMultiPartUpload = function (uploadId) {
     return __awaiter(this, void 0, void 0, function () {
-      var input, completeUploadCommand, data, error_2;
+      var input, completeUploadCommand, data, error_4;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -49807,59 +49822,11 @@ function () {
             , data.Key];
 
           case 3:
-            error_2 = _a.sent();
-            logger.error('error happened while finishing the upload. Cancelling the multipart upload', error_2);
-            this.cancelUpload();
-            return [2
-            /*return*/
-            ];
-
-          case 4:
-            return [2
-            /*return*/
-            ];
-        }
-      });
-    });
-  };
-
-  AWSS3ProviderManagedUpload.prototype.checkIfUploadCancelled = function (uploadId) {
-    return __awaiter(this, void 0, void 0, function () {
-      var errorMessage, error_3;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            if (!this.cancel) return [3
-            /*break*/
-            , 5];
-            errorMessage = 'Upload was cancelled.';
-            _a.label = 1;
-
-          case 1:
-            _a.trys.push([1, 3,, 4]);
-
-            return [4
-            /*yield*/
-            , this.cleanup(uploadId)];
-
-          case 2:
-            _a.sent();
-
-            return [3
-            /*break*/
-            , 4];
-
-          case 3:
-            error_3 = _a.sent();
-            errorMessage += " " + error_3.message;
-            return [3
-            /*break*/
-            , 4];
+            error_4 = _a.sent();
+            logger.error('Error happened while finishing the upload.');
+            throw error_4;
 
           case 4:
-            throw new Error(errorMessage);
-
-          case 5:
             return [2
             /*return*/
             ];
@@ -49868,10 +49835,6 @@ function () {
     });
   };
 
-  AWSS3ProviderManagedUpload.prototype.cancelUpload = function () {
-    this.cancel = true;
-  };
-
   AWSS3ProviderManagedUpload.prototype.cleanup = function (uploadId) {
     return __awaiter(this, void 0, void 0, function () {
       var input, data;
@@ -49903,7 +49866,7 @@ function () {
             data = _a.sent();
 
             if (data && data.Parts && data.Parts.length > 0) {
-              throw new Error('Multi Part upload clean up failed');
+              throw new Error('Multipart upload clean up failed.');
             }
 
             return [2