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

package/lib-esm/common/S3ClientUtils.js

@@ -1,8 +1,54 @@
-import { __assign, __awaiter, __generator } from "tslib";
-import { Category, Credentials, Logger, getAmplifyUserAgentObject, } from '@aws-amplify/core';
-import { S3Client } from '@aws-sdk/client-s3';
-import { AxiosHttpHandler } from '../providers/axios-http-handler';
-import { localTestingStorageEndpoint, SET_CONTENT_LENGTH_HEADER, } from './StorageConstants';
+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 };
+    }
+};
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { Category, Credentials, Logger, getAmplifyUserAgent, } from '@aws-amplify/core';
+import { localTestingStorageEndpoint } from './StorageConstants';
 var logger = new Logger('S3ClientUtils');
 // placeholder credentials in order to satisfy type requirement, always results in 403 when used
 var INVALID_CRED = { accessKeyId: '', secretAccessKey: '' };
@@ -32,70 +78,6 @@ export var getPrefix = function (config) {
             return publicPath;
     }
 };
-export var createPrefixMiddleware = function (opt, key) {
-    return function (next, _context) {
-        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-            var credentials, cred, prefix, clonedInput, result;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Credentials.get()];
-                    case 1:
-                        credentials = _a.sent();
-                        cred = Credentials.shear(credentials);
-                        prefix = getPrefix(__assign(__assign({}, opt), { credentials: cred }));
-                        clonedInput = Object.assign({}, args.input);
-                        if (Object.prototype.hasOwnProperty.call(args.input, 'Key')) {
-                            clonedInput.Key = prefix + key;
-                            args.input = clonedInput;
-                        }
-                        else if (Object.prototype.hasOwnProperty.call(args.input, 'Prefix')) {
-                            clonedInput.Prefix = prefix + key;
-                            args.input = clonedInput;
-                        }
-                        result = next(args);
-                        return [2 /*return*/, result];
-                }
-            });
-        }); };
-    };
-};
-var isTimeSkewedError = function (err) {
-    return err.ServerTime &&
-        typeof err.Code === 'string' &&
-        err.Code === 'RequestTimeTooSkewed';
-};
-// we want to take the S3Client config in parameter so we can modify it's systemClockOffset
-export var autoAdjustClockskewMiddleware = function (config) {
-    return function (next, _context) {
-        return function (args) { return __awaiter(void 0, void 0, void 0, function () {
-            var err_1, serverDate;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, next(args)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        err_1 = _a.sent();
-                        if (isTimeSkewedError(err_1)) {
-                            serverDate = new Date(err_1.ServerTime);
-                            config.systemClockOffset = serverDate.getTime() - Date.now();
-                        }
-                        throw err_1;
-                    case 3: return [2 /*return*/];
-                }
-            });
-        }); };
-    };
-};
-export var autoAdjustClockskewMiddlewareOptions = {
-    step: 'finalizeRequest',
-    name: 'autoAdjustClockskewMiddleware',
-};
-export var prefixMiddlewareOptions = {
-    step: 'initialize',
-    name: 'addPrefixMiddleware',
-};
 export var credentialsProvider = function () { return __awaiter(void 0, void 0, void 0, function () {
     var credentials, cred, error_1;
     return __generator(this, function (_a) {
@@ -118,32 +100,34 @@ export var credentialsProvider = function () { return __awaiter(void 0, void 0,
         }
     });
 }); };
-export var createS3Client = function (config, storageAction, emitter) {
-    var region = config.region, cancelTokenSource = config.cancelTokenSource, dangerouslyConnectToHttpEndpointForTesting = config.dangerouslyConnectToHttpEndpointForTesting, useAccelerateEndpoint = config.useAccelerateEndpoint;
-    var localTestingConfig = {};
-    if (dangerouslyConnectToHttpEndpointForTesting) {
-        localTestingConfig = {
-            endpoint: localTestingStorageEndpoint,
-            tls: false,
-            bucketEndpoint: false,
-            forcePathStyle: true,
-        };
+/**
+ * A function that persists the s3 configs, so we don't need to
+ * assign each config parameter for every s3 API call.
+ *
+ * @inernal
+ */
+export var loadS3Config = function (config) {
+    if (!config.region) {
+        // Same error thrown by aws-sdk
+        throw new Error('Region is missing.');
     }
-    var s3client = new S3Client(__assign(__assign({ region: region, 
-        // Using provider instead of a static credentials, so that if an upload task was in progress, but credentials gets
-        // changed or invalidated (e.g user signed out), the subsequent requests will fail.
-        credentials: credentialsProvider, customUserAgent: getAmplifyUserAgentObject({
+    return __assign(__assign(__assign({}, config), { region: config.region, credentials: config.credentials
+            ? function () { return Promise.resolve(config.credentials); }
+            : credentialsProvider, userAgentValue: getAmplifyUserAgent({
             category: Category.Storage,
-            action: storageAction,
-        }) }, localTestingConfig), { requestHandler: new AxiosHttpHandler({}, emitter, cancelTokenSource), useAccelerateEndpoint: useAccelerateEndpoint }));
-    s3client.middlewareStack.remove(SET_CONTENT_LENGTH_HEADER);
-    return s3client;
+            action: config.storageAction,
+        }) }), (config.dangerouslyConnectToHttpEndpointForTesting
+        ? {
+            customEndpoint: localTestingStorageEndpoint,
+            forcePathStyle: true,
+        }
+        : {}));
 };
-var MB = 1024 * 1024;
-var GB = 1024 * MB;
-var TB = 1024 * GB;
-export var DEFAULT_PART_SIZE = 5 * MB;
-export var MAX_OBJECT_SIZE = 5 * TB;
+var MiB = 1024 * 1024;
+var GiB = 1024 * MiB;
+var TiB = 1024 * GiB;
+export var DEFAULT_PART_SIZE = 5 * MiB;
+export var MAX_OBJECT_SIZE = 5 * TiB;
 export var MAX_PARTS_COUNT = 10000;
 export var DEFAULT_QUEUE_SIZE = 4;
 export var calculatePartSize = function (totalSize) {
@@ -155,4 +139,3 @@ export var calculatePartSize = function (totalSize) {
     }
     return partSize;
 };
-//# sourceMappingURL=S3ClientUtils.js.map

package/lib-esm/common/StorageConstants.d.ts

@@ -1,4 +1,3 @@
 export declare const AMPLIFY_SYMBOL: Symbol;
-export declare const SET_CONTENT_LENGTH_HEADER = "contentLengthMiddleware";
 export declare const localTestingStorageEndpoint = "http://localhost:20005";
 export declare const UPLOADS_STORAGE_KEY = "__uploadInProgress";

package/lib-esm/common/StorageConstants.js

@@ -1,7 +1,7 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 export var AMPLIFY_SYMBOL = (typeof Symbol !== 'undefined' && typeof Symbol.for === 'function'
     ? Symbol.for('amplify_default')
     : '@@amplify_default');
-export var SET_CONTENT_LENGTH_HEADER = 'contentLengthMiddleware';
 export var localTestingStorageEndpoint = 'http://localhost:20005';
 export var UPLOADS_STORAGE_KEY = '__uploadInProgress';
-//# sourceMappingURL=StorageConstants.js.map

package/lib-esm/common/StorageErrorStrings.js

@@ -1,3 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 export var StorageErrorStrings;
 (function (StorageErrorStrings) {
     StorageErrorStrings["NO_CREDENTIALS"] = "No credentials";
@@ -17,4 +19,3 @@ export var AWSS3ProviderUploadErrorStrings;
 (function (AWSS3ProviderUploadErrorStrings) {
     AWSS3ProviderUploadErrorStrings["UPLOAD_PAUSED_MESSAGE"] = "paused";
 })(AWSS3ProviderUploadErrorStrings || (AWSS3ProviderUploadErrorStrings = {}));
-//# sourceMappingURL=StorageErrorStrings.js.map

package/lib-esm/common/StorageUtils.js

@@ -1,3 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 import { Hub } from '@aws-amplify/core';
 import { AMPLIFY_SYMBOL } from './StorageConstants';
 export var byteLength = function (x) {
@@ -36,4 +38,3 @@ export var isBlob = function (x) {
 var isArrayBuffer = function (x) {
     return typeof x !== 'undefined' && x instanceof ArrayBuffer;
 };
-//# sourceMappingURL=StorageUtils.js.map

package/lib-esm/index.js

@@ -3,4 +3,4 @@
 import { Storage, StorageInstance } from './Storage';
 export { Storage as StorageClass, StorageInstance as Storage };
 export { AWSS3Provider } from './providers';
-//# sourceMappingURL=index.js.map
+export * from './types';

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

@@ -1,5 +1,5 @@
-import { PutObjectCommandInput } from '@aws-sdk/client-s3';
-import { StorageOptions, StorageProvider, S3ProviderGetConfig, S3ProviderGetOuput, S3ProviderPutConfig, S3ProviderRemoveConfig, S3ProviderListConfig, S3ProviderCopyConfig, S3ProviderCopyOutput, S3CopySource, S3CopyDestination, S3ProviderRemoveOutput, S3ProviderPutOutput, S3ProviderListOutput, S3ProviderGetPropertiesOutput, S3ProviderGetPropertiesConfig } from '../types';
+import { PutObjectInput } from '../AwsClients/S3';
+import { StorageOptions, StorageProvider, S3ProviderGetConfig, S3ProviderGetOuput, S3ProviderPutConfig, S3ProviderRemoveConfig, S3ProviderListConfig, S3ProviderCopyConfig, S3ProviderCopyOutput, S3CopySource, S3CopyDestination, S3ProviderRemoveOutput, S3ProviderPutOutput, S3ProviderListOutput, S3ProviderGetPropertiesConfig, S3ProviderGetPropertiesOutput } from '../types';
 /**
  * Provide storage methods to use AWS S3
  */
@@ -44,7 +44,7 @@ export declare class AWSS3Provider implements StorageProvider {
      *
      * @param {string} key - key of the object
      * @param {S3ProviderGetConfig} [config] - Optional configuration for the underlying S3 command
-     * @return {Promise<string | GetObjectCommandOutput>} - A promise resolves to Amazon S3 presigned URL or the
+     * @return {Promise<string | GetObjectOutput>} - A promise resolves to Amazon S3 presigned URL or the
      * GetObjectCommandOutput if download is set to true on success
      */
     get<T extends S3ProviderGetConfig & StorageOptions>(key: string, config?: T): Promise<S3ProviderGetOuput<T>>;
@@ -65,7 +65,7 @@ export declare class AWSS3Provider implements StorageProvider {
      * @return an instance of AWSS3UploadTask or a promise that resolves to an object with the new object's key on
      * success.
      */
-    put<T extends S3ProviderPutConfig>(key: string, object: PutObjectCommandInput['Body'], config?: T): S3ProviderPutOutput<T>;
+    put<T extends S3ProviderPutConfig>(key: string, object: PutObjectInput['Body'], config?: T): S3ProviderPutOutput<T>;
     /**
      * Remove the object for specified key
      * @param {string} key - key of the object
@@ -85,8 +85,4 @@ export declare class AWSS3Provider implements StorageProvider {
     private _ensureCredentials;
     private _isWithCredentials;
     private _prefix;
-    /**
-     * Creates an S3 client with new V3 aws sdk
-     */
-    private _createNewS3Client;
 }