@aws-amplify/storage 5.6.4-graphql-api-functional-options.1 → 5.6.4-unstable.28bc873.6

package/lib-esm/providers/AWSS3ProviderManagedUpload.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { PutObjectCommandInput, S3Client } from '@aws-sdk/client-s3';
-import * as events from 'events';
+import { PutObjectInput } from '../AwsClients/S3';
+import { EventEmitter } from 'events';
 export declare interface Part {
     bodyPart: any;
     partNumber: number;
-    emitter: events.EventEmitter;
+    emitter: EventEmitter;
     etag?: string;
     _lastUploadedBytes: number;
 }
@@ -13,14 +13,14 @@ export declare class AWSS3ProviderManagedUpload {
     private params;
     private opts;
     private completedParts;
-    private s3client;
+    private s3Config;
     private uploadId;
     private partSize;
     private bytesUploaded;
     private totalBytesToUpload;
     private emitter;
-    constructor(params: PutObjectCommandInput, opts: any, emitter: events.EventEmitter);
-    upload(): Promise<string | import("@aws-sdk/client-s3/types/").PutObjectCommandOutput>;
+    constructor(params: PutObjectInput, opts: any, emitter: EventEmitter);
+    upload(): Promise<string | import("../AwsClients/S3").PutObjectOutput>;
     private createParts;
     private createMultiPartUpload;
     /**
@@ -36,5 +36,5 @@ export declare class AWSS3ProviderManagedUpload {
     private byteLength;
     private validateAndSanitizeBody;
     private isGenericObject;
-    protected _createNewS3Client(config: any, emitter?: events.EventEmitter): S3Client;
+    private getObjectKeyWithPrefix;
 }

package/lib-esm/providers/AWSS3ProviderManagedUpload.js

@@ -1,11 +1,57 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { __assign, __awaiter, __generator } from "tslib";
+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 };
+    }
+};
 import { ConsoleLogger as Logger, StorageAction } from '@aws-amplify/core';
-import { PutObjectCommand, CreateMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, ListPartsCommand, AbortMultipartUploadCommand, } from '@aws-sdk/client-s3';
-import { SEND_UPLOAD_PROGRESS_EVENT, SEND_DOWNLOAD_PROGRESS_EVENT, } from './axios-http-handler';
-import * as events from 'events';
-import { autoAdjustClockskewMiddleware, autoAdjustClockskewMiddlewareOptions, calculatePartSize, createPrefixMiddleware, createS3Client, prefixMiddlewareOptions, DEFAULT_PART_SIZE, DEFAULT_QUEUE_SIZE, MAX_OBJECT_SIZE, } from '../common/S3ClientUtils';
+import { putObject, createMultipartUpload, uploadPart, completeMultipartUpload, abortMultipartUpload, listParts, } from '../AwsClients/S3';
+import { SEND_DOWNLOAD_PROGRESS_EVENT, SEND_UPLOAD_PROGRESS_EVENT, } from '../AwsClients/S3/utils';
+import { EventEmitter } from 'events';
+import { calculatePartSize, DEFAULT_PART_SIZE, DEFAULT_QUEUE_SIZE, MAX_OBJECT_SIZE, loadS3Config, getPrefix, credentialsProvider, } from '../common/S3ClientUtils';
 var logger = new Logger('AWSS3ProviderManagedUpload');
 var AWSS3ProviderManagedUpload = /** @class */ (function () {
     function AWSS3ProviderManagedUpload(params, opts, emitter) {
@@ -19,66 +65,71 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
         this.params = params;
         this.opts = opts;
         this.emitter = emitter;
-        this.s3client = this._createNewS3Client(opts, emitter);
+        this.s3Config = loadS3Config(__assign(__assign({}, opts), { emitter: emitter, storageAction: StorageAction.Put }));
     }
     AWSS3ProviderManagedUpload.prototype.upload = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var putObjectCommand, _a, numberOfPartsToUpload, parts, start, error_1;
+            var _a, _b, _c, _d, numberOfPartsToUpload, parts, start, error_1;
+            var _e;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
-                        _b.trys.push([0, 9, , 11]);
+                        _f.trys.push([0, 10, , 12]);
                         this.body = this.validateAndSanitizeBody(this.params.Body);
                         this.totalBytesToUpload = this.byteLength(this.body);
-                        if (!(this.totalBytesToUpload <= DEFAULT_PART_SIZE)) return [3 /*break*/, 1];
+                        if (!(this.totalBytesToUpload <= DEFAULT_PART_SIZE)) return [3 /*break*/, 2];
                         // Multipart upload is not required. Upload the sanitized body as is
                         this.params.Body = this.body;
-                        putObjectCommand = new PutObjectCommand(this.params);
-                        return [2 /*return*/, this.s3client.send(putObjectCommand)];
-                    case 1:
+                        _a = putObject;
+                        _b = [this.s3Config];
+                        _c = [__assign({}, this.params)];
+                        _e = {};
+                        return [4 /*yield*/, this.getObjectKeyWithPrefix(this.params.Key)];
+                    case 1: return [2 /*return*/, _a.apply(void 0, _b.concat([__assign.apply(void 0, _c.concat([(_e.Key = _f.sent(), _e)]))]))];
+                    case 2:
                         // Step 1: Determine appropriate part size.
                         this.partSize = calculatePartSize(this.totalBytesToUpload);
                         // Step 2: Initiate the multi part upload
-                        _a = this;
+                        _d = this;
                         return [4 /*yield*/, this.createMultiPartUpload()];
-                    case 2:
+                    case 3:
                         // Step 2: Initiate the multi part upload
-                        _a.uploadId = _b.sent();
+                        _d.uploadId = _f.sent();
                         numberOfPartsToUpload = Math.ceil(this.totalBytesToUpload / this.partSize);
                         parts = this.createParts();
                         start = 0;
-                        _b.label = 3;
-                    case 3:
-                        if (!(start < numberOfPartsToUpload)) return [3 /*break*/, 6];
-                        // Upload as many as `queueSize` parts simultaneously
-                        return [4 /*yield*/, this.uploadParts(this.uploadId, parts.slice(start, start + DEFAULT_QUEUE_SIZE))];
+                        _f.label = 4;
                     case 4:
+                        if (!(start < numberOfPartsToUpload)) return [3 /*break*/, 7];
                         // Upload as many as `queueSize` parts simultaneously
-                        _b.sent();
-                        _b.label = 5;
+                        return [4 /*yield*/, this.uploadParts(this.uploadId, parts.slice(start, start + DEFAULT_QUEUE_SIZE))];
                     case 5:
-                        start += DEFAULT_QUEUE_SIZE;
-                        return [3 /*break*/, 3];
+                        // Upload as many as `queueSize` parts simultaneously
+                        _f.sent();
+                        _f.label = 6;
                     case 6:
+                        start += DEFAULT_QUEUE_SIZE;
+                        return [3 /*break*/, 4];
+                    case 7:
                         parts.map(function (part) {
                             _this.removeEventListener(part);
                         });
                         return [4 /*yield*/, this.finishMultiPartUpload(this.uploadId)];
-                    case 7: 
+                    case 8: 
                     // Step 3: Finalize the upload such that S3 can recreate the file
-                    return [2 /*return*/, _b.sent()];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        error_1 = _b.sent();
+                    return [2 /*return*/, _f.sent()];
+                    case 9: return [3 /*break*/, 12];
+                    case 10:
+                        error_1 = _f.sent();
                         // if any error is thrown, call cleanup
                         return [4 /*yield*/, this.cleanup(this.uploadId)];
-                    case 10:
+                    case 11:
                         // if any error is thrown, call cleanup
-                        _b.sent();
+                        _f.sent();
                         logger.error('Error. Cancelling the multipart upload.');
                         throw error_1;
-                    case 11: return [2 /*return*/];
+                    case 12: return [2 /*return*/];
                 }
             });
         });
