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