@atlaskit/media-client 15.1.0 → 16.0.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/media-client
 
+## 16.0.1
+
+### Patch Changes
+
+- [`12d0af77572`](https://bitbucket.org/atlassian/atlassian-frontend/commits/12d0af77572) - Store media environment in session storage
+- [`325e210e59f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/325e210e59f) - Revert changes made in MEX-1638-revert-update-media-store-class-with-new-endpoint-parameters
+- [`b73f20ed703`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b73f20ed703) - EDM-3073: Fix collab for media inline and copy-paste regression
+- [`c2ede50a80a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c2ede50a80a) - Add media region and environment returned from media API response into failed analytic events.
+- Updated dependencies
+
+## 16.0.0
+
+### Major Changes
+
+- [`b6d47de3fd9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b6d47de3fd9) - [MEX-1417] remove access to media file streams cache
+
+### Minor Changes
+
+- [`5e249d1ad05`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5e249d1ad05) - Exposed media environment
+
+### Patch Changes
+
+- [`bde94d1a336`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bde94d1a336) - When chunkinator has multiple processing batches of chunks, file will only be finalised uploading for once.
+- [`567b33b2eeb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/567b33b2eeb) - stripe out null and undefined params when calling media server
+- [`c4c75f5a769`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c4c75f5a769) - Removed query string from media client
+- Updated dependencies
+
+## 15.1.1
+
+### Patch Changes
+
+- [`a424e62b264`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a424e62b264) - Changes to support Node 16 Typescript definitions from `@types/node`.
+
 ## 15.1.0
 
 ### Minor Changes

package/constants/package.json

@@ -3,5 +3,6 @@
   "main": "../dist/cjs/constants.js",
   "module": "../dist/esm/constants.js",
   "module:es2019": "../dist/es2019/constants.js",
+  "sideEffects": false,
   "types": "../dist/types/constants.d.ts"
 }

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

@@ -333,7 +333,6 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                             };
                             mediaType = (0, _mediaTypeUtils.getMediaTypeFromMimeType)(type); // we emit a richer state after the blob is fetched
 
-                            // we emit a richer state after the blob is fetched
                             subject.next({
                               status: 'processing',
                               name: name,
@@ -345,7 +344,6 @@ var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            // we don't want to wait for the file to be upload
                             _this3.upload(file, undefined, uploadableFileUpfrontIds);
 
                             _context3.next = 12;

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "MediaStoreError", {
     return _error.MediaStoreError;
   }
 });