@@ -91,7 +142,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
                 parts.push({
                     bodyPart: this.body.slice(bodyStart, bodyEnd),
                     partNumber: parts.length + 1,
-                    emitter: new events.EventEmitter(),
+                    emitter: new EventEmitter(),
                     _lastUploadedBytes: 0,
                 });
                 bodyStart += this.partSize;
@@ -105,22 +156,27 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
     };
     AWSS3ProviderManagedUpload.prototype.createMultiPartUpload = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var createMultiPartUploadCommand, response, error_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var response, _a, _b, _c, error_2;
+            var _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        createMultiPartUploadCommand = new CreateMultipartUploadCommand(this.params);
-                        return [4 /*yield*/, this.s3client.send(createMultiPartUploadCommand)];
-                    case 1:
-                        response = _a.sent();
+                        _e.trys.push([0, 3, , 4]);
+                        _a = createMultipartUpload;
+                        _b = [this.s3Config];
+                        _c = [__assign({}, this.params)];
+                        _d = {};
+                        return [4 /*yield*/, this.getObjectKeyWithPrefix(this.params.Key)];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, _b.concat([__assign.apply(void 0, _c.concat([(_d.Key = _e.sent(), _d)]))]))];
+                    case 2:
+                        response = _e.sent();
                         logger.debug(response.UploadId);
                         return [2 /*return*/, response.UploadId];
