@atlaskit/media-client 20.2.1 → 21.1.0
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 +35 -0
- package/dist/cjs/client/file-fetcher/error.js +4 -4
- package/dist/cjs/client/file-fetcher/index.js +275 -287
- package/dist/cjs/client/media-client.js +48 -34
- package/dist/cjs/client/media-store/index.js +367 -314
- package/dist/cjs/client/media-store/resolveAuth.js +30 -32
- package/dist/cjs/client/stargate-client.js +14 -16
- package/dist/cjs/index.js +6 -13
- package/dist/cjs/models/media.js +8 -9
- package/dist/cjs/uploader/error.js +4 -4
- package/dist/cjs/uploader/index.js +88 -96
- package/dist/cjs/utils/convertBase64ToBlob.js +2 -2
- package/dist/cjs/utils/createFileDataLoader.js +67 -70
- package/dist/cjs/utils/getDimensionsFromBlob.js +23 -25
- package/dist/cjs/utils/getVideoDimensionsFromBlob.js +24 -26
- package/dist/cjs/utils/hashing/hasherCreator.js +32 -34
- package/dist/cjs/utils/mediaSubscribable/fromObservable.js +2 -2
- package/dist/cjs/utils/mobileUpload/error.js +4 -4
- package/dist/cjs/utils/mobileUpload/helpers.js +41 -43
- package/dist/cjs/utils/mobileUpload/stateMachine/index.js +14 -16
- package/dist/cjs/utils/parseJwt.js +52 -0
- package/dist/cjs/utils/polling/index.js +40 -42
- package/dist/cjs/utils/request/errors.js +9 -9
- package/dist/cjs/utils/request/helpers.js +143 -155
- package/dist/cjs/utils/request/index.js +24 -26
- package/dist/cjs/utils/shouldFetchRemoteFileStates.js +39 -41
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/client/file-fetcher/index.js +1 -3
- package/dist/es2019/client/media-client.js +3 -2
- package/dist/es2019/client/media-store/index.js +58 -15
- package/dist/es2019/index.js +2 -3
- package/dist/es2019/models/media.js +6 -4
- package/dist/es2019/uploader/index.js +3 -0
- package/dist/es2019/utils/mediaSubscribable/fromObservable.js +2 -2
- package/dist/es2019/utils/mediaSubscribable/toPromise.js +10 -12
- package/dist/es2019/utils/parseJwt.js +46 -0
- package/dist/es2019/version.json +1 -1
- package/dist/esm/client/file-fetcher/error.js +4 -4
- package/dist/esm/client/file-fetcher/index.js +273 -286
- package/dist/esm/client/media-client.js +46 -32
- package/dist/esm/client/media-store/index.js +367 -314
- package/dist/esm/client/media-store/resolveAuth.js +30 -32
- package/dist/esm/client/stargate-client.js +14 -16
- package/dist/esm/index.js +2 -3
- package/dist/esm/models/media.js +6 -6
- package/dist/esm/uploader/error.js +4 -4
- package/dist/esm/uploader/index.js +89 -96
- package/dist/esm/utils/convertBase64ToBlob.js +2 -2
- package/dist/esm/utils/createFileDataLoader.js +65 -69
- package/dist/esm/utils/getDimensionsFromBlob.js +23 -25
- package/dist/esm/utils/getVideoDimensionsFromBlob.js +24 -26
- package/dist/esm/utils/hashing/hasherCreator.js +28 -30
- package/dist/esm/utils/mediaSubscribable/fromObservable.js +2 -2
- package/dist/esm/utils/mobileUpload/error.js +4 -4
- package/dist/esm/utils/mobileUpload/helpers.js +41 -43
- package/dist/esm/utils/mobileUpload/stateMachine/index.js +14 -16
- package/dist/esm/utils/parseJwt.js +46 -0
- package/dist/esm/utils/polling/index.js +40 -42
- package/dist/esm/utils/request/errors.js +9 -9
- package/dist/esm/utils/request/helpers.js +143 -155
- package/dist/esm/utils/request/index.js +24 -26
- package/dist/esm/utils/shouldFetchRemoteFileStates.js +39 -41
- package/dist/esm/version.json +1 -1
- package/dist/types/client/__mocks__/media-client.d.ts +0 -2
- package/dist/types/client/file-fetcher/index.d.ts +4 -4
- package/dist/types/client/media-client.d.ts +1 -2
- package/dist/types/client/media-store/index.d.ts +17 -13
- package/dist/types/index.d.ts +4 -6
- package/dist/types/models/file-state.d.ts +2 -2
- package/dist/types/models/media.d.ts +1 -21
- package/dist/types/utils/createFileDataLoader.d.ts +2 -2
- package/dist/types/utils/createMediaSubject.d.ts +2 -2
- package/dist/types/utils/detectEmptyFile.d.ts +2 -2
- package/dist/types/utils/mediaSubscribable/fromObservable.d.ts +3 -3
- package/dist/types/utils/mediaSubscribable/toPromise.d.ts +2 -2
- package/dist/types/utils/mediaSubscribable/types.d.ts +9 -8
- package/dist/types/utils/parseJwt.d.ts +1 -0
- package/package.json +2 -2
- package/report.api.md +77 -126
- package/dist/cjs/client/collection-fetcher.js +0 -98
- package/dist/cjs/models/media-subscribable.js +0 -5
- package/dist/cjs/utils/deprecatedEndpointError.js +0 -43
- package/dist/es2019/client/collection-fetcher.js +0 -38
- package/dist/es2019/models/media-subscribable.js +0 -1
- package/dist/es2019/utils/deprecatedEndpointError.js +0 -20
- package/dist/esm/client/collection-fetcher.js +0 -89
- package/dist/esm/models/media-subscribable.js +0 -1
- package/dist/esm/utils/deprecatedEndpointError.js +0 -34
- package/dist/types/client/collection-fetcher.d.ts +0 -42
- package/dist/types/models/media-subscribable.d.ts +0 -3
- package/dist/types/utils/deprecatedEndpointError.d.ts +0 -16
|
@@ -17,39 +17,37 @@ var resolveAuth = /*#__PURE__*/function () {
|
|
|
17
17
|
auth,
|
|
18
18
|
_args = arguments;
|
|
19
19
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
20
|
-
while (1) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
20
|
+
while (1) switch (_context.prev = _context.next) {
|
|
21
|
+
case 0:
|
|
22
|
+
authProviderTimeout = _args.length > 2 && _args[2] !== undefined ? _args[2] : DEFAULT_AUTH_PROVIDER_TIMEOUT;
|
|
23
|
+
_context.prev = 1;
|
|
24
|
+
_context.next = 4;
|
|
25
|
+
return Promise.race([authProvider(authContext), (0, _setTimeoutPromise.rejectTimeout)(authProviderTimeout, new _error.MediaStoreError('authProviderTimedOut'))]);
|
|
26
|
+
case 4:
|
|
27
|
+
auth = _context.sent;
|
|
28
|
+
_context.next = 12;
|
|
29
|
+
break;
|
|
30
|
+
case 7:
|
|
31
|
+
_context.prev = 7;
|
|
32
|
+
_context.t0 = _context["catch"](1);
|
|
33
|
+
if (!(_context.t0 instanceof _error.MediaStoreError)) {
|
|
34
|
+
_context.next = 11;
|
|
30
35
|
break;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
throw new _error.MediaStoreError('emptyAuth');
|
|
47
|
-
case 14:
|
|
48
|
-
return _context.abrupt("return", auth);
|
|
49
|
-
case 15:
|
|
50
|
-
case "end":
|
|
51
|
-
return _context.stop();
|
|
52
|
-
}
|
|
36
|
+
}
|
|
37
|
+
throw _context.t0;
|
|
38
|
+
case 11:
|
|
39
|
+
throw new _error.MediaStoreError('failedAuthProvider', _context.t0 instanceof Error ? _context.t0 : undefined);
|
|
40
|
+
case 12:
|
|
41
|
+
if (auth) {
|
|
42
|
+
_context.next = 14;
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
throw new _error.MediaStoreError('emptyAuth');
|
|
46
|
+
case 14:
|
|
47
|
+
return _context.abrupt("return", auth);
|
|
48
|
+
case 15:
|
|
49
|
+
case "end":
|
|
50
|
+
return _context.stop();
|
|
53
51
|
}
|
|
54
52
|
}, _callee, null, [[1, 7]]);
|
|
55
53
|
}));
|
|
@@ -19,22 +19,20 @@ var StargateClient = /*#__PURE__*/function () {
|
|
|
19
19
|
value: function () {
|
|
20
20
|
var _fetchToken = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(clientId) {
|
|
21
21
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
22
|
-
while (1) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return _context.stop();
|
|
37
|
-
}
|
|
22
|
+
while (1) switch (_context.prev = _context.next) {
|
|
23
|
+
case 0:
|
|
24
|
+
_context.next = 2;
|
|
25
|
+
return fetch("".concat(this.baseUrl, "/media/auth/smartedge"), {
|
|
26
|
+
credentials: 'include',
|
|
27
|
+
headers: {
|
|
28
|
+
'x-client-id': clientId
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
case 2:
|
|
32
|
+
return _context.abrupt("return", _context.sent.json());
|
|
33
|
+
case 3:
|
|
34
|
+
case "end":
|
|
35
|
+
return _context.stop();
|
|
38
36
|
}
|
|
39
37
|
}, _callee, this);
|
|
40
38
|
}));
|
package/dist/cjs/index.js
CHANGED
|
@@ -3,12 +3,6 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
Object.defineProperty(exports, "CollectionFetcher", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: function get() {
|
|
9
|
-
return _collectionFetcher.CollectionFetcher;
|
|
10
|
-
}
|
|
11
|
-
});
|
|
12
6
|
Object.defineProperty(exports, "FileFetcherError", {
|
|
13
7
|
enumerable: true,
|
|
14
8
|
get: function get() {
|
|
@@ -111,6 +105,12 @@ Object.defineProperty(exports, "createUrl", {
|
|
|
111
105
|
return _helpers.createUrl;
|
|
112
106
|
}
|
|
113
107
|
});
|
|
108
|
+
Object.defineProperty(exports, "fromObservable", {
|
|
109
|
+
enumerable: true,
|
|
110
|
+
get: function get() {
|
|
111
|
+
return _mediaSubscribable.fromObservable;
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
114
|
Object.defineProperty(exports, "getArtifactUrl", {
|
|
115
115
|
enumerable: true,
|
|
116
116
|
get: function get() {
|
|
@@ -235,12 +235,6 @@ Object.defineProperty(exports, "isMediaClientError", {
|
|
|
235
235
|
return _errors.isMediaClientError;
|
|
236
236
|
}
|
|
237
237
|
});
|
|
238
|
-
Object.defineProperty(exports, "isMediaCollectionItemFullDetails", {
|
|
239
|
-
enumerable: true,
|
|
240
|
-
get: function get() {
|
|
241
|
-
return _media.isMediaCollectionItemFullDetails;
|
|
242
|
-
}
|
|
243
|
-
});
|
|
244
238
|
Object.defineProperty(exports, "isMediaStoreError", {
|
|
245
239
|
enumerable: true,
|
|
246
240
|
get: function get() {
|
|
@@ -371,7 +365,6 @@ var _polling = require("./utils/polling");
|
|
|
371
365
|
var _errors2 = require("./utils/polling/errors");
|
|
372
366
|
var _imageResizeModeToFileImageMode = require("./utils/imageResizeModeToFileImageMode");
|
|
373
367
|
var _fileFetcher = require("./client/file-fetcher");
|
|
374
|
-
var _collectionFetcher = require("./client/collection-fetcher");
|
|
375
368
|
var _mediaClient = require("./client/media-client");
|
|
376
369
|
var _stargateClient = require("./client/stargate-client");
|
|
377
370
|
var _isImageRemote = require("./utils/isImageRemote");
|
package/dist/cjs/models/media.js
CHANGED
|
@@ -3,8 +3,11 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.isPreviewableType = exports.
|
|
6
|
+
exports.isPreviewableType = exports.DATA_UNIT = void 0;
|
|
7
7
|
var _mediaCommon = require("@atlaskit/media-common");
|
|
8
|
+
// Warning! You can't add new media file processing status!
|
|
9
|
+
// See packages/media/media-core/src/__tests__/cache-backward-compatibility.spec.ts
|
|
10
|
+
|
|
8
11
|
var isPreviewableType = function isPreviewableType(type, featureFlags) {
|
|
9
12
|
// in classic experience, only audio/video/image are previewable
|
|
10
13
|
var defaultPreviewableTypes = ['audio', 'video', 'image'];
|
|
@@ -16,14 +19,10 @@ var isPreviewableType = function isPreviewableType(type, featureFlags) {
|
|
|
16
19
|
return defaultPreviewableTypes.indexOf(type) > -1;
|
|
17
20
|
};
|
|
18
21
|
exports.isPreviewableType = isPreviewableType;
|
|
19
|
-
var
|
|
20
|
-
return !!mediaCollectionItem['mediaType'] && !!mediaCollectionItem['mimeType'] && !!mediaCollectionItem['processingStatus'];
|
|
21
|
-
};
|
|
22
|
-
exports.isMediaCollectionItemFullDetails = isMediaCollectionItemFullDetails;
|
|
23
|
-
var DATA_UNIT;
|
|
24
|
-
exports.DATA_UNIT = DATA_UNIT;
|
|
25
|
-
(function (DATA_UNIT) {
|
|
22
|
+
var DATA_UNIT = /*#__PURE__*/function (DATA_UNIT) {
|
|
26
23
|
DATA_UNIT[DATA_UNIT["MB"] = 1048576] = "MB";
|
|
27
24
|
DATA_UNIT[DATA_UNIT["GB"] = 1073741824] = "GB";
|
|
28
25
|
DATA_UNIT[DATA_UNIT["TB"] = 1099511627776] = "TB";
|
|
29
|
-
|
|
26
|
+
return DATA_UNIT;
|
|
27
|
+
}({});
|
|
28
|
+
exports.DATA_UNIT = DATA_UNIT;
|
|
@@ -31,10 +31,10 @@ var UploaderError = /*#__PURE__*/function (_BaseMediaClientError) {
|
|
|
31
31
|
get: function get() {
|
|
32
32
|
var reason = this.reason,
|
|
33
33
|
id = this.id,
|
|
34
|
-
_this$metadata = this.metadata
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
occurrenceKey = _this$
|
|
34
|
+
_this$metadata = this.metadata,
|
|
35
|
+
_this$metadata2 = _this$metadata === void 0 ? {} : _this$metadata,
|
|
36
|
+
collectionName = _this$metadata2.collectionName,
|
|
37
|
+
occurrenceKey = _this$metadata2.occurrenceKey;
|
|
38
38
|
return {
|
|
39
39
|
reason: reason,
|
|
40
40
|
id: id,
|
|
@@ -14,22 +14,22 @@ var _hasherCreator = require("../utils/hashing/hasherCreator");
|
|
|
14
14
|
var _error = require("./error");
|
|
15
15
|
var _constants = require("../constants");
|
|
16
16
|
var _calculateChunkSize = require("./calculateChunkSize");
|
|
17
|
+
// TODO: Allow to pass multiple files
|
|
18
|
+
|
|
17
19
|
var hashingFunction = /*#__PURE__*/function () {
|
|
18
20
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(blob) {
|
|
19
21
|
var hasher;
|
|
20
22
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
21
|
-
while (1) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return _context.stop();
|
|
32
|
-
}
|
|
23
|
+
while (1) switch (_context.prev = _context.next) {
|
|
24
|
+
case 0:
|
|
25
|
+
_context.next = 2;
|
|
26
|
+
return (0, _hasherCreator.createHasher)();
|
|
27
|
+
case 2:
|
|
28
|
+
hasher = _context.sent;
|
|
29
|
+
return _context.abrupt("return", hasher.hash(blob));
|
|
30
|
+
case 4:
|
|
31
|
+
case "end":
|
|
32
|
+
return _context.stop();
|
|
33
33
|
}
|
|
34
34
|
}, _callee);
|
|
35
35
|
}));
|
|
@@ -42,29 +42,27 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
|
|
|
42
42
|
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(chunks) {
|
|
43
43
|
var response, results;
|
|
44
44
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
45
|
-
while (1) {
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
return
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
return _context2.stop();
|
|
67
|
-
}
|
|
45
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
46
|
+
case 0:
|
|
47
|
+
_context2.t0 = store;
|
|
48
|
+
_context2.t1 = hashedChunks(chunks);
|
|
49
|
+
_context2.next = 4;
|
|
50
|
+
return deferredUploadId;
|
|
51
|
+
case 4:
|
|
52
|
+
_context2.t2 = _context2.sent;
|
|
53
|
+
_context2.t3 = collectionName;
|
|
54
|
+
_context2.t4 = traceContext;
|
|
55
|
+
_context2.next = 9;
|
|
56
|
+
return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t2, _context2.t3, _context2.t4);
|
|
57
|
+
case 9:
|
|
58
|
+
response = _context2.sent;
|
|
59
|
+
results = response.data.results;
|
|
60
|
+
return _context2.abrupt("return", Object.values(results).map(function (result) {
|
|
61
|
+
return result.exists;
|
|
62
|
+
}));
|
|
63
|
+
case 12:
|
|
64
|
+
case "end":
|
|
65
|
+
return _context2.stop();
|
|
68
66
|
}
|
|
69
67
|
}, _callee2);
|
|
70
68
|
}));
|
|
@@ -77,27 +75,25 @@ var createUploadingFunction = function createUploadingFunction(store, deferredUp
|
|
|
77
75
|
return /*#__PURE__*/function () {
|
|
78
76
|
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunk) {
|
|
79
77
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
80
|
-
while (1) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
return _context3.stop();
|
|
100
|
-
}
|
|
78
|
+
while (1) switch (_context3.prev = _context3.next) {
|
|
79
|
+
case 0:
|
|
80
|
+
_context3.t0 = store;
|
|
81
|
+
_context3.t1 = chunk.hash;
|
|
82
|
+
_context3.t2 = chunk.blob;
|
|
83
|
+
_context3.next = 5;
|
|
84
|
+
return deferredUploadId;
|
|
85
|
+
case 5:
|
|
86
|
+
_context3.t3 = _context3.sent;
|
|
87
|
+
_context3.t4 = chunk.partNumber;
|
|
88
|
+
_context3.t5 = collectionName;
|
|
89
|
+
_context3.t6 = traceContext;
|
|
90
|
+
_context3.next = 11;
|
|
91
|
+
return _context3.t0.uploadChunk.call(_context3.t0, _context3.t1, _context3.t2, _context3.t3, _context3.t4, _context3.t5, _context3.t6);
|
|
92
|
+
case 11:
|
|
93
|
+
return _context3.abrupt("return", _context3.sent);
|
|
94
|
+
case 12:
|
|
95
|
+
case "end":
|
|
96
|
+
return _context3.stop();
|
|
101
97
|
}
|
|
102
98
|
}, _callee3);
|
|
103
99
|
}));
|
|
@@ -111,28 +107,26 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
|
|
|
111
107
|
return /*#__PURE__*/function () {
|
|
112
108
|
var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(chunks) {
|
|
113
109
|
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
114
|
-
while (1) {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
return _context4.stop();
|
|
135
|
-
}
|
|
110
|
+
while (1) switch (_context4.prev = _context4.next) {
|
|
111
|
+
case 0:
|
|
112
|
+
_context4.t0 = store;
|
|
113
|
+
_context4.next = 3;
|
|
114
|
+
return deferredUploadId;
|
|
115
|
+
case 3:
|
|
116
|
+
_context4.t1 = _context4.sent;
|
|
117
|
+
_context4.t2 = {
|
|
118
|
+
chunks: hashedChunks(chunks),
|
|
119
|
+
offset: offset
|
|
120
|
+
};
|
|
121
|
+
_context4.t3 = collection;
|
|
122
|
+
_context4.t4 = traceContext;
|
|
123
|
+
_context4.next = 9;
|
|
124
|
+
return _context4.t0.appendChunksToUpload.call(_context4.t0, _context4.t1, _context4.t2, _context4.t3, _context4.t4);
|
|
125
|
+
case 9:
|
|
126
|
+
offset += chunks.length;
|
|
127
|
+
case 10:
|
|
128
|
+
case "end":
|
|
129
|
+
return _context4.stop();
|
|
136
130
|
}
|
|
137
131
|
}, _callee4);
|
|
138
132
|
}));
|
|
@@ -145,24 +139,22 @@ var createFileFromUpload = /*#__PURE__*/function () {
|
|
|
145
139
|
var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId, traceContext) {
|
|
146
140
|
var collection, name, mimeType, id, occurrenceKey;
|
|
147
141
|
return _regenerator.default.wrap(function _callee5$(_context5) {
|
|
148
|
-
while (1) {
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
return _context5.stop();
|
|
165
|
-
}
|
|
142
|
+
while (1) switch (_context5.prev = _context5.next) {
|
|
143
|
+
case 0:
|
|
144
|
+
collection = file.collection, name = file.name, mimeType = file.mimeType;
|
|
145
|
+
id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
|
|
146
|
+
return _context5.abrupt("return", store.createFileFromUpload({
|
|
147
|
+
uploadId: uploadId,
|
|
148
|
+
name: name,
|
|
149
|
+
mimeType: mimeType
|
|
150
|
+
}, {
|
|
151
|
+
occurrenceKey: occurrenceKey,
|
|
152
|
+
collection: collection,
|
|
153
|
+
replaceFileId: id
|
|
154
|
+
}, traceContext));
|
|
155
|
+
case 3:
|
|
156
|
+
case "end":
|
|
157
|
+
return _context5.stop();
|
|
166
158
|
}
|
|
167
159
|
}, _callee5);
|
|
168
160
|
}));
|
|
@@ -9,7 +9,7 @@ var convertBase64ToBlob = function convertBase64ToBlob(base64) {
|
|
|
9
9
|
var base64Data = base64.split(',')[1];
|
|
10
10
|
var byteCharacters = atob(base64Data);
|
|
11
11
|
var byteArrays = [];
|
|
12
|
-
var _loop = function _loop(
|
|
12
|
+
var _loop = function _loop() {
|
|
13
13
|
var slice = byteCharacters.slice(offset, offset + sliceSize);
|
|
14
14
|
var byteNumbers = slice.split('').map(function (_, i) {
|
|
15
15
|
return slice.charCodeAt(i);
|
|
@@ -18,7 +18,7 @@ var convertBase64ToBlob = function convertBase64ToBlob(base64) {
|
|
|
18
18
|
byteArrays.push(byteArray);
|
|
19
19
|
};
|
|
20
20
|
for (var offset = 0; offset < byteCharacters.length; offset += sliceSize) {
|
|
21
|
-
_loop(
|
|
21
|
+
_loop();
|
|
22
22
|
}
|
|
23
23
|
return new Blob(byteArrays, {
|
|
24
24
|
type: 'image/jpeg'
|
|
@@ -16,7 +16,8 @@ require("setimmediate");
|
|
|
16
16
|
var _dataloader = _interopRequireDefault(require("dataloader"));
|
|
17
17
|
var _mediaCommon = require("@atlaskit/media-common");
|
|
18
18
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
19
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; } // import setimmediate to temporary fix dataloader 2.0.0 bug
|
|
20
|
+
// @see https://github.com/graphql/dataloader/issues/249
|
|
20
21
|
var MAX_BATCH_SIZE = 100;
|
|
21
22
|
exports.MAX_BATCH_SIZE = MAX_BATCH_SIZE;
|
|
22
23
|
var isBatchLoadingErrorResult = function isBatchLoadingErrorResult(result) {
|
|
@@ -57,76 +58,72 @@ function createBatchLoadingFunc(mediaStore) {
|
|
|
57
58
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(keys) {
|
|
58
59
|
var nonCollectionName, fileIdsByCollection, items;
|
|
59
60
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
60
|
-
while (1) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
var fileIds = acc[collectionName] || [];
|
|
61
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
62
|
+
case 0:
|
|
63
|
+
nonCollectionName = '__media-single-file-collection__';
|
|
64
|
+
fileIdsByCollection = keys.reduce(function (acc, key) {
|
|
65
|
+
var collectionName = key.collectionName || nonCollectionName;
|
|
66
|
+
var fileIds = acc[collectionName] || [];
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
case "end":
|
|
128
|
-
return _context2.stop();
|
|
129
|
-
}
|
|
68
|
+
// de-duplicate ids in collection
|
|
69
|
+
if (fileIds.indexOf(key.id) === -1) {
|
|
70
|
+
fileIds.push(key.id);
|
|
71
|
+
}
|
|
72
|
+
acc[collectionName] = fileIds;
|
|
73
|
+
return acc;
|
|
74
|
+
}, {});
|
|
75
|
+
items = [];
|
|
76
|
+
_context2.next = 5;
|
|
77
|
+
return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
|
|
78
|
+
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(collectionNameKey) {
|
|
79
|
+
var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext;
|
|
80
|
+
return _regenerator.default.wrap(function _callee$(_context) {
|
|
81
|
+
while (1) switch (_context.prev = _context.next) {
|
|
82
|
+
case 0:
|
|
83
|
+
metadataTraceContext = {
|
|
84
|
+
traceId: (0, _mediaCommon.getRandomHex)(8),
|
|
85
|
+
spanId: (0, _mediaCommon.getRandomHex)(8)
|
|
86
|
+
};
|
|
87
|
+
fileIds = fileIdsByCollection[collectionNameKey];
|
|
88
|
+
collectionName = collectionNameKey === nonCollectionName ? undefined : collectionNameKey;
|
|
89
|
+
_context.prev = 3;
|
|
90
|
+
_context.next = 6;
|
|
91
|
+
return mediaStore.getItems(fileIds, collectionName, metadataTraceContext);
|
|
92
|
+
case 6:
|
|
93
|
+
response = _context.sent;
|
|
94
|
+
itemsWithMetadataTraceContext = response.data.items.map(function (item) {
|
|
95
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
96
|
+
metadataTraceContext: metadataTraceContext
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
items.push.apply(items, (0, _toConsumableArray2.default)(itemsWithMetadataTraceContext));
|
|
100
|
+
_context.next = 14;
|
|
101
|
+
break;
|
|
102
|
+
case 11:
|
|
103
|
+
_context.prev = 11;
|
|
104
|
+
_context.t0 = _context["catch"](3);
|
|
105
|
+
fileIds.forEach(function (fileId) {
|
|
106
|
+
items.push({
|
|
107
|
+
id: fileId,
|
|
108
|
+
collection: collectionName,
|
|
109
|
+
error: _context.t0
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
case 14:
|
|
113
|
+
case "end":
|
|
114
|
+
return _context.stop();
|
|
115
|
+
}
|
|
116
|
+
}, _callee, null, [[3, 11]]);
|
|
117
|
+
}));
|
|
118
|
+
return function (_x2) {
|
|
119
|
+
return _ref2.apply(this, arguments);
|
|
120
|
+
};
|
|
121
|
+
}()));
|
|
122
|
+
case 5:
|
|
123
|
+
return _context2.abrupt("return", getItemsFromKeys(keys, items));
|
|
124
|
+
case 6:
|
|
125
|
+
case "end":
|
|
126
|
+
return _context2.stop();
|
|
130
127
|
}
|
|
131
128
|
}, _callee2);
|
|
132
129
|
}));
|