@aws-amplify/storage 4.5.14 → 4.5.15-unstable.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +0 -8
- package/lib/.tsbuildinfo +3 -0
- package/lib/Storage.d.ts +104 -0
- package/lib/Storage.js +54 -69
- package/lib/Storage.js.map +1 -1
- package/lib/common/S3ClientUtils.d.ts +33 -0
- package/lib/common/S3ClientUtils.js +9 -55
- package/lib/common/S3ClientUtils.js.map +1 -1
- package/lib/common/StorageConstants.d.ts +4 -0
- package/lib/common/StorageErrorStrings.d.ts +16 -0
- package/lib/common/StorageUtils.d.ts +4 -0
- package/lib/index.d.ts +4 -0
- package/lib/index.js +5 -58
- package/lib/index.js.map +1 -1
- package/lib/providers/AWSS3Provider.d.ts +83 -0
- package/lib/providers/AWSS3Provider.js +70 -149
- package/lib/providers/AWSS3Provider.js.map +1 -1
- package/lib/providers/AWSS3ProviderManagedUpload.d.ts +41 -0
- package/lib/providers/AWSS3ProviderManagedUpload.js +19 -82
- package/lib/providers/AWSS3ProviderManagedUpload.js.map +1 -1
- package/lib/providers/AWSS3UploadTask.d.ts +107 -0
- package/lib/providers/AWSS3UploadTask.js +29 -87
- package/lib/providers/AWSS3UploadTask.js.map +1 -1
- package/lib/providers/axios-http-handler.d.ts +40 -0
- package/lib/providers/axios-http-handler.js +6 -45
- package/lib/providers/axios-http-handler.js.map +1 -1
- package/lib/providers/index.d.ts +1 -0
- package/lib/types/AWSS3Provider.d.ts +121 -0
- package/lib/types/Provider.d.ts +22 -0
- package/lib/types/Storage.d.ts +79 -0
- package/lib/types/Storage.js +2 -12
- package/lib/types/Storage.js.map +1 -1
- package/lib/types/index.d.ts +3 -0
- package/lib/types/index.js +2 -12
- package/lib/types/index.js.map +1 -1
- package/lib-esm/.tsbuildinfo +3 -0
- package/lib-esm/Storage.d.ts +1 -4
- package/lib-esm/Storage.js +49 -61
- package/lib-esm/Storage.js.map +1 -1
- package/lib-esm/common/S3ClientUtils.js +1 -47
- package/lib-esm/common/S3ClientUtils.js.map +1 -1
- package/lib-esm/index.d.ts +3 -8
- package/lib-esm/index.js +5 -57
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/providers/AWSS3Provider.d.ts +3 -7
- package/lib-esm/providers/AWSS3Provider.js +54 -126
- package/lib-esm/providers/AWSS3Provider.js.map +1 -1
- package/lib-esm/providers/AWSS3ProviderManagedUpload.js +3 -59
- package/lib-esm/providers/AWSS3ProviderManagedUpload.js.map +1 -1
- package/lib-esm/providers/AWSS3UploadTask.js +1 -56
- package/lib-esm/providers/AWSS3UploadTask.js.map +1 -1
- package/lib-esm/providers/axios-http-handler.js +3 -39
- package/lib-esm/providers/axios-http-handler.js.map +1 -1
- package/lib-esm/types/AWSS3Provider.d.ts +6 -5
- package/lib-esm/types/Storage.js +2 -12
- package/lib-esm/types/Storage.js.map +1 -1
- package/lib-esm/types/index.js +2 -12
- package/lib-esm/types/index.js.map +1 -1
- package/package.json +14 -10
- package/src/Storage.ts +59 -33
- package/src/index.ts +5 -57
- package/src/providers/AWSS3Provider.ts +41 -50
- package/src/providers/AWSS3ProviderManagedUpload.ts +2 -12
- package/src/providers/axios-http-handler.ts +2 -12
- package/src/types/AWSS3Provider.ts +6 -6
- package/src/types/Provider.ts +2 -12
- package/src/types/Storage.ts +2 -12
- package/src/types/index.ts +2 -12
- package/build.js +0 -5
- package/dist/aws-amplify-storage.js +0 -51312
- package/dist/aws-amplify-storage.js.map +0 -1
- package/dist/aws-amplify-storage.min.js +0 -26
- package/dist/aws-amplify-storage.min.js.map +0 -1
- package/index.js +0 -7
- package/webpack.config.dev.js +0 -6
package/CHANGELOG.md
CHANGED
|
@@ -3,14 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
## [4.5.14](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/storage@4.5.13...@aws-amplify/storage@4.5.14) (2022-11-04)
|
|
7
|
-
|
|
8
|
-
**Note:** Version bump only for package @aws-amplify/storage
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
6
|
## [4.5.13](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/storage@4.5.12...@aws-amplify/storage@4.5.13) (2022-10-27)
|
|
15
7
|
|
|
16
8
|
**Note:** Version bump only for package @aws-amplify/storage
|
package/lib/.tsbuildinfo
ADDED
package/lib/Storage.d.ts
ADDED
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { StorageCopySource, StorageCopyDestination, StorageGetConfig, StorageProvider, StoragePutConfig, StorageRemoveConfig, StorageListConfig, StorageCopyConfig, StorageGetOutput, StoragePutOutput, StorageRemoveOutput, StorageListOutput, StorageCopyOutput, UploadTask } from './types';
|
|
2
|
+
/**
|
|
3
|
+
* Provide storage methods to use AWS S3
|
|
4
|
+
*/
|
|
5
|
+
export declare class Storage {
|
|
6
|
+
/**
|
|
7
|
+
* @private
|
|
8
|
+
*/
|
|
9
|
+
private _config;
|
|
10
|
+
private _pluggables;
|
|
11
|
+
/**
|
|
12
|
+
* Similar to the API module. This weak map allows users to cancel their in-flight request made using the Storage
|
|
13
|
+
* module. For every get or put request, a unique cancel token will be generated and injected to it's underlying
|
|
14
|
+
* AxiosHttpHandler. This map maintains a mapping of Request to CancelTokenSource. When .cancel is invoked, it will
|
|
15
|
+
* attempt to retrieve it's corresponding cancelTokenSource and cancel the in-flight request.
|
|
16
|
+
*/
|
|
17
|
+
private _cancelTokenSourceMap;
|
|
18
|
+
/**
|
|
19
|
+
* @public
|
|
20
|
+
*/
|
|
21
|
+
vault: Storage;
|
|
22
|
+
/**
|
|
23
|
+
* Initialize Storage
|
|
24
|
+
* @param {Object} config - Configuration object for storage
|
|
25
|
+
*/
|
|
26
|
+
constructor();
|
|
27
|
+
getModuleName(): string;
|
|
28
|
+
/**
|
|
29
|
+
* add plugin into Storage category
|
|
30
|
+
* @param {Object} pluggable - an instance of the plugin
|
|
31
|
+
*/
|
|
32
|
+
addPluggable(pluggable: StorageProvider): {};
|
|
33
|
+
/**
|
|
34
|
+
* Get the plugin object
|
|
35
|
+
* @param providerName - the name of the plugin
|
|
36
|
+
*/
|
|
37
|
+
getPluggable(providerName: string): StorageProvider;
|
|
38
|
+
/**
|
|
39
|
+
* Remove the plugin object
|
|
40
|
+
* @param providerName - the name of the plugin
|
|
41
|
+
*/
|
|
42
|
+
removePluggable(providerName: string): void;
|
|
43
|
+
/**
|
|
44
|
+
* Configure Storage
|
|
45
|
+
* @param {Object} config - Configuration object for storage
|
|
46
|
+
* @return {Object} - Current configuration
|
|
47
|
+
*/
|
|
48
|
+
configure(config?: any): any;
|
|
49
|
+
private getCancellableTokenSource;
|
|
50
|
+
private updateRequestToBeCancellable;
|
|
51
|
+
private isUploadTask;
|
|
52
|
+
/**
|
|
53
|
+
* Cancels an inflight request
|
|
54
|
+
*
|
|
55
|
+
* @param request - The request to cancel
|
|
56
|
+
* @param [message] - A message to include in the cancelation exception
|
|
57
|
+
*/
|
|
58
|
+
cancel(request: UploadTask, message?: string): Promise<boolean>;
|
|
59
|
+
cancel(request: Promise<any>, message?: string): void;
|
|
60
|
+
/**
|
|
61
|
+
* Copies a file from src to dest.
|
|
62
|
+
*
|
|
63
|
+
* @param src - The source object.
|
|
64
|
+
* @param dest - The destination object.
|
|
65
|
+
* @param [config] - config for the Storage operation.
|
|
66
|
+
* @return A promise resolves to the copied object's key.
|
|
67
|
+
*/
|
|
68
|
+
copy<T extends Record<string, any>>(src: StorageCopySource, dest: StorageCopyDestination, config?: StorageCopyConfig<T>): StorageCopyOutput<T>;
|
|
69
|
+
/**
|
|
70
|
+
* Get a presigned URL of the file or the object data when download:true
|
|
71
|
+
*
|
|
72
|
+
* @param key - key of the object
|
|
73
|
+
* @param [config] - config for the Storage operation.
|
|
74
|
+
* @return - A promise resolves to either a presigned url or the object
|
|
75
|
+
*/
|
|
76
|
+
get<T extends Record<string, any> & {
|
|
77
|
+
download?: boolean;
|
|
78
|
+
}>(key: string, config?: StorageGetConfig<T>): StorageGetOutput<T>;
|
|
79
|
+
isCancelError(error: any): boolean;
|
|
80
|
+
/**
|
|
81
|
+
* Put a file in storage bucket specified to configure method
|
|
82
|
+
* @param key - key of the object
|
|
83
|
+
* @param object - File to be put in bucket
|
|
84
|
+
* @param [config] - { level : private|protected|public, contentType: MIME Types,
|
|
85
|
+
* progressCallback: function }
|
|
86
|
+
* @return - promise resolves to object on success
|
|
87
|
+
*/
|
|
88
|
+
put<T extends Record<string, any>>(key: string, object: any, config?: StoragePutConfig<T>): StoragePutOutput<T>;
|
|
89
|
+
/**
|
|
90
|
+
* Remove the object for specified key
|
|
91
|
+
* @param key - key of the object
|
|
92
|
+
* @param [config] - { level : private|protected|public }
|
|
93
|
+
* @return - Promise resolves upon successful removal of the object
|
|
94
|
+
*/
|
|
95
|
+
remove<T extends Record<string, any>>(key: string, config?: StorageRemoveConfig<T>): StorageRemoveOutput<T>;
|
|
96
|
+
/**
|
|
97
|
+
* List bucket objects relative to the level and prefix specified
|
|
98
|
+
* @param path - the path that contains objects
|
|
99
|
+
* @param [config] - { level : private|protected|public, maxKeys: NUMBER }
|
|
100
|
+
* @return - Promise resolves to list of keys for all objects in path
|
|
101
|
+
*/
|
|
102
|
+
list<T extends Record<string, any>>(key: string, config?: StorageListConfig<T>): StorageListOutput<T>;
|
|
103
|
+
}
|
|
104
|
+
export declare const StorageInstance: Storage;
|
package/lib/Storage.js
CHANGED
|
@@ -1,52 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*
|
|
5
|
-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
|
|
6
|
-
* the License. A copy of the License is located at
|
|
7
|
-
*
|
|
8
|
-
* http://aws.amazon.com/apache2.0/
|
|
9
|
-
*
|
|
10
|
-
* or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
11
|
-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
|
|
12
|
-
* and limitations under the License.
|
|
13
|
-
*/
|
|
14
|
-
var __assign = (this && this.__assign) || function () {
|
|
15
|
-
__assign = Object.assign || function(t) {
|
|
16
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
17
|
-
s = arguments[i];
|
|
18
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
19
|
-
t[p] = s[p];
|
|
20
|
-
}
|
|
21
|
-
return t;
|
|
22
|
-
};
|
|
23
|
-
return __assign.apply(this, arguments);
|
|
24
|
-
};
|
|
25
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
26
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
27
|
-
if (!m) return o;
|
|
28
|
-
var i = m.call(o), r, ar = [], e;
|
|
29
|
-
try {
|
|
30
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
31
|
-
}
|
|
32
|
-
catch (error) { e = { error: error }; }
|
|
33
|
-
finally {
|
|
34
|
-
try {
|
|
35
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
36
|
-
}
|
|
37
|
-
finally { if (e) throw e.error; }
|
|
38
|
-
}
|
|
39
|
-
return ar;
|
|
40
|
-
};
|
|
41
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
42
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
43
|
-
};
|
|
2
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
44
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
var tslib_1 = require("tslib");
|
|
45
6
|
var core_1 = require("@aws-amplify/core");
|
|
46
7
|
var providers_1 = require("./providers");
|
|
47
|
-
var axios_1 = __importDefault(require("axios"));
|
|
8
|
+
var axios_1 = tslib_1.__importDefault(require("axios"));
|
|
48
9
|
var AWSS3UploadTask_1 = require("./providers/AWSS3UploadTask");
|
|
49
10
|
var logger = new core_1.ConsoleLogger('StorageClass');
|
|
11
|
+
var loggerStorageInstance = new core_1.ConsoleLogger('Storage'); // Logging relating to Storage instance management
|
|
50
12
|
var DEFAULT_PROVIDER = 'AWSS3';
|
|
51
13
|
/**
|
|
52
14
|
* Provide storage methods to use AWS S3
|
|
@@ -109,12 +71,13 @@ var Storage = /** @class */ (function () {
|
|
|
109
71
|
*/
|
|
110
72
|
Storage.prototype.configure = function (config) {
|
|
111
73
|
var _this = this;
|
|
74
|
+
var _a;
|
|
112
75
|
logger.debug('configure Storage');
|
|
113
76
|
if (!config)
|
|
114
77
|
return this._config;
|
|
115
|
-
var amplifyConfig = core_1.
|
|
116
|
-
var
|
|
117
|
-
var
|
|
78
|
+
var amplifyConfig = core_1.parseAWSExports(config);
|
|
79
|
+
var storageConfig = (_a = amplifyConfig.Storage) !== null && _a !== void 0 ? _a : {};
|
|
80
|
+
var defaultProviderConfigKeys = [
|
|
118
81
|
'bucket',
|
|
119
82
|
'region',
|
|
120
83
|
'level',
|
|
@@ -126,28 +89,26 @@ var Storage = /** @class */ (function () {
|
|
|
126
89
|
'SSECustomerKeyMD5',
|
|
127
90
|
'SSEKMSKeyId',
|
|
128
91
|
];
|
|
129
|
-
var
|
|
130
|
-
return
|
|
131
|
-
};
|
|
132
|
-
var checkConfigKeysFromArray = function (k) {
|
|
133
|
-
return k.find(function (k) { return isInStorageArrayKeys(k); });
|
|
92
|
+
var hasDefaultProviderConfigKeys = function (config) {
|
|
93
|
+
return Object.keys(config).find(function (key) { return defaultProviderConfigKeys.includes(key); });
|
|
134
94
|
};
|
|
135
|
-
if (
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
95
|
+
if (hasDefaultProviderConfigKeys(storageConfig) &&
|
|
96
|
+
!storageConfig[DEFAULT_PROVIDER]) {
|
|
97
|
+
storageConfig[DEFAULT_PROVIDER] = {};
|
|
98
|
+
}
|
|
99
|
+
Object.entries(storageConfig).forEach(function (_a) {
|
|
100
|
+
var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
|
|
101
|
+
if (key &&
|
|
102
|
+
defaultProviderConfigKeys.includes(key) &&
|
|
103
|
+
value !== undefined) {
|
|
104
|
+
storageConfig[DEFAULT_PROVIDER][key] = value;
|
|
105
|
+
delete storageConfig[key];
|
|
145
106
|
}
|
|
146
107
|
});
|
|
147
108
|
// only update new values for each provider
|
|
148
|
-
Object.keys(
|
|
149
|
-
if (typeof
|
|
150
|
-
_this._config[providerName] = __assign(__assign({}, _this._config[providerName]),
|
|
109
|
+
Object.keys(storageConfig).forEach(function (providerName) {
|
|
110
|
+
if (typeof storageConfig[providerName] !== 'string') {
|
|
111
|
+
_this._config[providerName] = tslib_1.__assign(tslib_1.__assign({}, _this._config[providerName]), storageConfig[providerName]);
|
|
151
112
|
}
|
|
152
113
|
});
|
|
153
114
|
this._pluggables.forEach(function (pluggable) {
|
|
@@ -192,7 +153,7 @@ var Storage = /** @class */ (function () {
|
|
|
192
153
|
if (typeof prov.copy !== 'function') {
|
|
193
154
|
return Promise.reject(".copy is not implemented on provider " + prov.getProviderName());
|
|
194
155
|
}
|
|
195
|
-
var responsePromise = prov.copy(src, dest, __assign(__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
156
|
+
var responsePromise = prov.copy(src, dest, tslib_1.__assign(tslib_1.__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
196
157
|
this.updateRequestToBeCancellable(responsePromise, cancelTokenSource);
|
|
197
158
|
return responsePromise;
|
|
198
159
|
};
|
|
@@ -204,7 +165,7 @@ var Storage = /** @class */ (function () {
|
|
|
204
165
|
return Promise.reject('No plugin found in Storage for the provider');
|
|
205
166
|
}
|
|
206
167
|
var cancelTokenSource = this.getCancellableTokenSource();
|
|
207
|
-
var responsePromise = prov.get(key, __assign(__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
168
|
+
var responsePromise = prov.get(key, tslib_1.__assign(tslib_1.__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
208
169
|
this.updateRequestToBeCancellable(responsePromise, cancelTokenSource);
|
|
209
170
|
return responsePromise;
|
|
210
171
|
};
|
|
@@ -219,7 +180,7 @@ var Storage = /** @class */ (function () {
|
|
|
219
180
|
return Promise.reject('No plugin found in Storage for the provider');
|
|
220
181
|
}
|
|
221
182
|
var cancelTokenSource = this.getCancellableTokenSource();
|
|
222
|
-
var response = prov.put(key, object, __assign(__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
183
|
+
var response = prov.put(key, object, tslib_1.__assign(tslib_1.__assign({}, config), { cancelTokenSource: cancelTokenSource }));
|
|
223
184
|
if (!this.isUploadTask(response)) {
|
|
224
185
|
this.updateRequestToBeCancellable(response, cancelTokenSource);
|
|
225
186
|
}
|
|
@@ -247,7 +208,31 @@ var Storage = /** @class */ (function () {
|
|
|
247
208
|
}());
|
|
248
209
|
exports.Storage = Storage;
|
|
249
210
|
/**
|
|
250
|
-
*
|
|
211
|
+
* Configure & register Storage singleton instance.
|
|
251
212
|
*/
|
|
252
|
-
|
|
213
|
+
var _instance = null;
|
|
214
|
+
var getInstance = function () {
|
|
215
|
+
if (_instance) {
|
|
216
|
+
return _instance;
|
|
217
|
+
}
|
|
218
|
+
loggerStorageInstance.debug('Create Storage Instance, debug');
|
|
219
|
+
_instance = new Storage();
|
|
220
|
+
_instance.vault = new Storage();
|
|
221
|
+
var old_configure = _instance.configure;
|
|
222
|
+
_instance.configure = function (options) {
|
|
223
|
+
loggerStorageInstance.debug('storage configure called');
|
|
224
|
+
var vaultConfig = tslib_1.__assign({}, old_configure.call(_instance, options));
|
|
225
|
+
// set level private for each provider for the vault
|
|
226
|
+
Object.keys(vaultConfig).forEach(function (providerName) {
|
|
227
|
+
if (typeof vaultConfig[providerName] !== 'string') {
|
|
228
|
+
vaultConfig[providerName] = tslib_1.__assign(tslib_1.__assign({}, vaultConfig[providerName]), { level: 'private' });
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
loggerStorageInstance.debug('storage vault configure called');
|
|
232
|
+
_instance.vault.configure(vaultConfig);
|
|
233
|
+
};
|
|
234
|
+
return _instance;
|
|
235
|
+
};
|
|
236
|
+
exports.StorageInstance = getInstance();
|
|
237
|
+
core_1.Amplify.register(exports.StorageInstance);
|
|
253
238
|
//# sourceMappingURL=Storage.js.map
|
package/lib/Storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../src/Storage.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../src/Storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { ICredentials } from '@aws-amplify/core';
|
|
3
|
+
import { StorageAccessLevel, CustomPrefix } from '../types';
|
|
4
|
+
import { InitializeMiddleware, InitializeHandlerOptions, FinalizeRequestHandlerOptions, FinalizeRequestMiddleware } from '@aws-sdk/types';
|
|
5
|
+
import { S3ClientConfig, S3Client } from '@aws-sdk/client-s3';
|
|
6
|
+
import { CancelTokenSource } from 'axios';
|
|
7
|
+
import * as events from 'events';
|
|
8
|
+
export declare const getPrefix: (config: {
|
|
9
|
+
credentials: ICredentials;
|
|
10
|
+
level?: StorageAccessLevel;
|
|
11
|
+
customPrefix?: CustomPrefix;
|
|
12
|
+
identityId?: string;
|
|
13
|
+
}) => string;
|
|
14
|
+
export declare const createPrefixMiddleware: (opt: Record<string, any>, key: string) => InitializeMiddleware<any, any>;
|
|
15
|
+
export declare const autoAdjustClockskewMiddleware: (config: S3ClientConfig) => FinalizeRequestMiddleware<any, any>;
|
|
16
|
+
export declare const autoAdjustClockskewMiddlewareOptions: FinalizeRequestHandlerOptions;
|
|
17
|
+
export declare const prefixMiddlewareOptions: InitializeHandlerOptions;
|
|
18
|
+
export declare const credentialsProvider: () => Promise<{
|
|
19
|
+
accessKeyId: any;
|
|
20
|
+
sessionToken: any;
|
|
21
|
+
secretAccessKey: any;
|
|
22
|
+
identityId: any;
|
|
23
|
+
authenticated: any;
|
|
24
|
+
} | {
|
|
25
|
+
accessKeyId: string;
|
|
26
|
+
secretAccessKey: string;
|
|
27
|
+
}>;
|
|
28
|
+
export declare const createS3Client: (config: {
|
|
29
|
+
region?: string;
|
|
30
|
+
cancelTokenSource?: CancelTokenSource;
|
|
31
|
+
dangerouslyConnectToHttpEndpointForTesting?: boolean;
|
|
32
|
+
useAccelerateEndpoint?: boolean;
|
|
33
|
+
}, emitter?: events.EventEmitter) => S3Client;
|
|
@@ -1,52 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
-
});
|
|
21
|
-
};
|
|
22
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
-
function step(op) {
|
|
27
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
-
while (_) try {
|
|
29
|
-
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;
|
|
30
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
-
switch (op[0]) {
|
|
32
|
-
case 0: case 1: t = op; break;
|
|
33
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
-
default:
|
|
37
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
-
if (t[2]) _.ops.pop();
|
|
42
|
-
_.trys.pop(); continue;
|
|
43
|
-
}
|
|
44
|
-
op = body.call(thisArg, _);
|
|
45
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
-
}
|
|
48
|
-
};
|
|
49
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var tslib_1 = require("tslib");
|
|
50
4
|
var core_1 = require("@aws-amplify/core");
|
|
51
5
|
var client_s3_1 = require("@aws-sdk/client-s3");
|
|
52
6
|
var axios_http_handler_1 = require("../providers/axios-http-handler");
|
|
@@ -80,15 +34,15 @@ exports.getPrefix = function (config) {
|
|
|
80
34
|
return publicPath;
|
|
81
35
|
}
|
|
82
36
|
};
|
|
83
|
-
exports.createPrefixMiddleware = function (opt, key) { return function (next, _context) { return function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
37
|
+
exports.createPrefixMiddleware = function (opt, key) { return function (next, _context) { return function (args) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
84
38
|
var credentials, cred, prefix, clonedInput, result;
|
|
85
|
-
return __generator(this, function (_a) {
|
|
39
|
+
return tslib_1.__generator(this, function (_a) {
|
|
86
40
|
switch (_a.label) {
|
|
87
41
|
case 0: return [4 /*yield*/, core_1.Credentials.get()];
|
|
88
42
|
case 1:
|
|
89
43
|
credentials = _a.sent();
|
|
90
44
|
cred = core_1.Credentials.shear(credentials);
|
|
91
|
-
prefix = exports.getPrefix(__assign(__assign({}, opt), { credentials: cred }));
|
|
45
|
+
prefix = exports.getPrefix(tslib_1.__assign(tslib_1.__assign({}, opt), { credentials: cred }));
|
|
92
46
|
clonedInput = Object.assign({}, args.input);
|
|
93
47
|
if (Object.prototype.hasOwnProperty.call(args.input, 'Key')) {
|
|
94
48
|
clonedInput.Key = prefix + key;
|
|
@@ -109,9 +63,9 @@ var isTimeSkewedError = function (err) {
|
|
|
109
63
|
err.Code === 'RequestTimeTooSkewed';
|
|
110
64
|
};
|
|
111
65
|
// we want to take the S3Client config in parameter so we can modify it's systemClockOffset
|
|
112
|
-
exports.autoAdjustClockskewMiddleware = function (config) { return function (next, _context) { return function (args) { return __awaiter(void 0, void 0, void 0, function () {
|
|
66
|
+
exports.autoAdjustClockskewMiddleware = function (config) { return function (next, _context) { return function (args) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
113
67
|
var err_1, serverDate;
|
|
114
|
-
return __generator(this, function (_a) {
|
|
68
|
+
return tslib_1.__generator(this, function (_a) {
|
|
115
69
|
switch (_a.label) {
|
|
116
70
|
case 0:
|
|
117
71
|
_a.trys.push([0, 2, , 3]);
|
|
@@ -136,9 +90,9 @@ exports.prefixMiddlewareOptions = {
|
|
|
136
90
|
step: 'initialize',
|
|
137
91
|
name: 'addPrefixMiddleware',
|
|
138
92
|
};
|
|
139
|
-
exports.credentialsProvider = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
93
|
+
exports.credentialsProvider = function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
140
94
|
var credentials, cred, error_1;
|
|
141
|
-
return __generator(this, function (_a) {
|
|
95
|
+
return tslib_1.__generator(this, function (_a) {
|
|
142
96
|
switch (_a.label) {
|
|
143
97
|
case 0:
|
|
144
98
|
_a.trys.push([0, 2, , 3]);
|
|
@@ -169,7 +123,7 @@ exports.createS3Client = function (config, emitter) {
|
|
|
169
123
|
forcePathStyle: true,
|
|
170
124
|
};
|
|
171
125
|
}
|
|
172
|
-
var s3client = new client_s3_1.S3Client(__assign(__assign({ region: region,
|
|
126
|
+
var s3client = new client_s3_1.S3Client(tslib_1.__assign(tslib_1.__assign({ region: region,
|
|
173
127
|
// Using provider instead of a static credentials, so that if an upload task was in progress, but credentials gets
|
|
174
128
|
// changed or invalidated (e.g user signed out), the subsequent requests will fail.
|
|
175
129
|
credentials: exports.credentialsProvider, customUserAgent: core_1.getAmplifyUserAgent() }, localTestingConfig), { requestHandler: new axios_http_handler_1.AxiosHttpHandler({}, emitter, cancelTokenSource), useAccelerateEndpoint: useAccelerateEndpoint }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3ClientUtils.js","sourceRoot":"","sources":["../../src/common/S3ClientUtils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"S3ClientUtils.js","sourceRoot":"","sources":["../../src/common/S3ClientUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export declare enum StorageErrorStrings {
|
|
2
|
+
NO_CREDENTIALS = "No credentials",
|
|
3
|
+
NO_SRC_KEY = "source param should be an object with the property \"key\" with value of type string",
|
|
4
|
+
NO_DEST_KEY = "destination param should be an object with the property \"key\" with value of type string",
|
|
5
|
+
INVALID_BLOB = "Object must be an instance of Blob"
|
|
6
|
+
}
|
|
7
|
+
export declare enum AWSS3ProviderMultipartCopierErrors {
|
|
8
|
+
CLEANUP_FAILED = "Multipart copy clean up failed",
|
|
9
|
+
NO_OBJECT_FOUND = "Object does not exist",
|
|
10
|
+
INVALID_QUEUESIZE = "Queue size must be a positive number",
|
|
11
|
+
NO_COPYSOURCE = "You must specify a copy source",
|
|
12
|
+
MAX_NUM_PARTS_EXCEEDED = "Only a maximum of 10000 parts are allowed"
|
|
13
|
+
}
|
|
14
|
+
export declare enum AWSS3ProviderUploadErrorStrings {
|
|
15
|
+
UPLOAD_PAUSED_MESSAGE = "paused"
|
|
16
|
+
}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export declare const byteLength: (x: unknown) => number;
|
|
2
|
+
export declare const dispatchStorageEvent: (track: boolean, event: string, attrs: any, metrics: any, message: string) => void;
|
|
3
|
+
export declare const isFile: (x: unknown) => x is File;
|
|
4
|
+
export declare const isBlob: (x: unknown) => x is Blob;
|
package/lib/index.d.ts
ADDED
package/lib/index.js
CHANGED
|
@@ -1,63 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
*
|
|
5
|
-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
|
|
6
|
-
* the License. A copy of the License is located at
|
|
7
|
-
*
|
|
8
|
-
* http://aws.amazon.com/apache2.0/
|
|
9
|
-
*
|
|
10
|
-
* or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
|
11
|
-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
|
|
12
|
-
* and limitations under the License.
|
|
13
|
-
*/
|
|
14
|
-
var __assign = (this && this.__assign) || function () {
|
|
15
|
-
__assign = Object.assign || function(t) {
|
|
16
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
17
|
-
s = arguments[i];
|
|
18
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
19
|
-
t[p] = s[p];
|
|
20
|
-
}
|
|
21
|
-
return t;
|
|
22
|
-
};
|
|
23
|
-
return __assign.apply(this, arguments);
|
|
24
|
-
};
|
|
25
|
-
function __export(m) {
|
|
26
|
-
for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
|
|
27
|
-
}
|
|
2
|
+
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
28
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
5
|
var Storage_1 = require("./Storage");
|
|
30
6
|
exports.StorageClass = Storage_1.Storage;
|
|
31
|
-
|
|
32
|
-
var
|
|
33
|
-
|
|
34
|
-
var getInstance = function () {
|
|
35
|
-
if (_instance) {
|
|
36
|
-
return _instance;
|
|
37
|
-
}
|
|
38
|
-
logger.debug('Create Storage Instance, debug');
|
|
39
|
-
_instance = new Storage_1.Storage();
|
|
40
|
-
_instance.vault = new Storage_1.Storage();
|
|
41
|
-
var old_configure = _instance.configure;
|
|
42
|
-
_instance.configure = function (options) {
|
|
43
|
-
logger.debug('storage configure called');
|
|
44
|
-
var vaultConfig = __assign({}, old_configure.call(_instance, options));
|
|
45
|
-
// set level private for each provider for the vault
|
|
46
|
-
Object.keys(vaultConfig).forEach(function (providerName) {
|
|
47
|
-
if (typeof vaultConfig[providerName] !== 'string') {
|
|
48
|
-
vaultConfig[providerName] = __assign(__assign({}, vaultConfig[providerName]), { level: 'private' });
|
|
49
|
-
}
|
|
50
|
-
});
|
|
51
|
-
logger.debug('storage vault configure called');
|
|
52
|
-
_instance.vault.configure(vaultConfig);
|
|
53
|
-
};
|
|
54
|
-
return _instance;
|
|
55
|
-
};
|
|
56
|
-
exports.Storage = getInstance();
|
|
57
|
-
core_1.Amplify.register(exports.Storage);
|
|
58
|
-
/**
|
|
59
|
-
* @deprecated use named import
|
|
60
|
-
*/
|
|
61
|
-
exports.default = exports.Storage;
|
|
62
|
-
__export(require("./providers"));
|
|
7
|
+
exports.Storage = Storage_1.StorageInstance;
|
|
8
|
+
var providers_1 = require("./providers");
|
|
9
|
+
exports.AWSS3Provider = providers_1.AWSS3Provider;
|
|
63
10
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC,qCAAqD;AAEjC,uBAFX,iBAAO,CAEgB;AAAqB,kBAFnC,yBAAe,CAE2B;AAC5D,yCAA4C;AAAnC,oCAAA,aAAa,CAAA"}
|