-                    case 2:
-                        error_2 = _a.sent();
+                    case 3:
+                        error_2 = _e.sent();
                         logger.error(error_2);
                         throw error_2;
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -138,17 +194,29 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, Promise.all(parts.map(function (part) { return __awaiter(_this, void 0, void 0, function () {
-                                var options, _a, Key, Bucket, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, res;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
+                                var _a, Key, Bucket, SSECustomerAlgorithm, SSECustomerKey, SSECustomerKeyMD5, res, _b, _c;
+                                var _d;
+                                return __generator(this, function (_e) {
+                                    switch (_e.label) {
                                         case 0:
                                             this.setupEventListener(part);
-                                            options = { emitter: part.emitter };
                                             _a = this.params, Key = _a.Key, Bucket = _a.Bucket, SSECustomerAlgorithm = _a.SSECustomerAlgorithm, SSECustomerKey = _a.SSECustomerKey, SSECustomerKeyMD5 = _a.SSECustomerKeyMD5;
-                                            return [4 /*yield*/, this.s3client.send(new UploadPartCommand(__assign(__assign(__assign({ PartNumber: part.partNumber, Body: part.bodyPart, UploadId: uploadId, Key: Key,
-                                                    Bucket: Bucket }, (SSECustomerAlgorithm && { SSECustomerAlgorithm: SSECustomerAlgorithm })), (SSECustomerKey && { SSECustomerKey: SSECustomerKey })), (SSECustomerKeyMD5 && { SSECustomerKeyMD5: SSECustomerKeyMD5 }))), options)];
-                                        case 1:
-                                            res = _b.sent();
+                                            _b = uploadPart;
+                                            _c = [__assign(__assign({}, this.s3Config), { emitter: part.emitter })];
+                                            _d = {
+                                                PartNumber: part.partNumber,
+                                                Body: part.bodyPart,
+                                                UploadId: uploadId
+                                            };
+                                            return [4 /*yield*/, this.getObjectKeyWithPrefix(this.params.Key)];
+                                        case 1: return [4 /*yield*/, _b.apply(void 0, _c.concat([(_d.Key = _e.sent(),
+                                                    _d.Bucket = Bucket,
+                                                    _d.SSECustomerAlgorithm = SSECustomerAlgorithm,
+                                                    _d.SSECustomerKey = SSECustomerKey,
+                                                    _d.SSECustomerKeyMD5 = SSECustomerKeyMD5,
+                                                    _d)]))];
+                                        case 2:
+                                            res = _e.sent();
                                             return [2 /*return*/, res];
                                     }
                                 });
@@ -174,29 +242,32 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
     };
     AWSS3ProviderManagedUpload.prototype.finishMultiPartUpload = function (uploadId) {
         return __awaiter(this, void 0, void 0, function () {
-            var input, completeUploadCommand, data, error_4;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var input, Key, error_4;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        input = {
-                            Bucket: this.params.Bucket,
-                            Key: this.params.Key,
-                            UploadId: uploadId,
-                            MultipartUpload: { Parts: this.completedParts },
+                        _a = {
+                            Bucket: this.params.Bucket
                         };
-                        completeUploadCommand = new CompleteMultipartUploadCommand(input);
-                        _a.label = 1;
+                        return [4 /*yield*/, this.getObjectKeyWithPrefix(this.params.Key)];
                     case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.s3client.send(completeUploadCommand)];
+                        input = (_a.Key = _b.sent(),
+                            _a.UploadId = uploadId,
+                            _a.MultipartUpload = { Parts: this.completedParts },
+                            _a);
+                        _b.label = 2;
                     case 2:
-                        data = _a.sent();
-                        return [2 /*return*/, data.Key];
+                        _b.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, completeMultipartUpload(this.s3Config, input)];
                     case 3:
-                        error_4 = _a.sent();
+                        Key = (_b.sent()).Key;
+                        return [2 /*return*/, Key];
+                    case 4:
+                        error_4 = _b.sent();
                         logger.error('Error happened while finishing the upload.');
                         throw error_4;
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -204,8 +275,9 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
     AWSS3ProviderManagedUpload.prototype.cleanup = function (uploadId) {
         return __awaiter(this, void 0, void 0, function () {
             var input, data;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         // Reset this's state
                         this.body = null;
@@ -216,17 +288,20 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
                             // This is a single part upload;
                             return [2 /*return*/];
                         }
-                        input = {
-                            Bucket: this.params.Bucket,
-                            Key: this.params.Key,
-                            UploadId: uploadId,
+                        _a = {
+                            Bucket: this.params.Bucket
                         };
-                        return [4 /*yield*/, this.s3client.send(new AbortMultipartUploadCommand(input))];
+                        return [4 /*yield*/, this.getObjectKeyWithPrefix(this.params.Key)];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.s3client.send(new ListPartsCommand(input))];
+                        input = (_a.Key = _b.sent(),
+                            _a.UploadId = uploadId,
+                            _a);
+                        return [4 /*yield*/, abortMultipartUpload(this.s3Config, input)];
                     case 2:
-                        data = _a.sent();
+                        _b.sent();
+                        return [4 /*yield*/, listParts(this.s3Config, input)];
+                    case 3:
+                        data = _b.sent();
                         if (data && data.Parts && data.Parts.length > 0) {
                             throw new Error('Multipart upload clean up failed.');
                         }
@@ -288,7 +363,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
             sanitizedBody = body;
         } */
         if (this.byteLength(sanitizedBody) > MAX_OBJECT_SIZE) {
-            throw new Error("File size bigger than S3 Object limit of 5TB, got " + this.totalBytesToUpload + " Bytes");
+            throw new Error("File size bigger than S3 Object limit of 5TB, got ".concat(this.totalBytesToUpload, " Bytes"));
         }
         return sanitizedBody;
     };
@@ -305,13 +380,23 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
         }
         return false;
     };
-    AWSS3ProviderManagedUpload.prototype._createNewS3Client = function (config, emitter) {
-        var s3client = createS3Client(config, StorageAction.Put, emitter);
-        s3client.middlewareStack.add(createPrefixMiddleware(this.opts, this.params.Key), prefixMiddlewareOptions);
-        s3client.middlewareStack.add(autoAdjustClockskewMiddleware(s3client.config), autoAdjustClockskewMiddlewareOptions);
-        return s3client;
+    AWSS3ProviderManagedUpload.prototype.getObjectKeyWithPrefix = function (keyWithoutPrefix) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, _b;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _a = getPrefix;
+                        _b = [__assign({}, this.opts)];
+                        _c = {};
+                        return [4 /*yield*/, credentialsProvider()];
+                    case 1: return [4 /*yield*/, _a.apply(void 0, [__assign.apply(void 0, _b.concat([(_c.credentials = _d.sent(), _c)]))])];
+                    case 2: return [2 /*return*/, ((_d.sent()) + keyWithoutPrefix)];
+                }
+            });
+        });
     };
     return AWSS3ProviderManagedUpload;
 }());
 export { AWSS3ProviderManagedUpload };
