@atlaskit/media-client 29.1.0 → 30.0.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/media-client
 
+## 30.0.0
+
+### Major Changes
+
+- [#102527](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102527)
+  [`a90d34cd14faf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a90d34cd14faf) -
+  Updated the constructor of the following classes. Consult the type definitions for details.
+
+  - `RequestError`
+
+  - `PollingError`
+
+  - `FileFetcherError`
+
+### Minor Changes
+
+- [#102527](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/102527)
+  [`a90d34cd14faf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a90d34cd14faf) - -
+  New error verification helper `isCommonMediaClientError`
+
+  - `ErrorFileState` is now deserializable into a `CommonMediaClientError` using new export
+    `toCommonMediaClientError`
+
 ## 29.1.0
 
 ### Minor Changes

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

@@ -18,26 +18,28 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 var FileFetcherError = exports.FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function FileFetcherError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function FileFetcherError(reason, metadata) {
     var _this;
     (0, _classCallCheck2.default)(this, FileFetcherError);
-    _this = _callSuper(this, FileFetcherError, [reason]);
-    _this.reason = reason;
-    _this.id = id;
-    _this.metadata = metadata;
+    _this = _callSuper(this, FileFetcherError, [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 */
   (0, _inherits2.default)(FileFetcherError, _BaseMediaClientError);
   return (0, _createClass2.default)(FileFetcherError, [{
     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 _objectSpread({
         reason: reason,
         id: id,

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

@@ -19,7 +19,6 @@ 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"));
@@ -51,8 +50,7 @@ var _detectEmptyFile = require("../../utils/detectEmptyFile");
 var _mediaState = require("@atlaskit/media-state");
 var _createCopyIntentRegisterationBatcher = require("../../utils/createCopyIntentRegisterationBatcher");
 var _helpers = require("../../utils/request/helpers");
-var _excluded = ["metadata"],
-  _excluded2 = ["metadata"];
+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; }
 var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
@@ -67,26 +65,20 @@ 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,
-        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 ((0, _errors.isCommonMediaClientError)(error)) {
+        return (0, _errors.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 _errors.CommonMediaClientError(error);
+        return (0, _errors.fromCommonMediaClientError)(id, occurrenceKey, err);
+      } else {
+        var _err = new _errors.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 (0, _errors.fromCommonMediaClientError)(id, occurrenceKey, _err);
+      }
     });
     (0, _defineProperty2.default)(this, "setFileState", function (id, fileState) {
       _this.store.setState(function (state) {
@@ -119,7 +111,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 _context.next = 5;
                 break;
               }
-              throw new _error.FileFetcherError('emptyItems', id, {
+              throw new _error.FileFetcherError('emptyItems', {
+                id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
                 traceContext: response.metadataTraceContext
@@ -129,7 +122,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 _context.next = 7;
                 break;
               }
-              throw new _error.FileFetcherError('zeroVersionFile', id, {
+              throw new _error.FileFetcherError('zeroVersionFile', {
+                id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
                 traceContext: response.metadataTraceContext
@@ -202,25 +196,13 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
         occurrenceKey = options.occurrenceKey,
         includeHashForDuplicateFiles = options.includeHashForDuplicateFiles;
       if (!(0, _uuidValidate.default)(id)) {
-        var _err$attributes;
         var subject = (0, _createMediaSubject.createMediaSubject)();
-        var err = new _error.FileFetcherError('invalidFileId', id, {
+        var err = new _error.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 = (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: _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 (0, _mediaSubscribable.fromObservable)(subject);
@@ -261,8 +243,8 @@ var FileFetcherImpl = exports.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;
       });
     }
@@ -303,7 +285,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 return undefined;
               });
               preview = new Promise( /*#__PURE__*/function () {
-                var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resolve, reject) {
+                var _ref3 = (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) {
@@ -326,7 +308,7 @@ var FileFetcherImpl = exports.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
@@ -345,7 +327,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 _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resolve, reject) {
+                var _ref4 = (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) {
@@ -406,7 +388,7 @@ var FileFetcherImpl = exports.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/cjs/client/media-store/error.js

@@ -16,13 +16,12 @@ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0,
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var MediaStoreError = exports.MediaStoreError = /*#__PURE__*/function (_BaseMediaClientError) {
   function MediaStoreError(reason, innerError) {
-    var _this;
     (0, _classCallCheck2.default)(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 */
   (0, _inherits2.default)(MediaStoreError, _BaseMediaClientError);
   return (0, _createClass2.default)(MediaStoreError, [{
     key: "attributes",

package/dist/cjs/index.js

@@ -183,6 +183,12 @@ Object.defineProperty(exports, "isAbortedRequestError", {
     return _helpers.isAbortedRequestError;
   }
 });
+Object.defineProperty(exports, "isCommonMediaClientError", {
+  enumerable: true,
+  get: function get() {
+    return _errors.isCommonMediaClientError;
+  }
+});
 Object.defineProperty(exports, "isDifferentIdentifier", {
   enumerable: true,
   get: function get() {
@@ -315,6 +321,12 @@ Object.defineProperty(exports, "request", {
     return _request.request;
   }
 });
+Object.defineProperty(exports, "toCommonMediaClientError", {
+  enumerable: true,
+  get: function get() {
+    return _errors.toCommonMediaClientError;
+  }
+});
 Object.defineProperty(exports, "uploadFile", {
   enumerable: true,
   get: function get() {

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

@@ -4,19 +4,22 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BaseMediaClientError = void 0;
+exports.fromCommonMediaClientError = exports.CommonMediaClientError = exports.BaseMediaClientError = void 0;
 Object.defineProperty(exports, "getMediaClientErrorReason", {
   enumerable: true,
   get: function get() {
     return _helpers.getMediaClientErrorReason;
   }
 });
+exports.isCommonMediaClientError = isCommonMediaClientError;
 Object.defineProperty(exports, "isMediaClientError", {
   enumerable: true,
   get: function get() {
     return _helpers.isMediaClientError;
   }
 });
+exports.toCommonMediaClientError = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -24,19 +27,23 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _helpers = require("./helpers");
+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 _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 /**
  * Base class for media errors
  */
 var BaseMediaClientError = exports.BaseMediaClientError = /*#__PURE__*/function (_Error) {
-  function BaseMediaClientError(message) {
+  function BaseMediaClientError(reason, metadata, innerError) {
     var _this;
     (0, _classCallCheck2.default)(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
@@ -45,6 +52,62 @@ var BaseMediaClientError = exports.BaseMediaClientError = /*#__PURE__*/function
     }
     return _this;
   }
+
+  // TODO: Deprecate attributes getter https://product-fabric.atlassian.net/browse/CXP-4665
   (0, _inherits2.default)(BaseMediaClientError, _Error);
   return (0, _createClass2.default)(BaseMediaClientError);
-}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
+}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(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 */
+var CommonMediaClientError = exports.CommonMediaClientError = /*#__PURE__*/function (_BaseMediaClientError) {
+  function CommonMediaClientError(reason, metadata, innerError) {
+    (0, _classCallCheck2.default)(this, CommonMediaClientError);
+    return _callSuper(this, CommonMediaClientError, [reason, metadata, innerError]);
+  }
+  (0, _inherits2.default)(CommonMediaClientError, _BaseMediaClientError);
+  return (0, _createClass2.default)(CommonMediaClientError, [{
+    key: "attributes",
+    get: function get() {
+      return {
+        reason: this.reason
+      };
+    }
+  }]);
+}(BaseMediaClientError);
+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 */
+var toCommonMediaClientError = exports.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 */
+var fromCommonMediaClientError = exports.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/cjs/models/errors/types.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/uploader/error.js

@@ -15,25 +15,27 @@ var _errors = require("../models/errors");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 var UploaderError = exports.UploaderError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function UploaderError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function UploaderError(reason, metadata) {
     var _this;
     (0, _classCallCheck2.default)(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 */
   (0, _inherits2.default)(UploaderError, _BaseMediaClientError);
   return (0, _createClass2.default)(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/cjs/uploader/index.js

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

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

@@ -15,26 +15,28 @@ var _errors = require("../../models/errors");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 var MobileUploadError = exports.MobileUploadError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function MobileUploadError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function MobileUploadError(reason, metadata) {
     var _this;
     (0, _classCallCheck2.default)(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 */
   (0, _inherits2.default)(MobileUploadError, _BaseMediaClientError);
   return (0, _createClass2.default)(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/cjs/utils/mobileUpload/helpers.js

@@ -47,7 +47,8 @@ var createMobileDownloadFileStream = exports.createMobileDownloadFileStream = fu
             _context.next = 5;
             break;
           }
-          throw new _error.MobileUploadError('emptyItems', id, {
+          throw new _error.MobileUploadError('emptyItems', {
+            id: id,
             collectionName: collectionName,
             occurrenceKey: occurrenceKey,
             traceContext: response.metadataTraceContext
@@ -57,7 +58,8 @@ var createMobileDownloadFileStream = exports.createMobileDownloadFileStream = fu
             _context.next = 7;
             break;
           }
-          throw new _error.MobileUploadError('zeroVersionFile', id, {
+          throw new _error.MobileUploadError('zeroVersionFile', {
+            id: id,
             collectionName: collectionName,
             occurrenceKey: occurrenceKey,
             traceContext: response.metadataTraceContext

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

@@ -15,20 +15,19 @@ var _errors = require("../../models/errors");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(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; })(); }
 var PollingError = exports.PollingError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function PollingError(reason, attempts) {
-    var _this;
+  function PollingError(reason, metadata) {
     (0, _classCallCheck2.default)(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 */
   (0, _inherits2.default)(PollingError, _BaseMediaClientError);
   return (0, _createClass2.default)(PollingError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
-        attempts = this.attempts;
+        attempts = this.metadata.attempts;
       return {
         reason: reason,
         attempts: attempts

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

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

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

@@ -16,14 +16,12 @@ function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0,
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var RequestError = exports.RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
   function RequestError(reason, metadata, innerError) {
-    var _this;
     (0, _classCallCheck2.default)(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 */
   (0, _inherits2.default)(RequestError, _BaseMediaClientError);
   return (0, _createClass2.default)(RequestError, [{
     key: "attributes",

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

@@ -33,6 +33,10 @@ var _authQueryParameters = require("../../models/auth-query-parameters");
 var _errors = require("./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; }
+var getStatusCode = function getStatusCode(error) {
+  var _error$metadata;
+  return (0, _errors.isRequestError)(error) && ((_error$metadata = error.metadata) === null || _error$metadata === void 0 ? void 0 : _error$metadata.statusCode) && error.metadata.statusCode;
+};
 function waitPromise(timeout) {
   return new Promise(function (resolve) {
     return setTimeout(resolve, timeout);
@@ -47,7 +51,8 @@ function isFetchNetworkError(err) {
   return err instanceof TypeError;
 }
 function isRateLimitedError(error) {
-  return !!error && (0, _errors.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');
 }
 var extendTraceContext = exports.extendTraceContext = function extendTraceContext(traceContext) {
   return traceContext ? _objectSpread(_objectSpread({}, traceContext), {}, {
@@ -160,8 +165,8 @@ function createMapResponseToBlob(metadata) {
   }();
 }
 var defaultShouldRetryError = exports.defaultShouldRetryError = function defaultShouldRetryError(err) {
-  var _err$metadata;
-  return isFetchNetworkError(err) || (0, _errors.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);
 };
 var DEFAULT_RETRY_OPTIONS = exports.DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,

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

@@ -1,20 +1,23 @@
 import { BaseMediaClientError } from '../../models/errors';
 export class FileFetcherError extends BaseMediaClientError {
-  constructor(reason, id, metadata) {
-    super(reason);
-    this.reason = reason;
-    this.id = id;
-    this.metadata = metadata;
+  // Legacy Attribute. Should be removed
+
+  constructor(reason, metadata) {
+    super(reason, metadata, undefined);
+    this.id = metadata.id;
   }
+
+  // TODO: Deprecate this getter https://product-fabric.atlassian.net/browse/CXP-4665
+  /** Will be deprecated. Use the properties `reason` and `metadata` instead */
   get attributes() {
     const {
       reason,
-      id,
       metadata: {
+        id,
         collectionName,
         occurrenceKey,
         traceContext
-      } = {}
+      }
     } = this;
     return {
       reason,