@atlaskit/media-client 37.2.37 → 37.4.0

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # @atlaskit/media-client
 
+## 37.4.0
+
+### Minor Changes
+
+- [`bcd2b3a9ab05b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bcd2b3a9ab05b) -
+  Added a fallback for file size: if `size` is not supplied by the integrator, it is now inferred
+  from the Blob content.
+
+## 37.3.0
+
+### Minor Changes
+
+- [`6d7421629b9df`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6d7421629b9df) -
+  Apply the Volt one-export-per-file standard via `volt-migrate-package` to
+  `@atlaskit/media-client`. The package `exports` map is **unchanged** — all 51 public subpaths keep
+  their existing targets, because `@atlaskit/media-client` already resolved every subpath directly
+  to its `./src/*` implementation. What changed is the module layout: multi-export modules were
+  split so each shippable module owns a single export, with `@deprecated` compatibility re-exports
+  left behind on the original module (VOLTC-139 tracks their removal).
+
+  ### No public API was removed
+
+  Every symbol that moved is still exported from the subpath that previously exposed it, so existing
+  imports keep working:
+
+  ```ts
+  // Still valid — no change required, but deprecated
+  import { fetchRetry } from '@atlaskit/media-client/request/helpers';
+  ```
+
+  ### A few subpaths now expose additional symbols
+
+  Module-private helpers that the split modules need to share had to be hoisted into their own
+  modules and re-exported. They are not intended for consumer use:
+  - `./media-store` — `MEDIA_API_REGION`, `MEDIA_API_ENVIRONMENT`, `getValueFromSessionStorage`
+  - `./request/helpers` — `getStatusCode`
+  - `./url` — `mediaBlobUrlIdentifier`
+  - `./test-helpers/media-client-errors` — `defaultMetadata`, the `MediaHeaders` type
+  - `./test-helpers/media-client-provider` — `defaultAuthParameter`, the `AuthParameter` type
+  - `./test-helpers/media-picker-auth-provider` — `accessUrns`
+
+  ### Note for consumers that mock these modules
+
+  Internal cross-module imports now point at the split modules rather than the module that used to
+  declare everything, and four private barrels were deleted (`client/media-store/index.ts`,
+  `test-helpers/MockedMediaApi/index.ts`, `utils/mediaSubscribable/index.ts`,
+  `utils/mobileUpload/index.ts`). If your tests `jest.mock()` or `jest.spyOn()` a
+  `@atlaskit/media-client` module to intercept a symbol that media-client itself consumes
+  internally, the mock may no longer take effect — mock the module that now owns the export instead
+  (for example `client/media-store/resolveInitialAuth` rather than the `client/media-store` barrel,
+  and `utils/request/isFetchNetworkError` rather than `utils/request/helpers`).
+
+  ### Internal-only renames
+
+  Error classes and helpers were renamed to match their single export: `uploader/error.ts` →
+  `uploader/UploaderError.ts`, `utils/mobileUpload/error.ts` →
+  `utils/mobileUpload/MobileUploadError.ts`, `utils/mobileUpload/helpers.ts` →
+  `utils/mobileUpload/createMobileDownloadFileStream.ts`, `utils/mobileUpload/stateMachine/index.ts`
+  → `utils/mobileUpload/stateMachine/createMobileUploadStateMachine.ts`, and
+  `utils/setTimeoutPromise.ts` → `utils/rejectTimeout.ts`. None of these paths are reachable through
+  the `exports` map. No behaviour change.
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 37.2.37
 
 ### Patch Changes

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

@@ -0,0 +1,54 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FileFetcherError = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _BaseMediaClientError2 = require("../../models/errors/BaseMediaClientError");
+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; })(); }
+var FileFetcherError = exports.FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
+  // Legacy Attribute. Should be removed
+
+  function FileFetcherError(reason, metadata) {
+    var _this;
+    (0, _classCallCheck2.default)(this, FileFetcherError);
+    _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,
+        _this$metadata = this.metadata,
+        id = _this$metadata.id,
+        collectionName = _this$metadata.collectionName,
+        occurrenceKey = _this$metadata.occurrenceKey,
+        traceContext = _this$metadata.traceContext;
+      return _objectSpread({
+        reason: reason,
+        id: id,
+        collectionName: collectionName,
+        occurrenceKey: occurrenceKey
+      }, traceContext && {
+        metadata: {
+          traceContext: traceContext
+        }
+      });
+    }
+  }]);
+}(_BaseMediaClientError2.BaseMediaClientError);

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

@@ -1,58 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FileFetcherError = void 0;
-exports.isFileFetcherError = isFileFetcherError;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _errors = require("../../models/errors");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _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) {
-  // Legacy Attribute. Should be removed
-
-  function FileFetcherError(reason, metadata) {
-    var _this;
-    (0, _classCallCheck2.default)(this, FileFetcherError);
-    _this = _callSuper(this, FileFetcherError, [reason, metadata, undefined]);
-    _this.id = metadata.id;
-    return _this;
+Object.defineProperty(exports, "FileFetcherError", {
+  enumerable: true,
+  get: function get() {
+    return _FileFetcherError.FileFetcherError;
   }
-
-  // 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,
-        _this$metadata = this.metadata,
-        id = _this$metadata.id,
-        collectionName = _this$metadata.collectionName,
-        occurrenceKey = _this$metadata.occurrenceKey,
-        traceContext = _this$metadata.traceContext;
-      return _objectSpread({
-        reason: reason,
-        id: id,
-        collectionName: collectionName,
-        occurrenceKey: occurrenceKey
-      }, traceContext && {
-        metadata: {
-          traceContext: traceContext
-        }
-      });
-    }
-  }]);
-}(_errors.BaseMediaClientError);
-function isFileFetcherError(err) {
-  return err instanceof FileFetcherError;
-}
+});
+Object.defineProperty(exports, "isFileFetcherError", {
+  enumerable: true,
+  get: function get() {
+    return _isFileFetcherError.isFileFetcherError;
+  }
+});
+var _FileFetcherError = require("./FileFetcherError");
+var _isFileFetcherError = require("./isFileFetcherError");

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

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "FileFetcherError", {
   enumerable: true,
   get: function get() {
-    return _error.FileFetcherError;
+    return _FileFetcherError.FileFetcherError;
   }
 });
 exports.FileFetcherImpl = void 0;
 Object.defineProperty(exports, "isFileFetcherError", {
   enumerable: true,
   get: function get() {
-    return _error.isFileFetcherError;
+    return _isFileFetcherError.isFileFetcherError;
   }
 });
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
@@ -22,38 +22,51 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _Subscription = require("rxjs/Subscription");
 var _map = require("rxjs/operators/map");
+var _Subscription = require("rxjs/Subscription");
 var _v = _interopRequireDefault(require("uuid/v4"));
 var _mediaCore = require("@atlaskit/media-core");
 var _isValidUuid = require("@atlaskit/media-common/isValidUuid");
 var _downloadUrl = require("@atlaskit/media-common/downloadUrl");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _mediaStore = require("../media-store");
-var _fileState2 = require("../../models/file-state");
-var _media = require("../../models/media");
-var _error = require("./error");
-var _uploader = require("../../uploader");
+var _constants = require("../../constants");
 var _fileStreamsCache = require("../../file-streams-cache");
 var _globalMediaEventEmitter = require("../../globalMediaEventEmitter");
-var _constants = require("../../constants");
-var _createFileDataLoader = require("../../utils/createFileDataLoader");
-var _getMediaTypeFromUploadableFile = require("../../utils/getMediaTypeFromUploadableFile");
-var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknown");
+var _isErrorFileState = require("../../models/is-error-file-state");
+var _isFinalFileState = require("../../models/is-final-file-state");
+var _isNotFoundMediaItemDetails = require("../../models/is-not-found-media-item-details");
+var _isProcessingFileState = require("../../models/is-processing-file-state");
+var _mapMediaFileToFileState = require("../../models/map-media-file-to-file-state");
+var _mapMediaItemToFileState = require("../../models/map-media-item-to-file-state");
+var _uploader = require("../../uploader");
 var _convertBase64ToBlob = require("../../utils/convertBase64ToBlob");
-var _mediaSubscribable = require("../../utils/mediaSubscribable");
-var _getDimensionsFromBlob = require("../../utils/getDimensionsFromBlob");
+var _createFileDataloader = require("../../utils/createFileDataloader-2");
 var _createMediaSubject = require("../../utils/createMediaSubject");
+var _getDimensionsFromBlob = require("../../utils/getDimensionsFromBlob");
+var _getMediaTypeFromUploadableFile = require("../../utils/getMediaTypeFromUploadableFile");
+var _fromObservable = require("../../utils/mediaSubscribable/fromObservable");
+var _toPromise = require("../../utils/mediaSubscribable/toPromise");
+var _overrideMediaTypeIfUnknown = require("../../utils/overrideMediaTypeIfUnknown");
+var _MediaStore = require("../media-store/MediaStore");
+var _FileFetcherError = require("./FileFetcherError");
 var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
-var _shouldFetchRemoteFileStates = require("../../utils/shouldFetchRemoteFileStates");
-var _polling = require("../../utils/polling");
 var _detectEmptyFile = require("../../utils/detectEmptyFile");
-var _mediaStore2 = require("@atlaskit/media-state/media-store");
+var _polling = require("../../utils/polling");
+var _shouldFetchRemoteFileStates = require("../../utils/shouldFetchRemoteFileStates");
+var _mediaStore = require("@atlaskit/media-state/media-store");
 var _createCopyIntentRegisterationBatcher = require("../../utils/createCopyIntentRegisterationBatcher");
-var _helpers = require("../../utils/request/helpers");
-var _errors = require("../../models/errors");
+var _CommonMediaClientError = require("../../models/errors/CommonMediaClientError");
+var _fromCommonMediaClientError = require("../../models/errors/fromCommonMediaClientError");
+var _isCommonMediaClientError = require("../../models/errors/isCommonMediaClientError");
+var _defaultShouldRetryError = require("../../utils/request/defaultShouldRetryError");
+var _isFileFetcherError = require("./isFileFetcherError");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+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; } /* eslint-disable @repo/internal/deprecations/deprecation-ticket-required -- VOLTC-139 tracks removal of these deprecated re-export shims. */ // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+/**
+ * @deprecated Use `import { FileFetcherError } from '@atlaskit/media-client/file-fetcher/error'` instead.
+ */ /**
+ * @deprecated Use `import { isFileFetcherError } from '@atlaskit/media-client/file-fetcher/error'` instead.
+ */
 var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
   return !!token.authProvider;
 };