-//# sourceMappingURL=AWSS3ProviderManagedUpload.js.map

package/lib-esm/providers/AWSS3UploadTask.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import { UploadPartCommandInput, S3Client, PutObjectCommandInput } from '@aws-sdk/client-s3';
 import * as events from 'events';
-import { Canceler } from 'axios';
 import { UploadTask } from '../types/Provider';
+import { PutObjectInput, UploadPartInput } from '../AwsClients/S3';
+import { S3ResolvedConfig } from '../common/S3ClientUtils';
 import { StorageAccessLevel } from '..';
 export declare enum AWSS3UploadTaskState {
     INIT = 0,
@@ -18,18 +18,18 @@ export declare enum TaskEvents {
     ERROR = "error"
 }
 export interface AWSS3UploadTaskParams {
-    s3Client: S3Client;
+    s3Config: S3ResolvedConfig;
     file: Blob;
     storage: Storage;
     level: StorageAccessLevel;
-    params: PutObjectCommandInput;
+    params: PutObjectInput;
     prefixPromise: Promise<string>;
     emitter?: events.EventEmitter;
 }
 export interface InProgressRequest {
-    uploadPartInput: UploadPartCommandInput;
+    uploadPartInput: UploadPartInput;
     s3Request: Promise<any>;
-    cancel: Canceler;
+    abortController: AbortController;
 }
 export interface UploadTaskCompleteEvent {
     key?: string;
@@ -55,7 +55,7 @@ export declare class AWSS3UploadTask implements UploadTask {
     private readonly emitter;
     private readonly file;
     private readonly queueSize;
-    private readonly s3client;
+    private readonly s3Config;
     private readonly storage;
     private readonly storageSync;
     private readonly fileId;
@@ -69,7 +69,7 @@ export declare class AWSS3UploadTask implements UploadTask {
     private totalBytes;
     private uploadId;
     state: AWSS3UploadTaskState;
-    constructor({ s3Client, file, emitter, storage, params, level, prefixPromise, }: AWSS3UploadTaskParams);
+    constructor({ s3Config, file, emitter, storage, params, level, prefixPromise, }: AWSS3UploadTaskParams);
     get percent(): number;
     get isInProgress(): boolean;
     private _listSingleFile;