@atlaskit/media-client 17.1.3 → 17.1.4

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

@@ -31,7 +31,25 @@ export function isFetchNetworkError(err) {
 export function isRateLimitedError(error) {
   return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
+export var ZipkinHeaderKeys = {
+  traceId: 'x-b3-traceid',
+  spanId: 'x-b3-spanid',
+  parentSpanId: 'x-b3-parentspanid',
+  sampled: 'x-b3-sampled',
+  flags: 'x-b3-flags'
+};
+
+var mapTraceIdToRequestHeaders = function mapTraceIdToRequestHeaders(traceContext) {
+  var _ref;
+
+  return traceContext ? (_ref = {}, _defineProperty(_ref, ZipkinHeaderKeys.traceId, traceContext.traceId), _defineProperty(_ref, ZipkinHeaderKeys.spanId, traceContext.spanId), _ref) : {};
+};
+
 export function mapAuthToRequestHeaders(auth) {
+  if (!auth) {
+    return {};
+  }
+
   if (isClientBasedAuth(auth)) {
     return {
       'X-Client-Id': auth.clientId,
@@ -44,18 +62,18 @@ export function mapAuthToRequestHeaders(auth) {
     Authorization: "Bearer ".concat(auth.token)
   };
 }
-export function createUrl(url, _ref) {
-  var params = _ref.params,
-      auth = _ref.auth;
+export function createUrl(url, _ref2) {
+  var params = _ref2.params,
+      auth = _ref2.auth;
   var parsedUrl = new URL(url);
   var authParams = auth && mapAuthToQueryParameters(auth) || {};
 
   var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
 
-  Object.entries(paramsToAppend).filter(function (_ref2) {
-    var _ref3 = _slicedToArray(_ref2, 2),
-        _ = _ref3[0],
-        value = _ref3[1];
+  Object.entries(paramsToAppend).filter(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+        _ = _ref4[0],
+        value = _ref4[1];
 
     return value != null;
   }).forEach(function (pair) {
@@ -66,14 +84,12 @@ export function createUrl(url, _ref) {
   parsedUrl.searchParams.sort();
   return parsedUrl.toString();
 }
-export function withAuth(auth) {
-  return function (headers) {
-    if (auth) {
-      return _objectSpread(_objectSpread({}, headers || {}), mapAuthToRequestHeaders(auth));
-    }
+export function extendHeaders(headers, auth, traceContext) {
+  if (!auth && !traceContext && !headers) {
+    return undefined;
+  }
 
-    return headers;
-  };
+  return _objectSpread(_objectSpread(_objectSpread({}, headers !== null && headers !== void 0 ? headers : {}), mapAuthToRequestHeaders(auth)), mapTraceIdToRequestHeaders(traceContext));
 }
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
@@ -108,7 +124,7 @@ function _mapResponseToJson() {
             _context3.t0 = _context3["catch"](1);
             throw new RequestError('serverInvalidBody', {
               statusCode: response.status
-            }, _context3.t0 instanceof Error ? _context3.t0 : undefined);
+            }, _context3.t0);
 
           case 10:
           case "end":
@@ -148,7 +164,7 @@ function _mapResponseToBlob() {
             _context4.t0 = _context4["catch"](1);
             throw new RequestError('serverInvalidBody', {
               statusCode: response.status
-            }, _context4.t0 instanceof Error ? _context4.t0 : undefined);
+            }, _context4.t0);
 
           case 10:
           case "end":
@@ -167,7 +183,7 @@ export function mapResponseToVoid() {
 }
 export function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -184,7 +200,7 @@ export function createMapResponseToJson(metadata) {
               _context.t0 = _context["catch"](0);
               throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
-              }), _context.t0 instanceof Error ? _context.t0 : undefined);
+              }), _context.t0);
 
             case 9:
             case "end":
@@ -195,13 +211,13 @@ export function createMapResponseToJson(metadata) {
     }));
 
     return function (_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }
 export function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -218,7 +234,7 @@ export function createMapResponseToBlob(metadata) {
               _context2.t0 = _context2["catch"](0);
               throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
-              }), _context2.t0 instanceof Error ? _context2.t0 : undefined);
+              }), _context2.t0);
 
             case 9:
             case "end":
