@atlaskit/media-client 28.0.8 → 28.2.0

package/dist/es2019/utils/createFileDataLoader.js

@@ -4,6 +4,9 @@ export const MAX_BATCH_SIZE = 100;
 const isBatchLoadingErrorResult = result => {
   return result.error instanceof Error;
 };
+const isResponseFileItem = fileItem => {
+  return 'details' in fileItem;
+};
 const makeCacheKey = (id, collection) => collection ? `${id}-${collection}` : id;
 export const getItemsFromKeys = (dataloaderKeys, fileItems) => {
   const itemsByKey = fileItems.reduce((prev, fileItem) => {
@@ -12,10 +15,21 @@ export const getItemsFromKeys = (dataloaderKeys, fileItems) => {
       collection
     } = fileItem;
     const key = makeCacheKey(id, collection);
-    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : {
-      ...fileItem.details,
-      metadataTraceContext: fileItem.metadataTraceContext
-    };
+    if (isBatchLoadingErrorResult(fileItem)) {
+      prev[key] = fileItem.error;
+    } else if (isResponseFileItem(fileItem)) {
+      prev[key] = {
+        ...fileItem.details,
+        metadataTraceContext: fileItem.metadataTraceContext
+      };
+    } else {
+      prev[key] = {
+        id,
+        collection,
+        type: 'not-found',
+        metadataTraceContext: fileItem.metadataTraceContext
+      };
+    }
     return prev;
   }, {});
   return dataloaderKeys.map(dataloaderKey => {
@@ -24,7 +38,10 @@ export const getItemsFromKeys = (dataloaderKeys, fileItems) => {
       collectionName
     } = dataloaderKey;
     const key = makeCacheKey(id, collectionName);
-    return itemsByKey[key] || null;
+    return itemsByKey[key] || {
+      id,
+      type: 'not-found'
+    };
   });
 };
 /**
@@ -65,6 +82,18 @@ export function createBatchLoadingFunc(mediaStore) {
           metadataTraceContext
         }));
         items.push(...itemsWithMetadataTraceContext);
+
+        // add EmptyResponseFileItem for each file ID not included in /items response
+        const itemsIds = itemsWithMetadataTraceContext.map(item => item.id);
+        const fileIdsNotFound = fileIds.filter(id => !itemsIds.includes(id));
+        fileIdsNotFound.forEach(fileId => {
+          items.push({
+            id: fileId,
+            collection: collectionName,
+            type: 'not-found',
+            metadataTraceContext
+          });
+        });
       } catch (error) {
         fileIds.forEach(fileId => {
           items.push({

package/dist/es2019/utils/mobileUpload/error.js

@@ -12,14 +12,18 @@ export class MobileUploadError extends BaseMediaClientError {
       id,
       metadata: {
         collectionName,
-        occurrenceKey
+        occurrenceKey,
+        traceContext
       } = {}
     } = this;
     return {
       reason,
       id,
       collectionName,
-      occurrenceKey
+      occurrenceKey,
+      metadata: {
+        traceContext
+      }
     };
   }
 }

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

@@ -6,6 +6,7 @@ import { createMediaSubject } from '../createMediaSubject';
 import { isEmptyFile } from '../detectEmptyFile';
 import { PollingFunction } from '../polling';
 import { MobileUploadError } from './error';
+import { isNotFoundMediaItemDetails } from '../../models/media';
 export const createMobileFileStateSubject = service => {
   const subject = new ReplaySubject(1);
   from(service.start()).pipe(map(state => state.context.currentFileState)).subscribe(subject);
@@ -22,16 +23,18 @@ export const createMobileDownloadFileStream = (dataloader, id, collectionName, o
       id,
       collectionName
     });
-    if (!response) {
+    if (isNotFoundMediaItemDetails(response)) {
       throw new MobileUploadError('emptyItems', id, {
         collectionName,
-        occurrenceKey
+        occurrenceKey,
+        traceContext: response.metadataTraceContext
       });
     }
     if (isEmptyFile(response)) {
       throw new MobileUploadError('zeroVersionFile', id, {
         collectionName,
-        occurrenceKey
+        occurrenceKey,
+        traceContext: response.metadataTraceContext
       });
     }
     const fileState = mapMediaItemToFileState(id, response);

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

@@ -16,7 +16,8 @@ export class RequestError extends BaseMediaClientError {
         mediaEnv,
         attempts,
         clientExhaustedRetries,
-        statusCode
+        statusCode,
+        traceContext
       } = {},
       innerError
     } = this;
@@ -29,6 +30,9 @@ export class RequestError extends BaseMediaClientError {
       attempts,
       clientExhaustedRetries,
       statusCode,
+      metadata: {
+        traceContext
+      },
       innerError
     };
   }

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

@@ -1,8 +1,11 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import { BaseMediaClientError } from '../../models/errors';
@@ -26,13 +29,18 @@ export var FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
         _this$metadata = this.metadata,
         _this$metadata2 = _this$metadata === void 0 ? {} : _this$metadata,
         collectionName = _this$metadata2.collectionName,
-        occurrenceKey = _this$metadata2.occurrenceKey;
-      return {
+        occurrenceKey = _this$metadata2.occurrenceKey,
+        traceContext = _this$metadata2.traceContext;
+      return _objectSpread({
         reason: reason,
         id: id,
         collectionName: collectionName,
         occurrenceKey: occurrenceKey
-      };
+      }, traceContext && {
+        metadata: {
+          traceContext: traceContext
+        }
+      });
     }
   }]);
   return FileFetcherError;

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

@@ -1,10 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _excluded = ["metadata"],
+  _excluded2 = ["metadata"];
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { Subscription } from 'rxjs/Subscription';
 import { map } from 'rxjs/operators/map';
 import uuid from 'uuid/v4';
@@ -12,6 +15,7 @@ import { authToOwner } from '@atlaskit/media-core';
 import { downloadUrl } from '@atlaskit/media-common/downloadUrl';
 import { MediaStore as MediaApi } from '../media-store';
 import { isErrorFileState, isFinalFileState, isProcessingFileState, mapMediaFileToFileState, mapMediaItemToFileState } from '../../models/file-state';
+import { isNotFoundMediaItemDetails } from '../../models/media';
 import { FileFetcherError } from './error';
 import { uploadFile } from '../../uploader';
 import { getFileStreamsCache } from '../../file-streams-cache';
@@ -37,6 +41,10 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : mediaStore;
     _classCallCheck(this, FileFetcherImpl);
     _defineProperty(this, "getErrorFileState", function (error, id, occurrenceKey) {
+      var _error$attributes;
+      var _ref = (_error$attributes = error === null || error === void 0 ? void 0 : error.attributes) !== null && _error$attributes !== void 0 ? _error$attributes : {},
+        metadata = _ref.metadata,
+        attributes = _objectWithoutProperties(_ref, _excluded);
       return typeof error === 'string' ? {
         status: 'error',
         id: id,
@@ -47,7 +55,9 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         status: 'error',
         id: id,
         reason: error === null || error === void 0 ? void 0 : error.reason,
-        details: error === null || error === void 0 ? void 0 : error.attributes,
+        details: _objectSpread(_objectSpread({}, attributes), (metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
+          metadata: metadata
+        }),
         occurrenceKey: occurrenceKey,
         message: error === null || error === void 0 ? void 0 : error.message
       };
@@ -78,13 +88,14 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               });
             case 2:
               response = _context.sent;
-              if (response) {
+              if (!isNotFoundMediaItemDetails(response)) {
                 _context.next = 5;
                 break;
               }
               throw new FileFetcherError('emptyItems', id, {
                 collectionName: collectionName,
-                occurrenceKey: occurrenceKey
+                occurrenceKey: occurrenceKey,
+                traceContext: response.metadataTraceContext
               });
             case 5:
               if (!isEmptyFile(response)) {
@@ -93,7 +104,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               }
               throw new FileFetcherError('zeroVersionFile', id, {
                 collectionName: collectionName,
-                occurrenceKey: occurrenceKey
+                occurrenceKey: occurrenceKey,
+                traceContext: response.metadataTraceContext
               });
             case 7:
               fileState = mapMediaItemToFileState(id, response);
@@ -161,18 +173,24 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       var collectionName = options.collectionName,
         occurrenceKey = options.occurrenceKey;
       if (!isValidId(id)) {
+        var _err$attributes;
         var subject = createMediaSubject();
         var err = new FileFetcherError('invalidFileId', id, {
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
         });
+        var _ref3 = (_err$attributes = err === null || err === void 0 ? void 0 : err.attributes) !== null && _err$attributes !== void 0 ? _err$attributes : {},
+          metadata = _ref3.metadata,
+          attributes = _objectWithoutProperties(_ref3, _excluded2);
         var errorFileState = {
           status: 'error',
           id: id,
           reason: err === null || err === void 0 ? void 0 : err.reason,
           message: err === null || err === void 0 ? void 0 : err.message,
           occurrenceKey: occurrenceKey,
-          details: err === null || err === void 0 ? void 0 : err.attributes
+          details: _objectSpread(_objectSpread({}, attributes), (metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
+            metadata: metadata
+          })
         };
         subject.error(err);
         this.setFileState(id, errorFileState);
@@ -214,8 +232,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         descriptors: descriptors
       }, {
         collection: collection
-      }, traceContext).then(function (_ref2) {
-        var data = _ref2.data;
+      }, traceContext).then(function (_ref4) {
+        var data = _ref4.data;
         return data;
       });
     }
@@ -256,7 +274,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 return undefined;
               });
               preview = new Promise( /*#__PURE__*/function () {
-                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
+                var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
                   var blob;
                   return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
@@ -279,7 +297,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   }, _callee2);
                 }));
                 return function (_x4, _x5) {
-                  return _ref3.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               name = url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
@@ -298,7 +316,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               getFileStreamsCache().set(id, subject);
               this.setFileState(id, fileState);
               return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resolve, reject) {
+                var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resolve, reject) {
                   var blob, type, size, file, mediaType, dimensions;
                   return _regeneratorRuntime.wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
@@ -359,7 +377,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   }, _callee3, null, [[10, 16]]);
                 }));
                 return function (_x6, _x7) {
-                  return _ref4.apply(this, arguments);
+                  return _ref6.apply(this, arguments);
                 };
               }()));
             case 11:

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

