@aws-amplify/storage 4.4.3 → 4.4.4-in-app-messaging.35

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.
Files changed (78) hide show
  1. package/CHANGELOG.md +28 -352
  2. package/dist/aws-amplify-storage.js +6523 -5062
  3. package/dist/aws-amplify-storage.js.map +1 -1
  4. package/dist/aws-amplify-storage.min.js +5 -5
  5. package/dist/aws-amplify-storage.min.js.map +1 -1
  6. package/lib/Storage.d.ts +3 -1
  7. package/lib/Storage.js +25 -21
  8. package/lib/Storage.js.map +1 -1
  9. package/lib/common/S3ClientUtils.d.ts +33 -0
  10. package/lib/common/S3ClientUtils.js +179 -0
  11. package/lib/common/S3ClientUtils.js.map +1 -0
  12. package/lib/common/StorageConstants.d.ts +4 -0
  13. package/lib/common/StorageConstants.js +10 -0
  14. package/lib/common/StorageConstants.js.map +1 -0
  15. package/lib/common/StorageErrorStrings.d.ts +5 -1
  16. package/lib/common/StorageErrorStrings.js +5 -0
  17. package/lib/common/StorageErrorStrings.js.map +1 -1
  18. package/lib/common/StorageUtils.d.ts +4 -0
  19. package/lib/common/StorageUtils.js +41 -0
  20. package/lib/common/StorageUtils.js.map +1 -0
  21. package/lib/providers/AWSS3Provider.d.ts +9 -6
  22. package/lib/providers/AWSS3Provider.js +197 -149
  23. package/lib/providers/AWSS3Provider.js.map +1 -1
  24. package/lib/providers/AWSS3ProviderManagedUpload.d.ts +3 -10
  25. package/lib/providers/AWSS3ProviderManagedUpload.js +41 -109
  26. package/lib/providers/AWSS3ProviderManagedUpload.js.map +1 -1
  27. package/lib/providers/AWSS3UploadTask.d.ts +107 -0
  28. package/lib/providers/AWSS3UploadTask.js +610 -0
  29. package/lib/providers/AWSS3UploadTask.js.map +1 -0
  30. package/lib/providers/axios-http-handler.d.ts +5 -1
  31. package/lib/providers/axios-http-handler.js +28 -5
  32. package/lib/providers/axios-http-handler.js.map +1 -1
  33. package/lib/types/AWSS3Provider.d.ts +24 -4
  34. package/lib/types/Provider.d.ts +7 -1
  35. package/lib/types/Storage.d.ts +8 -8
  36. package/lib-esm/Storage.d.ts +3 -1
  37. package/lib-esm/Storage.js +25 -21
  38. package/lib-esm/Storage.js.map +1 -1
  39. package/lib-esm/common/S3ClientUtils.d.ts +33 -0
  40. package/lib-esm/common/S3ClientUtils.js +177 -0
  41. package/lib-esm/common/S3ClientUtils.js.map +1 -0
  42. package/lib-esm/common/StorageConstants.d.ts +4 -0
  43. package/lib-esm/common/StorageConstants.js +8 -0
  44. package/lib-esm/common/StorageConstants.js.map +1 -0
  45. package/lib-esm/common/StorageErrorStrings.d.ts +5 -1
  46. package/lib-esm/common/StorageErrorStrings.js +5 -0
  47. package/lib-esm/common/StorageErrorStrings.js.map +1 -1
  48. package/lib-esm/common/StorageUtils.d.ts +4 -0
  49. package/lib-esm/common/StorageUtils.js +39 -0
  50. package/lib-esm/common/StorageUtils.js.map +1 -0
  51. package/lib-esm/providers/AWSS3Provider.d.ts +9 -6
  52. package/lib-esm/providers/AWSS3Provider.js +192 -144
  53. package/lib-esm/providers/AWSS3Provider.js.map +1 -1
  54. package/lib-esm/providers/AWSS3ProviderManagedUpload.d.ts +3 -10
  55. package/lib-esm/providers/AWSS3ProviderManagedUpload.js +44 -112
  56. package/lib-esm/providers/AWSS3ProviderManagedUpload.js.map +1 -1
  57. package/lib-esm/providers/AWSS3UploadTask.d.ts +107 -0
  58. package/lib-esm/providers/AWSS3UploadTask.js +605 -0
  59. package/lib-esm/providers/AWSS3UploadTask.js.map +1 -0
  60. package/lib-esm/providers/axios-http-handler.d.ts +5 -1
  61. package/lib-esm/providers/axios-http-handler.js +28 -5
  62. package/lib-esm/providers/axios-http-handler.js.map +1 -1
  63. package/lib-esm/types/AWSS3Provider.d.ts +24 -4
  64. package/lib-esm/types/Provider.d.ts +7 -1
  65. package/lib-esm/types/Storage.d.ts +8 -8
  66. package/package.json +3 -3
  67. package/src/Storage.ts +85 -27
  68. package/src/common/S3ClientUtils.ts +168 -0
  69. package/src/common/StorageConstants.ts +10 -0
  70. package/src/common/StorageErrorStrings.ts +5 -0
  71. package/src/common/StorageUtils.ts +51 -0
  72. package/src/providers/AWSS3Provider.ts +251 -88
  73. package/src/providers/AWSS3ProviderManagedUpload.ts +346 -397
  74. package/src/providers/AWSS3UploadTask.ts +543 -0
  75. package/src/providers/axios-http-handler.ts +221 -186
  76. package/src/types/AWSS3Provider.ts +48 -7
  77. package/src/types/Provider.ts +18 -3
  78. package/src/types/Storage.ts +9 -9