@@ -229,7 +245,7 @@ export function createMapResponseToBlob(metadata) {
     }));
 
     return function (_x4) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 }
@@ -274,7 +290,7 @@ function _fetchRetry() {
             timeoutInMs = startTimeoutInMs;
 
             waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+              var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
                 return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
@@ -295,7 +311,7 @@ function _fetchRetry() {
               }));
 
               return function waitAndBumpTimeout() {
-                return _ref6.apply(this, arguments);
+                return _ref7.apply(this, arguments);
               };
             }();
 
@@ -419,4 +435,9 @@ export function extractMediaHeaders(response) {
     mediaRegion: mediaRegion,
     mediaEnv: mediaEnv
   };
+}
+export function getRandomHex(size) {
+  return _toConsumableArray(Array(size)).map(function () {
+    return Math.floor(Math.random() * 16).toString(16);
+  }).join('');
 }

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

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 export { RequestError, isRequestError } from './errors';
 export { isRateLimitedError } from './helpers';
-import { createUrl, fetchRetry, createProcessFetchResponse, withAuth } from './helpers';
+import { createUrl, fetchRetry, createProcessFetchResponse, extendHeaders } from './helpers';
 export function request(_x) {
   return _request.apply(this, arguments);
 }
@@ -20,6 +20,7 @@ function _request() {
         body,
         _options$clientOption,
         clientOptions,
+        traceContext,
         retryOptions,
         metadata,
         doFetch,
@@ -31,7 +32,7 @@ function _request() {
           case 0:
             options = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
             controller = _args.length > 2 ? _args[2] : undefined;
-            _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption;
+            _options$method = options.method, method = _options$method === void 0 ? 'GET' : _options$method, endpoint = options.endpoint, auth = options.auth, params = options.params, headers = options.headers, body = options.body, _options$clientOption = options.clientOptions, clientOptions = _options$clientOption === void 0 ? {} : _options$clientOption, traceContext = options.traceContext;
             retryOptions = clientOptions.retryOptions;
             metadata = {
               method: method,
@@ -44,7 +45,7 @@ function _request() {
               }), {
                 method: method,
                 body: body,
-                headers: withAuth(auth)(headers),
+                headers: extendHeaders(headers, auth, traceContext),
                 signal: controller && controller.signal
               }).then(createProcessFetchResponse(metadata));
             };

package/dist/esm/version.json

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

package/dist/types/client/file-fetcher/index.d.ts

@@ -8,6 +8,7 @@ import { MediaFileArtifacts } from '../../models/artifacts';
 import { UploadController } from '../../upload-controller';
 import { MediaSubscribable } from '../../utils/mediaSubscribable';
 import { Dimensions } from '../../utils/getDimensionsFromBlob';
