@atlaskit/media-client 20.0.1 → 20.0.3

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

@@ -6,7 +6,6 @@ export class RequestError extends BaseMediaClientError {
     this.metadata = metadata;
     this.innerError = innerError;
   }
-
   get attributes() {
     const {
       reason,
@@ -33,7 +32,6 @@ export class RequestError extends BaseMediaClientError {
       innerError
     };
   }
-
 }
 export function isRequestError(err) {
   return err instanceof RequestError;

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

@@ -11,8 +11,9 @@ export function waitPromise(timeout) {
 }
 export function isAbortedRequestError(err) {
   return err instanceof Error && err.message === 'request_cancelled' || !!err && err.name === 'AbortError';
-} // fetch throws TypeError for network errors
+}
 
+// fetch throws TypeError for network errors
 export function isFetchNetworkError(err) {
   return err instanceof TypeError;
 }
@@ -26,26 +27,22 @@ export const ZipkinHeaderKeys = {
   sampled: 'x-b3-sampled',
   flags: 'x-b3-flags'
 };
-
 const mapTraceIdToRequestHeaders = traceContext => {
   return traceContext ? {
     [ZipkinHeaderKeys.traceId]: traceContext.traceId,
     [ZipkinHeaderKeys.spanId]: traceContext.spanId
   } : {};
 };