@@ -0,0 +1,605 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
10
+ var __generator = (this && this.__generator) || function (thisArg, body) {
11
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
12
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
13
+ function verb(n) { return function (v) { return step([n, v]); }; }
14
+ function step(op) {
15
+ if (f) throw new TypeError("Generator is already executing.");
16
+ while (_) try {
17
+ 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;
18
+ if (y = 0, t) op = [op[0] & 2, t.value];
19
+ switch (op[0]) {
20
+ case 0: case 1: t = op; break;
21
+ case 4: _.label++; return { value: op[1], done: false };
22
+ case 5: _.label++; y = op[1]; op = [0]; continue;
23
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
24
+ default:
25
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
26
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
27
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
28
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
29
+ if (t[2]) _.ops.pop();
30
+ _.trys.pop(); continue;
31
+ }
32
+ op = body.call(thisArg, _);
33
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
34
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
35
+ }
36
+ };
37
+ var __read = (this && this.__read) || function (o, n) {
38
+ var m = typeof Symbol === "function" && o[Symbol.iterator];
39
+ if (!m) return o;
40
+ var i = m.call(o), r, ar = [], e;
41
+ try {
42
+ while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
43
+ }
44
+ catch (error) { e = { error: error }; }
45
+ finally {
46
+ try {
47
+ if (r && !r.done && (m = i["return"])) m.call(i);
48
+ }
49
+ finally { if (e) throw e.error; }
50
+ }
51
+ return ar;
52
+ };
53
+ var __spread = (this && this.__spread) || function () {
54
+ for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
55
+ return ar;
56
+ };
57
+ import { UploadPartCommand, CompleteMultipartUploadCommand, AbortMultipartUploadCommand, ListPartsCommand, CreateMultipartUploadCommand, ListObjectsV2Command, } from '@aws-sdk/client-s3';
58
+ import axios from 'axios';
59
+ import { Logger } from '@aws-amplify/core';
60
+ import { byteLength, isFile } from '../common/StorageUtils';
61
+ import { AWSS3ProviderUploadErrorStrings } from '../common/StorageErrorStrings';
62
+ import { SET_CONTENT_LENGTH_HEADER, UPLOADS_STORAGE_KEY, } from '../common/StorageConstants';
63
+ var logger = new Logger('AWSS3UploadTask');
64
+ export var AWSS3UploadTaskState;
65
+ (function (AWSS3UploadTaskState) {
66
+ AWSS3UploadTaskState[AWSS3UploadTaskState["INIT"] = 0] = "INIT";
67
+ AWSS3UploadTaskState[AWSS3UploadTaskState["IN_PROGRESS"] = 1] = "IN_PROGRESS";
68
+ AWSS3UploadTaskState[AWSS3UploadTaskState["PAUSED"] = 2] = "PAUSED";
69
+ AWSS3UploadTaskState[AWSS3UploadTaskState["CANCELLED"] = 3] = "CANCELLED";
70
+ AWSS3UploadTaskState[AWSS3UploadTaskState["COMPLETED"] = 4] = "COMPLETED";
71
+ })(AWSS3UploadTaskState || (AWSS3UploadTaskState = {}));
72
+ export var TaskEvents;
73
+ (function (TaskEvents) {
74
+ TaskEvents["CANCEL"] = "cancel";
75
+ TaskEvents["UPLOAD_COMPLETE"] = "uploadComplete";
76
+ TaskEvents["UPLOAD_PROGRESS"] = "uploadPartProgress";
77
+ TaskEvents["ERROR"] = "error";
78
+ })(TaskEvents || (TaskEvents = {}));
79
+ // maximum number of parts per upload request according the S3 spec,
80
+ // see: https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
81
+ var MAX_PARTS = 10000;
82
+ // 5MB in bytes
83
+ var PART_SIZE = 5 * 1024 * 1024;
84
+ var DEFAULT_QUEUE_SIZE = 4;
85
+ function comparePartNumber(a, b) {
86
+ return a.PartNumber - b.PartNumber;
87
+ }
88
+ var AWSS3UploadTask = /** @class */ (function () {
89
+ function AWSS3UploadTask(_a) {
90
+ var s3Client = _a.s3Client, file = _a.file, emitter = _a.emitter, storage = _a.storage, params = _a.params, level = _a.level, prefixPromise = _a.prefixPromise;
91
+ this.partSize = PART_SIZE;
92
+ this.queueSize = DEFAULT_QUEUE_SIZE;
93
+ this.inProgress = [];
94
+ this.completedParts = [];
95
+ this.queued = [];
96
+ this.bytesUploaded = 0;
97
+ this.totalBytes = 0;
98
+ this.state = AWSS3UploadTaskState.INIT;
99
+ this.prefixPromise = prefixPromise;
100
+ this.s3client = s3Client;
101
+ this.s3client.middlewareStack.remove(SET_CONTENT_LENGTH_HEADER);
102
+ this.storage = storage;
103
+ this.storageSync = Promise.resolve();
104
+ if (typeof this.storage['sync'] === 'function') {
105
+ this.storageSync = this.storage['sync']();
106
+ }
107
+ this.params = params;
108
+ this.file = file;
109
+ this.totalBytes = this.file.size;
110
+ this.bytesUploaded = 0;
111
+ this.emitter = emitter;
112
+ this.queued = [];
113
+ this.fileId = this._getFileId(level);
114
+ this._validateParams();
115
+ // event emitter will re-throw an error if an event emits an error unless there's a listener, attaching a no-op
116
+ // function to it unless user adds their own onError callback
117
+ this.emitter.on(TaskEvents.ERROR, function () { });
118
+ }
119
+ Object.defineProperty(AWSS3UploadTask.prototype, "percent", {
120
+ get: function () {
121
+ return (this.bytesUploaded / this.totalBytes) * 100;
122
+ },
123
+ enumerable: true,
124
+ configurable: true
125
+ });
126
+ Object.defineProperty(AWSS3UploadTask.prototype, "isInProgress", {
127
+ get: function () {
128
+ return this.state === AWSS3UploadTaskState.IN_PROGRESS;
129
+ },
130
+ enumerable: true,
131
+ configurable: true
132
+ });
133
+ AWSS3UploadTask.prototype._listSingleFile = function (_a) {
134
+ var key = _a.key, bucket = _a.bucket;
135
+ return __awaiter(this, void 0, void 0, function () {
136
+ var listObjectRes, _b, Contents, prefix, obj;
137
+ return __generator(this, function (_c) {
138
+ switch (_c.label) {
139
+ case 0: return [4 /*yield*/, this.s3client.send(new ListObjectsV2Command({
140
+ Bucket: bucket,
141
+ Prefix: key,
142
+ }))];
143
+ case 1:
144
+ listObjectRes = _c.sent();
145
+ _b = listObjectRes.Contents, Contents = _b === void 0 ? [] : _b;
146
+ return [4 /*yield*/, this.prefixPromise];
147
+ case 2:
148
+ prefix = _c.sent();
149
+ obj = Contents.find(function (o) { return o.Key === "" + prefix + key; });
150
+ return [2 /*return*/, obj];
151
+ }
152
+ });
153
+ });
154
+ };
155
+ AWSS3UploadTask.prototype._getFileId = function (level) {
156
+ // We should check if it's a File first because File is also instance of a Blob
157
+ if (isFile(this.file)) {
158
+ return [
159
+ this.file.name,
160
+ this.file.lastModified,
161
+ this.file.size,
162
+ this.file.type,
163
+ this.params.Bucket,
164
+ level,
165
+ this.params.Key,
166
+ ].join('-');
167
+ }
168
+ else {
169
+ return [
170
+ this.file.size,
171
+ this.file.type,
172
+ this.params.Bucket,
173
+ level,
174
+ this.params.Key,
175
+ ].join('-');
176
+ }
177
+ };
178
+ AWSS3UploadTask.prototype._findCachedUploadParts = function () {
179
+ return __awaiter(this, void 0, void 0, function () {
180
+ var uploadRequests, cachedUploadFileData, listPartsOutput;
181
+ return __generator(this, function (_a) {
182
+ switch (_a.label) {
183
+ case 0: return [4 /*yield*/, this._listCachedUploadTasks()];
184
+ case 1:
185
+ uploadRequests = _a.sent();
186
+ if (Object.keys(uploadRequests).length === 0 ||
187
+ !Object.prototype.hasOwnProperty.call(uploadRequests, this.fileId)) {
188
+ return [2 /*return*/, { parts: [], uploadId: null }];
189
+ }
190
+ cachedUploadFileData = uploadRequests[this.fileId];
191
+ cachedUploadFileData.lastTouched = Date.now();
192
+ this.storage.setItem(UPLOADS_STORAGE_KEY, JSON.stringify(uploadRequests));
193
+ return [4 /*yield*/, this.s3client.send(new ListPartsCommand({
194
+ Bucket: this.params.Bucket,
195
+ Key: this.params.Key,
196
+ UploadId: cachedUploadFileData.uploadId,
197
+ }))];
198
+ case 2:
199
+ listPartsOutput = _a.sent();
200
+ return [2 /*return*/, {
201
+ parts: listPartsOutput.Parts || [],
202
+ uploadId: cachedUploadFileData.uploadId,
203
+ }];
204
+ }
205
+ });
206
+ });
207
+ };
208
+ AWSS3UploadTask.prototype._emitEvent = function (event, payload) {
209
+ this.emitter.emit(event, payload);
210
+ };
211
+ AWSS3UploadTask.prototype._validateParams = function () {
212
+ if (this.file.size / this.partSize > MAX_PARTS) {
213
+ throw new Error("Too many parts. Number of parts is " + this.file.size /
214
+ this.partSize + ", maximum is " + MAX_PARTS + ".");
215
+ }
216
+ };
217
+ AWSS3UploadTask.prototype._listCachedUploadTasks = function () {
218
+ return __awaiter(this, void 0, void 0, function () {
219
+ var tasks;
220
+ return __generator(this, function (_a) {
221
+ switch (_a.label) {
222
+ case 0: return [4 /*yield*/, this.storageSync];
223
+ case 1:
224
+ _a.sent();
225
+ tasks = this.storage.getItem(UPLOADS_STORAGE_KEY) || '{}';
226
+ return [2 /*return*/, JSON.parse(tasks)];
227
+ }
228
+ });
229
+ });
230
+ };
231
+ AWSS3UploadTask.prototype._cache = function (fileMetadata) {
232
+ return __awaiter(this, void 0, void 0, function () {
233
+ var uploadRequests;
234
+ return __generator(this, function (_a) {
235
+ switch (_a.label) {
236
+ case 0: return [4 /*yield*/, this._listCachedUploadTasks()];
237
+ case 1:
238
+ uploadRequests = _a.sent();
239
+ uploadRequests[this.fileId] = fileMetadata;
240
+ this.storage.setItem(UPLOADS_STORAGE_KEY, JSON.stringify(uploadRequests));
241
+ return [2 /*return*/];
242
+ }
243
+ });
244
+ });
245
+ };
246
+ AWSS3UploadTask.prototype._isCached = function () {
247
+ return __awaiter(this, void 0, void 0, function () {
248
+ var _a, _b;
249
+ return __generator(this, function (_c) {
250
+ switch (_c.label) {
251
+ case 0:
252
+ _b = (_a = Object.prototype.hasOwnProperty).call;
253
+ return [4 /*yield*/, this._listCachedUploadTasks()];
254
+ case 1: return [2 /*return*/, _b.apply(_a, [_c.sent(),
255
+ this.fileId])];
256
+ }
257
+ });
258
+ });
259
+ };
260
+ AWSS3UploadTask.prototype._removeFromCache = function () {
261
+ return __awaiter(this, void 0, void 0, function () {
262
+ var uploadRequests;
263
+ return __generator(this, function (_a) {
264
+ switch (_a.label) {
265
+ case 0: return [4 /*yield*/, this._listCachedUploadTasks()];
266
+ case 1:
267
+ uploadRequests = _a.sent();
268
+ delete uploadRequests[this.fileId];
269
+ this.storage.setItem(UPLOADS_STORAGE_KEY, JSON.stringify(uploadRequests));
270
+ return [2 /*return*/];
271
+ }
272
+ });
273
+ });
274
+ };
275
+ AWSS3UploadTask.prototype._onPartUploadCompletion = function (_a) {
276
+ var eTag = _a.eTag, partNumber = _a.partNumber, chunk = _a.chunk;
277
+ return __awaiter(this, void 0, void 0, function () {
278
+ return __generator(this, function (_b) {
279
+ this.completedParts.push({
280
+ ETag: eTag,
281
+ PartNumber: partNumber,
282
+ });
283
+ this.bytesUploaded += byteLength(chunk);
284
+ this._emitEvent(TaskEvents.UPLOAD_PROGRESS, {
285
+ loaded: this.bytesUploaded,
286
+ total: this.totalBytes,
287
+ });
288
+ // Remove the completed item from the inProgress array
289
+ this.inProgress = this.inProgress.filter(function (job) { return job.uploadPartInput.PartNumber !== partNumber; });
290
+ if (this.queued.length && this.state !== AWSS3UploadTaskState.PAUSED)
291
+ this._startNextPart();
292
+ if (this._isDone())
293
+ this._completeUpload();
294
+ return [2 /*return*/];
295
+ });
296
+ });
297
+ };
298
+ AWSS3UploadTask.prototype._completeUpload = function () {
299
+ return __awaiter(this, void 0, void 0, function () {
300
+ var err_1;
301
+ return __generator(this, function (_a) {
302
+ switch (_a.label) {
303
+ case 0:
304
+ _a.trys.push([0, 2, , 3]);
305
+ return [4 /*yield*/, this.s3client.send(new CompleteMultipartUploadCommand({
306
+ Bucket: this.params.Bucket,
307
+ Key: this.params.Key,
308
+ UploadId: this.uploadId,
309
+ MultipartUpload: {
310
+ // Parts are not always completed in order, we need to manually sort them
311
+ Parts: this.completedParts.sort(comparePartNumber),
312
+ },
313
+ }))];
314
+ case 1:
315
+ _a.sent();
316
+ this._verifyFileSize();
317
+ this._emitEvent(TaskEvents.UPLOAD_COMPLETE, {
318
+ key: this.params.Bucket + "/" + this.params.Key,
319
+ });
320
+ this._removeFromCache();
321
+ this.state = AWSS3UploadTaskState.COMPLETED;
322
+ return [3 /*break*/, 3];
323
+ case 2:
324
+ err_1 = _a.sent();
325
+ logger.error('error completing upload', err_1);
326
+ this._emitEvent(TaskEvents.ERROR, err_1);
327
+ return [3 /*break*/, 3];
328
+ case 3: return [2 /*return*/];
329
+ }
330
+ });
331
+ });
332
+ };
333
+ AWSS3UploadTask.prototype._makeUploadPartRequest = function (input, cancelTokenSource) {
334
+ return __awaiter(this, void 0, void 0, function () {
335
+ var res, err_2;
336
+ return __generator(this, function (_a) {
337
+ switch (_a.label) {
338
+ case 0:
339
+ _a.trys.push([0, 3, , 4]);
340
+ return [4 /*yield*/, this.s3client.send(new UploadPartCommand(input), {
341
+ cancelTokenSource: cancelTokenSource,
342
+ })];
343
+ case 1:
344
+ res = _a.sent();
345
+ return [4 /*yield*/, this._onPartUploadCompletion({
346
+ eTag: res.ETag,
347
+ partNumber: input.PartNumber,
348
+ chunk: input.Body,
349
+ })];
350
+ case 2:
351
+ _a.sent();
352
+ return [3 /*break*/, 4];
353
+ case 3:
354
+ err_2 = _a.sent();
355
+ if (this.state === AWSS3UploadTaskState.PAUSED) {
356
+ logger.log('upload paused');
357
+ }
358
+ else if (this.state === AWSS3UploadTaskState.CANCELLED) {
359
+ logger.log('upload aborted');
360
+ }
361
+ else {
362
+ logger.error('error starting next part of upload: ', err_2);
363
+ }
364
+ // axios' cancel will also throw an error, however we don't need to emit an event in that case as it's an
365
+ // expected behavior
366
+ if (!axios.isCancel(err_2) &&
367
+ err_2.message !== AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE) {
368
+ this._emitEvent(TaskEvents.ERROR, err_2);
369
+ this.pause();
370
+ }
371
+ return [3 /*break*/, 4];
372
+ case 4: return [2 /*return*/];
373
+ }
374
+ });
375
+ });
376
+ };
377
+ AWSS3UploadTask.prototype._startNextPart = function () {
378
+ if (this.queued.length > 0 && this.state !== AWSS3UploadTaskState.PAUSED) {
379
+ var cancelTokenSource = axios.CancelToken.source();
380
+ var nextPart = this.queued.shift();
381
+ this.inProgress.push({
382
+ uploadPartInput: nextPart,
383
+ s3Request: this._makeUploadPartRequest(nextPart, cancelTokenSource),
384
+ cancel: cancelTokenSource.cancel,
385
+ });
386
+ }
387
+ };
388
+ /**
389
+ * Verify on S3 side that the file size matches the one on the client side.
390
+ *
391
+ * @async
392
+ * @throws throws an error if the file size does not match between local copy of the file and the file on s3.
393
+ */
394
+ AWSS3UploadTask.prototype._verifyFileSize = function () {
395
+ return __awaiter(this, void 0, void 0, function () {
396
+ var obj, valid;
397
+ return __generator(this, function (_a) {
398
+ switch (_a.label) {
399
+ case 0: return [4 /*yield*/, this._listSingleFile({
400
+ key: this.params.Key,
401
+ bucket: this.params.Bucket,
402
+ })];
403
+ case 1:
404
+ obj = _a.sent();
405
+ valid = Boolean(obj && obj.Size === this.file.size);
406
+ if (!valid) {
407
+ throw new Error('File size does not match between local file and file on s3');
408
+ }
409
+ return [2 /*return*/, valid];
410
+ }
411
+ });
412
+ });
413
+ };
414
+ AWSS3UploadTask.prototype._isDone = function () {
415
+ return (!this.queued.length &&
416
+ !this.inProgress.length &&
417
+ this.bytesUploaded === this.totalBytes);
418
+ };
419
+ AWSS3UploadTask.prototype._createParts = function () {
420
+ var size = this.file.size;
421
+ var parts = [];
422
+ for (var bodyStart = 0; bodyStart < size;) {
423
+ var bodyEnd = Math.min(bodyStart + this.partSize, size);
424
+ parts.push({
425
+ Body: this.file.slice(bodyStart, bodyEnd),
426
+ Key: this.params.Key,
427
+ Bucket: this.params.Bucket,
428
+ PartNumber: parts.length + 1,
429
+ UploadId: this.uploadId,
430
+ });
431
+ bodyStart += this.partSize;
432
+ }
433
+ return parts;
434
+ };
435
+ AWSS3UploadTask.prototype._initCachedUploadParts = function (cachedParts) {
436
+ this.bytesUploaded += cachedParts.reduce(function (acc, part) { return acc + part.Size; }, 0);
437
+ // Find the set of part numbers that have already been uploaded
438
+ var uploadedPartNumSet = new Set(cachedParts.map(function (part) { return part.PartNumber; }));
439
+ this.queued = this.queued.filter(function (part) { return !uploadedPartNumSet.has(part.PartNumber); });
440
+ this.completedParts = cachedParts.map(function (part) { return ({
441
+ PartNumber: part.PartNumber,
442
+ ETag: part.ETag,
443
+ }); });
444
+ this._emitEvent(TaskEvents.UPLOAD_PROGRESS, {
445
+ loaded: this.bytesUploaded,
446
+ total: this.totalBytes,
447
+ });
448
+ };
449
+ AWSS3UploadTask.prototype._initMultipartUpload = function () {
450
+ return __awaiter(this, void 0, void 0, function () {
451
+ var res;
452
+ return __generator(this, function (_a) {
453
+ switch (_a.label) {
454
+ case 0: return [4 /*yield*/, this.s3client.send(new CreateMultipartUploadCommand(this.params))];
455
+ case 1:
456
+ res = _a.sent();
457
+ this._cache({
458
+ uploadId: res.UploadId,
459
+ lastTouched: Date.now(),
460
+ bucket: this.params.Bucket,
461
+ key: this.params.Key,
462
+ fileName: this.file instanceof File ? this.file.name : '',
463
+ });
464
+ return [2 /*return*/, res.UploadId];
465
+ }
466
+ });
467
+ });
468
+ };
469
+ AWSS3UploadTask.prototype._initializeUploadTask = function () {
470
+ return __awaiter(this, void 0, void 0, function () {
471
+ var _a, parts, uploadId, uploadId, err_3;
472
+ return __generator(this, function (_b) {
473
+ switch (_b.label) {
474
+ case 0:
475
+ this.state = AWSS3UploadTaskState.IN_PROGRESS;
476
+ _b.label = 1;
477
+ case 1:
478
+ _b.trys.push([1, 7, , 8]);
479
+ return [4 /*yield*/, this._isCached()];
480
+ case 2:
481
+ if (!_b.sent()) return [3 /*break*/, 4];
482
+ return [4 /*yield*/, this._findCachedUploadParts()];
483
+ case 3:
484
+ _a = _b.sent(), parts = _a.parts, uploadId = _a.uploadId;
485
+ this.uploadId = uploadId;
486
+ this.queued = this._createParts();
487
+ this._initCachedUploadParts(parts);
488
+ this._startUpload();
489
+ return [3 /*break*/, 6];
490
+ case 4:
491
+ if (!!this.uploadId) return [3 /*break*/, 6];
492
+ return [4 /*yield*/, this._initMultipartUpload()];
493
+ case 5:
494
+ uploadId = _b.sent();
495
+ this.uploadId = uploadId;
496
+ this.queued = this._createParts();
497
+ this._startUpload();
498
+ _b.label = 6;
499
+ case 6: return [3 /*break*/, 8];
500
+ case 7:
501
+ err_3 = _b.sent();
502
+ if (!axios.isCancel(err_3)) {
503
+ logger.error('Error initializing the upload task', err_3);
504
+ }
505
+ return [3 /*break*/, 8];
506
+ case 8: return [2 /*return*/];
507
+ }
508
+ });
509
+ });
510
+ };
511
+ AWSS3UploadTask.prototype.resume = function () {
512
+ if (this.state === AWSS3UploadTaskState.CANCELLED) {
513
+ logger.warn('This task has already been cancelled');
514
+ }
515
+ else if (this.state === AWSS3UploadTaskState.COMPLETED) {
516
+ logger.warn('This task has already been completed');
517
+ }
518
+ else if (this.state === AWSS3UploadTaskState.IN_PROGRESS) {
519
+ logger.warn('Upload task already in progress');
520
+ // first time running resume, find any cached parts on s3 or start a new multipart upload request before
521
+ // starting the upload
522
+ }
523
+ else if (!this.uploadId) {
524
+ this._initializeUploadTask();
525
+ }
526
+ else {
527
+ this._startUpload();
528
+ }
529
+ };
530
+ AWSS3UploadTask.prototype._startUpload = function () {
531
+ this.state = AWSS3UploadTaskState.IN_PROGRESS;
532
+ for (var i = 0; i < this.queueSize; i++) {
533
+ this._startNextPart();
534
+ }
535
+ };
536
+ AWSS3UploadTask.prototype._cancel = function () {
537
+ return __awaiter(this, void 0, void 0, function () {
538
+ var err_4;
539
+ return __generator(this, function (_a) {
540
+ switch (_a.label) {
541
+ case 0:
542
+ if (!(this.state === AWSS3UploadTaskState.CANCELLED)) return [3 /*break*/, 1];
543
+ logger.warn('This task has already been cancelled');
544
+ return [2 /*return*/, false];
545
+ case 1:
546
+ if (!(this.state === AWSS3UploadTaskState.COMPLETED)) return [3 /*break*/, 2];
547
+ logger.warn('This task has already been completed');
548
+ return [2 /*return*/, false];
549
+ case 2:
550
+ this.pause();
551
+ this.queued = [];
552
+ this.completedParts = [];
553
+ this.bytesUploaded = 0;
554
+ this.state = AWSS3UploadTaskState.CANCELLED;
555
+ _a.label = 3;
556
+ case 3:
557
+ _a.trys.push([3, 6, , 7]);
558
+ return [4 /*yield*/, this.s3client.send(new AbortMultipartUploadCommand({
559
+ Bucket: this.params.Bucket,
560
+ Key: this.params.Key,
561
+ UploadId: this.uploadId,
562
+ }))];
563
+ case 4:
564
+ _a.sent();
565
+ return [4 /*yield*/, this._removeFromCache()];
566
+ case 5:
567
+ _a.sent();
568
+ return [2 /*return*/, true];
569
+ case 6:
570
+ err_4 = _a.sent();
571
+ logger.error('Error cancelling upload task', err_4);
572
+ return [2 /*return*/, false];
573
+ case 7: return [2 /*return*/];
574
+ }
575
+ });
576
+ });
577
+ };
578
+ /**
579
+ * pause this particular upload task
580
+ **/
581
+ AWSS3UploadTask.prototype.pause = function () {
582
+ var _a;
583
+ if (this.state === AWSS3UploadTaskState.CANCELLED) {
584
+ logger.warn('This task has already been cancelled');
585
+ }
586
+ else if (this.state === AWSS3UploadTaskState.COMPLETED) {
587
+ logger.warn('This task has already been completed');
588
+ }
589
+ else if (this.state === AWSS3UploadTaskState.PAUSED) {
590
+ logger.warn('This task is already paused');
591
+ }
592
+ this.state = AWSS3UploadTaskState.PAUSED;
593
+ // Use axios cancel token to abort the part request immediately
594
+ // Add the inProgress parts back to pending
595
+ var removedInProgressReq = this.inProgress.splice(0, this.inProgress.length);
596
+ removedInProgressReq.forEach(function (req) {
597
+ req.cancel(AWSS3ProviderUploadErrorStrings.UPLOAD_PAUSED_MESSAGE);
598
+ });
599
+ // Put all removed in progress parts back into the queue
600
+ (_a = this.queued).unshift.apply(_a, __spread(removedInProgressReq.map(function (req) { return req.uploadPartInput; })));
601
+ };
602
+ return AWSS3UploadTask;
603
+ }());
604
+ export { AWSS3UploadTask };
605
+ //# sourceMappingURL=AWSS3UploadTask.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AWSS3UploadTask.js","sourceRoot":"","sources":["../../src/providers/AWSS3UploadTask.ts"],"names":[],"mappings":"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"}
@@ -7,13 +7,17 @@ import * as events from 'events';
7
7
  export declare const SEND_UPLOAD_PROGRESS_EVENT = "sendUploadProgress";
8
8
  export declare const SEND_DOWNLOAD_PROGRESS_EVENT = "sendDownloadProgress";
9
9
  export declare const reactNativeRequestTransformer: AxiosTransformer[];
10
+ export declare type AxiosHttpHandlerOptions = HttpHandlerOptions & {
11
+ cancelTokenSource?: CancelTokenSource;
12
+ emitter?: events.EventEmitter;
13
+ };
10
14
  export declare class AxiosHttpHandler implements HttpHandler {
11
15
  private readonly httpOptions;
12
16
  private readonly emitter?;
13
17
  private readonly cancelTokenSource?;
14
18
  constructor(httpOptions?: FetchHttpHandlerOptions, emitter?: events.EventEmitter, cancelTokenSource?: CancelTokenSource);
15
19
  destroy(): void;
16
- handle(request: HttpRequest, options: HttpHandlerOptions): Promise<{
20
+ handle(request: HttpRequest, options: AxiosHttpHandlerOptions): Promise<{
17
21
  response: HttpResponse;
18
22
  }>;
19
23
  }