@atlaskit/media-client 29.1.0 → 31.0.0

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

@@ -1,13 +1,10 @@
 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';
@@ -36,6 +33,7 @@ import { isEmptyFile } from '../../utils/detectEmptyFile';
 import { mediaStore } from '@atlaskit/media-state';
 import { createCopyIntentRegisterationBatcher } from '../../utils/createCopyIntentRegisterationBatcher';
 import { defaultShouldRetryError } from '../../utils/request/helpers';
+import { isCommonMediaClientError, CommonMediaClientError, fromCommonMediaClientError } from '../../models/errors';
 export { isFileFetcherError, FileFetcherError } from './error';
 var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
   return !!token.authProvider;
@@ -49,26 +47,20 @@ 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,
-        reason: error,
-        occurrenceKey: occurrenceKey,
-        message: error
-      } : {
-        status: 'error',
-        id: id,
-        reason: error === null || error === void 0 ? void 0 : error.reason,
-        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
-      };
+      if (isCommonMediaClientError(error)) {
+        return fromCommonMediaClientError(id, occurrenceKey, error);
+      }
+      // ________________________________________________
+      // Legacy serializers
+      // We need to revisit all the incoming error types and ensure all the "reason" values are known
+      // We need to change the input error: any for a known type.
+      if (typeof error === 'string') {
+        var err = new CommonMediaClientError(error);
+        return fromCommonMediaClientError(id, occurrenceKey, err);
+      } else {
+        var _err = new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown', error === null || error === void 0 ? void 0 : error.metadata, error === null || error === void 0 ? void 0 : error.innerError);
+        return fromCommonMediaClientError(id, occurrenceKey, _err);
+      }
     });
     _defineProperty(this, "setFileState", function (id, fileState) {
       _this.store.setState(function (state) {
@@ -76,7 +68,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       });
     });
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
-    _defineProperty(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey, includeHashForDuplicateFiles) {
+    _defineProperty(this, "createDownloadFileStream", function (id, collectionName, occurrenceKey, includeHashForDuplicateFiles, forceRefresh) {
       var subject = createMediaSubject();
       var poll = new PollingFunction();
 
@@ -89,47 +81,56 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (forceRefresh) {
+                _this.dataloader.clear({
+                  id: id,
+                  collectionName: collectionName,
+                  includeHashForDuplicateFiles: includeHashForDuplicateFiles
+                });
+              }
+              _context.next = 3;
               return _this.dataloader.load({
                 id: id,
                 collectionName: collectionName,
                 includeHashForDuplicateFiles: includeHashForDuplicateFiles
               });
-            case 2:
+            case 3:
               response = _context.sent;
               if (!isNotFoundMediaItemDetails(response)) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
-              throw new FileFetcherError('emptyItems', id, {
+              throw new FileFetcherError('emptyItems', {
+                id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
                 traceContext: response.metadataTraceContext
               });
-            case 5:
+            case 6:
               if (!isEmptyFile(response)) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
-              throw new FileFetcherError('zeroVersionFile', id, {
+              throw new FileFetcherError('zeroVersionFile', {
+                id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
                 traceContext: response.metadataTraceContext
               });
-            case 7:
+            case 8:
               fileState = mapMediaItemToFileState(id, response);
               subject.next(fileState);
               _context.t0 = fileState.status;
-              _context.next = _context.t0 === 'processing' ? 12 : _context.t0 === 'processed' ? 14 : 16;
+              _context.next = _context.t0 === 'processing' ? 13 : _context.t0 === 'processed' ? 15 : 17;
               break;
-            case 12:
+            case 13:
               // the only case for continuing polling, otherwise this function is run once only
               poll.next();
-              return _context.abrupt("break", 16);
-            case 14:
+              return _context.abrupt("break", 17);
+            case 15:
               subject.complete();
-              return _context.abrupt("break", 16);
-            case 16:
+              return _context.abrupt("break", 17);
+            case 17:
             case "end":
               return _context.stop();
           }
@@ -182,33 +183,25 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
       var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       var collectionName = options.collectionName,
         occurrenceKey = options.occurrenceKey,
-        includeHashForDuplicateFiles = options.includeHashForDuplicateFiles;
+        includeHashForDuplicateFiles = options.includeHashForDuplicateFiles,
+        forceRefresh = options.forceRefresh;
       if (!isValidId(id)) {
-        var _err$attributes;
         var subject = createMediaSubject();
-        var err = new FileFetcherError('invalidFileId', id, {
+        var err = new FileFetcherError('invalidFileId', {
+          id: 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: _objectSpread(_objectSpread({}, attributes), (metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
-            metadata: metadata
-          })
-        };
+        var errorFileState = this.getErrorFileState(err, id, occurrenceKey);
         subject.error(err);
         this.setFileState(id, errorFileState);
         return fromObservable(subject);
       }
+      if (forceRefresh) {
+        getFileStreamsCache().remove(id);
+      }
       return fromObservable(getFileStreamsCache().getOrInsert(id, function () {
-        var subject = _this2.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles);
+        var subject = _this2.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles, forceRefresh);
         subject.subscribe({
           next: function next(fileState) {
             _this2.setFileState(id, fileState);
@@ -243,8 +236,8 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
         descriptors: descriptors
       }, {
         collection: collection
-      }, traceContext).then(function (_ref4) {
-        var data = _ref4.data;
+      }, traceContext).then(function (_ref2) {
+        var data = _ref2.data;
         return data;
       });
     }
@@ -285,7 +278,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                 return undefined;
               });
               preview = new Promise( /*#__PURE__*/function () {
-                var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
+                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resolve, reject) {
                   var blob;
                   return _regeneratorRuntime.wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
@@ -308,7 +301,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   }, _callee2);
                 }));
                 return function (_x4, _x5) {
-                  return _ref5.apply(this, arguments);
+                  return _ref3.apply(this, arguments);
                 };
               }());
               name = url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
@@ -327,7 +320,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               getFileStreamsCache().set(id, subject);
               this.setFileState(id, fileState);
               return _context4.abrupt("return", new Promise( /*#__PURE__*/function () {
-                var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resolve, reject) {
+                var _ref4 = _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) {
@@ -388,7 +381,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   }, _callee3, null, [[10, 16]]);
                 }));
                 return function (_x6, _x7) {
-                  return _ref6.apply(this, arguments);
+                  return _ref4.apply(this, arguments);
                 };
               }()));
             case 11:

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