@@ -63,22 +76,22 @@ var isCopyDestinationWithToken = function isCopyDestinationWithToken(token) {
 var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
   function FileFetcherImpl(mediaApi) {
     var _this = this;
-    var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _mediaStore2.mediaStore;
+    var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _mediaStore.mediaStore;
     (0, _classCallCheck2.default)(this, FileFetcherImpl);
     (0, _defineProperty2.default)(this, "getErrorFileState", function (error, id, occurrenceKey) {
-      if ((0, _errors.isCommonMediaClientError)(error)) {
-        return (0, _errors.fromCommonMediaClientError)(id, occurrenceKey, error);
+      if ((0, _isCommonMediaClientError.isCommonMediaClientError)(error)) {
+        return (0, _fromCommonMediaClientError.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);
+        var err = new _CommonMediaClientError.CommonMediaClientError(error);
+        return (0, _fromCommonMediaClientError.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);
+        var _err = new _CommonMediaClientError.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, _fromCommonMediaClientError.fromCommonMediaClientError)(id, occurrenceKey, _err);
       }
     });
     (0, _defineProperty2.default)(this, "setFileState", function (id, fileState) {
@@ -122,11 +135,11 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               });
             case 2:
               response = _context.sent;
-              if (!(0, _media.isNotFoundMediaItemDetails)(response)) {
+              if (!(0, _isNotFoundMediaItemDetails.isNotFoundMediaItemDetails)(response)) {
                 _context.next = 3;
                 break;
               }
-              throw new _error.FileFetcherError('emptyItems', {
+              throw new _FileFetcherError.FileFetcherError('emptyItems', {
                 id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
@@ -137,14 +150,14 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 _context.next = 4;
                 break;
               }
-              throw new _error.FileFetcherError('zeroVersionFile', {
+              throw new _FileFetcherError.FileFetcherError('zeroVersionFile', {
                 id: id,
                 collectionName: collectionName,
                 occurrenceKey: occurrenceKey,
                 traceContext: response.metadataTraceContext
               });
             case 4:
-              fileState = (0, _fileState2.mapMediaItemToFileState)(id, response);
+              fileState = (0, _mapMediaItemToFileState.mapMediaItemToFileState)(id, response);
               subject.next(fileState);
               _t = fileState.status;
               _context.next = _t === 'processing' ? 5 : _t === 'processed' ? 6 : 7;
@@ -214,7 +227,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               _yield$_this$mediaApi2 = _context2.sent;
               altData = _yield$_this$mediaApi2.data;
               itemDetails = altData.items[0].details; // ------------------------------------------------------------
-              _this.setFileState(id, (0, _fileState2.mapMediaItemToFileState)(id, itemDetails));
+              _this.setFileState(id, (0, _mapMediaItemToFileState.mapMediaItemToFileState)(id, itemDetails));
               return _context2.abrupt("return", data);
             case 3:
             case "end":
@@ -460,7 +473,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
     }());
     this.mediaApi = mediaApi;
     this.store = store;
-    this.dataloader = (0, _createFileDataLoader.createFileDataloader)(mediaApi);
+    this.dataloader = (0, _createFileDataloader.createFileDataloader)(mediaApi);
     this.copyIntentRegisterationBatcher = (0, _createCopyIntentRegisterationBatcher.createCopyIntentRegisterationBatcher)(mediaApi);
   }
   return (0, _createClass2.default)(FileFetcherImpl, [{
@@ -478,7 +491,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
         // is meaningless and would cause subscribers to briefly see a
         // valid-looking file state before the error is emitted.
         var subject = (0, _createMediaSubject.createMediaSubject)();
-        var err = new _error.FileFetcherError('invalidFileId', {
+        var err = new _FileFetcherError.FileFetcherError('invalidFileId', {
           id: id,
           collectionName: collectionName,
           occurrenceKey: occurrenceKey
@@ -486,12 +499,12 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
         var errorFileState = this.getErrorFileState(err, id, occurrenceKey);
         subject.error(err);
         this.setFileState(id, errorFileState);
-        return (0, _mediaSubscribable.fromObservable)(subject);
+        return (0, _fromObservable.fromObservable)(subject);
       }
       if (forceRefresh) {
         (0, _fileStreamsCache.getFileStreamsCache)().remove(id);
       }
-      return (0, _mediaSubscribable.fromObservable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
+      return (0, _fromObservable.fromObservable)((0, _fileStreamsCache.getFileStreamsCache)().getOrInsert(id, function () {
         var subject = _this2.createDownloadFileStream(id, collectionName, undefined, includeHashForDuplicateFiles, forceRefresh, initialFileState);
         subject.subscribe({
           next: function next(fileState) {
@@ -508,7 +521,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
   }, {
     key: "getCurrentState",
     value: function getCurrentState(id, options) {
-      return (0, _mediaSubscribable.toPromise)(this.getFileState(id, options));
+      return (0, _toPromise.toPromise)(this.getFileState(id, options));
     }
   }, {
     key: "getArtifactURL",
@@ -747,7 +760,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
       // We should report progress asynchronously, since this is what consumer expects
       // (otherwise in newUploadService file-converting event will be emitted before files-added)
       setTimeout(onProgress, 0, 0);
-      return (0, _mediaSubscribable.fromObservable)(subject);
+      return (0, _fromObservable.fromObservable)(subject);
     }
   }, {
     key: "downloadBinary",
@@ -827,7 +840,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                 break;
               }
               // if the error is retryable then it should not be cached
-              if ((0, _helpers.defaultShouldRetryError)(error)) {
+              if ((0, _defaultShouldRetryError.defaultShouldRetryError)(error)) {
                 this.copyIntentRegisterationBatcher.clear(key);
               }
               throw error;
@@ -852,7 +865,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
             case 0:
               authProvider = source.authProvider, sourceCollection = source.collection, id = source.id;
               destinationAuthProvider = destination.authProvider, destinationCollectionName = destination.collection, replaceFileId = destination.replaceFileId, occurrenceKey = destination.occurrenceKey;
-              mediaStore = destination.mediaStore || new _mediaStore.MediaStore({
+              mediaStore = destination.mediaStore || new _MediaStore.MediaStore({
                 authProvider: destinationAuthProvider
               });
               _t6 = _mediaCore.authToOwner;
@@ -986,15 +999,15 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               copiedId = copiedFileWithMimeType.id, copiedMimeType = copiedFileWithMimeType.mimeType; // backend may return an "unknown" mediaType just after the copy
               // it's better to deduce it from "copiedMimeType" using getMediaTypeFromMimeType()
               mediaType = copiedMimeType ? (0, _mediaTypeUtils.getMediaTypeFromMimeType)(copiedMimeType) : 'unknown';
-              copiedFileState = (0, _fileState2.mapMediaFileToFileState)({
+              copiedFileState = (0, _mapMediaFileToFileState.mapMediaFileToFileState)({
                 data: copiedFileWithMimeType
               });
               fileCache = cache.get(copiedId);
               subject = fileCache || (0, _createMediaSubject.createMediaSubject)(); // if we were passed a "preview", we propagate it into the copiedFileState
-              previewOverride = !(0, _fileState2.isErrorFileState)(copiedFileState) && !!preview ? {
+              previewOverride = !(0, _isErrorFileState.isErrorFileState)(copiedFileState) && !!preview ? {
                 preview: preview
               } : {};
-              _t7 = !(0, _fileState2.isFinalFileState)(copiedFileState) &&
+              _t7 = !(0, _isFinalFileState.isFinalFileState)(copiedFileState) &&
               // mimeType should always be returned by "copyFileWithToken"
               // but in case it's not, we don't want to penalize "copyFile"
               copiedMimeType;
@@ -1016,7 +1029,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               this.setFileState(copiedId, fileState);
               processingSubscription = this.createDownloadFileStream(copiedId, destinationCollectionName, occurrenceKey).subscribe({
                 next: function next(remoteFileState) {
-                  var fileState = _objectSpread(_objectSpread(_objectSpread({}, remoteFileState), (0, _overrideMediaTypeIfUnknown.overrideMediaTypeIfUnknown)(remoteFileState, mediaType)), !(0, _fileState2.isErrorFileState)(remoteFileState) && previewOverride);
+                  var fileState = _objectSpread(_objectSpread(_objectSpread({}, remoteFileState), (0, _overrideMediaTypeIfUnknown.overrideMediaTypeIfUnknown)(remoteFileState, mediaType)), !(0, _isErrorFileState.isErrorFileState)(remoteFileState) && previewOverride);
                   _this5.setFileState(copiedId, fileState);
                   return subject.next(fileState);
                 },
@@ -1032,8 +1045,8 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               _context13.next = 9;
               break;
             case 8:
-              if (!(0, _fileState2.isProcessingFileState)(copiedFileState)) {
-                _fileState = _objectSpread(_objectSpread({}, copiedFileState), !(0, _fileState2.isErrorFileState)(copiedFileState) && previewOverride);
+              if (!(0, _isProcessingFileState.isProcessingFileState)(copiedFileState)) {
+                _fileState = _objectSpread(_objectSpread({}, copiedFileState), !(0, _isErrorFileState.isErrorFileState)(copiedFileState) && previewOverride);
                 subject.next(_fileState);
                 this.setFileState(copiedId, _fileState);
               }

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

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFileFetcherError = isFileFetcherError;
+var _FileFetcherError = require("./FileFetcherError");
+function isFileFetcherError(err) {
+  return err instanceof _FileFetcherError.FileFetcherError;
+}

package/dist/cjs/client/media-client.js

@@ -12,10 +12,10 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _eventemitter = require("eventemitter2");
 var _mediaCore = require("@atlaskit/media-core");
-var _mediaStore = require("./media-store");
 var _fileFetcher = require("./file-fetcher");
+var _MediaStore = require("./media-store/MediaStore");
 var _stargateClient = require("./stargate-client");
-var _mediaStore2 = require("@atlaskit/media-state/media-store");
+var _mediaStore = require("@atlaskit/media-state/media-store");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
   // mobile upload is lazily loaded
@@ -23,12 +23,12 @@ var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
   // Deprecated value introduced for backward compatibility with Context
 
   function MediaClient(mediaClientConfig) {
-    var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _mediaStore2.mediaStore;
+    var store = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _mediaStore.mediaStore;
     var mediaApi = arguments.length > 2 ? arguments[2] : undefined;
     (0, _classCallCheck2.default)(this, MediaClient);
     this.mediaClientConfig = mediaClientConfig;
     this.store = store;
-    this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new _mediaStore.MediaStore({
+    this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new _MediaStore.MediaStore({
       authProvider: mediaClientConfig.authProvider,
       initialAuth: mediaClientConfig.initialAuth,
       chunkHashAlgorithm: _mediaCore.ChunkHashAlgorithm.Sha256,