+exports.getMediaRegion = exports.getMediaEnvironment = void 0;
 Object.defineProperty(exports, "isMediaStoreError", {
   enumerable: true,
   get: function get() {
@@ -45,6 +46,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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) { (0, _defineProperty2.default)(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; }
 
+var MEDIA_API_REGION = 'media-api-region';
+var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var defaultImageOptions = {
   'max-age': _constants.FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -699,10 +702,11 @@ var MediaStore = /*#__PURE__*/function () {
 
               case 8:
                 response = _context11.sent;
-                updateMediaRegion(response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
                 return _context11.abrupt("return", response);
 
-              case 11:
+              case 12:
               case "end":
                 return _context11.stop();
             }
@@ -722,14 +726,30 @@ var MediaStore = /*#__PURE__*/function () {
 
 exports.MediaStore = MediaStore;
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+var getValueFromSessionStorage = function getValueFromSessionStorage(key) {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+var setKeyValueInSessionStorage = function setKeyValueInSessionStorage(key, value) {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  var currentRegion = window.sessionStorage.getItem('media-api-region');
+  var currentValue = window.sessionStorage.getItem(key);
 
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem('media-api-region', region);
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
-}
+};
+
+var getMediaEnvironment = function getMediaEnvironment() {
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
+};
+
+exports.getMediaEnvironment = getMediaEnvironment;
+
+var getMediaRegion = function getMediaRegion() {
+  return getValueFromSessionStorage(MEDIA_API_REGION);
+};
+
+exports.getMediaRegion = getMediaRegion;

package/dist/cjs/index.js

@@ -135,12 +135,6 @@ Object.defineProperty(exports, "getDimensionsFromBlob", {
     return _getDimensionsFromBlob.getDimensionsFromBlob;
   }
 });
-Object.defineProperty(exports, "getFileStreamsCache", {
-  enumerable: true,
-  get: function get() {
-    return _fileStreamsCache.getFileStreamsCache;
-  }
-});
 Object.defineProperty(exports, "getMediaClient", {
   enumerable: true,
   get: function get() {
@@ -153,6 +147,18 @@ Object.defineProperty(exports, "getMediaClientErrorReason", {
     return _errors.getMediaClientErrorReason;
   }
 });
+Object.defineProperty(exports, "getMediaEnvironment", {
+  enumerable: true,
+  get: function get() {
+    return _mediaStore.getMediaEnvironment;
+  }
+});
+Object.defineProperty(exports, "getMediaRegion", {
+  enumerable: true,
+  get: function get() {
+    return _mediaStore.getMediaRegion;
+  }
+});
 exports.getMediaTypeFromMimeType = void 0;
 Object.defineProperty(exports, "globalMediaEventEmitter", {
   enumerable: true,

package/dist/cjs/uploader.js

@@ -156,6 +156,8 @@ var createFileFromUpload = /*#__PURE__*/function () {
 }();
 
 var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks) {
+  var chunkSize = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 4 * 1024 * 1024;
+  var processingBatchSize = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1000;
   var content = file.content,
       collection = file.collection;
   var deferredUploadId = uploadableFileUpfrontIds.deferredUploadId;
@@ -163,11 +165,11 @@ var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, call
     hashingFunction: hashingFunction,
     hashingConcurrency: 5,
     probingBatchSize: 100,
-    chunkSize: 4 * 1024 * 1024,
+    chunkSize: chunkSize,
     uploadingConcurrency: 3,
     uploadingFunction: createUploadingFunction(store, collection),
     probingFunction: createProbingFunction(store, collection),
-    processingBatchSize: 1000,
+    processingBatchSize: processingBatchSize,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection)
   }, {
     onProgress: function onProgress(progress) {

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

@@ -48,6 +48,8 @@ var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
       _this$metadata = _this$metadata === void 0 ? {} : _this$metadata;
       var method = _this$metadata.method,
           endpoint = _this$metadata.endpoint,
+          mediaRegion = _this$metadata.mediaRegion,
+          mediaEnv = _this$metadata.mediaEnv,
           attempts = _this$metadata.attempts,
           clientExhaustedRetries = _this$metadata.clientExhaustedRetries,
           statusCode = _this$metadata.statusCode,
@@ -56,6 +58,8 @@ var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         reason: reason,
         method: method,
         endpoint: endpoint,
+        mediaRegion: mediaRegion,
+        mediaEnv: mediaEnv,
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,

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

@@ -14,7 +14,7 @@ exports.createProcessFetchResponse = createProcessFetchResponse;
 exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
 exports.createRequestErrorReason = createRequestErrorReason;
 exports.createUrl = createUrl;
-exports.extract = extract;
+exports.extractMediaHeaders = extractMediaHeaders;
 exports.fetchRetry = fetchRetry;
 exports.isAbortedRequestError = isAbortedRequestError;
 exports.isFetchNetworkError = isFetchNetworkError;
@@ -30,12 +30,14 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _mediaCore = require("@atlaskit/media-core");
 
-var _queryString = require("query-string");
-
 var _authQueryParameters = require("../../models/auth-query-parameters");
 
 var _errors = require("./errors");
@@ -69,21 +71,6 @@ function isRateLimitedError(error) {
   return !!error && (0, _errors.isRequestError)(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
 
-function extract(url) {
-  var index = url.indexOf('?');
-
-  if (index > 0) {
-    return {
-      baseUrl: url.substring(0, index),
-      queryParams: (0, _queryString.parse)(url.substring(index + 1, url.length))
-    };
-  } else {
-    return {
-      baseUrl: url
-    };
-  }
-}
-
 function mapAuthToRequestHeaders(auth) {
   if ((0, _mediaCore.isClientBasedAuth)(auth)) {
     return {
@@ -101,15 +88,24 @@ function mapAuthToRequestHeaders(auth) {
 function createUrl(url, _ref) {
   var params = _ref.params,
       auth = _ref.auth;
+  var parsedUrl = new URL(url);
+  var authParams = auth && (0, _authQueryParameters.mapAuthToQueryParameters)(auth) || {};
+
+  var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
 
-  var _extract = extract(url),
-      baseUrl = _extract.baseUrl,
-      queryParams = _extract.queryParams;
+  Object.entries(paramsToAppend).filter(function (_ref2) {
+    var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+        _ = _ref3[0],
+        value = _ref3[1];
 
-  var authParams = auth && (0, _authQueryParameters.mapAuthToQueryParameters)(auth);
-  var queryString = (0, _queryString.stringify)(_objectSpread(_objectSpread(_objectSpread({}, queryParams), params), authParams));
-  var shouldAppendQueryString = queryString.length > 0;
-  return "".concat(baseUrl).concat(shouldAppendQueryString ? "?".concat(queryString) : '');
+    return value != null;
+  }).forEach(function (pair) {
+    var _parsedUrl$searchPara;
+
+    (_parsedUrl$searchPara = parsedUrl.searchParams).append.apply(_parsedUrl$searchPara, (0, _toConsumableArray2.default)(pair));
+  });
+  parsedUrl.searchParams.sort();
+  return parsedUrl.toString();
 }
 
 function withAuth(auth) {
@@ -217,7 +213,7 @@ function mapResponseToVoid() {
 
 function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(response) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -232,7 +228,7 @@ function createMapResponseToJson(metadata) {
             case 6:
               _context.prev = 6;
               _context.t0 = _context["catch"](0);
-              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context.t0);
 
@@ -245,14 +241,14 @@ function createMapResponseToJson(metadata) {
     }));
 
     return function (_x3) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 }
 
 function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(response) {
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -267,7 +263,7 @@ function createMapResponseToBlob(metadata) {
             case 6:
               _context2.prev = 6;
               _context2.t0 = _context2["catch"](0);
-              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new _errors.RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context2.t0);
 
@@ -280,7 +276,7 @@ function createMapResponseToBlob(metadata) {
     }));
 
     return function (_x4) {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }
@@ -329,7 +325,7 @@ function _fetchRetry() {
             timeoutInMs = startTimeoutInMs;
 
             waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+              var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
                 return _regenerator.default.wrap(function _callee5$(_context5) {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
@@ -350,7 +346,7 @@ function _fetchRetry() {
               }));
 
               return function waitAndBumpTimeout() {
-                return _ref4.apply(this, arguments);
+                return _ref6.apply(this, arguments);
               };
             }();
 
@@ -453,7 +449,7 @@ function createRequestErrorReason(statusCode) {
 function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
   var reason = createRequestErrorReason(statusCode);
-  return new _errors.RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+  return new _errors.RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
     statusCode: statusCode
   }));
 }
@@ -467,4 +463,14 @@ function createProcessFetchResponse(metadata) {
     var requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+
+function extractMediaHeaders(response) {
+  var headers = response.headers;
+  var mediaRegion = headers.get('x-media-region') || 'unknown';
+  var mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv
+  };
 }

package/dist/cjs/version.json

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

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

@@ -5,6 +5,8 @@ import { request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 export { MediaStoreError, isMediaStoreError } from './error';
+const MEDIA_API_REGION = 'media-api-region';
+const MEDIA_API_ENVIRONMENT = 'media-api-environment';
 const defaultImageOptions = {
   'max-age': FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -373,20 +375,32 @@ export class MediaStore {
       body,
       clientOptions
     }, controller);
-    updateMediaRegion(response.headers.get('x-media-region'));
+    setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+    setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
     return response;
   }
 
 }
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+const getValueFromSessionStorage = key => {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+const setKeyValueInSessionStorage = (key, value) => {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  const currentRegion = window.sessionStorage.getItem('media-api-region');
+  const currentValue = window.sessionStorage.getItem(key);
 
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem('media-api-region', region);
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
-}
+};
+
+export const getMediaEnvironment = () => {
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
+};
+export const getMediaRegion = () => {
+  return getValueFromSessionStorage(MEDIA_API_REGION);
+};

package/dist/es2019/index.js

@@ -1,11 +1,11 @@
-export { MediaStore, MediaStoreError, isMediaStoreError } from './client/media-store';
+export { MediaStore, MediaStoreError, isMediaStoreError, getMediaEnvironment, getMediaRegion } from './client/media-store';
 export { UploadController } from './upload-controller';
 export { isPreviewableType, isMediaCollectionItemFullDetails } 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';
 // TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
-export { getFileStreamsCache, StreamsCache } from './file-streams-cache';
+export { StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError } from './utils/request';
 export { isAbortedRequestError, mapResponseToJson, mapResponseToBlob, mapResponseToVoid, createUrl } from './utils/request/helpers';

package/dist/es2019/uploader.js

@@ -50,7 +50,7 @@ const createFileFromUpload = async (file, store, uploadableFileUpfrontIds, uploa
   });
 };
 
-export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) => {
+export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks, chunkSize = 4 * 1024 * 1024, processingBatchSize = 1000) => {
   const {
     content,
     collection
@@ -62,11 +62,11 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks) =>
     hashingFunction,
     hashingConcurrency: 5,
     probingBatchSize: 100,
-    chunkSize: 4 * 1024 * 1024,
+    chunkSize,
     uploadingConcurrency: 3,
     uploadingFunction: createUploadingFunction(store, collection),
     probingFunction: createProbingFunction(store, collection),
-    processingBatchSize: 1000,
+    processingBatchSize,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection)
   }, {
     onProgress(progress) {

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

@@ -13,6 +13,8 @@ export class RequestError extends BaseMediaClientError {
       metadata: {
         method,
         endpoint,
+        mediaRegion,
+        mediaEnv,
         attempts,
         clientExhaustedRetries,
         statusCode
@@ -23,6 +25,8 @@ export class RequestError extends BaseMediaClientError {
       reason,
       method,
       endpoint,
+      mediaRegion,
+      mediaEnv,
       attempts,
       clientExhaustedRetries,
       statusCode,

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

@@ -1,5 +1,4 @@
 import { isClientBasedAuth } from '@atlaskit/media-core';
-import { parse, stringify } from 'query-string';
 import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
 import { RequestError, isRequestError } from './errors';
 export function clientTimeoutPromise(timeout) {
@@ -20,20 +19,6 @@ export function isFetchNetworkError(err) {
 export function isRateLimitedError(error) {
   return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
-export function extract(url) {
-  const index = url.indexOf('?');
-
-  if (index > 0) {
-    return {
-      baseUrl: url.substring(0, index),
-      queryParams: parse(url.substring(index + 1, url.length))
-    };
-  } else {
-    return {
-      baseUrl: url
-    };
-  }
-}
 export function mapAuthToRequestHeaders(auth) {
   if (isClientBasedAuth(auth)) {
     return {
@@ -51,17 +36,16 @@ export function createUrl(url, {
   params,
   auth
 }) {
-  const {
-    baseUrl,
-    queryParams
-  } = extract(url);
-  const authParams = auth && mapAuthToQueryParameters(auth);
-  const queryString = stringify({ ...queryParams,
-    ...params,
+  const parsedUrl = new URL(url);
+  const authParams = auth && mapAuthToQueryParameters(auth) || {};
+  const paramsToAppend = { ...params,
     ...authParams
+  };
+  Object.entries(paramsToAppend).filter(([_, value]) => value != null).forEach(pair => {
+    parsedUrl.searchParams.append(...pair);
   });
-  const shouldAppendQueryString = queryString.length > 0;
-  return `${baseUrl}${shouldAppendQueryString ? `?${queryString}` : ''}`;
+  parsedUrl.searchParams.sort();
+  return parsedUrl.toString();
 }
 export function withAuth(auth) {
   return headers => {
@@ -124,6 +108,7 @@ export function createMapResponseToJson(metadata) {
       return await response.json();
     } catch (err) {
       throw new RequestError('serverInvalidBody', { ...metadata,
+        ...extractMediaHeaders(response),
         statusCode: response.status
       }, err);
     }
@@ -135,6 +120,7 @@ export function createMapResponseToBlob(metadata) {
       return await response.blob();
     } catch (err) {
       throw new RequestError('serverInvalidBody', { ...metadata,
+        ...extractMediaHeaders(response),
         statusCode: response.status
       }, err);
     }
@@ -240,6 +226,7 @@ export function createRequestErrorFromResponse(metadata, response) {
   } = response;
   const reason = createRequestErrorReason(statusCode);
   return new RequestError(reason, { ...metadata,
+    ...extractMediaHeaders(response),
     statusCode
   });
 }
@@ -252,4 +239,15 @@ export function createProcessFetchResponse(metadata) {
     const requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+export function extractMediaHeaders(response) {
+  const {
+    headers
+  } = response;
+  const mediaRegion = headers.get('x-media-region') || 'unknown';
+  const mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion,
+    mediaEnv
+  };
 }

package/dist/es2019/version.json

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

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

@@ -285,7 +285,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                             };
                             mediaType = getMediaTypeFromMimeType(type); // we emit a richer state after the blob is fetched
 
-                            // we emit a richer state after the blob is fetched
                             subject.next({
                               status: 'processing',
                               name: name,
@@ -297,7 +296,6 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                               preview: preview
                             }); // we don't want to wait for the file to be upload
 
-                            // we don't want to wait for the file to be upload
                             _this3.upload(file, undefined, uploadableFileUpfrontIds);
 
                             _context3.next = 12;

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

@@ -14,6 +14,8 @@ import { request as _request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 export { MediaStoreError, isMediaStoreError } from './error';
+var MEDIA_API_REGION = 'media-api-region';
+var MEDIA_API_ENVIRONMENT = 'media-api-environment';
 var defaultImageOptions = {
   'max-age': FILE_CACHE_MAX_AGE,
   allowAnimated: true,
@@ -670,10 +672,11 @@ export var MediaStore = /*#__PURE__*/function () {
 
               case 8:
                 response = _context11.sent;
-                updateMediaRegion(response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_REGION, response.headers.get('x-media-region'));
+                setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
                 return _context11.abrupt("return", response);
 
-              case 11:
+              case 12:
               case "end":
                 return _context11.stop();
             }
@@ -692,14 +695,25 @@ export var MediaStore = /*#__PURE__*/function () {
   return MediaStore;
 }();
 
-function updateMediaRegion(region) {
-  if (!region || !(window && window.sessionStorage)) {
+var getValueFromSessionStorage = function getValueFromSessionStorage(key) {
+  return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;
+};
+
+var setKeyValueInSessionStorage = function setKeyValueInSessionStorage(key, value) {
+  if (!value || !(window && window.sessionStorage)) {
     return;
   }
 
-  var currentRegion = window.sessionStorage.getItem('media-api-region');
+  var currentValue = window.sessionStorage.getItem(key);
 
-  if (currentRegion !== region) {
-    window.sessionStorage.setItem('media-api-region', region);
+  if (currentValue !== value) {
+    window.sessionStorage.setItem(key, value);
   }
-}
+};
+
+export var getMediaEnvironment = function getMediaEnvironment() {
+  return getValueFromSessionStorage(MEDIA_API_ENVIRONMENT);
+};
+export var getMediaRegion = function getMediaRegion() {
+  return getValueFromSessionStorage(MEDIA_API_REGION);
+};

package/dist/esm/index.js

@@ -1,11 +1,11 @@
-export { MediaStore, MediaStoreError, isMediaStoreError } from './client/media-store';
+export { MediaStore, MediaStoreError, isMediaStoreError, getMediaEnvironment, getMediaRegion } from './client/media-store';
 export { UploadController } from './upload-controller';
 export { isPreviewableType, isMediaCollectionItemFullDetails } 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';
 // TODO: remove access to media file stream cache https://product-fabric.atlassian.net/browse/MEX-1417
-export { getFileStreamsCache, StreamsCache } from './file-streams-cache';
+export { StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError } from './utils/request';
 export { isAbortedRequestError, mapResponseToJson, mapResponseToBlob, mapResponseToVoid, createUrl } from './utils/request/helpers';

package/dist/esm/uploader.js

@@ -142,6 +142,8 @@ var createFileFromUpload = /*#__PURE__*/function () {
 }();
 
 export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks) {
+  var chunkSize = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 4 * 1024 * 1024;
+  var processingBatchSize = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1000;
   var content = file.content,
       collection = file.collection;
   var deferredUploadId = uploadableFileUpfrontIds.deferredUploadId;
@@ -149,11 +151,11 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
     hashingFunction: hashingFunction,
     hashingConcurrency: 5,
     probingBatchSize: 100,
-    chunkSize: 4 * 1024 * 1024,
+    chunkSize: chunkSize,
     uploadingConcurrency: 3,
     uploadingFunction: createUploadingFunction(store, collection),
     probingFunction: createProbingFunction(store, collection),
-    processingBatchSize: 1000,
+    processingBatchSize: processingBatchSize,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection)
   }, {
     onProgress: function onProgress(progress) {

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

@@ -34,6 +34,8 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
       _this$metadata = _this$metadata === void 0 ? {} : _this$metadata;
       var method = _this$metadata.method,
           endpoint = _this$metadata.endpoint,
+          mediaRegion = _this$metadata.mediaRegion,
+          mediaEnv = _this$metadata.mediaEnv,
           attempts = _this$metadata.attempts,
           clientExhaustedRetries = _this$metadata.clientExhaustedRetries,
           statusCode = _this$metadata.statusCode,
@@ -42,6 +44,8 @@ export var RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
         reason: reason,
         method: method,
         endpoint: endpoint,
+        mediaRegion: mediaRegion,
+        mediaEnv: mediaEnv,
         attempts: attempts,
         clientExhaustedRetries: clientExhaustedRetries,
         statusCode: statusCode,

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

@@ -1,5 +1,7 @@
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 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; }
@@ -7,7 +9,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 { isClientBasedAuth } from '@atlaskit/media-core';
-import { parse, stringify } from 'query-string';
 import { mapAuthToQueryParameters } from '../../models/auth-query-parameters';
 import { RequestError, isRequestError } from './errors';
 export function clientTimeoutPromise(timeout) {
@@ -30,20 +31,6 @@ export function isFetchNetworkError(err) {
 export function isRateLimitedError(error) {
   return !!error && isRequestError(error) && error.attributes.statusCode === 429 || !!error && !!error.message && error.message.includes('429');
 }
-export function extract(url) {
-  var index = url.indexOf('?');
-
-  if (index > 0) {
-    return {
-      baseUrl: url.substring(0, index),
-      queryParams: parse(url.substring(index + 1, url.length))
-    };
-  } else {
-    return {
-      baseUrl: url
-    };
-  }
-}
 export function mapAuthToRequestHeaders(auth) {
   if (isClientBasedAuth(auth)) {
     return {
@@ -60,15 +47,24 @@ export function mapAuthToRequestHeaders(auth) {
 export function createUrl(url, _ref) {
   var params = _ref.params,
       auth = _ref.auth;
+  var parsedUrl = new URL(url);
+  var authParams = auth && mapAuthToQueryParameters(auth) || {};
 
-  var _extract = extract(url),
-      baseUrl = _extract.baseUrl,
-      queryParams = _extract.queryParams;
+  var paramsToAppend = _objectSpread(_objectSpread({}, params), authParams);
 
-  var authParams = auth && mapAuthToQueryParameters(auth);
-  var queryString = stringify(_objectSpread(_objectSpread(_objectSpread({}, queryParams), params), authParams));
-  var shouldAppendQueryString = queryString.length > 0;
-  return "".concat(baseUrl).concat(shouldAppendQueryString ? "?".concat(queryString) : '');
+  Object.entries(paramsToAppend).filter(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+        _ = _ref3[0],
+        value = _ref3[1];
+
+    return value != null;
+  }).forEach(function (pair) {
+    var _parsedUrl$searchPara;
+
+    (_parsedUrl$searchPara = parsedUrl.searchParams).append.apply(_parsedUrl$searchPara, _toConsumableArray(pair));
+  });
+  parsedUrl.searchParams.sort();
+  return parsedUrl.toString();
 }
 export function withAuth(auth) {
   return function (headers) {
@@ -171,7 +167,7 @@ export function mapResponseToVoid() {
 }
 export function createMapResponseToJson(metadata) {
   return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -186,7 +182,7 @@ export function createMapResponseToJson(metadata) {
             case 6:
               _context.prev = 6;
               _context.t0 = _context["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context.t0);
 
@@ -199,13 +195,13 @@ export function createMapResponseToJson(metadata) {
     }));
 
     return function (_x3) {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
 }
 export function createMapResponseToBlob(metadata) {
   return /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(response) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -220,7 +216,7 @@ export function createMapResponseToBlob(metadata) {
             case 6:
               _context2.prev = 6;
               _context2.t0 = _context2["catch"](0);
-              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread({}, metadata), {}, {
+              throw new RequestError('serverInvalidBody', _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
                 statusCode: response.status
               }), _context2.t0);
 
@@ -233,7 +229,7 @@ export function createMapResponseToBlob(metadata) {
     }));
 
     return function (_x4) {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }
@@ -278,7 +274,7 @@ function _fetchRetry() {
             timeoutInMs = startTimeoutInMs;
 
             waitAndBumpTimeout = /*#__PURE__*/function () {
-              var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
+              var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
                 return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                   while (1) {
                     switch (_context5.prev = _context5.next) {
@@ -299,7 +295,7 @@ function _fetchRetry() {
               }));
 
               return function waitAndBumpTimeout() {
-                return _ref4.apply(this, arguments);
+                return _ref6.apply(this, arguments);
               };
             }();
 
@@ -401,7 +397,7 @@ export function createRequestErrorReason(statusCode) {
 export function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
   var reason = createRequestErrorReason(statusCode);
-  return new RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+  return new RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
     statusCode: statusCode
   }));
 }
@@ -414,4 +410,13 @@ export function createProcessFetchResponse(metadata) {
     var requestError = createRequestErrorFromResponse(metadata, response);
     throw requestError;
   };
+}
+export function extractMediaHeaders(response) {
+  var headers = response.headers;
+  var mediaRegion = headers.get('x-media-region') || 'unknown';
+  var mediaEnv = headers.get('x-media-env') || 'unknown';
+  return {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv
+  };
 }

package/dist/esm/version.json

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

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

@@ -33,6 +33,8 @@ export declare class MediaStore {
     resolveAuth: (authContext?: AuthContext | undefined) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
 }
+export declare const getMediaEnvironment: () => string | undefined;
+export declare const getMediaRegion: () => string | undefined;
 export interface ResponseFileItem {
     id: string;
     type: 'file';

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export { MediaStore, MediaStoreError, isMediaStoreError, } from './client/media-store';
+export { MediaStore, MediaStoreError, isMediaStoreError, getMediaEnvironment, getMediaRegion, } from './client/media-store';
 export type { ResponseFileItem, ItemsPayload, ImageMetadataArtifact, ImageMetadata, MediaStoreResponse, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileParams, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, MediaStoreCreateFileFromBinaryParams, MediaStoreCreateFileFromUploadConditions, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, MediaStoreGetCollectionItemsParams, SourceFile, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, CreatedTouchedFile, TouchedFiles, EmptyFile, MediaStoreErrorReason, MediaStoreErrorAttributes, } from './client/media-store';
 export { UploadController } from './upload-controller';
 export type { AbortFunction } from './upload-controller';
@@ -13,7 +13,7 @@ export type { MediaClientError, MediaClientErrorReason, MediaClientErrorAttribut
 export { isUploadingFileState, isProcessingFileState, isProcessedFileState, isErrorFileState, isPreviewableFileState, isFinalFileState, isImageRepresentationReady, mapMediaFileToFileState, mapMediaItemToFileState, } from './models/file-state';
 export type { FileStatus, FilePreview, PreviewOptions, GetFileOptions, UploadingFileState, ProcessingFileState, ProcessedFileState, ProcessingFailedState, ErrorFileState, NonErrorFileState, PreviewableFileState, FileState, } from './models/file-state';
 export type { MobileUploadStartEvent, MobileUploadProgressEvent, MobileUploadEndEvent, MobileUploadErrorEvent, } from './models/mobile-upload';
-export { getFileStreamsCache, StreamsCache } from './file-streams-cache';
+export { StreamsCache } from './file-streams-cache';
 export { uploadFile } from './uploader';
 export type { UploadableFile, UploadableFileUpfrontIds, UploadFileCallbacks, UploadFileResult, } from './uploader';
 export { request, RequestError, isRequestError, isRateLimitedError, } from './utils/request';

package/dist/types/uploader.d.ts

@@ -18,4 +18,4 @@ export declare type UploadFileCallbacks = {
 export interface UploadFileResult {
     cancel: () => void;
 }
-export declare const uploadFile: (file: UploadableFile, store: MediaStore, uploadableFileUpfrontIds: UploadableFileUpfrontIds, callbacks?: UploadFileCallbacks | undefined) => UploadFileResult;
+export declare const uploadFile: (file: UploadableFile, store: MediaStore, uploadableFileUpfrontIds: UploadableFileUpfrontIds, callbacks?: UploadFileCallbacks | undefined, chunkSize?: number, processingBatchSize?: number) => UploadFileResult;

package/dist/types/utils/request/errors.d.ts

@@ -9,6 +9,8 @@ export declare class RequestError extends BaseMediaClientError<RequestErrorAttri
         reason: RequestErrorReason;
         method: import("./types").RequestMethod | undefined;
         endpoint: string | undefined;
+        mediaRegion: string | undefined;
+        mediaEnv: string | undefined;
         attempts: number | undefined;
         clientExhaustedRetries: boolean | undefined;
         statusCode: number | undefined;

package/dist/types/utils/request/helpers.d.ts

@@ -6,10 +6,6 @@ export declare function waitPromise(timeout: number): Promise<void>;
 export declare function isAbortedRequestError(err: any): boolean;
 export declare function isFetchNetworkError(err: any): err is TypeError;
 export declare function isRateLimitedError(error: Error | undefined): boolean;
-export declare function extract(url: string): {
-    baseUrl: string;
-    queryParams?: any;
-};
 export declare function mapAuthToRequestHeaders(auth: Auth): RequestHeaders;
 export declare function createUrl(url: string, { params, auth }: CreateUrlOptions): string;
 export declare function withAuth(auth?: Auth): (headers?: RequestHeaders | undefined) => RequestHeaders | undefined;
@@ -36,3 +32,7 @@ export declare function fetchRetry(functionToRetry: () => Promise<Response>, met
 export declare function createRequestErrorReason(statusCode: number): RequestErrorReason;
 export declare function createRequestErrorFromResponse(metadata: RequestErrorMetadata, response: Response): RequestError;
 export declare function createProcessFetchResponse(metadata: RequestMetadata): (response: Response) => Response;
+export declare function extractMediaHeaders(response: Response): {
+    mediaRegion: string;
+    mediaEnv: string;
+};

package/dist/types/utils/request/types.d.ts

@@ -18,6 +18,8 @@ export declare type ClientOptions = {
 export declare type RequestMetadata = {
     readonly method?: RequestMethod;
     readonly endpoint?: string;
+    readonly mediaRegion?: string;
+    readonly mediaEnv?: string;
 };
 export declare type RequestOptions = RequestMetadata & {
     readonly auth?: Auth;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "15.1.0",
+  "version": "16.0.1",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -27,14 +27,13 @@
     }
   },
   "dependencies": {
-    "@atlaskit/chunkinator": "^3.1.0",
-    "@atlaskit/media-common": "^2.12.0",
+    "@atlaskit/chunkinator": "^4.0.0",
+    "@atlaskit/media-common": "^2.14.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
     "eventemitter2": "^4.1.0",
     "lru-fast": "^0.2.2",
-    "query-string": "^6.14.1",
     "rusha": "^0.8.13",
     "rxjs": "^5.5.0",
     "setimmediate": "^1.0.5",
@@ -44,23 +43,21 @@
     "xstate": "^4.20.0"
   },
   "peerDependencies": {
-    "@atlaskit/media-core": "^32.3.1",
+    "@atlaskit/media-core": "^33.0.0",
     "react": "^16.8.0"
   },
   "devDependencies": {
     "@atlaskit/button": "^16.3.0",
     "@atlaskit/docs": "*",
-    "@atlaskit/media-card": "^73.5.0",
-    "@atlaskit/media-core": "^32.3.0",
-    "@atlaskit/media-test-helpers": "^29.4.0",
+    "@atlaskit/media-card": "^73.7.0",
+    "@atlaskit/media-core": "^33.0.0",
+    "@atlaskit/media-test-helpers": "^30.0.0",
     "@atlaskit/ssr": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@types/deep-equal": "^1.0.1",
-    "@types/query-string": "^4.3.1",
     "@types/uuid-validate": "^0.0.0",
     "enzyme": "^3.10.0",
     "fetch-mock": "^8.0.0",
-    "jest-fetch-mock": "^3.0.3",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "styled-components": "^3.2.6",