@aws-amplify/storage 5.6.4-api-v6.2 → 5.6.4-api-v6.13

package/lib-esm/providers/AWSS3UploadTask.js

@@ -1,11 +1,81 @@
-import { __awaiter, __generator, __read, __spread } from "tslib";
-import { UploadPartCommand, CompleteMultipartUploadCommand, AbortMultipartUploadCommand, ListPartsCommand, CreateMultipartUploadCommand, ListObjectsV2Command, } from '@aws-sdk/client-s3';
-import axios from 'axios';
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { Logger } from '@aws-amplify/core';
+import { createMultipartUpload, uploadPart, listObjectsV2, listParts, completeMultipartUpload, abortMultipartUpload, } from '../AwsClients/S3';
+import { isCancelError, CANCELED_ERROR_MESSAGE } from '../AwsClients/S3/utils';
 import { calculatePartSize, DEFAULT_PART_SIZE, DEFAULT_QUEUE_SIZE, MAX_OBJECT_SIZE, } from '../common/S3ClientUtils';
 import { byteLength, isFile } from '../common/StorageUtils';
-import { AWSS3ProviderUploadErrorStrings } from '../common/StorageErrorStrings';
-import { SET_CONTENT_LENGTH_HEADER, UPLOADS_STORAGE_KEY, } from '../common/StorageConstants';
+import { UPLOADS_STORAGE_KEY } from '../common/StorageConstants';
 var logger = new Logger('AWSS3UploadTask');
 export var AWSS3UploadTaskState;
 (function (AWSS3UploadTaskState) {
@@ -27,7 +97,7 @@ function comparePartNumber(a, b) {
 }
 var AWSS3UploadTask = /** @class */ (function () {
     function AWSS3UploadTask(_a) {
-        var s3Client = _a.s3Client, file = _a.file, emitter = _a.emitter, storage = _a.storage, params = _a.params, level = _a.level, prefixPromise = _a.prefixPromise;
+        var s3Config = _a.s3Config, file = _a.file, emitter = _a.emitter, storage = _a.storage, params = _a.params, level = _a.level, prefixPromise = _a.prefixPromise;
         this.queueSize = DEFAULT_QUEUE_SIZE;
         this.partSize = DEFAULT_PART_SIZE;
         this.inProgress = [];
@@ -37,8 +107,7 @@ var AWSS3UploadTask = /** @class */ (function () {
         this.totalBytes = 0;
         this.state = AWSS3UploadTaskState.INIT;
         this.prefixPromise = prefixPromise;
-        this.s3client = s3Client;
-        this.s3client.middlewareStack.remove(SET_CONTENT_LENGTH_HEADER);
+        this.s3Config = s3Config;
         this.storage = storage;
         this.storageSync = Promise.resolve();
         if (typeof this.storage['sync'] === 'function') {
@@ -60,33 +129,32 @@ var AWSS3UploadTask = /** @class */ (function () {
         get: function () {
             return (this.bytesUploaded / this.totalBytes) * 100;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(AWSS3UploadTask.prototype, "isInProgress", {
         get: function () {
             return this.state === AWSS3UploadTaskState.IN_PROGRESS;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     AWSS3UploadTask.prototype._listSingleFile = function (_a) {
         var key = _a.key, bucket = _a.bucket;
         return __awaiter(this, void 0, void 0, function () {
-            var listObjectRes, _b, Contents, prefix, obj;
+            var objectKeyPrefix, _b, Contents, obj;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.s3client.send(new ListObjectsV2Command({
-                            Bucket: bucket,
-                            Prefix: key,
-                        }))];
+                    case 0: return [4 /*yield*/, this.prefixPromise];
                     case 1:
-                        listObjectRes = _c.sent();
-                        _b = listObjectRes.Contents, Contents = _b === void 0 ? [] : _b;
-                        return [4 /*yield*/, this.prefixPromise];
+                        objectKeyPrefix = _c.sent();
+                        return [4 /*yield*/, listObjectsV2(this.s3Config, {
+                                Bucket: bucket,
+                                Prefix: objectKeyPrefix + key,
+                            })];
                     case 2:
-                        prefix = _c.sent();
-                        obj = Contents.find(function (o) { return o.Key === "" + prefix + key; });
+                        _b = (_c.sent()).Contents, Contents = _b === void 0 ? [] : _b;
+                        obj = Contents.find(function (o) { return o.Key === "".concat(objectKeyPrefix).concat(key); });
                         return [2 /*return*/, obj];
                 }
             });
@@ -117,12 +185,13 @@ var AWSS3UploadTask = /** @class */ (function () {
     };
     AWSS3UploadTask.prototype._findCachedUploadParts = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var uploadRequests, cachedUploadFileData, listPartsOutput;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var uploadRequests, cachedUploadFileData, _a, Parts, _b, _c;
+            var _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4 /*yield*/, this._listCachedUploadTasks()];
                     case 1:
-                        uploadRequests = _a.sent();
+                        uploadRequests = _e.sent();
                         if (Object.keys(uploadRequests).length === 0 ||
                             !Object.prototype.hasOwnProperty.call(uploadRequests, this.fileId)) {
                             return [2 /*return*/, { parts: [], uploadId: null }];
@@ -130,15 +199,19 @@ var AWSS3UploadTask = /** @class */ (function () {
                         cachedUploadFileData = uploadRequests[this.fileId];
                         cachedUploadFileData.lastTouched = Date.now();
                         this.storage.setItem(UPLOADS_STORAGE_KEY, JSON.stringify(uploadRequests));
-                        return [4 /*yield*/, this.s3client.send(new ListPartsCommand({
-                                Bucket: this.params.Bucket,
-                                Key: this.params.Key,
-                                UploadId: cachedUploadFileData.uploadId,
-                            }))];
-                    case 2:
-                        listPartsOutput = _a.sent();
+                        _b = listParts;
+                        _c = [this.s3Config];
+                        _d = {
+                            Bucket: this.params.Bucket
+                        };
+                        return [4 /*yield*/, this.prefixPromise];
+                    case 2: return [4 /*yield*/, _b.apply(void 0, _c.concat([(_d.Key = (_e.sent()) + this.params.Key,
+                                _d.UploadId = cachedUploadFileData.uploadId,
+                                _d)]))];
+                    case 3:
+                        _a = (_e.sent()).Parts, Parts = _a === void 0 ? [] : _a;
                         return [2 /*return*/, {
-                                parts: listPartsOutput.Parts || [],
+                                parts: Parts,
                                 uploadId: cachedUploadFileData.uploadId,
                             }];
                 }
@@ -150,7 +223,7 @@ var AWSS3UploadTask = /** @class */ (function () {
     };
     AWSS3UploadTask.prototype._validateParams = function () {
         if (this.totalBytes > MAX_OBJECT_SIZE) {
-            throw new Error("File size bigger than S3 Object limit of 5TB, got " + this.totalBytes + " Bytes");
+            throw new Error("File size bigger than S3 Object limit of 5TB, got ".concat(this.totalBytes, " Bytes"));
         }
     };
     AWSS3UploadTask.prototype._listCachedUploadTasks = function () {
@@ -190,8 +263,7 @@ var AWSS3UploadTask = /** @class */ (function () {
                     case 0:
                         _b = (_a = Object.prototype.hasOwnProperty).call;
                         return [4 /*yield*/, this._listCachedUploadTasks()];
-                    case 1: return [2 /*return*/, _b.apply(_a, [_c.sent(),
-                            this.fileId])];
+                    case 1: return [2 /*return*/, _b.apply(_a, [_c.sent(), this.fileId])];
                 }
             });
         });
@@ -236,63 +308,72 @@ var AWSS3UploadTask = /** @class */ (function () {
     };
     AWSS3UploadTask.prototype._completeUpload = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var err_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, _b, err_1;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.s3client.send(new CompleteMultipartUploadCommand({
-                                Bucket: this.params.Bucket,
-                                Key: this.params.Key,
-                                UploadId: this.uploadId,
-                                MultipartUpload: {
+                        _d.trys.push([0, 4, , 5]);
+                        _a = completeMultipartUpload;
+                        _b = [this.s3Config];
+                        _c = {
+                            Bucket: this.params.Bucket
+                        };
+                        return [4 /*yield*/, this.prefixPromise];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.Key = (_d.sent()) + this.params.Key,
+                                _c.UploadId = this.uploadId,
+                                _c.MultipartUpload = {
                                     // Parts are not always completed in order, we need to manually sort them
-                                    Parts: this.completedParts.sort(comparePartNumber),
+                                    Parts: __spreadArray([], __read(this.completedParts), false).sort(comparePartNumber),
                                 },
-                            }))];
-                    case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this._verifyFileSize()];
+                                _c)]))];
                     case 2:
-                        _a.sent();
+                        _d.sent();
+                        return [4 /*yield*/, this._verifyFileSize()];
+                    case 3:
+                        _d.sent();
                         this._emitEvent(TaskEvents.UPLOAD_COMPLETE, {
                             key: this.params.Key,
                         });
                         this._removeFromCache();
                         this.state = AWSS3UploadTaskState.COMPLETED;
-                        return [3 /*break*/, 4];
-                    case 3:
-                        err_1 = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_1 = _d.sent();
                         logger.error('error completing upload', err_1);
                         this._emitEvent(TaskEvents.ERROR, err_1);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
-    AWSS3UploadTask.prototype._makeUploadPartRequest = function (input, cancelTokenSource) {
+    AWSS3UploadTask.prototype._makeUploadPartRequest = function (input, abortSignal) {
         return __awaiter(this, void 0, void 0, function () {
-            var res, err_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var res, _a, _b, _c, err_2;
+            var _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.s3client.send(new UploadPartCommand(input), {
-                                cancelTokenSource: cancelTokenSource,
-                            })];
-                    case 1:
-                        res = _a.sent();
+                        _e.trys.push([0, 4, , 5]);
+                        _a = uploadPart;
+                        _b = [__assign(__assign({}, this.s3Config), { abortSignal: abortSignal })];
+                        _c = [__assign({}, input)];
+                        _d = {};
+                        return [4 /*yield*/, this.prefixPromise];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([__assign.apply(void 0, _c.concat([(_d.Key = (_e.sent()) + this.params.Key, _d)]))]))];
+                    case 2:
+                        res = _e.sent();
                         return [4 /*yield*/, this._onPartUploadCompletion({
                                 eTag: res.ETag,
                                 partNumber: input.PartNumber,
                                 chunk: input.Body,
                             })];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
                     case 3:
-                        err_2 = _a.sent();
+                        _e.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_2 = _e.sent();
                         if (this.state === AWSS3UploadTaskState.PAUSED) {
                             logger.log('upload paused');
                         }
@@ -302,27 +383,26 @@ var AWSS3UploadTask = /** @class */ (function () {
                         else {
                             logger.error('error starting next part of upload: ', err_2);
                         }
-                        // axios' cancel will also throw an error, however we don't need to emit an event in that case as it's an
+                        // xhr transfer handlers' cancel will also throw an error, however we don't need to emit an event in that case as it's an
                         // expected behavior
-                        if (!axios.isCancel(err_2) &&
-                            err_2.message !== AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE) {
+                        if (!isCancelError(err_2) && err_2.message !== CANCELED_ERROR_MESSAGE) {
                             this._emitEvent(TaskEvents.ERROR, err_2);
                             this.pause();
                         }
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
     };
     AWSS3UploadTask.prototype._startNextPart = function () {
         if (this.queued.length > 0 && this.state !== AWSS3UploadTaskState.PAUSED) {
-            var cancelTokenSource = axios.CancelToken.source();
+            var abortController = new AbortController();
             var nextPart = this.queued.shift();
             this.inProgress.push({
                 uploadPartInput: nextPart,
-                s3Request: this._makeUploadPartRequest(nextPart, cancelTokenSource),
-                cancel: cancelTokenSource.cancel,
+                s3Request: this._makeUploadPartRequest(nextPart, abortController.signal),
+                abortController: abortController,
             });
         }
     };
@@ -399,12 +479,19 @@ var AWSS3UploadTask = /** @class */ (function () {
     };
     AWSS3UploadTask.prototype._initMultipartUpload = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var res;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.s3client.send(new CreateMultipartUploadCommand(this.params))];
-                    case 1:
-                        res = _a.sent();
+            var res, _a, _b, _c;
+            var _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        _a = createMultipartUpload;
+                        _b = [this.s3Config];
+                        _c = [__assign({}, this.params)];
+                        _d = {};
+                        return [4 /*yield*/, this.prefixPromise];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([__assign.apply(void 0, _c.concat([(_d.Key = (_e.sent()) + this.params.Key, _d)]))]))];
+                    case 2:
+                        res = _e.sent();
                         this._cache({
                             uploadId: res.UploadId,
                             lastTouched: Date.now(),
@@ -437,7 +524,12 @@ var AWSS3UploadTask = /** @class */ (function () {
                         this.uploadId = uploadId;
                         this.queued = this._createParts();
                         this._initCachedUploadParts(parts);
-                        this._startUpload();
+                        if (this._isDone()) {
+                            this._completeUpload();
+                        }
+                        else {
+                            this._startUpload();
+                        }
                         return [3 /*break*/, 6];
                     case 4:
                         if (!!this.uploadId) return [3 /*break*/, 6];
@@ -451,7 +543,7 @@ var AWSS3UploadTask = /** @class */ (function () {
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         err_3 = _b.sent();
-                        if (!axios.isCancel(err_3)) {
+                        if (!isCancelError(err_3)) {
                             logger.error('Error initializing the upload task', err_3);
                             this._emitEvent(TaskEvents.ERROR, err_3);
                         }
@@ -488,9 +580,10 @@ var AWSS3UploadTask = /** @class */ (function () {
     };
     AWSS3UploadTask.prototype._cancel = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var err_4;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, _b, err_4;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (!(this.state === AWSS3UploadTaskState.CANCELLED)) return [3 /*break*/, 1];
                         logger.warn('This task has already been cancelled');
@@ -505,25 +598,29 @@ var AWSS3UploadTask = /** @class */ (function () {
                         this.completedParts = [];
                         this.bytesUploaded = 0;
                         this.state = AWSS3UploadTaskState.CANCELLED;
-                        _a.label = 3;
+                        _d.label = 3;
                     case 3:
-                        _a.trys.push([3, 6, , 7]);
-                        return [4 /*yield*/, this.s3client.send(new AbortMultipartUploadCommand({
-                                Bucket: this.params.Bucket,
-                                Key: this.params.Key,
-                                UploadId: this.uploadId,
-                            }))];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, this._removeFromCache()];
+                        _d.trys.push([3, 7, , 8]);
+                        _a = abortMultipartUpload;
+                        _b = [this.s3Config];
+                        _c = {
+                            Bucket: this.params.Bucket
+                        };
+                        return [4 /*yield*/, this.prefixPromise];
+                    case 4: return [4 /*yield*/, _a.apply(void 0, _b.concat([(_c.Key = (_d.sent()) + this.params.Key,
+                                _c.UploadId = this.uploadId,
+                                _c)]))];
                     case 5:
-                        _a.sent();
-                        return [2 /*return*/, true];
+                        _d.sent();
+                        return [4 /*yield*/, this._removeFromCache()];
                     case 6:
-                        err_4 = _a.sent();
+                        _d.sent();
+                        return [2 /*return*/, true];
+                    case 7:
+                        err_4 = _d.sent();
                         logger.error('Error cancelling upload task', err_4);
                         return [2 /*return*/, false];
-                    case 7: return [2 /*return*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });
@@ -543,16 +640,15 @@ var AWSS3UploadTask = /** @class */ (function () {
             logger.warn('This task is already paused');
         }
         this.state = AWSS3UploadTaskState.PAUSED;
-        // Use axios cancel token to abort the part request immediately
+        // Abort the part request immediately
         // Add the inProgress parts back to pending
         var removedInProgressReq = this.inProgress.splice(0, this.inProgress.length);
         removedInProgressReq.forEach(function (req) {
-            req.cancel(AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE);
+            req.abortController.abort();
         });
         // Put all removed in progress parts back into the queue
-        (_a = this.queued).unshift.apply(_a, __spread(removedInProgressReq.map(function (req) { return req.uploadPartInput; })));
+        (_a = this.queued).unshift.apply(_a, __spreadArray([], __read(removedInProgressReq.map(function (req) { return req.uploadPartInput; })), false));
     };
     return AWSS3UploadTask;
 }());
 export { AWSS3UploadTask };
-//# sourceMappingURL=AWSS3UploadTask.js.map

package/lib-esm/providers/index.js

@@ -1,2 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 export { AWSS3Provider } from './AWSS3Provider';
-//# sourceMappingURL=index.js.map