@aws-amplify/storage 4.4.23 → 4.4.24-unstable.4
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/dist/aws-amplify-storage.js +84 -121
- package/dist/aws-amplify-storage.js.map +1 -1
- package/dist/aws-amplify-storage.min.js +1 -1
- 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-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/package.json +3 -3
- package/src/providers/AWSS3ProviderManagedUpload.ts +75 -89
|
@@ -15,8 +15,8 @@ export declare class AWSS3ProviderManagedUpload {
|
|
|
15
15
|
private params;
|
|
16
16
|
private opts;
|
|
17
17
|
private completedParts;
|
|
18
|
-
private cancel;
|
|
19
18
|
private s3client;
|
|
19
|
+
private uploadId;
|
|
20
20
|
private bytesUploaded;
|
|
21
21
|
private totalBytesToUpload;
|
|
22
22
|
private emitter;
|
|
@@ -30,8 +30,6 @@ export declare class AWSS3ProviderManagedUpload {
|
|
|
30
30
|
*/
|
|
31
31
|
protected uploadParts(uploadId: string, parts: Part[]): Promise<void>;
|
|
32
32
|
private finishMultiPartUpload;
|
|
33
|
-
private checkIfUploadCancelled;
|
|
34
|
-
cancelUpload(): void;
|
|
35
33
|
private cleanup;
|
|
36
34
|
private removeEventListener;
|
|
37
35
|
private setupEventListener;
|
|
@@ -82,7 +82,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
82
82
|
this.params = null;
|
|
83
83
|
this.opts = null;
|
|
84
84
|
this.completedParts = [];
|
|
85
|
-
this.
|
|
85
|
+
this.uploadId = null;
|
|
86
86
|
// Progress reporting
|
|
87
87
|
this.bytesUploaded = 0;
|
|
88
88
|
this.totalBytesToUpload = 0;
|
|
@@ -94,95 +94,105 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
94
94
|
}
|
|
95
95
|
AWSS3ProviderManagedUpload.prototype.upload = function () {
|
|
96
96
|
return __awaiter(this, void 0, void 0, function () {
|
|
97
|
-
var _a, putObjectCommand,
|
|
97
|
+
var _a, putObjectCommand, _b, numberOfPartsToUpload, parts, start, error_1;
|
|
98
98
|
var _this = this;
|
|
99
|
-
return __generator(this, function (
|
|
100
|
-
switch (
|
|
99
|
+
return __generator(this, function (_c) {
|
|
100
|
+
switch (_c.label) {
|
|
101
101
|
case 0:
|
|
102
|
+
_c.trys.push([0, 10, , 12]);
|
|
102
103
|
_a = this;
|
|
103
104
|
return [4 /*yield*/, this.validateAndSanitizeBody(this.params.Body)];
|
|
104
105
|
case 1:
|
|
105
|
-
_a.body =
|
|
106
|
+
_a.body = _c.sent();
|
|
106
107
|
this.totalBytesToUpload = this.byteLength(this.body);
|
|
107
108
|
if (!(this.totalBytesToUpload <= this.minPartSize)) return [3 /*break*/, 2];
|
|
108
109
|
// Multipart upload is not required. Upload the sanitized body as is
|
|
109
110
|
this.params.Body = this.body;
|
|
110
111
|
putObjectCommand = new client_s3_1.PutObjectCommand(this.params);
|
|
111
112
|
return [2 /*return*/, this.s3client.send(putObjectCommand)];
|
|
112
|
-
case 2:
|
|
113
|
+
case 2:
|
|
114
|
+
// Step 1: Initiate the multi part upload
|
|
115
|
+
_b = this;
|
|
116
|
+
return [4 /*yield*/, this.createMultiPartUpload()];
|
|
113
117
|
case 3:
|
|
114
|
-
|
|
118
|
+
// Step 1: Initiate the multi part upload
|
|
119
|
+
_b.uploadId = _c.sent();
|
|
115
120
|
numberOfPartsToUpload = Math.ceil(this.totalBytesToUpload / this.minPartSize);
|
|
116
121
|
parts = this.createParts();
|
|
117
122
|
start = 0;
|
|
118
|
-
|
|
123
|
+
_c.label = 4;
|
|
119
124
|
case 4:
|
|
120
|
-
if (!(start < numberOfPartsToUpload)) return [3 /*break*/,
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
**/
|
|
124
|
-
return [4 /*yield*/, this.checkIfUploadCancelled(uploadId)];
|
|
125
|
+
if (!(start < numberOfPartsToUpload)) return [3 /*break*/, 7];
|
|
126
|
+
// Upload as many as `queueSize` parts simultaneously
|
|
127
|
+
return [4 /*yield*/, this.uploadParts(this.uploadId, parts.slice(start, start + this.queueSize))];
|
|
125
128
|
case 5:
|
|
126
|
-
/** This first block will try to cancel the upload if the cancel
|
|
127
|
-
* request came before any parts uploads have started.
|
|
128
|
-
**/
|
|
129
|
-
_b.sent();
|
|
130
129
|
// Upload as many as `queueSize` parts simultaneously
|
|
131
|
-
|
|
130
|
+
_c.sent();
|
|
131
|
+
_c.label = 6;
|
|
132
132
|
case 6:
|
|
133
|
-
// Upload as many as `queueSize` parts simultaneously
|
|
134
|
-
_b.sent();
|
|
135
|
-
/** Call cleanup a second time in case there were part upload requests
|
|
136
|
-
* in flight. This is to ensure that all parts are cleaned up.
|
|
137
|
-
*/
|
|
138
|
-
return [4 /*yield*/, this.checkIfUploadCancelled(uploadId)];
|
|
139
|
-
case 7:
|
|
140
|
-
/** Call cleanup a second time in case there were part upload requests
|
|
141
|
-
* in flight. This is to ensure that all parts are cleaned up.
|
|
142
|
-
*/
|
|
143
|
-
_b.sent();
|
|
144
|
-
_b.label = 8;
|
|
145
|
-
case 8:
|
|
146
133
|
start += this.queueSize;
|
|
147
134
|
return [3 /*break*/, 4];
|
|
148
|
-
case
|
|
135
|
+
case 7:
|
|
149
136
|
parts.map(function (part) {
|
|
150
137
|
_this.removeEventListener(part);
|
|
151
138
|
});
|
|
152
|
-
return [4 /*yield*/, this.finishMultiPartUpload(uploadId)];
|
|
153
|
-
case
|
|
139
|
+
return [4 /*yield*/, this.finishMultiPartUpload(this.uploadId)];
|
|
140
|
+
case 8:
|
|
154
141
|
// Step 3: Finalize the upload such that S3 can recreate the file
|
|
155
|
-
return [2 /*return*/,
|
|
142
|
+
return [2 /*return*/, _c.sent()];
|
|
143
|
+
case 9: return [3 /*break*/, 12];
|
|
144
|
+
case 10:
|
|
145
|
+
error_1 = _c.sent();
|
|
146
|
+
// if any error is thrown, call cleanup
|
|
147
|
+
return [4 /*yield*/, this.cleanup(this.uploadId)];
|
|
148
|
+
case 11:
|
|
149
|
+
// if any error is thrown, call cleanup
|
|
150
|
+
_c.sent();
|
|
151
|
+
logger.error('Error. Cancelling the multipart upload.');
|
|
152
|
+
throw error_1;
|
|
153
|
+
case 12: return [2 /*return*/];
|
|
156
154
|
}
|
|
157
155
|
});
|
|
158
156
|
});
|
|
159
157
|
};
|
|
160
158
|
AWSS3ProviderManagedUpload.prototype.createParts = function () {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
var
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
159
|
+
try {
|
|
160
|
+
var parts = [];
|
|
161
|
+
for (var bodyStart = 0; bodyStart < this.totalBytesToUpload;) {
|
|
162
|
+
var bodyEnd = Math.min(bodyStart + this.minPartSize, this.totalBytesToUpload);
|
|
163
|
+
parts.push({
|
|
164
|
+
bodyPart: this.body.slice(bodyStart, bodyEnd),
|
|
165
|
+
partNumber: parts.length + 1,
|
|
166
|
+
emitter: new events.EventEmitter(),
|
|
167
|
+
_lastUploadedBytes: 0,
|
|
168
|
+
});
|
|
169
|
+
bodyStart += this.minPartSize;
|
|
170
|
+
}
|
|
171
|
+
return parts;
|
|
172
|
+
}
|
|
173
|
+
catch (error) {
|
|
174
|
+
logger.error(error);
|
|
175
|
+
throw error;
|
|
171
176
|
}
|
|
172
|
-
return parts;
|
|
173
177
|
};
|
|
174
178
|
AWSS3ProviderManagedUpload.prototype.createMultiPartUpload = function () {
|
|
175
179
|
return __awaiter(this, void 0, void 0, function () {
|
|
176
|
-
var createMultiPartUploadCommand, response;
|
|
180
|
+
var createMultiPartUploadCommand, response, error_2;
|
|
177
181
|
return __generator(this, function (_a) {
|
|
178
182
|
switch (_a.label) {
|
|
179
183
|
case 0:
|
|
184
|
+
_a.trys.push([0, 2, , 3]);
|
|
180
185
|
createMultiPartUploadCommand = new client_s3_1.CreateMultipartUploadCommand(this.params);
|
|
181
186
|
return [4 /*yield*/, this.s3client.send(createMultiPartUploadCommand)];
|
|
182
187
|
case 1:
|
|
183
188
|
response = _a.sent();
|
|
184
189
|
logger.debug(response.UploadId);
|
|
185
190
|
return [2 /*return*/, response.UploadId];
|
|
191
|
+
case 2:
|
|
192
|
+
error_2 = _a.sent();
|
|
193
|
+
logger.error(error_2);
|
|
194
|
+
throw error_2;
|
|
195
|
+
case 3: return [2 /*return*/];
|
|
186
196
|
}
|
|
187
197
|
});
|
|
188
198
|
});
|
|
@@ -193,7 +203,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
193
203
|
*/
|
|
194
204
|
AWSS3ProviderManagedUpload.prototype.uploadParts = function (uploadId, parts) {
|
|
195
205
|
return __awaiter(this, void 0, void 0, function () {
|
|
196
|
-
var allResults, i,
|
|
206
|
+
var allResults, i, error_3;
|
|
197
207
|
var _this = this;
|
|
198
208
|
return __generator(this, function (_a) {
|
|
199
209
|
switch (_a.label) {
|
|
@@ -226,10 +236,9 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
226
236
|
}
|
|
227
237
|
return [3 /*break*/, 3];
|
|
228
238
|
case 2:
|
|
229
|
-
|
|
230
|
-
logger.error('
|
|
231
|
-
|
|
232
|
-
return [2 /*return*/];
|
|
239
|
+
error_3 = _a.sent();
|
|
240
|
+
logger.error('Error happened while uploading a part. Cancelling the multipart upload');
|
|
241
|
+
throw error_3;
|
|
233
242
|
case 3: return [2 /*return*/];
|
|
234
243
|
}
|
|
235
244
|
});
|
|
@@ -237,7 +246,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
237
246
|
};
|
|
238
247
|
AWSS3ProviderManagedUpload.prototype.finishMultiPartUpload = function (uploadId) {
|
|
239
248
|
return __awaiter(this, void 0, void 0, function () {
|
|
240
|
-
var input, completeUploadCommand, data,
|
|
249
|
+
var input, completeUploadCommand, data, error_4;
|
|
241
250
|
return __generator(this, function (_a) {
|
|
242
251
|
switch (_a.label) {
|
|
243
252
|
case 0:
|
|
@@ -256,43 +265,14 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
256
265
|
data = _a.sent();
|
|
257
266
|
return [2 /*return*/, data.Key];
|
|
258
267
|
case 3:
|
|
259
|
-
|
|
260
|
-
logger.error('
|
|
261
|
-
|
|
262
|
-
return [2 /*return*/];
|
|
268
|
+
error_4 = _a.sent();
|
|
269
|
+
logger.error('Error happened while finishing the upload.');
|
|
270
|
+
throw error_4;
|
|
263
271
|
case 4: return [2 /*return*/];
|
|
264
272
|
}
|
|
265
273
|
});
|
|
266
274
|
});
|
|
267
275
|
};
|
|
268
|
-
AWSS3ProviderManagedUpload.prototype.checkIfUploadCancelled = function (uploadId) {
|
|
269
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
270
|
-
var errorMessage, error_3;
|
|
271
|
-
return __generator(this, function (_a) {
|
|
272
|
-
switch (_a.label) {
|
|
273
|
-
case 0:
|
|
274
|
-
if (!this.cancel) return [3 /*break*/, 5];
|
|
275
|
-
errorMessage = 'Upload was cancelled.';
|
|
276
|
-
_a.label = 1;
|
|
277
|
-
case 1:
|
|
278
|
-
_a.trys.push([1, 3, , 4]);
|
|
279
|
-
return [4 /*yield*/, this.cleanup(uploadId)];
|
|
280
|
-
case 2:
|
|
281
|
-
_a.sent();
|
|
282
|
-
return [3 /*break*/, 4];
|
|
283
|
-
case 3:
|
|
284
|
-
error_3 = _a.sent();
|
|
285
|
-
errorMessage += " " + error_3.message;
|
|
286
|
-
return [3 /*break*/, 4];
|
|
287
|
-
case 4: throw new Error(errorMessage);
|
|
288
|
-
case 5: return [2 /*return*/];
|
|
289
|
-
}
|
|
290
|
-
});
|
|
291
|
-
});
|
|
292
|
-
};
|
|
293
|
-
AWSS3ProviderManagedUpload.prototype.cancelUpload = function () {
|
|
294
|
-
this.cancel = true;
|
|
295
|
-
};
|
|
296
276
|
AWSS3ProviderManagedUpload.prototype.cleanup = function (uploadId) {
|
|
297
277
|
return __awaiter(this, void 0, void 0, function () {
|
|
298
278
|
var input, data;
|
|
@@ -316,7 +296,7 @@ var AWSS3ProviderManagedUpload = /** @class */ (function () {
|
|
|
316
296
|
case 2:
|
|
317
297
|
data = _a.sent();
|
|
318
298
|
if (data && data.Parts && data.Parts.length > 0) {
|
|
319
|
-
throw new Error('
|
|
299
|
+
throw new Error('Multipart upload clean up failed.');
|
|
320
300
|
}
|
|
321
301
|
return [2 /*return*/];
|
|
322
302
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AWSS3ProviderManagedUpload.js","sourceRoot":"","sources":["../../src/providers/AWSS3ProviderManagedUpload.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0CAA4D;AAC5D,gDAW4B;AAC5B,2DAI8B;AAC9B,6CAAiC;AACjC,yDAMiC;AAEjC,IAAM,MAAM,GAAG,IAAI,oBAAM,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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"}
|
|
@@ -15,8 +15,8 @@ export declare class AWSS3ProviderManagedUpload {
|
|
|
15
15
|
private params;
|
|
16
16
|
private opts;
|
|
17
17
|
private completedParts;
|
|
18
|
-
private cancel;
|
|
19
18
|
private s3client;
|
|
19
|
+
private uploadId;
|
|
20
20
|
private bytesUploaded;
|
|
21
21
|
private totalBytesToUpload;
|
|
22
22
|
private emitter;
|
|
@@ -30,8 +30,6 @@ export declare class AWSS3ProviderManagedUpload {
|
|
|
30
30
|
*/
|
|
31
31
|
protected uploadParts(uploadId: string, parts: Part[]): Promise<void>;
|
|
32
32
|
private finishMultiPartUpload;
|
|
33
|
-
private checkIfUploadCancelled;
|
|
34
|
-
cancelUpload(): void;
|
|
35
33
|
private cleanup;
|
|
36
34
|
private removeEventListener;
|
|
37
35
|
private setupEventListener;
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/storage",
|
|
3
|
-
"version": "4.4.
|
|
3
|
+
"version": "4.4.24-unstable.4+00923cfae",
|
|
4
4
|
"description": "Storage category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
},
|
|
42
42
|
"homepage": "https://aws-amplify.github.io/",
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@aws-amplify/core": "4.5.4",
|
|
44
|
+
"@aws-amplify/core": "4.5.5-unstable.4+00923cfae",
|
|
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",
|
|
@@ -98,5 +98,5 @@
|
|
|
98
98
|
"devDependencies": {
|
|
99
99
|
"@types/sinon": "^7.5.1"
|
|
100
100
|
},
|
|
101
|
-
"gitHead": "
|
|
101
|
+
"gitHead": "00923cfaeafcee97a0f54cc6aa04724f7155e75d"
|
|
102
102
|
}
|