@atlaskit/media-client 17.1.2 → 17.1.4

package/dist/es2019/uploader/index.js

@@ -5,23 +5,23 @@ import { createHasher } from '../utils/hashing/hasherCreator';
 import { UploaderError } from './error';
 import { CHUNK_SIZE, PROCESSING_BATCH_SIZE } from '../constants';
 import { calculateChunkSize, fileSizeError } from './calculateChunkSize';
-import { getMediaFeatureFlag } from '@atlaskit/media-common'; // TODO: Allow to pass multiple files
+import { getMediaFeatureFlag } from '@atlaskit/media-common';
 
 const hashingFunction = async blob => {
   const hasher = await createHasher();
   return hasher.hash(blob);
 };
 
-const createProbingFunction = (store, deferredUploadId, collectionName) => async chunks => {
+const createProbingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunks => {
   const response = await store.probeChunks(hashedChunks(chunks), {
     collectionName,
     uploadId: getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? await deferredUploadId : undefined
-  });
+  }, traceContext);
   const results = response.data.results;
   return Object.values(results).map(result => result.exists);
 };
 
-const createUploadingFunction = (store, deferredUploadId, collectionName) => async chunk => {
+const createUploadingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunk => {
   const options = getMediaFeatureFlag('mediaUploadApiV2', store.featureFlags) ? {
     partNumber: chunk.partNumber,
     uploadId: await deferredUploadId
@@ -29,21 +29,21 @@ const createUploadingFunction = (store, deferredUploadId, collectionName) => asy
   return await store.uploadChunk(chunk.hash, chunk.blob, {
     collectionName,
     ...options
-  });
+  }, traceContext);
 };
 
-const createProcessingFunction = (store, deferredUploadId, collection) => {
+const createProcessingFunction = (store, deferredUploadId, collection, traceContext) => {
   let offset = 0;
   return async chunks => {
     await store.appendChunksToUpload(await deferredUploadId, {
       chunks: hashedChunks(chunks),
       offset
-    }, collection);
+    }, collection, traceContext);
     offset += chunks.length;
   };
 };
 
-const createFileFromUpload = async (file, store, uploadableFileUpfrontIds, uploadId) => {
+const createFileFromUpload = async (file, store, uploadableFileUpfrontIds, uploadId, traceContext) => {
   const {
     collection,
     name,
@@ -61,10 +61,10 @@ const createFileFromUpload = async (file, store, uploadableFileUpfrontIds, uploa
     occurrenceKey,
     collection,
     replaceFileId: id
-  });
+  }, traceContext);
 };
 
-export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) => {
+export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks, traceContext) => {
   const {
     content,
     collection
@@ -101,10 +101,10 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) =>
     probingBatchSize: 100,
     chunkSize,
     uploadingConcurrency: 3,
-    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection),
-    probingFunction: createProbingFunction(store, deferredUploadId, collection),
+    uploadingFunction: createUploadingFunction(store, deferredUploadId, collection, traceContext),
+    probingFunction: createProbingFunction(store, deferredUploadId, collection, traceContext),
     processingBatchSize: PROCESSING_BATCH_SIZE,