@@ -302,7 +302,7 @@ export var MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getFileBinary",
     value: function () {
-      var _getFileBinary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id, collectionName) {
+      var _getFileBinary = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(id, collectionName, abortController) {
         var maxAge,
           headers,
           binaryEndpoint,
@@ -312,7 +312,7 @@ export var MediaStore = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              maxAge = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : FILE_CACHE_MAX_AGE;
+              maxAge = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : FILE_CACHE_MAX_AGE;
               headers = {};
               binaryEndpoint = cdnFeatureFlag('binary');
               metadata = {
@@ -329,14 +329,14 @@ export var MediaStore = /*#__PURE__*/function () {
                   'max-age': "".concat(maxAge)
                 }
               });
-              return _context5.abrupt("return", this.request("/file/".concat(id, "/").concat(binaryEndpoint), options, undefined, true).then(createMapResponseToBlob(metadata)));
+              return _context5.abrupt("return", this.request("/file/".concat(id, "/").concat(binaryEndpoint), options, abortController, true).then(createMapResponseToBlob(metadata)));
             case 6:
             case "end":
               return _context5.stop();
           }
         }, _callee5, this);
       }));
-      function getFileBinary(_x14, _x15) {
+      function getFileBinary(_x14, _x15, _x16) {
         return _getFileBinary.apply(this, arguments);
       }
       return getFileBinary;
@@ -376,7 +376,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function getFileBinaryURL(_x16, _x17) {
+      function getFileBinaryURL(_x17, _x18) {
         return _getFileBinaryURL.apply(this, arguments);
       }
       return getFileBinaryURL;
@@ -416,7 +416,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee7, this);
       }));
