@atlaskit/media-client 29.1.0 → 31.0.0

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,

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

@@ -27,36 +27,27 @@ 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';
 const isCopySourceFileWithToken = token => !!token.authProvider;
 const isCopyDestinationWithToken = token => !!token.authProvider;
 export class FileFetcherImpl {
   constructor(mediaApi, store = mediaStore) {
     _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
-      };
+      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') {
+        const err = new CommonMediaClientError(error);
+        return fromCommonMediaClientError(id, occurrenceKey, err);
+      } else {
+        const 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", (id, fileState) => {
       this.store.setState(state => {
@@ -64,27 +55,36 @@ export class FileFetcherImpl {
       });
     });
     // TODO: ----- ADD TICKET TO PASS TRACE ID to this.dataloader.load
-    _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey, includeHashForDuplicateFiles) => {
+    _defineProperty(this, "createDownloadFileStream", (id, collectionName, occurrenceKey, includeHashForDuplicateFiles, forceRefresh) => {
       const subject = createMediaSubject();
       const poll = new PollingFunction();
 
       // ensure subject errors if polling exceeds max iterations or uncaught exception in executor
       poll.onError = error => subject.error(error);
       poll.execute(async () => {
+        if (forceRefresh) {
+          this.dataloader.clear({
+            id,
+            collectionName,
+            includeHashForDuplicateFiles
+          });
+        }
         const response = await this.dataloader.load({
           id,
           collectionName,
           includeHashForDuplicateFiles
         });
         if (isNotFoundMediaItemDetails(response)) {
-          throw new FileFetcherError('emptyItems', id, {
+          throw new FileFetcherError('emptyItems', {
+            id,
             collectionName,
             occurrenceKey,
             traceContext: response.metadataTraceContext
           });
         }
         if (isEmptyFile(response)) {
-          throw new FileFetcherError('zeroVersionFile', id, {
+          throw new FileFetcherError('zeroVersionFile', {
+            id,
             collectionName,
             occurrenceKey,
             traceContext: response.metadataTraceContext
@@ -149,38 +149,26 @@ export class FileFetcherImpl {
     const {
       collectionName,
       occurrenceKey,
-      includeHashForDuplicateFiles
+      includeHashForDuplicateFiles,
+      forceRefresh
     } = options;
     if (!isValidId(id)) {
-      var _err$attributes;
       const subject = createMediaSubject();
-      const err = new FileFetcherError('invalidFileId', id, {
+      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: {
-          ...attributes,
-          ...((metadata === null || metadata === void 0 ? void 0 : metadata.traceContext) && {
-            metadata
-          })
-        }
-      };
+      const 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, () => {
-      const subject = this.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles);
+      const subject = this.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles, forceRefresh);
       subject.subscribe({
         next: fileState => {
           this.setFileState(id, fileState);

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

@@ -1,10 +1,11 @@
 import { BaseMediaClientError } from '../../models/errors';
 export class MediaStoreError extends BaseMediaClientError {
   constructor(reason, innerError) {
-    super(reason);
-    this.reason = reason;
-    this.innerError = innerError;
+    super(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 */
   get attributes() {
     const {
       reason,

package/dist/es2019/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/es2019/models/errors/index.js

@@ -3,12 +3,16 @@ export { isMediaClientError, getMediaClientErrorReason } from './helpers';
 /**
  * Base class for media errors
  */
-export class BaseMediaClientError extends Error {
-  constructor(message) {
-    super(message);
+export class BaseMediaClientError extends Error
+// TODO: Deprecate attributes getter https://product-fabric.atlassian.net/browse/CXP-4665
+{
+  constructor(reason, metadata, innerError) {
+    super(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, new.target.prototype);
 
     // https://v8.dev/docs/stack-trace-api
@@ -16,4 +20,57 @@ export class BaseMediaClientError extends Error {
       Error.captureStackTrace(this, new.target);
     }
   }
-}
+
+  // 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 class CommonMediaClientError extends BaseMediaClientError {
+  constructor(reason, metadata, innerError) {
+    super(reason, metadata, innerError);
+  }
+  get attributes() {
+    return {
+      reason: this.reason
+    };
+  }
+}
+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 const toCommonMediaClientError = errorFileState => {
+  var _errorFileState$detai;
+  const 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 const fromCommonMediaClientError = (id, occurrenceKey, error) => {
+  return {
+    status: 'error',
+    id,
+    occurrenceKey,
+    reason: error.reason,
+    details: {
+      /** 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
+      },
+      // Legacy details
+      ...(error === null || error === void 0 ? void 0 : error.attributes)
+    },
+    message: error === null || error === void 0 ? void 0 : error.message
+  };
+};

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

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

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

@@ -4,6 +4,7 @@ export const isProcessedFileState = fileState => fileState.status === 'processed
 export const isErrorFileState = fileState => fileState.status === 'error';
 export const isPreviewableFileState = fileState => !isErrorFileState(fileState) && !!fileState.preview;
 export const isFinalFileState = fileState => ['processed', 'failed-processing', 'error'].includes(fileState.status);
+export const isNonErrorFinalFileState = fileState => ['processed', 'failed-processing'].includes(fileState.status);
 export const isImageRepresentationReady = fileState => {
   switch (fileState.status) {
     case 'processing':

package/dist/es2019/uploader/error.js

@@ -1,19 +1,22 @@
 import { BaseMediaClientError } from '../models/errors';
 export class UploaderError 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
-      } = {}
+      }
     } = this;
     return {
       reason,

package/dist/es2019/uploader/index.js

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

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

@@ -1,20 +1,23 @@
 import { BaseMediaClientError } from '../../models/errors';
 export class MobileUploadError 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,

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

@@ -24,14 +24,16 @@ export const createMobileDownloadFileStream = (dataloader, id, collectionName, o
       collectionName
     });
     if (isNotFoundMediaItemDetails(response)) {
-      throw new MobileUploadError('emptyItems', id, {
+      throw new MobileUploadError('emptyItems', {
+        id,
         collectionName,
         occurrenceKey,
         traceContext: response.metadataTraceContext
       });
     }
     if (isEmptyFile(response)) {
-      throw new MobileUploadError('zeroVersionFile', id, {
+      throw new MobileUploadError('zeroVersionFile', {
+        id,
         collectionName,
         occurrenceKey,
         traceContext: response.metadataTraceContext

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

@@ -1,14 +1,17 @@
 import { BaseMediaClientError } from '../../models/errors';
 export class PollingError extends BaseMediaClientError {
-  constructor(reason, attempts) {
-    super(reason);
-    this.reason = reason;
-    this.attempts = attempts;
+  constructor(reason, metadata) {
+    super(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 */
   get attributes() {
     const {
       reason,
-      attempts
+      metadata: {
+        attempts
+      }
     } = this;
     return {
       reason,

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

@@ -38,7 +38,9 @@ export class PollingFunction {
     } = this.options;
     if (poll_maxAttempts === 0) {
       // hard kill, polling disabled
-      return this.fail(new PollingError('pollingMaxAttemptsExceeded', this.attempt));
+      return this.fail(new PollingError('pollingMaxAttemptsExceeded', {
+        attempts: this.attempt
+      }));
     }
     try {
       // executor must explicitly call this.next() for triggering next iteration (pull)
@@ -49,7 +51,9 @@ export class PollingFunction {
       }
       if (this.attempt >= poll_maxAttempts) {
         // max iterations exceeded, let the consumer know
-        return this.fail(new PollingError('pollingMaxAttemptsExceeded', this.attempt));
+        return this.fail(new PollingError('pollingMaxAttemptsExceeded', {
+          attempts: this.attempt
+        }));
       }
       this.poll_intervalMs = this.getIntervalMsForIteration(this.attempt);
       this.attempt++;

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

@@ -1,11 +1,11 @@
 import { BaseMediaClientError } from '../../models/errors';
 export class RequestError extends BaseMediaClientError {
   constructor(reason, metadata, innerError) {
-    super(reason);
-    this.reason = reason;
-    this.metadata = metadata;
-    this.innerError = innerError;
+    super(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 */
   get attributes() {
     const {
       reason,

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

@@ -2,6 +2,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';
+const 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(resolve => setTimeout(resolve, timeout));
 }
@@ -14,7 +18,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');
+  const statusCode = error && getStatusCode(error);
+  return statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
 export const extendTraceContext = traceContext => traceContext ? {
   ...traceContext,
@@ -101,8 +106,8 @@ export function createMapResponseToBlob(metadata) {
   };
 }
 export const 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;
+  const statusCode = getStatusCode(err);
+  return isFetchNetworkError(err) || (statusCode ? statusCode >= 500 : false);
 };
 export const DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,

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

@@ -10,26 +10,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 FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
-  function FileFetcherError(reason, id, metadata) {
+  // Legacy Attribute. Should be removed
+
+  function FileFetcherError(reason, metadata) {
     var _this;
     _classCallCheck(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 */
   _inherits(FileFetcherError, _BaseMediaClientError);
   return _createClass(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,