@@ -8,13 +8,12 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import { BaseMediaClientError } from '../../models/errors';
 export var MediaStoreError = /*#__PURE__*/function (_BaseMediaClientError) {
   function MediaStoreError(reason, innerError) {
-    var _this;
     _classCallCheck(this, MediaStoreError);
-    _this = _callSuper(this, MediaStoreError, [reason]);
-    _this.reason = reason;
-    _this.innerError = innerError;
-    return _this;
+    return _callSuper(this, MediaStoreError, [reason, undefined, innerError]);
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   _inherits(MediaStoreError, _BaseMediaClientError);
   return _createClass(MediaStoreError, [{
     key: "attributes",

package/dist/esm/index.js

@@ -2,8 +2,8 @@ export { MediaStore, MediaStoreError, isMediaStoreError, getMediaEnvironment, ge
 export { UploadController } from './upload-controller';
 export { isPreviewableType } from './models/media';
 export { getArtifactUrl } from './models/artifacts';
-export { isMediaClientError, getMediaClientErrorReason } from './models/errors';
-export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, mapMediaFileToFileState, mapMediaItemToFileState } from './models/file-state';
+export { isMediaClientError, getMediaClientErrorReason, isCommonMediaClientError, toCommonMediaClientError } from './models/errors';
+export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, isNonErrorFinalFileState, mapMediaFileToFileState, mapMediaItemToFileState } from './models/file-state';
 export { uploadFile } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError, createRequestErrorReason } from './utils/request';
 export { isAbortedRequestError, createUrl } from './utils/request/helpers';

package/dist/esm/models/errors/index.js

@@ -1,9 +1,12 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _wrapNativeSuper from "@babel/runtime/helpers/wrapNativeSuper";
+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 _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 export { isMediaClientError, getMediaClientErrorReason } from './helpers';
@@ -12,13 +15,15 @@ export { isMediaClientError, getMediaClientErrorReason } from './helpers';
  * Base class for media errors
  */
 export var BaseMediaClientError = /*#__PURE__*/function (_Error) {
-  function BaseMediaClientError(message) {
+  function BaseMediaClientError(reason, metadata, innerError) {
     var _this;
     _classCallCheck(this, BaseMediaClientError);
-    _this = _callSuper(this, BaseMediaClientError, [message]);
+    _this = _callSuper(this, BaseMediaClientError, [reason]);
 
     // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#support-for-newtarget
-    _this.message = message;
+    _this.reason = reason;
+    _this.metadata = metadata;
+    _this.innerError = innerError;
     Object.setPrototypeOf(_this, (this instanceof BaseMediaClientError ? this.constructor : void 0).prototype);
 
     // https://v8.dev/docs/stack-trace-api
@@ -27,6 +32,64 @@ export var BaseMediaClientError = /*#__PURE__*/function (_Error) {
     }
     return _this;
   }
+
+  // TODO: Deprecate attributes getter https://product-fabric.atlassian.net/browse/CXP-4665
   _inherits(BaseMediaClientError, _Error);
   return _createClass(BaseMediaClientError);
-}( /*#__PURE__*/_wrapNativeSuper(Error));
+}( /*#__PURE__*/_wrapNativeSuper(Error
+// TODO: Deprecate attributes getter https://product-fabric.atlassian.net/browse/CXP-4665
+));
+
+// The only reason why this class exists is because BaseMediaClientError is abstract class, so it can't be used to deserialize ErrorFileState. We can refactor and simplify this later.
+/** Generic Media Client Erorr. All errors extending BaseMediaClientError match CommonMediaClientError attributes. Used to deserialize ErrorFileState */
+export var CommonMediaClientError = /*#__PURE__*/function (_BaseMediaClientError) {
+  function CommonMediaClientError(reason, metadata, innerError) {
+    _classCallCheck(this, CommonMediaClientError);
+    return _callSuper(this, CommonMediaClientError, [reason, metadata, innerError]);
+  }
+  _inherits(CommonMediaClientError, _BaseMediaClientError);
+  return _createClass(CommonMediaClientError, [{
+    key: "attributes",
+    get: function get() {
+      return {
+        reason: this.reason
+      };
+    }
+  }]);
+}(BaseMediaClientError);
+export function isCommonMediaClientError(error) {
+  if (!error) {
+    return false;
+  }
+  // Check if the error is an instance of Error
+  if (error instanceof CommonMediaClientError) {
+    return true;
+  }
+  return typeof error.reason === 'string' && ('metadata' in error || error.metadata === undefined) && ('innerError' in error || error.innerError === undefined);
+}
+
+/** Deserializer ErrorFileState -> CommonMediaClientError */
+export var toCommonMediaClientError = function toCommonMediaClientError(errorFileState) {
+  var _errorFileState$detai;
+  var error = (_errorFileState$detai = errorFileState.details) === null || _errorFileState$detai === void 0 ? void 0 : _errorFileState$detai.error;
+  return new CommonMediaClientError((error === null || error === void 0 ? void 0 : error.reason) || 'unknown-reason', error.metadata, error.innerError);
+};
+
+/** Serializer CommonMediaClientError -> ErrorFileState */
+export var fromCommonMediaClientError = function fromCommonMediaClientError(id, occurrenceKey, error) {
+  return {
+    status: 'error',
+    id: id,
+    occurrenceKey: occurrenceKey,
+    reason: error.reason,
+    details: _objectSpread({
+      /** Use this attr to translate back into CommonMediaClientError (toCommonMediaClientError) */
+      error: {
+        reason: error === null || error === void 0 ? void 0 : error.reason,
+        metadata: error === null || error === void 0 ? void 0 : error.metadata,
+        innerError: error === null || error === void 0 ? void 0 : error.innerError
+      }
+    }, error === null || error === void 0 ? void 0 : error.attributes),
+    message: error === null || error === void 0 ? void 0 : error.message
+  };
+};

package/dist/esm/models/errors/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/models/file-state.js

@@ -19,6 +19,9 @@ export var isPreviewableFileState = function isPreviewableFileState(fileState) {
 export var isFinalFileState = function isFinalFileState(fileState) {
   return ['processed', 'failed-processing', 'error'].includes(fileState.status);
 };
+export var isNonErrorFinalFileState = function isNonErrorFinalFileState(fileState) {
+  return ['processed', 'failed-processing'].includes(fileState.status);
+};
 export var isImageRepresentationReady = function isImageRepresentationReady(fileState) {
   switch (fileState.status) {
     case 'processing':

package/dist/esm/uploader/error.js

@@ -7,25 +7,27 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 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';
 export var UploaderError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function UploaderError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function UploaderError(reason, metadata) {
     var _this;
     _classCallCheck(this, UploaderError);
-    _this = _callSuper(this, UploaderError, [reason]);
-    _this.reason = reason;
-    _this.id = id;
-    _this.metadata = metadata;
+    _this = _callSuper(this, UploaderError, [reason, metadata, undefined]);
+    _this.id = metadata.id;
     return _this;
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   _inherits(UploaderError, _BaseMediaClientError);
   return _createClass(UploaderError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
-        id = this.id,
         _this$metadata = this.metadata,
-        _this$metadata2 = _this$metadata === void 0 ? {} : _this$metadata,
-        collectionName = _this$metadata2.collectionName,
-        occurrenceKey = _this$metadata2.occurrenceKey;
+        id = _this$metadata.id,
+        collectionName = _this$metadata.collectionName,
+        occurrenceKey = _this$metadata.occurrenceKey;
       return {
         reason: reason,
         id: id,

package/dist/esm/uploader/index.js

@@ -143,7 +143,8 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
     }
   } catch (err) {
     if (err instanceof Error && err.message === fileSizeError) {
-      callbacks === null || callbacks === void 0 || callbacks.onUploadFinish(new UploaderError(err.message, id, {
+      callbacks === null || callbacks === void 0 || callbacks.onUploadFinish(new UploaderError(err.message, {
+        id: id,
         collectionName: collection,
         occurrenceKey: occurrenceKey
       }));

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

@@ -7,26 +7,28 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 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';
 export var MobileUploadError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function MobileUploadError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function MobileUploadError(reason, metadata) {
     var _this;
     _classCallCheck(this, MobileUploadError);
-    _this = _callSuper(this, MobileUploadError, [reason]);
-    _this.reason = reason;
-    _this.id = id;
-    _this.metadata = metadata;
+    _this = _callSuper(this, MobileUploadError, [reason, metadata, undefined]);
+    _this.id = metadata.id;
     return _this;
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   _inherits(MobileUploadError, _BaseMediaClientError);
   return _createClass(MobileUploadError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
-        id = this.id,
         _this$metadata = this.metadata,
-        _this$metadata2 = _this$metadata === void 0 ? {} : _this$metadata,
-        collectionName = _this$metadata2.collectionName,
-        occurrenceKey = _this$metadata2.occurrenceKey,
-        traceContext = _this$metadata2.traceContext;
+        id = _this$metadata.id,
+        collectionName = _this$metadata.collectionName,
+        occurrenceKey = _this$metadata.occurrenceKey,
+        traceContext = _this$metadata.traceContext;
       return {
         reason: reason,
         id: id,

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

@@ -40,7 +40,8 @@ export var createMobileDownloadFileStream = function createMobileDownloadFileStr
             _context.next = 5;
             break;
           }
-          throw new MobileUploadError('emptyItems', id, {
+          throw new MobileUploadError('emptyItems', {
+            id: id,
             collectionName: collectionName,
             occurrenceKey: occurrenceKey,
             traceContext: response.metadataTraceContext
@@ -50,7 +51,8 @@ export var createMobileDownloadFileStream = function createMobileDownloadFileStr
             _context.next = 7;
             break;
           }
-          throw new MobileUploadError('zeroVersionFile', id, {
+          throw new MobileUploadError('zeroVersionFile', {
+            id: id,
             collectionName: collectionName,
             occurrenceKey: occurrenceKey,
             traceContext: response.metadataTraceContext

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

@@ -7,20 +7,19 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 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';
 export var PollingError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function PollingError(reason, attempts) {
-    var _this;
+  function PollingError(reason, metadata) {
     _classCallCheck(this, PollingError);
-    _this = _callSuper(this, PollingError, [reason]);
-    _this.reason = reason;
-    _this.attempts = attempts;
-    return _this;
+    return _callSuper(this, PollingError, [reason, metadata, undefined]);
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   _inherits(PollingError, _BaseMediaClientError);
   return _createClass(PollingError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
-        attempts = this.attempts;
+        attempts = this.metadata.attempts;
       return {
         reason: reason,
         attempts: attempts

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

@@ -50,7 +50,9 @@ export var PollingFunction = /*#__PURE__*/function () {
                 _context.next = 3;
                 break;
               }
-              return _context.abrupt("return", this.fail(new PollingError('pollingMaxAttemptsExceeded', this.attempt)));
+              return _context.abrupt("return", this.fail(new PollingError('pollingMaxAttemptsExceeded', {
+                attempts: this.attempt
+              })));
             case 3:
               _context.prev = 3;
               // executor must explicitly call this.next() for triggering next iteration (pull)
@@ -68,7 +70,9 @@ export var PollingFunction = /*#__PURE__*/function () {
                 _context.next = 11;
                 break;
               }
-              return _context.abrupt("return", this.fail(new PollingError('pollingMaxAttemptsExceeded', this.attempt)));
+              return _context.abrupt("return", this.fail(new PollingError('pollingMaxAttemptsExceeded', {
+                attempts: this.attempt
+              })));
             case 11:
               this.poll_intervalMs = this.getIntervalMsForIteration(this.attempt);
               this.attempt++;

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

@@ -8,14 +8,12 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import { BaseMediaClientError } from '../../models/errors';
 export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
   function RequestError(reason, metadata, innerError) {
-    var _this;
     _classCallCheck(this, RequestError);
-    _this = _callSuper(this, RequestError, [reason]);
-    _this.reason = reason;
-    _this.metadata = metadata;
-    _this.innerError = innerError;
-    return _this;
+    return _callSuper(this, RequestError, [reason, metadata, innerError]);
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   _inherits(RequestError, _BaseMediaClientError);
   return _createClass(RequestError, [{
     key: "attributes",

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

@@ -9,6 +9,10 @@ import { isClientBasedAuth } from '@atlaskit/media-core';
 import { getRandomHex } from '@atlaskit/media-common';
 import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
 import { RequestError, isRequestError } from './errors';
+var getStatusCode = function getStatusCode(error) {
+  var _error$metadata;
+  return isRequestError(error) && ((_error$metadata = error.metadata) === null || _error$metadata === void 0 ? void 0 : _error$metadata.statusCode) && error.metadata.statusCode;
+};
 export function waitPromise(timeout) {
   return new Promise(function (resolve) {
     return setTimeout(resolve, timeout);
@@ -23,7 +27,8 @@ export function isFetchNetworkError(err) {
   return err instanceof TypeError;
 }
 export function isRateLimitedError(error) {
-  return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
+  var statusCode = error && getStatusCode(error);
+  return statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
 export var extendTraceContext = function extendTraceContext(traceContext) {
   return traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
@@ -136,8 +141,8 @@ export function createMapResponseToBlob(metadata) {
   }();
 }
 export var defaultShouldRetryError = function defaultShouldRetryError(err) {
-  var _err$metadata;
-  return isFetchNetworkError(err) || isRequestError(err) && !!(err !== null && err !== void 0 && (_err$metadata = err.metadata) !== null && _err$metadata !== void 0 && _err$metadata.statusCode) && err.metadata.statusCode >= 500;
+  var statusCode = getStatusCode(err);
+  return isFetchNetworkError(err) || (statusCode ? statusCode >= 500 : false);
 };
 export var DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,

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

@@ -10,19 +10,16 @@ export type FileFetcherErrorAttributes = {
         readonly traceContext?: MediaTraceContext;
     };
 };
-export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorAttributes> {
-    readonly reason: FileFetcherErrorReason;
+export type FileFetcherErrorMetadata = {
     readonly id: string;
-    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);
+    readonly collectionName?: string;
+    readonly occurrenceKey?: string;
+    readonly traceContext?: MediaTraceContext;
+};
+export declare class FileFetcherError extends BaseMediaClientError<FileFetcherErrorReason, FileFetcherErrorMetadata, undefined, FileFetcherErrorAttributes> {
+    readonly id: string;
+    constructor(reason: FileFetcherErrorReason, metadata: FileFetcherErrorMetadata);
+    /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
         metadata?: {
             traceContext: MediaTraceContext;

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

@@ -4,10 +4,9 @@ export type MediaStoreErrorAttributes = {
     readonly reason: MediaStoreErrorReason;
     readonly innerError?: Error;
 };
-export declare class MediaStoreError extends BaseMediaClientError<MediaStoreErrorAttributes> {
-    readonly reason: MediaStoreErrorReason;
-    readonly innerError?: Error | undefined;
-    constructor(reason: MediaStoreErrorReason, innerError?: Error | undefined);
+export declare class MediaStoreError extends BaseMediaClientError<MediaStoreErrorReason, undefined, Error | undefined, MediaStoreErrorAttributes> {
+    constructor(reason: MediaStoreErrorReason, innerError?: Error);
+    /** Will be deprecated. Use the properties `reason` and `metadata` instead */
     get attributes(): {
         reason: MediaStoreErrorReason;
         innerError: Error | undefined;