-      function getArtifactURL(_x18, _x19, _x20) {
+      function getArtifactURL(_x19, _x20, _x21) {
         return _getArtifactURL.apply(this, arguments);
       }
       return getArtifactURL;
@@ -456,7 +456,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function getImage(_x21, _x22, _x23, _x24, _x25) {
+      function getImage(_x22, _x23, _x24, _x25, _x26) {
         return _getImage.apply(this, arguments);
       }
       return getImage;
@@ -497,7 +497,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function getItems(_x26, _x27, _x28) {
+      function getItems(_x27, _x28, _x29) {
         return _getItems.apply(this, arguments);
       }
       return getItems;
@@ -528,7 +528,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function getImageMetadata(_x29, _x30, _x31) {
+      function getImageMetadata(_x30, _x31, _x32) {
         return _getImageMetadata.apply(this, arguments);
       }
       return getImageMetadata;
@@ -561,7 +561,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function appendChunksToUpload(_x32, _x33, _x34, _x35) {
+      function appendChunksToUpload(_x33, _x34, _x35, _x36) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -656,7 +656,7 @@ export var MediaStore = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function request(_x36) {
+      function request(_x37) {
         return _request2.apply(this, arguments);
       }
       return request;

package/dist/esm/models/media.js

@@ -5,6 +5,9 @@ export var isPreviewableType = function isPreviewableType(type) {
   var defaultPreviewableTypes = ['audio', 'video', 'image', 'doc'];
   return defaultPreviewableTypes.indexOf(type) > -1;
 };
+export var isNotFoundMediaItemDetails = function isNotFoundMediaItemDetails(itemDetails) {
+  return 'type' in itemDetails && itemDetails.type === 'not-found';
+};
 export var DATA_UNIT = /*#__PURE__*/function (DATA_UNIT) {
   DATA_UNIT[DATA_UNIT["MB"] = 1048576] = "MB";
   DATA_UNIT[DATA_UNIT["GB"] = 1073741824] = "GB";

package/dist/esm/utils/createFileDataLoader.js

@@ -10,6 +10,9 @@ export var MAX_BATCH_SIZE = 100;
 var isBatchLoadingErrorResult = function isBatchLoadingErrorResult(result) {
   return result.error instanceof Error;
 };
+var isResponseFileItem = function isResponseFileItem(fileItem) {
+  return 'details' in fileItem;
+};
 var makeCacheKey = function makeCacheKey(id, collection) {
   return collection ? "".concat(id, "-").concat(collection) : id;
 };
@@ -18,16 +21,30 @@ export var getItemsFromKeys = function getItemsFromKeys(dataloaderKeys, fileItem
     var id = fileItem.id,
       collection = fileItem.collection;
     var key = makeCacheKey(id, collection);
-    prev[key] = isBatchLoadingErrorResult(fileItem) ? fileItem.error : _objectSpread(_objectSpread({}, fileItem.details), {}, {
-      metadataTraceContext: fileItem.metadataTraceContext
-    });
+    if (isBatchLoadingErrorResult(fileItem)) {
+      prev[key] = fileItem.error;
+    } else if (isResponseFileItem(fileItem)) {
+      prev[key] = _objectSpread(_objectSpread({}, fileItem.details), {}, {
+        metadataTraceContext: fileItem.metadataTraceContext
+      });
+    } else {
+      prev[key] = {
+        id: id,
+        collection: collection,
+        type: 'not-found',
+        metadataTraceContext: fileItem.metadataTraceContext
+      };
+    }
     return prev;
   }, {});
   return dataloaderKeys.map(function (dataloaderKey) {
     var id = dataloaderKey.id,
       collectionName = dataloaderKey.collectionName;
     var key = makeCacheKey(id, collectionName);
-    return itemsByKey[key] || null;
+    return itemsByKey[key] || {
+      id: id,
+      type: 'not-found'
+    };
   });
 };
 /**
@@ -62,7 +79,7 @@ export function createBatchLoadingFunc(mediaStore) {
             _context2.next = 5;
             return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(collectionNameKey) {
-                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext;
+                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
                 return _regeneratorRuntime.wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -83,10 +100,26 @@ export function createBatchLoadingFunc(mediaStore) {
                         });
                       });
                       items.push.apply(items, _toConsumableArray(itemsWithMetadataTraceContext));
-                      _context.next = 14;
+
+                      // add EmptyResponseFileItem for each file ID not included in /items response
+                      itemsIds = itemsWithMetadataTraceContext.map(function (item) {
+                        return item.id;
+                      });
+                      fileIdsNotFound = fileIds.filter(function (id) {
+                        return !itemsIds.includes(id);
+                      });
+                      fileIdsNotFound.forEach(function (fileId) {
+                        items.push({
+                          id: fileId,
+                          collection: collectionName,
+                          type: 'not-found',
+                          metadataTraceContext: metadataTraceContext
+                        });
+                      });
+                      _context.next = 17;
                       break;
-                    case 11:
-                      _context.prev = 11;
+                    case 14:
+                      _context.prev = 14;
                       _context.t0 = _context["catch"](3);
                       fileIds.forEach(function (fileId) {
                         items.push({
@@ -95,11 +128,11 @@ export function createBatchLoadingFunc(mediaStore) {
                           error: _context.t0
                         });
                       });
-                    case 14:
+                    case 17:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee, null, [[3, 11]]);
+                }, _callee, null, [[3, 14]]);
               }));
               return function (_x2) {
                 return _ref2.apply(this, arguments);

package/dist/esm/utils/mobileUpload/error.js

@@ -26,12 +26,16 @@ export var MobileUploadError = /*#__PURE__*/function (_BaseMediaClientError) {
         _this$metadata = this.metadata,
         _this$metadata2 = _this$metadata === void 0 ? {} : _this$metadata,
         collectionName = _this$metadata2.collectionName,
-        occurrenceKey = _this$metadata2.occurrenceKey;
+        occurrenceKey = _this$metadata2.occurrenceKey,
+        traceContext = _this$metadata2.traceContext;
       return {
         reason: reason,
         id: id,
         collectionName: collectionName,
-        occurrenceKey: occurrenceKey
+        occurrenceKey: occurrenceKey,
+        metadata: {
+          traceContext: traceContext
+        }
       };
     }
   }]);

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

@@ -8,6 +8,7 @@ import { createMediaSubject } from '../createMediaSubject';
 import { isEmptyFile } from '../detectEmptyFile';
 import { PollingFunction } from '../polling';
 import { MobileUploadError } from './error';
+import { isNotFoundMediaItemDetails } from '../../models/media';
 export var createMobileFileStateSubject = function createMobileFileStateSubject(service) {
   var subject = new ReplaySubject(1);
   from(service.start()).pipe(map(function (state) {
@@ -35,13 +36,14 @@ export var createMobileDownloadFileStream = function createMobileDownloadFileStr
           });
         case 2:
           response = _context.sent;
-          if (response) {
+          if (!isNotFoundMediaItemDetails(response)) {
             _context.next = 5;
             break;
           }
           throw new MobileUploadError('emptyItems', id, {
             collectionName: collectionName,
-            occurrenceKey: occurrenceKey
+            occurrenceKey: occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         case 5:
           if (!isEmptyFile(response)) {
@@ -50,7 +52,8 @@ export var createMobileDownloadFileStream = function createMobileDownloadFileStr
           }
           throw new MobileUploadError('zeroVersionFile', id, {
             collectionName: collectionName,
-            occurrenceKey: occurrenceKey
+            occurrenceKey: occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         case 7:
           fileState = mapMediaItemToFileState(id, response);

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

@@ -31,6 +31,7 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         attempts = _this$metadata2.attempts,
         clientExhaustedRetries = _this$metadata2.clientExhaustedRetries,
         statusCode = _this$metadata2.statusCode,
+        traceContext = _this$metadata2.traceContext,
         innerError = this.innerError;
       return {
         reason: reason,
@@ -41,6 +42,9 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,
+        metadata: {
+          traceContext: traceContext
+        },
         innerError: innerError
       };
     }

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

@@ -1,4 +1,5 @@
 import { BaseMediaClientError } from '../../models/errors';
+import { type MediaTraceContext } from '@atlaskit/media-common';
 export type FileFetcherErrorReason = 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName';
 export type FileFetcherErrorAttributes = {
     readonly reason: FileFetcherErrorReason;
@@ -6,6 +7,7 @@ export type FileFetcherErrorAttributes = {
     readonly metadata?: {
         readonly collectionName?: string;
         readonly occurrenceKey?: string;
+        readonly traceContext?: MediaTraceContext;
     };
 };
 export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorAttributes> {
@@ -14,12 +16,17 @@ export declare class FileFetcherError extends BaseMediaClientError<FileFetcherEr
     readonly metadata?: {
         readonly collectionName?: string | undefined;
         readonly occurrenceKey?: string | undefined;
+        readonly traceContext?: MediaTraceContext | undefined;
     } | undefined;
     constructor(reason: FileFetcherErrorReason, id: string, metadata?: {
         readonly collectionName?: string | undefined;
         readonly occurrenceKey?: string | undefined;
+        readonly traceContext?: MediaTraceContext | undefined;
     } | undefined);
     get attributes(): {
+        metadata?: {
+            traceContext: MediaTraceContext;
+        } | undefined;
         reason: FileFetcherErrorReason;
         id: string;
         collectionName: string | undefined;

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

@@ -18,7 +18,7 @@ export declare class MediaStore implements MediaApi {
     getFileImageURL(id: string, params?: MediaStoreGetFileImageParams): Promise<string>;
     getFileImageURLSync(id: string, params?: MediaStoreGetFileImageParams): string;
     private createFileImageURL;
-    getFileBinary(id: string, collectionName?: string, maxAge?: number): Promise<Blob>;
+    getFileBinary(id: string, collectionName?: string, abortController?: AbortController, maxAge?: number): Promise<Blob>;
     getFileBinaryURL(id: string, collectionName?: string, maxAge?: number): Promise<string>;
     getArtifactURL(artifacts: MediaFileArtifacts, artifactName: keyof MediaFileArtifacts, collectionName?: string): Promise<string>;
     getImage(id: string, params?: MediaStoreGetFileImageParams, controller?: AbortController, fetchMaxRes?: boolean, traceContext?: MediaTraceContext): Promise<Blob>;

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

@@ -1,4 +1,4 @@
 export type { MediaStoreErrorReason, MediaStoreErrorAttributes } from './error';
 export { MediaStoreError, isMediaStoreError } from './error';
 export { MediaStore, getMediaEnvironment, getMediaRegion } from './MediaStore';
-export type { ResponseFileItem, ItemsPayload, ImageMetadataArtifact, ImageMetadata, MediaStoreResponse, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileParams, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, MediaStoreCreateFileFromBinaryParams, MediaStoreCreateFileFromUploadConditions, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, SourceFile, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, CreatedTouchedFile, RejectedTouchFile, RejectionError, TouchedFiles, EmptyFile, MediaApi, } from './types';
+export type { ResponseFileItem, EmptyResponseFileItem, ItemsPayload, ImageMetadataArtifact, ImageMetadata, MediaStoreResponse, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileParams, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, MediaStoreCreateFileFromBinaryParams, MediaStoreCreateFileFromUploadConditions, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, SourceFile, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, CreatedTouchedFile, RejectedTouchFile, RejectionError, TouchedFiles, EmptyFile, MediaApi, } from './types';