-
 export function mapAuthToRequestHeaders(auth) {
   if (!auth) {
     return {};
   }
-
   if (isClientBasedAuth(auth)) {
     return {
       'X-Client-Id': auth.clientId,
       Authorization: `Bearer ${auth.token}`
     };
   }
-
   return {
     'X-Issuer': auth.asapIssuer,
     Authorization: `Bearer ${auth.token}`
@@ -57,7 +54,8 @@ export function createUrl(url, {
 }) {
   const parsedUrl = new URL(url);
   const authParams = auth && mapAuthToQueryParameters(auth) || {};
-  const paramsToAppend = { ...params,
+  const paramsToAppend = {
+    ...params,
     ...authParams
   };
   Object.entries(paramsToAppend).filter(([_, value]) => value != null).forEach(pair => {
@@ -70,21 +68,20 @@ export function extendHeaders(headers, auth, traceContext) {
   if (!auth && !traceContext && !headers) {
     return undefined;
   }
-
-  return { ...(headers !== null && headers !== void 0 ? headers : {}),
+  return {
+    ...(headers !== null && headers !== void 0 ? headers : {}),
     ...mapAuthToRequestHeaders(auth),
     ...mapTraceIdToRequestHeaders(traceContext)
   };
 }
+
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
  * TODO: https://product-fabric.atlassian.net/browse/BMPT-1354
  */
-
 export async function mapResponseToJson(response) {
   // eslint-disable-next-line no-console
   console.warn('Helper is deprecated and will be remove in the next major version');
-
   try {
     return await response.json();
   } catch (err) {
@@ -93,15 +90,14 @@ export async function mapResponseToJson(response) {
     }, err instanceof Error ? err : undefined);
   }
 }
+
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
  * TODO: https://product-fabric.atlassian.net/browse/BMPT-1354
  */
-
 export async function mapResponseToBlob(response) {
   // eslint-disable-next-line no-console
   console.warn('Helper is deprecated and will be remove in the next major version');
-
   try {
     return await response.blob();
   } catch (err) {
@@ -110,11 +106,11 @@ export async function mapResponseToBlob(response) {
     }, err instanceof Error ? err : undefined);
   }
 }
+
 /**
  * @deprecated Helper is deprecated and will be removed in the next major version.
  * TODO: https://product-fabric.atlassian.net/browse/BMPT-1354
  */
-
 export function mapResponseToVoid() {
   // eslint-disable-next-line no-console
   console.warn('Helper is deprecated and will be remove in the next major version');
@@ -125,7 +121,8 @@ export function createMapResponseToJson(metadata) {
     try {
       return await response.json();
     } catch (err) {
-      throw new RequestError('serverInvalidBody', { ...metadata,
+      throw new RequestError('serverInvalidBody', {
+        ...metadata,
         ...extractMediaHeaders(response),
         statusCode: response.status
       }, err instanceof Error ? err : undefined);
@@ -137,7 +134,8 @@ export function createMapResponseToBlob(metadata) {
     try {
       return await response.blob();
     } catch (err) {
-      throw new RequestError('serverInvalidBody', { ...metadata,
+      throw new RequestError('serverInvalidBody', {
+        ...metadata,
         ...extractMediaHeaders(response),
         statusCode: response.status
       }, err instanceof Error ? err : undefined);
@@ -150,20 +148,22 @@ export const DEFAULT_RETRY_OPTIONS = {
   maxAttempts: 5,
   // Current test delay is 60s, so retries should finish before if a promise takes < 1s
   factor: 2 // Good for polling, which is out main use case
-
 };
+
 export function cloneRequestError(error, extraMetadata) {
   const {
     reason,
     metadata,
     innerError
   } = error;
-  return new RequestError(reason, { ...metadata,
+  return new RequestError(reason, {
+    ...metadata,
     ...extraMetadata
   }, innerError);
 }
 export async function fetchRetry(functionToRetry, metadata, overwriteOptions = {}) {
-  const options = { ...DEFAULT_RETRY_OPTIONS,
+  const options = {
+    ...DEFAULT_RETRY_OPTIONS,
     ...overwriteOptions
   };
   const {
@@ -174,39 +174,35 @@ export async function fetchRetry(functionToRetry, metadata, overwriteOptions = {
   let attempts = 0;
   let timeoutInMs = startTimeoutInMs;
   let lastError;
-
   const waitAndBumpTimeout = async () => {
     await waitPromise(timeoutInMs);
     timeoutInMs *= factor;
     attempts += 1;
   };
-
   while (attempts < maxAttempts) {
     try {
       return await functionToRetry();
     } catch (err) {
-      lastError = err; // don't retry if request was aborted by user
+      lastError = err;
 
+      // don't retry if request was aborted by user
       if (isAbortedRequestError(err)) {
         throw new RequestError('clientAbortedRequest', metadata, err);
       }
-
       if (!isFetchNetworkError(err) && !isRequestError(err) || isRequestError(err) && (!err.metadata || !err.metadata.statusCode || err.metadata.statusCode < 500)) {
         throw err;
       }
-
       await waitAndBumpTimeout();
     }
   }
-
   if (isRequestError(lastError)) {
     throw cloneRequestError(lastError, {
       attempts,
       clientExhaustedRetries: true
     });
   }
-
-  throw new RequestError('serverUnexpectedError', { ...metadata,
+  throw new RequestError('serverUnexpectedError', {
+    ...metadata,
     attempts,
     clientExhaustedRetries: true
   }, lastError);
@@ -215,25 +211,18 @@ export function createRequestErrorReason(statusCode) {
   switch (statusCode) {
     case 400:
       return 'serverBadRequest';
-
     case 401:
       return 'serverUnauthorized';
-
     case 403:
       return 'serverForbidden';
-
     case 404:
       return 'serverNotFound';
-
     case 429:
       return 'serverRateLimited';
-
     case 500:
       return 'serverInternalError';
-
     case 502:
       return 'serverBadGateway';
-
     default:
       return 'serverUnexpectedError';
   }
@@ -243,7 +232,8 @@ export function createRequestErrorFromResponse(metadata, response) {
     status: statusCode
   } = response;
   const reason = createRequestErrorReason(statusCode);
-  return new RequestError(reason, { ...metadata,
+  return new RequestError(reason, {
+    ...metadata,
     ...extractMediaHeaders(response),
     statusCode
   });
@@ -253,7 +243,6 @@ export function createProcessFetchResponse(metadata) {
     if (response.ok || response.status < 400) {
       return response;
     }
-
     const requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };

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

@@ -19,8 +19,9 @@ export async function request(url, options = {}, controller) {
     method,
     endpoint,
     traceContext
-  }; // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
+  };
 
+  // TODO BMPT-918: add client timeout feature behing a FF (using clientOptions.clientTimeout + Promise.race)
   const doFetch = () => fetch(createUrl(url, {
     params
   }), {
@@ -29,6 +30,5 @@ export async function request(url, options = {}, controller) {
     headers: extendHeaders(headers, auth, traceContext),
     signal: controller && controller.signal
   }).then(createProcessFetchResponse(metadata));
-
   return fetchRetry(doFetch, metadata, retryOptions);
 }

package/dist/es2019/utils/shouldFetchRemoteFileStates.js

@@ -1,6 +1,7 @@
 import { from } from 'rxjs/observable/from';
 import { isMimeTypeSupportedByBrowser, isMimeTypeSupportedByServer } from '@atlaskit/media-common/mediaTypeUtils';
 import { getVideoDimensionsFromBlob } from './getVideoDimensionsFromBlob';
+
 /**
  * Async helper determining if we should fetch remote fileStates from the backend:
  * - we poll the backend for all supported documents,
@@ -12,19 +13,15 @@ import { getVideoDimensionsFromBlob } from './getVideoDimensionsFromBlob';
  * Polling is needed for the use cases above to properly render the file in our components.
  *
  */
-
 export async function shouldFetchRemoteFileStates(mediaType, mimeType, preview) {
   if ((mediaType === 'doc' || !isMimeTypeSupportedByBrowser(mimeType) || !preview) && isMimeTypeSupportedByServer(mimeType)) {
     return true;
   }
-
   if (mediaType === 'video' && !!preview) {
     const content = (await preview).value;
-
     if (!(content instanceof Blob)) {
       return false;
     }
-
     try {
       const {
         width,
@@ -37,7 +34,6 @@ export async function shouldFetchRemoteFileStates(mediaType, mimeType, preview)
       return true;
     }
   }
-
   return false;
 }
 export function shouldFetchRemoteFileStatesObservable(mediaType, mimeType, preview) {

package/dist/es2019/utils/url.js

@@ -2,33 +2,27 @@ const mediaBlobUrlIdentifier = 'media-blob-url';
 export const isMediaBlobUrl = url => {
   return url.indexOf(`${mediaBlobUrlIdentifier}=true`) > -1;
 };
-
 const getNumberFromParams = (params, name) => {
   const value = params.get(name);
   return typeof value === 'string' && !isNaN(parseInt(value)) ? parseInt(value) : undefined;
 };
-
 const getStringFromParams = (params, name) => {
   const value = params.get(name);
-
   if (!value) {
     return;
   }
-
   return decodeURIComponent(value);
 };
-
 export const getAttrsFromUrl = blobUrl => {
   const url = new URL(blobUrl);
   const hash = url.hash.replace('#', '');
   const params = new URLSearchParams(hash);
   const id = params.get('id');
-  const contextId = params.get('contextId'); // check if we have the required params
-
+  const contextId = params.get('contextId');
+  // check if we have the required params
   if (!id || !contextId) {
     return;
   }
-
   return {
     id,
     contextId,
@@ -44,28 +38,26 @@ export const getAttrsFromUrl = blobUrl => {
 export const objectToQueryString = json => {
   return Object.keys(json).filter(attrName => typeof json[attrName] !== 'undefined' && json[attrName] !== null).map(key => {
     const value = json[key];
-
     if (typeof value === 'undefined' || value === null) {
       return;
     }
-
     return `${encodeURIComponent(key)}=${encodeURIComponent(value.toString())}`;
   }).join('&');
 };
 export const addFileAttrsToUrl = (url, fileAttrs) => {
   const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-
   if (isSafari) {
     return url;
   }
-
   const mediaIdentifierAttr = {
     [mediaBlobUrlIdentifier]: 'true'
   };
-  const mergedAttrs = { ...mediaIdentifierAttr,
+  const mergedAttrs = {
+    ...mediaIdentifierAttr,
     ...fileAttrs
   };
-  const queryAttrs = objectToQueryString(mergedAttrs); // we can't use '?' separator for blob url params
+  const queryAttrs = objectToQueryString(mergedAttrs);
 
+  // we can't use '?' separator for blob url params
   return `${url}#${queryAttrs}`;
 };

package/dist/es2019/utils/with-media-client-hoc.js

@@ -1,18 +1,23 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import { MediaClient } from '../client/media-client';
+const NO_FLAGS = 'NO_FLAGS';
 const mediaClientsMap = new Map();
 export const getMediaClient = (mediaClientConfig, featureFlags) => {
-  let mediaClient = mediaClientsMap.get(mediaClientConfig);
-
+  var _mediaClientsMap$get;
+  const flagsMapKey = featureFlags || NO_FLAGS;
+  let mediaClient = (_mediaClientsMap$get = mediaClientsMap.get(mediaClientConfig)) === null || _mediaClientsMap$get === void 0 ? void 0 : _mediaClientsMap$get.get(flagsMapKey);
   if (!mediaClient) {
+    let subMap = mediaClientsMap.get(mediaClientConfig);
+    if (!subMap) {
+      subMap = new Map();
+      mediaClientsMap.set(mediaClientConfig, subMap);
+    }
     mediaClient = new MediaClient(mediaClientConfig, featureFlags);
-    mediaClientsMap.set(mediaClientConfig, mediaClient);
+    subMap.set(flagsMapKey, mediaClient);
   }
-
   return mediaClient;
 };
-
 const createEmptyMediaClient = featureFlags => {
   const emptyConfig = {
     authProvider: () => Promise.resolve({
@@ -23,7 +28,6 @@ const createEmptyMediaClient = featureFlags => {
   };
   return new MediaClient(emptyConfig, featureFlags);
 };
-
 export const withMediaClient = (Component, featureFlags) => {
   return class extends React.Component {
     render() {
@@ -37,6 +41,5 @@ export const withMediaClient = (Component, featureFlags) => {
         mediaClient: mediaClient
       }));
     }
-
   };
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "20.0.1",
+	"version": "20.0.3",
 	"sideEffects": false
 }

package/dist/esm/client/collection-fetcher.js

@@ -4,17 +4,13 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { getFileStreamsCache } from '../file-streams-cache';
 import { mapMediaFileToFileState } from '../models/file-state';
 import { fromObservable } from '../utils/mediaSubscribable';
 export var collectionCache = {};
-
 var createCacheEntry = function createCacheEntry() {
   return {
     items: [],
@@ -22,23 +18,18 @@ var createCacheEntry = function createCacheEntry() {
     isLoadingNextPage: false
   };
 };
-
 export var CollectionFetcher = /*#__PURE__*/function () {
   function CollectionFetcher(mediaStore) {
     _classCallCheck(this, CollectionFetcher);
-
     this.mediaStore = mediaStore;
   }
-
   _createClass(CollectionFetcher, [{
     key: "createFileStateObserver",
     value: function createFileStateObserver(id, details) {
       var subject = new ReplaySubject(1);
-
       var mediaFile = _objectSpread({
         id: id
       }, details);
-
       var fileState = mapMediaFileToFileState({
         data: mediaFile
       });
@@ -49,10 +40,8 @@ export var CollectionFetcher = /*#__PURE__*/function () {
     key: "populateCache",
     value: function populateCache(items) {
       var _this = this;
-
       items.forEach(function (item) {
         var fileStream = _this.createFileStateObserver(item.id, item.details);
-
         getFileStreamsCache().set(item.id, fileStream);
       });
     }
@@ -62,11 +51,9 @@ export var CollectionFetcher = /*#__PURE__*/function () {
       var collectionCacheIndex = collectionCache[collectionName].items.findIndex(function (item) {
         return item.id === id;
       });
-
       if (collectionCacheIndex === -1) {
         return;
       }
-
       getFileStreamsCache().remove(id);
       collectionCache[collectionName].items.splice(collectionCacheIndex, 1);
     }
@@ -74,24 +61,20 @@ export var CollectionFetcher = /*#__PURE__*/function () {
     key: "getItems",
     value: function getItems(collectionName, params, traceContext) {
       var _this2 = this;
-
       if (!collectionCache[collectionName]) {
         collectionCache[collectionName] = createCacheEntry();
       }
-
       var collection = collectionCache[collectionName];
       var subject = collection.subject;
       this.mediaStore.getCollectionItems(collectionName, _objectSpread(_objectSpread({}, params), {}, {
         details: 'full'
       }), traceContext).then(function (items) {
         var _items$data = items.data,
-            contents = _items$data.contents,
-            nextInclusiveStartKey = _items$data.nextInclusiveStartKey;
-
-        _this2.populateCache(contents); // It's hard to merge two together, so we just take what's came from the server.
+          contents = _items$data.contents,
+          nextInclusiveStartKey = _items$data.nextInclusiveStartKey;
+        _this2.populateCache(contents);
+        // It's hard to merge two together, so we just take what's came from the server.
         // Since we load only one page > 2 pages will be ditched from the cache.
-
-
         collection.items = items.data.contents;
         collection.nextInclusiveStartKey = nextInclusiveStartKey;
         subject.next(collection.items);
@@ -111,12 +94,10 @@ export var CollectionFetcher = /*#__PURE__*/function () {
               case 0:
                 _context.next = 2;
                 return this.mediaStore.removeCollectionFile(id, collectionName, occurrenceKey, traceContext);
-
               case 2:
                 this.removeFromCache(id, collectionName);
                 collection = collectionCache[collectionName];
                 collection.subject.next(collection.items);
-
               case 5:
               case "end":
                 return _context.stop();
@@ -124,11 +105,9 @@ export var CollectionFetcher = /*#__PURE__*/function () {
           }
         }, _callee, this);
       }));
-
       function removeFile(_x, _x2, _x3, _x4) {
         return _removeFile.apply(this, arguments);
       }
-
       return removeFile;
     }()
   }, {
@@ -136,21 +115,17 @@ export var CollectionFetcher = /*#__PURE__*/function () {
     value: function () {
       var _loadNextPage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(collectionName, params, traceContext) {
         var collection, isLoading, _collectionCache$coll, inclusiveStartKey, currentItems, subject, response, _response$data, contents, nextInclusiveStartKey, newItems, items;
-
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 collection = collectionCache[collectionName];
                 isLoading = collection ? collection.isLoadingNextPage : false;
-
                 if (!(!collection || !collection.nextInclusiveStartKey || isLoading)) {
                   _context2.next = 4;
                   break;
                 }
-
                 return _context2.abrupt("return");
-
               case 4:
                 collection.isLoadingNextPage = true;
                 _collectionCache$coll = collectionCache[collectionName], inclusiveStartKey = _collectionCache$coll.nextInclusiveStartKey, currentItems = _collectionCache$coll.items, subject = _collectionCache$coll.subject;
@@ -159,7 +134,6 @@ export var CollectionFetcher = /*#__PURE__*/function () {
                   inclusiveStartKey: inclusiveStartKey,
                   details: 'full'
                 }), traceContext);
-
               case 8:
                 response = _context2.sent;
                 _response$data = response.data, contents = _response$data.contents, nextInclusiveStartKey = _response$data.nextInclusiveStartKey;
@@ -173,7 +147,6 @@ export var CollectionFetcher = /*#__PURE__*/function () {
                   subject: subject,
                   isLoadingNextPage: false
                 };
-
               case 15:
               case "end":
                 return _context2.stop();
@@ -181,14 +154,11 @@ export var CollectionFetcher = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-
       function loadNextPage(_x5, _x6, _x7) {
         return _loadNextPage.apply(this, arguments);
       }
-
       return loadNextPage;
     }()
   }]);
-
   return CollectionFetcher;
 }();

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

@@ -3,38 +3,30 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _inherits from "@babel/runtime/helpers/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 import { BaseMediaClientError } from '../../models/errors';
 export var FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
   _inherits(FileFetcherError, _BaseMediaClientError);
-
   var _super = _createSuper(FileFetcherError);
-
   function FileFetcherError(reason, id, metadata) {
     var _this;
-
     _classCallCheck(this, FileFetcherError);
-
     _this = _super.call(this, reason);
     _this.reason = reason;
     _this.id = id;
     _this.metadata = metadata;
     return _this;
   }
-
   _createClass(FileFetcherError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
-          id = this.id,
-          _this$metadata = this.metadata;
+        id = this.id,
+        _this$metadata = this.metadata;
       _this$metadata = _this$metadata === void 0 ? {} : _this$metadata;
       var collectionName = _this$metadata.collectionName,
-          occurrenceKey = _this$metadata.occurrenceKey;
+        occurrenceKey = _this$metadata.occurrenceKey;
       return {
         reason: reason,
         id: id,
@@ -43,7 +35,6 @@ export var FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
       };
     }
   }]);
-
   return FileFetcherError;
 }(BaseMediaClientError);
 export function isFileFetcherError(err) {