@atlaskit/media-client 28.0.8 → 28.2.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/media-client
 
+## 28.2.0
+
+### Minor Changes
+
+- [`6099ac032dd30`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6099ac032dd30) -
+  Added viewerOptions to override file preview renderer in media components
+
+## 28.1.0
+
+### Minor Changes
+
+- [#156454](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156454)
+  [`cfba72d9716f0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cfba72d9716f0) -
+  Logs trace context for metadata error events
+
 ## 28.0.8
 
 ### Patch Changes

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

@@ -6,12 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FileFetcherError = void 0;
 exports.isFileFetcherError = isFileFetcherError;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _errors = require("../../models/errors");
+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) { (0, _defineProperty2.default)(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 = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var FileFetcherError = exports.FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
@@ -34,13 +37,18 @@ var FileFetcherError = exports.FileFetcherError = /*#__PURE__*/function (_BaseMe
         _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/cjs/client/file-fetcher/index.js

@@ -19,6 +19,7 @@ Object.defineProperty(exports, "isFileFetcherError", {
 });
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -29,6 +30,7 @@ var _mediaCore = require("@atlaskit/media-core");
 var _downloadUrl = require("@atlaskit/media-common/downloadUrl");
 var _mediaStore = require("../media-store");
 var _fileState2 = require("../../models/file-state");
+var _media = require("../../models/media");
 var _error = require("./error");
 var _uploader = require("../../uploader");
 var _fileStreamsCache = require("../../file-streams-cache");
@@ -47,6 +49,8 @@ var _shouldFetchRemoteFileStates = require("../../utils/shouldFetchRemoteFileSta
 var _polling = require("../../utils/polling");
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
 var _mediaState = require("@atlaskit/media-state");
+var _excluded = ["metadata"],
+  _excluded2 = ["metadata"];
 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) { (0, _defineProperty2.default)(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; }
 var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
@@ -55,6 +59,10 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
     var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _mediaState.mediaStore;
     (0, _classCallCheck2.default)(this, FileFetcherImpl);
     (0, _defineProperty2.default)(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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
       return typeof error === 'string' ? {
         status: 'error',
         id: id,
@@ -65,7 +73,9 @@ var FileFetcherImpl = exports.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
       };
@@ -96,13 +106,14 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               });
             case 2:
               response = _context.sent;
-              if (response) {
+              if (!(0, _media.isNotFoundMediaItemDetails)(response)) {
                 _context.next = 5;
                 break;
               }
               throw new _error.FileFetcherError('emptyItems', id, {
                 collectionName: collectionName,
-                occurrenceKey: occurrenceKey
+                occurrenceKey: occurrenceKey,
+                traceContext: response.metadataTraceContext
               });
             case 5:
               if (!(0, _detectEmptyFile.isEmptyFile)(response)) {
@@ -111,7 +122,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               }
               throw new _error.FileFetcherError('zeroVersionFile', id, {
                 collectionName: collectionName,
-                occurrenceKey: occurrenceKey
+                occurrenceKey: occurrenceKey,
+                traceContext: response.metadataTraceContext
               });
             case 7:
               fileState = (0, _fileState2.mapMediaItemToFileState)(id, response);
@@ -179,18 +191,24 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
       var collectionName = options.collectionName,
         occurrenceKey = options.occurrenceKey;
       if (!(0, _uuidValidate.default)(id)) {
+        var _err$attributes;
         var subject = (0, _createMediaSubject.createMediaSubject)();
         var err = new _error.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 = (0, _objectWithoutProperties2.default)(_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);
@@ -232,8 +250,8 @@ var FileFetcherImpl = exports.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;
       });
     }
@@ -274,7 +292,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 return undefined;
               });
               preview = new Promise( /*#__PURE__*/function () {
-                var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resolve, reject) {
+                var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resolve, reject) {
                   var blob;
                   return _regenerator.default.wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
@@ -297,7 +315,7 @@ var FileFetcherImpl = exports.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
@@ -316,7 +334,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               (0, _fileStreamsCache.getFileStreamsCache)().set(id, subject);
               this.setFileState(id, fileState);
               return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resolve, reject) {
+                var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resolve, reject) {
                   var blob, type, size, file, mediaType, dimensions;
                   return _regenerator.default.wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
@@ -377,7 +395,7 @@ var FileFetcherImpl = exports.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/cjs/client/media-store/MediaStore.js

@@ -308,7 +308,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
   }, {
     key: "getFileBinary",
     value: function () {
-      var _getFileBinary = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(id, collectionName) {
+      var _getFileBinary = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(id, collectionName, abortController) {
         var maxAge,
           headers,
           binaryEndpoint,
@@ -318,7 +318,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              maxAge = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : _constants.FILE_CACHE_MAX_AGE;
+              maxAge = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : _constants.FILE_CACHE_MAX_AGE;
               headers = {};
               binaryEndpoint = cdnFeatureFlag('binary');
               metadata = {
@@ -335,14 +335,14 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                   'max-age': "".concat(maxAge)
                 }
               });
-              return _context5.abrupt("return", this.request("/file/".concat(id, "/").concat(binaryEndpoint), options, undefined, true).then((0, _helpers.createMapResponseToBlob)(metadata)));
+              return _context5.abrupt("return", this.request("/file/".concat(id, "/").concat(binaryEndpoint), options, abortController, true).then((0, _helpers.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;
@@ -382,7 +382,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function getFileBinaryURL(_x16, _x17) {
+      function getFileBinaryURL(_x17, _x18) {
         return _getFileBinaryURL.apply(this, arguments);
       }
       return getFileBinaryURL;
@@ -422,7 +422,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee7, this);
       }));
-      function getArtifactURL(_x18, _x19, _x20) {
+      function getArtifactURL(_x19, _x20, _x21) {
         return _getArtifactURL.apply(this, arguments);
       }
       return getArtifactURL;
@@ -462,7 +462,7 @@ var MediaStore = exports.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;
@@ -503,7 +503,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function getItems(_x26, _x27, _x28) {
+      function getItems(_x27, _x28, _x29) {
         return _getItems.apply(this, arguments);
       }
       return getItems;
@@ -534,7 +534,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function getImageMetadata(_x29, _x30, _x31) {
+      function getImageMetadata(_x30, _x31, _x32) {
         return _getImageMetadata.apply(this, arguments);
       }
       return getImageMetadata;
@@ -567,7 +567,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function appendChunksToUpload(_x32, _x33, _x34, _x35) {
+      function appendChunksToUpload(_x33, _x34, _x35, _x36) {
         return _appendChunksToUpload.apply(this, arguments);
       }
       return appendChunksToUpload;
@@ -662,7 +662,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function request(_x36) {
+      function request(_x37) {
         return _request2.apply(this, arguments);
       }
       return request;

package/dist/cjs/models/media.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isPreviewableType = exports.DATA_UNIT = void 0;
+exports.isPreviewableType = exports.isNotFoundMediaItemDetails = exports.DATA_UNIT = void 0;
 // Warning! You can't add new media file processing status!
 // See packages/media/media-core/src/__tests__/cache-backward-compatibility.spec.ts
 
@@ -11,6 +11,9 @@ var isPreviewableType = exports.isPreviewableType = function isPreviewableType(t
   var defaultPreviewableTypes = ['audio', 'video', 'image', 'doc'];
   return defaultPreviewableTypes.indexOf(type) > -1;
 };
+var isNotFoundMediaItemDetails = exports.isNotFoundMediaItemDetails = function isNotFoundMediaItemDetails(itemDetails) {
+  return 'type' in itemDetails && itemDetails.type === 'not-found';
+};
 var DATA_UNIT = exports.DATA_UNIT = /*#__PURE__*/function (DATA_UNIT) {
   DATA_UNIT[DATA_UNIT["MB"] = 1048576] = "MB";
   DATA_UNIT[DATA_UNIT["GB"] = 1073741824] = "GB";

package/dist/cjs/utils/createFileDataLoader.js

@@ -20,6 +20,9 @@ var MAX_BATCH_SIZE = exports.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;
 };
@@ -28,16 +31,30 @@ var getItemsFromKeys = exports.getItemsFromKeys = function getItemsFromKeys(data
     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'
+    };
   });
 };
 /**
@@ -72,7 +89,7 @@ function createBatchLoadingFunc(mediaStore) {
             _context2.next = 5;
             return Promise.all(Object.keys(fileIdsByCollection).map( /*#__PURE__*/function () {
               var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(collectionNameKey) {
-                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext;
+                var metadataTraceContext, fileIds, collectionName, response, itemsWithMetadataTraceContext, itemsIds, fileIdsNotFound;
                 return _regenerator.default.wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -93,10 +110,26 @@ function createBatchLoadingFunc(mediaStore) {
                         });
                       });
                       items.push.apply(items, (0, _toConsumableArray2.default)(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({
@@ -105,11 +138,11 @@ 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/cjs/utils/mobileUpload/error.js

@@ -34,12 +34,16 @@ var MobileUploadError = exports.MobileUploadError = /*#__PURE__*/function (_Base
         _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/cjs/utils/mobileUpload/helpers.js

@@ -15,6 +15,7 @@ var _createMediaSubject = require("../createMediaSubject");
 var _detectEmptyFile = require("../detectEmptyFile");
 var _polling = require("../polling");
 var _error = require("./error");
+var _media = require("../../models/media");
 var createMobileFileStateSubject = exports.createMobileFileStateSubject = function createMobileFileStateSubject(service) {
   var subject = new _ReplaySubject.ReplaySubject(1);
   (0, _from.from)(service.start()).pipe((0, _map.map)(function (state) {
@@ -42,13 +43,14 @@ var createMobileDownloadFileStream = exports.createMobileDownloadFileStream = fu
           });
         case 2:
           response = _context.sent;
-          if (response) {
+          if (!(0, _media.isNotFoundMediaItemDetails)(response)) {
             _context.next = 5;
             break;
           }
           throw new _error.MobileUploadError('emptyItems', id, {
             collectionName: collectionName,
-            occurrenceKey: occurrenceKey
+            occurrenceKey: occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         case 5:
           if (!(0, _detectEmptyFile.isEmptyFile)(response)) {
@@ -57,7 +59,8 @@ var createMobileDownloadFileStream = exports.createMobileDownloadFileStream = fu
           }
           throw new _error.MobileUploadError('zeroVersionFile', id, {
             collectionName: collectionName,
-            occurrenceKey: occurrenceKey
+            occurrenceKey: occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         case 7:
           fileState = (0, _fileState.mapMediaItemToFileState)(id, response);

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

@@ -39,6 +39,7 @@ var RequestError = exports.RequestError = /*#__PURE__*/function (_BaseMediaClien
         attempts = _this$metadata2.attempts,
         clientExhaustedRetries = _this$metadata2.clientExhaustedRetries,
         statusCode = _this$metadata2.statusCode,
+        traceContext = _this$metadata2.traceContext,
         innerError = this.innerError;
       return {
         reason: reason,
@@ -49,6 +50,9 @@ var RequestError = exports.RequestError = /*#__PURE__*/function (_BaseMediaClien
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,
+        metadata: {
+          traceContext: traceContext
+        },
         innerError: innerError
       };
     }

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

@@ -12,14 +12,20 @@ export class FileFetcherError extends BaseMediaClientError {
       id,
       metadata: {
         collectionName,
-        occurrenceKey
+        occurrenceKey,
+        traceContext
       } = {}
     } = this;
     return {
       reason,
       id,
       collectionName,
-      occurrenceKey
+      occurrenceKey,
+      ...(traceContext && {
+        metadata: {
+          traceContext
+        }
+      })
     };
   }
 }

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

@@ -6,6 +6,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';
@@ -27,19 +28,31 @@ import { mediaStore } from '@atlaskit/media-state';
 export { isFileFetcherError, FileFetcherError } from './error';
 export class FileFetcherImpl {
   constructor(mediaApi, store = mediaStore) {
-    _defineProperty(this, "getErrorFileState", (error, id, occurrenceKey) => typeof error === 'string' ? {
-      status: 'error',
-      id,
-      reason: error,
-      occurrenceKey,
-      message: error
-    } : {
-      status: 'error',
-      id,
-      reason: error === null || error === void 0 ? void 0 : error.reason,
-      details: error === null || error === void 0 ? void 0 : error.attributes,
-      occurrenceKey,
-      message: error === null || error === void 0 ? void 0 : error.message
+    _defineProperty(this, "getErrorFileState", (error, id, occurrenceKey) => {
+      var _error$attributes;
+      const {
+        metadata,
+        ...attributes
+      } = (_error$attributes = error === null || error === void 0 ? void 0 : error.attributes) !== null && _error$attributes !== void 0 ? _error$attributes : {};
+      return typeof error === 'string' ? {
+        status: 'error',
+        id,
+        reason: error,
+        occurrenceKey,
+        message: error
+      } : {
+        status: 'error',
+        id,
+        reason: error === null || error === void 0 ? void 0 : error.reason,
+        details: {
+          ...attributes,
+          ...((metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
+            metadata
+          })
+        },
+        occurrenceKey,
+        message: error === null || error === void 0 ? void 0 : error.message
+      };
     });
     _defineProperty(this, "setFileState", (id, fileState) => {
       this.store.setState(state => {
@@ -58,16 +71,18 @@ export class FileFetcherImpl {
           id,
           collectionName
         });
-        if (!response) {
+        if (isNotFoundMediaItemDetails(response)) {
           throw new FileFetcherError('emptyItems', id, {
             collectionName,
-            occurrenceKey
+            occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         }
         if (isEmptyFile(response)) {
           throw new FileFetcherError('zeroVersionFile', id, {
             collectionName,
-            occurrenceKey
+            occurrenceKey,
+            traceContext: response.metadataTraceContext
           });
         }
         const fileState = mapMediaItemToFileState(id, response);
@@ -130,18 +145,28 @@ export class FileFetcherImpl {
       occurrenceKey
     } = options;
     if (!isValidId(id)) {
+      var _err$attributes;
       const subject = createMediaSubject();
       const err = new FileFetcherError('invalidFileId', id, {
         collectionName,
         occurrenceKey
       });
+      const {
+        metadata,
+        ...attributes
+      } = (_err$attributes = err === null || err === void 0 ? void 0 : err.attributes) !== null && _err$attributes !== void 0 ? _err$attributes : {};
       const errorFileState = {
         status: 'error',
         id,
         reason: err === null || err === void 0 ? void 0 : err.reason,
         message: err === null || err === void 0 ? void 0 : err.message,
         occurrenceKey,
-        details: err === null || err === void 0 ? void 0 : err.attributes
+        details: {
+          ...attributes,
+          ...((metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
+            metadata
+          })
+        }
       };
       subject.error(err);
       this.setFileState(id, errorFileState);

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

@@ -200,7 +200,7 @@ export class MediaStore {
     const imageEndpoint = cdnFeatureFlag('image');
     return mapToMediaCdnUrl(createUrl(`${auth.baseUrl}/file/${id}/${imageEndpoint}`, options), auth.token);
   }
-  async getFileBinary(id, collectionName, maxAge = FILE_CACHE_MAX_AGE) {
+  async getFileBinary(id, collectionName, abortController, maxAge = FILE_CACHE_MAX_AGE) {
     const headers = {};
     const binaryEndpoint = cdnFeatureFlag('binary');
     const metadata = {
@@ -218,7 +218,7 @@ export class MediaStore {
         'max-age': `${maxAge}`
       }
     };
-    return this.request(`/file/${id}/${binaryEndpoint}`, options, undefined, true).then(createMapResponseToBlob(metadata));
+    return this.request(`/file/${id}/${binaryEndpoint}`, options, abortController, true).then(createMapResponseToBlob(metadata));
   }
   async getFileBinaryURL(id, collectionName, maxAge = FILE_CACHE_MAX_AGE) {
     const auth = await this.resolveAuth({

package/dist/es2019/models/media.js

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