+import { MediaTraceContext } from '../../utils/request/types';
 export type { FileFetcherErrorAttributes, FileFetcherErrorReason, } from './error';
 export { isFileFetcherError, FileFetcherError } from './error';
 export interface CopySourceFile {
@@ -30,12 +31,12 @@ export declare type ExternalUploadPayload = {
 export interface FileFetcher {
     getFileState(id: string, options?: GetFileOptions): MediaSubscribable<FileState>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
-    touchFiles(descriptors: TouchFileDescriptor[], collection?: string): Promise<TouchedFiles>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): MediaSubscribable<FileState>;
-    uploadExternal(url: string, collection?: string): Promise<ExternalUploadPayload>;
+    touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable<FileState>;
+    uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
     getCurrentState(id: string, options?: GetFileOptions): Promise<FileState>;
-    copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions): Promise<MediaFile>;
+    copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
     getFileBinaryURL(id: string, collectionName?: string): Promise<string>;
 }
 export declare class FileFetcherImpl implements FileFetcher {
@@ -47,10 +48,10 @@ export declare class FileFetcherImpl implements FileFetcher {
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getFileBinaryURL(id: string, collectionName?: string): Promise<string>;
     private createDownloadFileStream;
-    touchFiles(descriptors: TouchFileDescriptor[], collection?: string): Promise<TouchedFiles>;
+    touchFiles(descriptors: TouchFileDescriptor[], collection?: string, traceContext?: MediaTraceContext): Promise<TouchedFiles>;
     private generateUploadableFileUpfrontIds;
-    uploadExternal(url: string, collection?: string): Promise<ExternalUploadPayload>;
-    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds): MediaSubscribable<FileState>;
+    uploadExternal(url: string, collection?: string, traceContext?: MediaTraceContext): Promise<ExternalUploadPayload>;
+    upload(file: UploadableFile, controller?: UploadController, uploadableFileUpfrontIds?: UploadableFileUpfrontIds, traceContext?: MediaTraceContext): MediaSubscribable<FileState>;
     downloadBinary(id: string, name?: string, collectionName?: string): Promise<void>;
-    copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions): Promise<MediaFile>;
+    copyFile(source: CopySourceFile, destination: CopyDestination, options?: CopyFileOptions, traceContext?: MediaTraceContext): Promise<MediaFile>;
 }

package/dist/types/client/media-client.d.ts

@@ -6,6 +6,7 @@ import { FileFetcher } from './file-fetcher';
 import { UploadEventPayloadMap, EventPayloadListener } from './events';
 import { StargateClient } from './stargate-client';
 import { MobileUpload } from '../models/mobile-upload';
+import { MediaTraceContext } from '../utils/request/types';
 export declare class MediaClient {
     readonly mediaClientConfig: MediaClientConfig;
     readonly featureFlags?: MediaFeatureFlags | undefined;
@@ -17,7 +18,7 @@ export declare class MediaClient {
     private mobileUpload?;
     readonly config: MediaClientConfig;
     constructor(mediaClientConfig: MediaClientConfig, featureFlags?: MediaFeatureFlags | undefined);
-    getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean): Promise<Blob>;
+    getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext): Promise<Blob>;
     getImageUrl(id: string, params?: MediaStoreGetFileImageParams): Promise<string>;
     getImageUrlSync(id: string, params?: MediaStoreGetFileImageParams): string;
     getImageMetadata(id: string, params?: MediaStoreGetFileImageParams): Promise<ImageMetadata>;

package/dist/types/client/media-store/index.d.ts

@@ -2,40 +2,40 @@ import { AsapBasedAuth, AuthContext, ClientAltBasedAuth, MediaApiConfig, Auth }
 import { MediaFeatureFlags } from '@atlaskit/media-common';
 import { MediaFileArtifacts } from '../../models/artifacts';
 import { MediaChunksProbe, MediaCollectionItemFullDetails, MediaCollectionItems, MediaFile, MediaUpload } from '../../models/media';