-    processingFunction: createProcessingFunction(store, deferredUploadId, collection)
+    processingFunction: createProcessingFunction(store, deferredUploadId, collection, traceContext)
   }, {
     onProgress(progress) {
       if (callbacks) {
@@ -116,7 +116,7 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) =>
 
   const onUploadFinish = callbacks && callbacks.onUploadFinish || (() => {});
 
-  const subscription = from(deferredUploadId).pipe(concatMap(uploadId => chunkinatorObservable.pipe(concatMap(() => from(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId)))))).subscribe({
+  const subscription = from(deferredUploadId).pipe(concatMap(uploadId => chunkinatorObservable.pipe(concatMap(() => from(createFileFromUpload(file, store, uploadableFileUpfrontIds, uploadId, traceContext)))))).subscribe({
     error: err => onUploadFinish(err),
     complete: () => onUploadFinish()
   });

package/dist/es2019/utils/request/helpers.js

@@ -19,7 +19,26 @@ export function isFetchNetworkError(err) {
 export function isRateLimitedError(error) {
   return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
+export const ZipkinHeaderKeys = {
+  traceId: 'x-b3-traceid',
+  spanId: 'x-b3-spanid',
+  parentSpanId: 'x-b3-parentspanid',
+  sampled: 'x-b3-sampled',
+  flags: 'x-b3-flags'
+};
+
+const mapTraceIdToRequestHeaders = traceContext => {
+  return traceContext ? {
+    [ZipkinHeaderKeys.traceId]: traceContext.traceId,
+    [ZipkinHeaderKeys.spanId]: traceContext.spanId
+  } : {};
+};
+
 export function mapAuthToRequestHeaders(auth) {
+  if (!auth) {
+    return {};
+  }
+
   if (isClientBasedAuth(auth)) {
     return {
       'X-Client-Id': auth.clientId,
@@ -47,15 +66,14 @@ export function createUrl(url, {
   parsedUrl.searchParams.sort();
   return parsedUrl.toString();
 }
-export function withAuth(auth) {
-  return headers => {
-    if (auth) {
-      return { ...(headers || {}),
-        ...mapAuthToRequestHeaders(auth)
-      };
-    }
+export function extendHeaders(headers, auth, traceContext) {
+  if (!auth && !traceContext && !headers) {
+    return undefined;
+  }
 
-    return headers;
+  return { ...(headers !== null && headers !== void 0 ? headers : {}),
+    ...mapAuthToRequestHeaders(auth),
+    ...mapTraceIdToRequestHeaders(traceContext)
   };
 }
 /**
@@ -250,4 +268,7 @@ export function extractMediaHeaders(response) {
     mediaRegion,
     mediaEnv
   };
+}
+export function getRandomHex(size) {
+  return [...Array(size)].map(() => Math.floor(Math.random() * 16).toString(16)).join('');
 }

package/dist/es2019/utils/request/index.js

@@ -1,6 +1,6 @@
 export { RequestError, isRequestError } from './errors';
 export { isRateLimitedError } from './helpers';
-import { createUrl, fetchRetry, createProcessFetchResponse, withAuth } from './helpers';
+import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders } from './helpers';
 export async function request(url, options = {}, controller) {
   const {
     method = 'GET',
@@ -9,7 +9,8 @@ export async function request(url, options = {}, controller) {
     params,
     headers,
     body,
-    clientOptions = {}
+    clientOptions = {},
+    traceContext
   } = options;
   const {
     retryOptions
@@ -24,7 +25,7 @@ export async function request(url, options = {}, controller) {
   }), {
     method,
     body,
-    headers: withAuth(auth)(headers),
+    headers: extendHeaders(headers, auth, traceContext),
     signal: controller && controller.signal
   }).then(createProcessFetchResponse(metadata));
 

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "17.1.2",
+	"version": "17.1.4",
 	"sideEffects": false
 }

package/dist/esm/client/file-fetcher/index.js

@@ -154,22 +154,23 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     key: "getFileBinaryURL",
     value: function getFileBinaryURL(id, collectionName) {
       return this.mediaStore.getFileBinaryURL(id, collectionName);
-    }
+    } // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
+
   }, {
     key: "touchFiles",
-    value: function touchFiles(descriptors, collection) {
+    value: function touchFiles(descriptors, collection, traceContext) {
       return this.mediaStore.touchFiles({
         descriptors: descriptors
       }, {
         collection: collection
-      }).then(function (_ref2) {
+      }, traceContext).then(function (_ref2) {
         var data = _ref2.data;
         return data;
       });
     }
   }, {
     key: "generateUploadableFileUpfrontIds",
-    value: function generateUploadableFileUpfrontIds(collection) {
+    value: function generateUploadableFileUpfrontIds(collection, traceContext) {
       var id = uuid();
       var occurrenceKey = uuid();
       var touchFileDescriptor = {
@@ -177,7 +178,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         occurrenceKey: occurrenceKey,
         collection: collection
       };
-      var deferredUploadId = this.touchFiles([touchFileDescriptor], collection).then(function (touchedFiles) {
+      var deferredUploadId = this.touchFiles([touchFileDescriptor], collection, traceContext).then(function (touchedFiles) {
         return touchedFiles.created[0].uploadId;
       });
       return {
@@ -189,7 +190,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "uploadExternal",
     value: function () {
-      var _uploadExternal = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url, collection) {
+      var _uploadExternal = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url, collection, traceContext) {
         var _this3 = this;
 
         var uploadableFileUpfrontIds, id, occurrenceKey, subject, deferredBlob, preview, name, fileState;
@@ -197,7 +198,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+                uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
                 id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
                 subject = createMediaSubject();
                 deferredBlob = fetch(url).then(function (response) {
@@ -235,7 +236,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                     }, _callee2);
                   }));
 
-                  return function (_x3, _x4) {
+                  return function (_x4, _x5) {
                     return _ref3.apply(this, arguments);
                   };
                 }());
@@ -295,7 +296,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            _this3.upload(file, undefined, uploadableFileUpfrontIds);
+                            _this3.upload(file, undefined, uploadableFileUpfrontIds, traceContext);
 
                             _context3.next = 12;
                             return getDimensionsFromBlob(mediaType, blob);
@@ -315,7 +316,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                     }, _callee3);
                   }));
 
-                  return function (_x5, _x6) {
+                  return function (_x6, _x7) {
                     return _ref4.apply(this, arguments);
                   };
                 }()));
@@ -328,7 +329,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         }, _callee4, this);
       }));
 
-      function uploadExternal(_x, _x2) {
+      function uploadExternal(_x, _x2, _x3) {
         return _uploadExternal.apply(this, arguments);
       }
 
@@ -336,7 +337,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     }()
   }, {
     key: "upload",
-    value: function upload(file, controller, uploadableFileUpfrontIds) {
+    value: function upload(file, controller, uploadableFileUpfrontIds, traceContext) {
       var _this4 = this;
 
       if (typeof file.content === 'string') {
@@ -349,7 +350,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
           collection = file.collection;
 
       if (!uploadableFileUpfrontIds) {
-        uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection);
+        uploadableFileUpfrontIds = this.generateUploadableFileUpfrontIds(collection, traceContext);
       }
 
       var id = uploadableFileUpfrontIds.id;
@@ -414,7 +415,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       var _uploadFile = uploadFile(file, this.mediaStore, uploadableFileUpfrontIds, {
         onUploadFinish: onUploadFinish,
         onProgress: onProgress
-      }),
+      }, traceContext),
           cancel = _uploadFile.cancel;
 
       getFileStreamsCache().set(id, subject); // We should report progress asynchronously, since this is what consumer expects
@@ -432,7 +433,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       }
 
       return fromObservable(subject);
-    }
+    } // TODO: ----- ADD TICKET
+
   }, {
     key: "downloadBinary",
     value: function () {
@@ -469,7 +471,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         }, _callee5, this);
       }));
 
-      function downloadBinary(_x7) {
+      function downloadBinary(_x8) {
         return _downloadBinary.apply(this, arguments);
       }
 
@@ -480,6 +482,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     value: function () {
       var _copyFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(source, destination) {
         var options,
+            traceContext,
             authProvider,
             sourceCollection,
             id,
@@ -513,6 +516,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
             switch (_context6.prev = _context6.next) {
               case 0:
                 options = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : {};
+                traceContext = _args6.length > 3 ? _args6[3] : undefined;
                 authProvider = source.authProvider, sourceCollection = source.collection, id = source.id;
                 destinationAuthProvider = destination.authProvider, destinationCollectionName = destination.collection, replaceFileId = destination.replaceFileId, occurrenceKey = destination.occurrenceKey;
                 preview = options.preview, mimeType = options.mimeType;
@@ -520,12 +524,12 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   authProvider: destinationAuthProvider
                 });
                 _context6.t0 = authToOwner;
-                _context6.next = 8;
+                _context6.next = 9;
                 return authProvider({
                   collectionName: sourceCollection
                 });
 
-              case 8:
+              case 9:
                 _context6.t1 = _context6.sent;
                 owner = (0, _context6.t0)(_context6.t1);
                 body = {
@@ -541,11 +545,11 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   occurrenceKey: occurrenceKey
                 };
                 cache = getFileStreamsCache();
-                _context6.prev = 13;
-                _context6.next = 16;
-                return mediaStore.copyFileWithToken(body, params);
+                _context6.prev = 14;
+                _context6.next = 17;
+                return mediaStore.copyFileWithToken(body, params, traceContext);
 
-              case 16:
+              case 17:
                 _yield$mediaStore$cop = _context6.sent;
                 copiedFile = _yield$mediaStore$cop.data;
                 // if we were passed a "mimeType", we propagate it into copiedFileWithMimeType
@@ -570,19 +574,19 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 copiedMimeType;
 
                 if (!_context6.t2) {
-                  _context6.next = 30;
+                  _context6.next = 31;
                   break;
                 }
 
-                _context6.next = 29;
+                _context6.next = 30;
                 return shouldFetchRemoteFileStates(mediaType, copiedMimeType, preview);
 
-              case 29:
+              case 30:
                 _context6.t2 = _context6.sent;
 
-              case 30:
+              case 31:
                 if (!_context6.t2) {
-                  _context6.next = 35;
+                  _context6.next = 36;
                   break;
                 }
 
@@ -598,24 +602,24 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                     return subject.complete();
                   }
                 });
-                _context6.next = 36;
+                _context6.next = 37;
                 break;
 
-              case 35:
+              case 36:
                 if (!isProcessingFileState(copiedFileState)) {
                   subject.next(_objectSpread(_objectSpread({}, copiedFileState), !isErrorFileState(copiedFileState) && previewOverride));
                 }
 
-              case 36:
+              case 37:
                 if (!cache.has(copiedId)) {
                   getFileStreamsCache().set(copiedId, subject);
                 }
 
                 return _context6.abrupt("return", copiedFile);
 
-              case 40:
-                _context6.prev = 40;
-                _context6.t3 = _context6["catch"](13);
+              case 41:
+                _context6.prev = 41;
+                _context6.t3 = _context6["catch"](14);
 
                 if (processingSubscription) {
                   processingSubscription.unsubscribe();
@@ -634,15 +638,15 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
 
                 throw _context6.t3;
 
-              case 45:
+              case 46:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee6, this, [[13, 40]]);
+        }, _callee6, this, [[14, 41]]);
       }));
 
-      function copyFile(_x8, _x9) {
+      function copyFile(_x9, _x10) {
         return _copyFile.apply(this, arguments);
       }
 

package/dist/esm/client/media-client.js

@@ -28,8 +28,8 @@ export var MediaClient = /*#__PURE__*/function () {
 
   _createClass(MediaClient, [{
     key: "getImage",
-    value: function getImage(id, params, controller, fetchMaxRes) {
-      return this.mediaStore.getImage(id, params, controller, fetchMaxRes);
+    value: function getImage(id, params, controller, fetchMaxRes, traceContext) {
+      return this.mediaStore.getImage(id, params, controller, fetchMaxRes, traceContext);
     }
   }, {
     key: "getImageUrl",