@aws-amplify/storage 4.4.12 → 4.4.13-custom-pk.86
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 +146 -0
- package/dist/aws-amplify-storage.js +316 -248
- package/dist/aws-amplify-storage.js.map +1 -1
- package/dist/aws-amplify-storage.min.js +4 -18
- package/dist/aws-amplify-storage.min.js.map +1 -1
- package/lib/providers/AWSS3ProviderManagedUpload.d.ts +1 -3
- package/lib/providers/AWSS3ProviderManagedUpload.js +66 -86
- package/lib/providers/AWSS3ProviderManagedUpload.js.map +1 -1
- package/lib/providers/axios-http-handler.d.ts +18 -1
- package/lib/providers/axios-http-handler.js +20 -7
- package/lib/providers/axios-http-handler.js.map +1 -1
- package/lib-esm/providers/AWSS3ProviderManagedUpload.d.ts +1 -3
- package/lib-esm/providers/AWSS3ProviderManagedUpload.js +66 -86
- package/lib-esm/providers/AWSS3ProviderManagedUpload.js.map +1 -1
- package/lib-esm/providers/axios-http-handler.d.ts +18 -1
- package/lib-esm/providers/axios-http-handler.js +20 -7
- package/lib-esm/providers/axios-http-handler.js.map +1 -1
- package/package.json +5 -6
- package/src/providers/AWSS3ProviderManagedUpload.ts +75 -89
- package/src/providers/axios-http-handler.ts +38 -7
|
@@ -73,7 +73,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
73
73
|
this.params = null;
|
|
74
74
|
this.opts = null;
|
|
75
75
|
this.completedParts = [];
|
|
76
|
-
this.
|
|
76
|
+
this.uploadId = null;
|
|
77
77
|
// Progress reporting
|
|
78
78
|
this.bytesUploaded = 0;
|
|
79
79
|
this.totalBytesToUpload = 0;
|
|
@@ -85,95 +85,105 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
85
85
|
}
|
|
86
86
|
AWSS3ProviderManagedUpload.prototype.upload = function () {
|
|
87
87
|
return __awaiter(this, void 0, void 0, function () {
|
|
88
|
-
var _a, putObjectCommand,
|
|
88
|
+
var _a, putObjectCommand, _b, numberOfPartsToUpload, parts, start, error_1;
|
|
89
89
|
var _this = this;
|
|
90
|
-
return __generator(this, function (
|
|
91
|
-
switch (
|
|
90
|
+
return __generator(this, function (_c) {
|
|
91
|
+
switch (_c.label) {
|
|
92
92
|
case 0:
|
|
93
|
+
_c.trys.push([0, 10, , 12]);
|
|
93
94
|
_a = this;
|
|
94
95
|
return [4 /*yield*/, this.validateAndSanitizeBody(this.params.Body)];
|
|
95
96
|
case 1:
|
|
96
|
-
_a.body =
|
|
97
|
+
_a.body = _c.sent();
|
|
97
98
|
this.totalBytesToUpload = this.byteLength(this.body);
|
|
98
99
|
if (!(this.totalBytesToUpload <= this.minPartSize)) return [3 /*break*/, 2];
|
|
99
100
|
// Multipart upload is not required. Upload the sanitized body as is
|
|
100
101
|
this.params.Body = this.body;
|
|
101
102
|
putObjectCommand = new PutObjectCommand(this.params);
|
|
102
103
|
return [2 /*return*/, this.s3client.send(putObjectCommand)];
|
|
103
|
-
case 2:
|
|
104
|
+
case 2:
|
|
105
|
+
// Step 1: Initiate the multi part upload
|
|
106
|
+
_b = this;
|
|
107
|
+
return [4 /*yield*/, this.createMultiPartUpload()];
|
|
104
108
|
case 3:
|
|
105
|
-
|
|
109
|
+
// Step 1: Initiate the multi part upload
|
|
110
|
+
_b.uploadId = _c.sent();
|
|
106
111
|
numberOfPartsToUpload = Math.ceil(this.totalBytesToUpload / this.minPartSize);
|
|
107
112
|
parts = this.createParts();
|
|
108
113
|
start = 0;
|
|
109
|
-
|
|
114
|
+
_c.label = 4;
|
|
110
115
|
case 4:
|
|
111
|
-
if (!(start < numberOfPartsToUpload)) return [3 /*break*/,
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
**/
|
|
115
|
-
return [4 /*yield*/, this.checkIfUploadCancelled(uploadId)];
|
|
116
|
+
if (!(start < numberOfPartsToUpload)) return [3 /*break*/, 7];
|
|
117
|
+
// Upload as many as `queueSize` parts simultaneously
|
|
118
|
+
return [4 /*yield*/, this.uploadParts(this.uploadId, parts.slice(start, start + this.queueSize))];
|
|
116
119
|
case 5:
|
|
117
|
-
/** This first block will try to cancel the upload if the cancel
|
|
118
|
-
* request came before any parts uploads have started.
|
|
119
|
-
**/
|
|
120
|
-
_b.sent();
|
|
121
120
|
// Upload as many as `queueSize` parts simultaneously
|
|
122
|
-
|
|
121
|
+
_c.sent();
|
|
122
|
+
_c.label = 6;
|
|
123
123
|
case 6:
|
|
124
|
-
// Upload as many as `queueSize` parts simultaneously
|
|
125
|
-
_b.sent();
|
|
126
|
-
/** Call cleanup a second time in case there were part upload requests
|
|
127
|
-
* in flight. This is to ensure that all parts are cleaned up.
|
|
128
|
-
*/
|
|
129
|
-
return [4 /*yield*/, this.checkIfUploadCancelled(uploadId)];
|
|
130
|
-
case 7:
|
|
131
|
-
/** Call cleanup a second time in case there were part upload requests
|
|
132
|
-
* in flight. This is to ensure that all parts are cleaned up.
|
|
133
|
-
*/
|
|
134
|
-
_b.sent();
|
|
135
|
-
_b.label = 8;
|
|
136
|
-
case 8:
|
|
137
124
|
start += this.queueSize;
|
|
138
125
|
return [3 /*break*/, 4];
|
|
139
|
-
case
|
|
126
|
+
case 7:
|
|
140
127
|
parts.map(function (part) {
|
|
141
128
|
_this.removeEventListener(part);
|
|
142
129
|
});
|
|
143
|
-
return [4 /*yield*/, this.finishMultiPartUpload(uploadId)];
|
|
144
|
-
case
|
|
130
|
+
return [4 /*yield*/, this.finishMultiPartUpload(this.uploadId)];
|
|
131
|
+
case 8:
|
|
145
132
|
// Step 3: Finalize the upload such that S3 can recreate the file
|
|
146
|
-
return [2 /*return*/,
|
|
133
|
+
return [2 /*return*/, _c.sent()];
|
|
134
|
+
case 9: return [3 /*break*/, 12];
|
|
135
|
+
case 10:
|
|
136
|
+
error_1 = _c.sent();
|
|
137
|
+
// if any error is thrown, call cleanup
|
|
138
|
+
return [4 /*yield*/, this.cleanup(this.uploadId)];
|
|
139
|
+
case 11:
|
|
140
|
+
// if any error is thrown, call cleanup
|
|
141
|
+
_c.sent();
|
|
142
|
+
logger.error('Error. Cancelling the multipart upload.');
|
|
143
|
+
throw error_1;
|
|
144
|
+
case 12: return [2 /*return*/];
|
|
147
145
|
}
|
|
148
146
|
});
|
|
149
147
|
});
|
|
150
148
|
};
|
|
151
149
|
AWSS3ProviderManagedUpload.prototype.createParts = function () {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
var
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
150
|
+
try {
|
|
151
|
+
var parts = [];
|
|
152
|
+
for (var bodyStart = 0; bodyStart < this.totalBytesToUpload;) {
|
|
153
|
+
var bodyEnd = Math.min(bodyStart + this.minPartSize, this.totalBytesToUpload);
|
|
154
|
+
parts.push({
|
|
155
|
+
bodyPart: this.body.slice(bodyStart, bodyEnd),
|
|
156
|
+
partNumber: parts.length + 1,
|
|
157
|
+
emitter: new events.EventEmitter(),
|
|
158
|
+
_lastUploadedBytes: 0,
|
|
159
|
+
});
|
|
160
|
+
bodyStart += this.minPartSize;
|
|
161
|
+
}
|
|
162
|
+
return parts;
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
logger.error(error);
|
|
166
|
+
throw error;
|
|
162
167
|
}
|
|
163
|
-
return parts;
|
|
164
168
|
};
|
|
165
169
|
AWSS3ProviderManagedUpload.prototype.createMultiPartUpload = function () {
|
|
166
170
|
return __awaiter(this, void 0, void 0, function () {
|
|
167
|
-
var createMultiPartUploadCommand, response;
|
|
171
|
+
var createMultiPartUploadCommand, response, error_2;
|
|
168
172
|
return __generator(this, function (_a) {
|
|
169
173
|
switch (_a.label) {
|
|
170
174
|
case 0:
|
|
175
|
+
_a.trys.push([0, 2, , 3]);
|
|
171
176
|
createMultiPartUploadCommand = new CreateMultipartUploadCommand(this.params);
|
|
172
177
|
return [4 /*yield*/, this.s3client.send(createMultiPartUploadCommand)];
|
|
173
178
|
case 1:
|
|
174
179
|
response = _a.sent();
|
|
175
180
|
logger.debug(response.UploadId);
|
|
176
181
|
return [2 /*return*/, response.UploadId];
|
|
182
|
+
case 2:
|
|
183
|
+
error_2 = _a.sent();
|
|
184
|
+
logger.error(error_2);
|
|
185
|
+
throw error_2;
|
|
186
|
+
case 3: return [2 /*return*/];
|
|
177
187
|
}
|
|
178
188
|
});
|
|
179
189
|
});
|
|
@@ -184,7 +194,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
184
194
|
*/
|
|
185
195
|
AWSS3ProviderManagedUpload.prototype.uploadParts = function (uploadId, parts) {
|
|
186
196
|
return __awaiter(this, void 0, void 0, function () {
|
|
187
|
-
var allResults, i,
|
|
197
|
+
var allResults, i, error_3;
|
|
188
198
|
var _this = this;
|
|
189
199
|
return __generator(this, function (_a) {
|
|
190
200
|
switch (_a.label) {
|
|
@@ -217,10 +227,9 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
217
227
|
}
|
|
218
228
|
return [3 /*break*/, 3];
|
|
219
229
|
case 2:
|
|
220
|
-
|
|
221
|
-
logger.error('
|
|
222
|
-
|
|
223
|
-
return [2 /*return*/];
|
|
230
|
+
error_3 = _a.sent();
|
|
231
|
+
logger.error('Error happened while uploading a part. Cancelling the multipart upload');
|
|
232
|
+
throw error_3;
|
|
224
233
|
case 3: return [2 /*return*/];
|
|
225
234
|
}
|
|
226
235
|
});
|
|
@@ -228,7 +237,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
228
237
|
};
|
|
229
238
|
AWSS3ProviderManagedUpload.prototype.finishMultiPartUpload = function (uploadId) {
|
|
230
239
|
return __awaiter(this, void 0, void 0, function () {
|
|
231
|
-
var input, completeUploadCommand, data,
|
|
240
|
+
var input, completeUploadCommand, data, error_4;
|
|
232
241
|
return __generator(this, function (_a) {
|
|
233
242
|
switch (_a.label) {
|
|
234
243
|
case 0:
|
|
@@ -247,43 +256,14 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
247
256
|
data = _a.sent();
|
|
248
257
|
return [2 /*return*/, data.Key];
|
|
249
258
|
case 3:
|
|
250
|
-
|
|
251
|
-
logger.error('
|
|
252
|
-
|
|
253
|
-
return [2 /*return*/];
|
|
259
|
+
error_4 = _a.sent();
|
|
260
|
+
logger.error('Error happened while finishing the upload.');
|
|
261
|
+
throw error_4;
|
|
254
262
|
case 4: return [2 /*return*/];
|
|
255
263
|
}
|
|
256
264
|
});
|
|
257
265
|
});
|
|
258
266
|
};
|
|
259
|
-
AWSS3ProviderManagedUpload.prototype.checkIfUploadCancelled = function (uploadId) {
|
|
260
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
261
|
-
var errorMessage, error_3;
|
|
262
|
-
return __generator(this, function (_a) {
|
|
263
|
-
switch (_a.label) {
|
|
264
|
-
case 0:
|
|
265
|
-
if (!this.cancel) return [3 /*break*/, 5];
|
|
266
|
-
errorMessage = 'Upload was cancelled.';
|
|
267
|
-
_a.label = 1;
|
|
268
|
-
case 1:
|
|
269
|
-
_a.trys.push([1, 3, , 4]);
|
|
270
|
-
return [4 /*yield*/, this.cleanup(uploadId)];
|
|
271
|
-
case 2:
|
|
272
|
-
_a.sent();
|
|
273
|
-
return [3 /*break*/, 4];
|
|
274
|
-
case 3:
|
|
275
|
-
error_3 = _a.sent();
|
|
276
|
-
errorMessage += " " + error_3.message;
|
|
277
|
-
return [3 /*break*/, 4];
|
|
278
|
-
case 4: throw new Error(errorMessage);
|
|
279
|
-
case 5: return [2 /*return*/];
|
|
280
|
-
}
|
|
281
|
-
});
|
|
282
|
-
});
|
|
283
|
-
};
|
|
284
|
-
AWSS3ProviderManagedUpload.prototype.cancelUpload = function () {
|
|
285
|
-
this.cancel = true;
|
|
286
|
-
};
|
|
287
267
|
AWSS3ProviderManagedUpload.prototype.cleanup = function (uploadId) {
|
|
288
268
|
return __awaiter(this, void 0, void 0, function () {
|
|
289
269
|
var input, data;
|
|
@@ -307,7 +287,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
307
287
|
case 2:
|
|
308
288
|
data = _a.sent();
|
|
309
289
|
if (data && data.Parts && data.Parts.length > 0) {
|
|
310
|
-
throw new Error('
|
|
290
|
+
throw new Error('Multipart upload clean up failed.');
|
|
311
291
|
}
|
|
312
292
|
return [2 /*return*/];
|
|
313
293
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSS3ProviderManagedUpload.js","sourceRoot":"","sources":["../../src/providers/AWSS3ProviderManagedUpload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,OAAO,EAAE,aAAa,IAAI,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACN,gBAAgB,EAEhB,4BAA4B,EAC5B,iBAAiB,EACjB,8BAA8B,EAE9B,gBAAgB,EAChB,2BAA2B,GAG3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACN,0BAA0B,EAC1B,4BAA4B,GAE5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EACN,sBAAsB,EACtB,uBAAuB,EACvB,6BAA6B,EAC7B,oCAAoC,EACpC,cAAc,GACd,MAAM,yBAAyB,CAAC;AAEjC,IAAM,MAAM,GAAG,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAUxD;IAkBC,oCAAY,MAAwB,EAAE,IAAI,EAAE,OAA4B;QAjBxE,WAAW;QACD,gBAAW,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ;QACzC,cAAS,GAAG,CAAC,CAAC;QAEtB,0BAA0B;QAClB,SAAI,GAAG,IAAI,CAAC;QACZ,WAAM,GAAqB,IAAI,CAAC;QAChC,SAAI,GAAG,IAAI,CAAC;QACZ,mBAAc,GAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"AWSS3ProviderManagedUpload.js","sourceRoot":"","sources":["../../src/providers/AWSS3ProviderManagedUpload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,27 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { HttpHandlerOptions } from '@aws-sdk/types';
|
|
3
3
|
import { HttpHandler, HttpRequest, HttpResponse } from '@aws-sdk/protocol-http';
|
|
4
|
-
import { CancelTokenSource,
|
|
4
|
+
import { CancelTokenSource, AxiosRequestHeaders, AxiosRequestTransformer } from 'axios';
|
|
5
5
|
import { FetchHttpHandlerOptions } from '@aws-sdk/fetch-http-handler';
|
|
6
6
|
import * as events from 'events';
|
|
7
|
+
/**
|
|
8
|
+
Extending the axios interface here to make headers required, (previously,
|
|
9
|
+
they were not required on the type we were using, but our implementation
|
|
10
|
+
does not currently account for missing headers. This worked previously,
|
|
11
|
+
because the previous `headers` type was `any`.
|
|
12
|
+
*/
|
|
13
|
+
interface AxiosTransformer extends Partial<AxiosRequestTransformer> {
|
|
14
|
+
(data: any, headers: AxiosRequestHeaders): any;
|
|
15
|
+
}
|
|
7
16
|
export declare const SEND_UPLOAD_PROGRESS_EVENT = "sendUploadProgress";
|
|
8
17
|
export declare const SEND_DOWNLOAD_PROGRESS_EVENT = "sendDownloadProgress";
|
|
18
|
+
export declare type ErrorWithResponse = {
|
|
19
|
+
response: {
|
|
20
|
+
status: number;
|
|
21
|
+
} & {
|
|
22
|
+
[key: string]: any;
|
|
23
|
+
};
|
|
24
|
+
};
|
|
9
25
|
export declare const reactNativeRequestTransformer: AxiosTransformer[];
|
|
10
26
|
export declare type AxiosHttpHandlerOptions = HttpHandlerOptions & {
|
|
11
27
|
cancelTokenSource?: CancelTokenSource;
|
|
@@ -21,3 +37,4 @@ export declare class AxiosHttpHandler implements HttpHandler {
|
|
|
21
37
|
response: HttpResponse;
|
|
22
38
|
}>;
|
|
23
39
|
}
|
|
40
|
+
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Copyright 2017-
|
|
2
|
+
* Copyright 2017-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
3
3
|
*
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
|
|
5
5
|
* the License. A copy of the License is located at
|
|
@@ -48,6 +48,13 @@ export var SEND_DOWNLOAD_PROGRESS_EVENT = 'sendDownloadProgress';
|
|
|
48
48
|
function isBlob(body) {
|
|
49
49
|
return typeof Blob !== 'undefined' && body instanceof Blob;
|
|
50
50
|
}
|
|
51
|
+
function hasErrorResponse(error) {
|
|
52
|
+
return (typeof error !== 'undefined' &&
|
|
53
|
+
Object.prototype.hasOwnProperty.call(error, 'response') &&
|
|
54
|
+
typeof error.response !== 'undefined' &&
|
|
55
|
+
Object.prototype.hasOwnProperty.call(error.response, 'status') &&
|
|
56
|
+
typeof error.response.status === 'number');
|
|
57
|
+
}
|
|
51
58
|
var normalizeHeaders = function (headers, normalizedName) {
|
|
52
59
|
var e_1, _a;
|
|
53
60
|
try {
|
|
@@ -133,10 +140,12 @@ var AxiosHttpHandler = /** @class */ (function () {
|
|
|
133
140
|
}
|
|
134
141
|
}
|
|
135
142
|
if (emitter) {
|
|
143
|
+
// TODO: Unify linting rules across JS repo
|
|
136
144
|
axiosRequest.onUploadProgress = function (event) {
|
|
137
145
|
emitter.emit(SEND_UPLOAD_PROGRESS_EVENT, event);
|
|
138
146
|
logger.debug(event);
|
|
139
147
|
};
|
|
148
|
+
// TODO: Unify linting rules across JS repo
|
|
140
149
|
axiosRequest.onDownloadProgress = function (event) {
|
|
141
150
|
emitter.emit(SEND_DOWNLOAD_PROGRESS_EVENT, event);
|
|
142
151
|
logger.debug(event);
|
|
@@ -171,24 +180,28 @@ var AxiosHttpHandler = /** @class */ (function () {
|
|
|
171
180
|
};
|
|
172
181
|
})
|
|
173
182
|
.catch(function (error) {
|
|
174
|
-
var _a, _b
|
|
183
|
+
var _a, _b;
|
|
175
184
|
// Error
|
|
176
185
|
if (error.message !==
|
|
177
186
|
AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE) {
|
|
178
187
|
logger.error(error.message);
|
|
179
188
|
}
|
|
180
189
|
// for axios' cancel error, we should re-throw it back so it's not considered an s3client error
|
|
181
|
-
// if we return empty, or an abitrary error HttpResponse, it will be hard to debug down the line
|
|
182
|
-
|
|
190
|
+
// if we return empty, or an abitrary error HttpResponse, it will be hard to debug down the line.
|
|
191
|
+
//
|
|
192
|
+
// for errors that does not have a 'response' object, it's very likely that it is an unexpected error for
|
|
193
|
+
// example a disconnect. Without it we cannot meaningfully reconstruct a HttpResponse, and the AWS SDK might
|
|
194
|
+
// consider the request successful by mistake. In this case we should also re-throw the error.
|
|
195
|
+
if (axios.isCancel(error) || !hasErrorResponse(error)) {
|
|
183
196
|
throw error;
|
|
184
197
|
}
|
|
185
198
|
// otherwise, we should re-construct an HttpResponse from the error, so that it can be passed down to other
|
|
186
199
|
// aws sdk middleware (e.g retry, clock skew correction, error message serializing)
|
|
187
200
|
return {
|
|
188
201
|
response: new HttpResponse({
|
|
189
|
-
statusCode:
|
|
190
|
-
body: (
|
|
191
|
-
headers: (
|
|
202
|
+
statusCode: error.response.status,
|
|
203
|
+
body: (_a = error.response) === null || _a === void 0 ? void 0 : _a.data,
|
|
204
|
+
headers: (_b = error.response) === null || _b === void 0 ? void 0 : _b.headers,
|
|
192
205
|
}),
|
|
193
206
|
};
|
|
194
207
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios-http-handler.js","sourceRoot":"","sources":["../../src/providers/axios-http-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGH,OAAO,EAA4B,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"axios-http-handler.js","sourceRoot":"","sources":["../../src/providers/axios-http-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/storage",
|
|
3
|
-
"version": "4.4.
|
|
3
|
+
"version": "4.4.13-custom-pk.86+e6bcf1cd8",
|
|
4
4
|
"description": "Storage category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -41,14 +41,13 @@
|
|
|
41
41
|
},
|
|
42
42
|
"homepage": "https://aws-amplify.github.io/",
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@aws-amplify/core": "4.3.
|
|
44
|
+
"@aws-amplify/core": "4.3.12-custom-pk.86+e6bcf1cd8",
|
|
45
45
|
"@aws-sdk/client-s3": "3.6.1",
|
|
46
46
|
"@aws-sdk/s3-request-presigner": "3.6.1",
|
|
47
47
|
"@aws-sdk/util-create-request": "3.6.1",
|
|
48
48
|
"@aws-sdk/util-format-url": "3.6.1",
|
|
49
|
-
"axios": "0.
|
|
50
|
-
"events": "^3.1.0"
|
|
51
|
-
"sinon": "^7.5.0"
|
|
49
|
+
"axios": "0.26.0",
|
|
50
|
+
"events": "^3.1.0"
|
|
52
51
|
},
|
|
53
52
|
"jest": {
|
|
54
53
|
"globals": {
|
|
@@ -99,5 +98,5 @@
|
|
|
99
98
|
"devDependencies": {
|
|
100
99
|
"@types/sinon": "^7.5.1"
|
|
101
100
|
},
|
|
102
|
-
"gitHead": "
|
|
101
|
+
"gitHead": "e6bcf1cd8128b132b9bc06f98bb6694cf23e41b2"
|
|
103
102
|
}
|