-import { ClientOptions, RequestHeaders, RequestMethod, RequestParams, RequestMetadata } from '../../utils/request/types';
+import { ClientOptions, RequestHeaders, RequestMethod, RequestParams, RequestMetadata, MediaTraceContext } from '../../utils/request/types';
 export type { MediaStoreErrorReason, MediaStoreErrorAttributes } from './error';
 export { MediaStoreError, isMediaStoreError } from './error';
 export declare class MediaStore {
     private readonly config;
     readonly featureFlags?: MediaFeatureFlags | undefined;
     constructor(config: MediaApiConfig, featureFlags?: MediaFeatureFlags | undefined);
-    getCollectionItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams): Promise<MediaStoreResponse<MediaCollectionItems>>;
-    removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string): Promise<void>;
-    createUpload(createUpTo?: number, collectionName?: string): Promise<MediaStoreResponse<MediaUpload[]>>;
+    getCollectionItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaCollectionItems>>;
+    removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
+    createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;
     uploadChunk(etag: string, blob: Blob, { collectionName, uploadId, partNumber, }?: {
         collectionName?: string;
         uploadId?: string;
         partNumber?: number;
-    }): Promise<void>;
+    }, traceContext?: MediaTraceContext): Promise<void>;
     probeChunks(chunks: string[], { collectionName, uploadId, }?: {
         collectionName?: string;
         uploadId?: string;
-    }): Promise<MediaStoreResponse<MediaChunksProbe>>;
-    createFileFromUpload(body: MediaStoreCreateFileFromUploadBody, params?: MediaStoreCreateFileFromUploadParams): Promise<MediaStoreResponse<MediaFile>>;
-    touchFiles(body: MediaStoreTouchFileBody, params?: MediaStoreTouchFileParams): Promise<MediaStoreResponse<TouchedFiles>>;
-    getFile(fileId: string, params?: MediaStoreGetFileParams): Promise<MediaStoreResponse<MediaFile>>;
+    }, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaChunksProbe>>;
+    createFileFromUpload(body: MediaStoreCreateFileFromUploadBody, params?: MediaStoreCreateFileFromUploadParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;
+    touchFiles(body: MediaStoreTouchFileBody, params?: MediaStoreTouchFileParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<TouchedFiles>>;
+    getFile(fileId: string, params?: MediaStoreGetFileParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;
     getFileImageURL(id: string, params?: MediaStoreGetFileImageParams): Promise<string>;
     getFileImageURLSync(id: string, params?: MediaStoreGetFileImageParams): string;
     private createFileImageURL;
     getFileBinaryURL(id: string, collectionName?: string): Promise<string>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
-    getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean): Promise<Blob>;
-    getItems(ids: string[], collectionName?: string): Promise<MediaStoreResponse<ItemsPayload>>;
-    getImageMetadata(id: string, params?: MediaStoreGetFileImageParams): Promise<{
+    getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext): Promise<Blob>;
+    getItems(ids: string[], collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<ItemsPayload>>;
+    getImageMetadata(id: string, params?: MediaStoreGetFileImageParams, traceContext?: MediaTraceContext): Promise<{
         metadata: ImageMetadata;
     }>;
-    appendChunksToUpload(uploadId: string, body: AppendChunksToUploadRequestBody, collectionName?: string): Promise<void>;
-    copyFileWithToken(body: MediaStoreCopyFileWithTokenBody, params: MediaStoreCopyFileWithTokenParams): Promise<MediaStoreResponse<MediaFile>>;
+    appendChunksToUpload(uploadId: string, body: AppendChunksToUploadRequestBody, collectionName?: string, traceContext?: MediaTraceContext): Promise<void>;
+    copyFileWithToken(body: MediaStoreCopyFileWithTokenBody, params: MediaStoreCopyFileWithTokenParams, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaFile>>;
     request(path: string, options?: MediaStoreRequestOptions, controller?: AbortController): Promise<Response>;
     resolveAuth: (authContext?: AuthContext | undefined) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
@@ -72,6 +72,7 @@ export declare type MediaStoreRequestOptions = RequestMetadata & {
     readonly headers?: RequestHeaders;
     readonly body?: any;
     readonly clientOptions?: ClientOptions;
+    readonly traceContext?: MediaTraceContext;
 };
 export declare type MediaStoreCreateFileFromUploadParams = {
     readonly collection?: string;

package/dist/types/index.d.ts

@@ -12,17 +12,17 @@ export { isMediaClientError, getMediaClientErrorReason } from './models/errors';
 export type { MediaClientError, MediaClientErrorReason, MediaClientErrorAttributes, } from './models/errors';
 export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, mapMediaFileToFileState, mapMediaItemToFileState, } from './models/file-state';
 export type { FileStatus, FilePreview, PreviewOptions, GetFileOptions, UploadingFileState, ProcessingFileState, ProcessedFileState, ProcessingFailedState, ErrorFileState, NonErrorFileState, PreviewableFileState, FileState, } from './models/file-state';
-export type { MobileUpload, MobileUploadStartEvent, MobileUploadProgressEvent, MobileUploadEndEvent, MobileUploadErrorEvent, } from './models/mobile-upload';
+export type { MobileUploadStartEvent, MobileUploadProgressEvent, MobileUploadEndEvent, MobileUploadErrorEvent, } from './models/mobile-upload';
 export { StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export type { UploadableFile, UploadableFileUpfrontIds, UploadFileCallbacks, UploadFileResult, } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError, } from './utils/request';
 export type { RequestErrorReason, RequestErrorMetadata, RequestErrorAttributes, } from './utils/request';
-export { isAbortedRequestError, mapResponseToJson, mapResponseToBlob, mapResponseToVoid, createUrl, } from './utils/request/helpers';
+export { isAbortedRequestError, mapResponseToJson, mapResponseToBlob, mapResponseToVoid, createUrl, getRandomHex, } from './utils/request/helpers';
 export { PollingFunction } from './utils/polling';
 export { isPollingError, PollingError } from './utils/polling/errors';
 export type { Executor, PollingErrorAttributes, PollingErrorReason, } from './utils/polling/types';
-export type { RequestMethod, RequestParams, RequestHeaders, RetryOptions, ClientOptions, RequestMetadata, RequestOptions, CreateUrlOptions, } from './utils/request/types';
+export type { RequestMethod, RequestParams, RequestHeaders, RetryOptions, ClientOptions, RequestMetadata, RequestOptions, CreateUrlOptions, MediaTraceContext, } from './utils/request/types';
 export type { ImageResizeMode } from './utils/imageResizeModeToFileImageMode';
 export { imageResizeModeToFileImageMode } from './utils/imageResizeModeToFileImageMode';
 export { FileFetcherImpl, FileFetcherError, isFileFetcherError, } from './client/file-fetcher';

package/dist/types/uploader/index.d.ts

@@ -1,5 +1,6 @@
 import { ChunkinatorFile } from '@atlaskit/chunkinator';
 import { MediaStore } from '../client/media-store';
+import { MediaTraceContext } from '../utils/request/types';
 export declare type UploadableFile = {
     content: ChunkinatorFile;
     name?: string;
@@ -18,4 +19,4 @@ export declare type UploadFileCallbacks = {
 export interface UploadFileResult {
     cancel: () => void;
 }
-export declare const uploadFile: (file: UploadableFile, store: MediaStore, uploadableFileUpfrontIds: UploadableFileUpfrontIds, callbacks?: UploadFileCallbacks | undefined) => UploadFileResult;
+export declare const uploadFile: (file: UploadableFile, store: MediaStore, uploadableFileUpfrontIds: UploadableFileUpfrontIds, callbacks?: UploadFileCallbacks | undefined, traceContext?: MediaTraceContext | undefined) => UploadFileResult;

package/dist/types/utils/request/helpers.d.ts

@@ -1,14 +1,21 @@
 import { Auth } from '@atlaskit/media-core';
 import { RequestError } from './errors';
-import { CreateUrlOptions, RequestErrorReason, RequestErrorMetadata, RequestHeaders, RequestMetadata, RetryOptions } from './types';
+import { CreateUrlOptions, RequestErrorReason, RequestErrorMetadata, RequestHeaders, RequestMetadata, RetryOptions, MediaTraceContext } from './types';
 export declare function clientTimeoutPromise(timeout: number): Promise<Response>;
 export declare function waitPromise(timeout: number): Promise<void>;
 export declare function isAbortedRequestError(err: any): boolean;
 export declare function isFetchNetworkError(err: any): err is TypeError;
 export declare function isRateLimitedError(error: Error | undefined): boolean;
-export declare function mapAuthToRequestHeaders(auth: Auth): RequestHeaders;
+export declare const ZipkinHeaderKeys: {
+    traceId: string;
+    spanId: string;
+    parentSpanId: string;
+    sampled: string;
+    flags: string;
+};
+export declare function mapAuthToRequestHeaders(auth?: Auth): RequestHeaders;
 export declare function createUrl(url: string, { params, auth }: CreateUrlOptions): string;
-export declare function withAuth(auth?: Auth): (headers?: RequestHeaders | undefined) => RequestHeaders | undefined;
+export declare function extendHeaders(headers?: RequestHeaders, auth?: Auth, traceContext?: Required<MediaTraceContext>): RequestHeaders | undefined;
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
  * TODO: https://product-fabric.atlassian.net/browse/BMPT-1354
@@ -36,3 +43,4 @@ export declare function extractMediaHeaders(response: Response): {
     mediaRegion: string;
     mediaEnv: string;
 };
+export declare function getRandomHex(size: number): string;

package/dist/types/utils/request/types.d.ts

@@ -23,6 +23,7 @@ export declare type RequestMetadata = {
 };
 export declare type RequestOptions = RequestMetadata & {
     readonly auth?: Auth;
+    readonly traceContext?: Required<MediaTraceContext>;
     readonly params?: RequestParams;
     readonly headers?: RequestHeaders;
     readonly body?: any;
@@ -41,3 +42,7 @@ export declare type RequestErrorMetadata = RequestMetadata & {
 export declare type RequestErrorAttributes = RequestErrorMetadata & {
     readonly reason: RequestErrorReason;
 };
+export declare type MediaTraceContext = {
+    traceId: string;
+    spanId?: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "17.1.3",
+  "version": "17.1.4",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -12,13 +12,6 @@
   "module": "dist/esm/index.js",
   "module:es2019": "dist/es2019/index.js",
   "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    ">=4.0 <4.5": {
-      "*": [
-        "dist/types-ts4.0/*"
-      ]
-    }
-  },
   "sideEffects": false,
   "atlaskit:src": "src/index.ts",
   "af:exports": {
@@ -35,7 +28,7 @@
   },
   "dependencies": {
     "@atlaskit/chunkinator": "^4.1.0",
-    "@atlaskit/media-common": "^2.16.0",
+    "@atlaskit/media-common": "^2.15.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
@@ -50,14 +43,14 @@
     "xstate": "^4.20.0"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^33.0.3",
+    "@atlaskit/media-core": "^33.0.1",
     "@emotion/react": "^11.7.1",
     "react": "^16.8.0"
   },
   "devDependencies": {
     "@atlaskit/button": "^16.3.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^74.1.0",
+    "@atlaskit/media-card": "^74.0.0",
     "@atlaskit/media-core": "^33.0.0",
     "@atlaskit/media-test-helpers": "^30.0.0",
     "@atlaskit/ssr": "*",
@@ -69,7 +62,7 @@
     "fetch-mock": "^8.0.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
-    "typescript": "4.5.5"
+    "typescript": "4.2.4"
   },
   "resolutions": {
     "lru-fast": "0.2.2"

package/dist/types-ts4.0/client/__mocks__/collection-fetcher.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="jest" />
-export declare const collectionCache: {};
-export declare class CollectionFetcher {
-    constructor();
-    getItems: jest.Mock<any, any>;
-    removeFile: jest.Mock<any, any>;
-    loadNextPage: jest.Mock<any, any>;
-}

package/dist/types-ts4.0/client/__mocks__/file-fetcher.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="jest" />
-export declare class FileFetcher {
-    constructor();
-    getFileState: jest.Mock<any, any>;
-    getCurrentState: jest.Mock<any, any>;
-    getArtifactURL: jest.Mock<any, any>;
-    touchFiles: jest.Mock<any, any>;
-    upload: jest.Mock<any, any>;
-    downloadBinary: jest.Mock<any, any>;
-}

package/dist/types-ts4.0/client/__mocks__/media-client.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="jest" />
-import { MediaClientConfig } from '@atlaskit/media-core';
-import { CollectionFetcher } from '../collection-fetcher';
-import { FileFetcher } from '../file-fetcher';
-export declare class MediaClient {
-    readonly config: MediaClientConfig;
-    readonly collection: CollectionFetcher;
-    readonly file: FileFetcher;
-    constructor(config: MediaClientConfig);
-    getImage: jest.Mock<any, any>;
-    getImageUrl: jest.Mock<any, any>;
-    getImageMetadata: jest.Mock<any, any>;
-}

package/dist/types-ts4.0/client/collection-fetcher.d.ts

@@ -1,35 +0,0 @@
-import { ReplaySubject } from 'rxjs/ReplaySubject';
-import { FileDetails, FileItem } from '../models/item';
-import { MediaCollectionItem } from '../models/media';
-import { MediaStore, MediaStoreGetCollectionItemsParams } from './media-store';
-import { MediaSubscribable } from '../utils/mediaSubscribable';
-export interface MediaCollectionFileItemDetails extends FileDetails {
-    occurrenceKey: string;
-}
-export interface MediaCollectionFileItem extends FileItem {
-    details: MediaCollectionFileItemDetails;
-}
-export interface MediaCollection {
-    id: string;
-    items: Array<MediaCollectionItem>;
-}
-export interface CollectionCacheEntry {
-    items: MediaCollectionItem[];
-    subject: ReplaySubject<MediaCollectionItem[]>;
-    isLoadingNextPage: boolean;
-    nextInclusiveStartKey?: string;
-}
-export declare type CollectionCache = {
-    [collectionName: string]: CollectionCacheEntry;
-};
-export declare const collectionCache: CollectionCache;
-export declare class CollectionFetcher {
-    readonly mediaStore: MediaStore;
-    constructor(mediaStore: MediaStore);
-    private createFileStateObserver;
-    private populateCache;
-    private removeFromCache;
-    getItems(collectionName: string, params?: MediaStoreGetCollectionItemsParams): MediaSubscribable<MediaCollectionItem[]>;
-    removeFile(id: string, collectionName: string, occurrenceKey?: string): Promise<void>;
-    loadNextPage(collectionName: string, params?: MediaStoreGetCollectionItemsParams): Promise<void>;
-}

package/dist/types-ts4.0/client/events.d.ts

@@ -1,14 +0,0 @@
-import { FileState } from '../models/file-state';
-export declare type EventPayloadMap<P> = {
-    readonly [event: string]: P;
-};
-export declare type EventPayloadListener<M extends EventPayloadMap<P>, E extends keyof M, P = any> = (payload: M[E]) => void;
-export interface MediaViewedEventPayload {
-    fileId: string;
-    viewingLevel: 'minimal' | 'full' | 'download';
-    isUserCollection?: boolean;
-}
-export declare type UploadEventPayloadMap = {
-    'file-added': FileState;
-    'media-viewed': MediaViewedEventPayload;
-};

package/dist/types-ts4.0/client/file-fetcher/error.d.ts

@@ -1,29 +0,0 @@
-import { BaseMediaClientError } from '../../models/errors';
-export declare type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile';
-export declare type FileFetcherErrorAttributes = {
-    readonly reason: FileFetcherErrorReason;
-    readonly id: string;
-    readonly metadata?: {
-        readonly collectionName?: string;
-        readonly occurrenceKey?: string;
-    };
-};
-export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorAttributes> {
-    readonly reason: FileFetcherErrorReason;
-    readonly id: string;
-    readonly metadata?: {
-        readonly collectionName?: string | undefined;
-        readonly occurrenceKey?: string | undefined;
-    } | undefined;
-    constructor(reason: FileFetcherErrorReason, id: string, metadata?: {
-        readonly collectionName?: string | undefined;
-        readonly occurrenceKey?: string | undefined;
-    } | undefined);
-    get attributes(): {
-        reason: FileFetcherErrorReason;
-        id: string;
-        collectionName: string | undefined;
-        occurrenceKey: string | undefined;
-    };
-}
-export declare function isFileFetcherError(err: Error): err is FileFetcherError;