@atlaskit/media-client 28.5.0 → 28.6.0

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

@@ -8,25 +8,24 @@ exports.MobileUploadError = void 0;
 exports.isMobileUploadError = isMobileUploadError;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, 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 MobileUploadError = exports.MobileUploadError = /*#__PURE__*/function (_BaseMediaClientError) {
-  (0, _inherits2.default)(MobileUploadError, _BaseMediaClientError);
-  var _super = _createSuper(MobileUploadError);
   function MobileUploadError(reason, id, metadata) {
     var _this;
     (0, _classCallCheck2.default)(this, MobileUploadError);
-    _this = _super.call(this, reason);
+    _this = _callSuper(this, MobileUploadError, [reason]);
     _this.reason = reason;
     _this.id = id;
     _this.metadata = metadata;
     return _this;
   }
-  (0, _createClass2.default)(MobileUploadError, [{
+  (0, _inherits2.default)(MobileUploadError, _BaseMediaClientError);
+  return (0, _createClass2.default)(MobileUploadError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
@@ -47,7 +46,6 @@ var MobileUploadError = exports.MobileUploadError = /*#__PURE__*/function (_Base
       };
     }
   }]);
-  return MobileUploadError;
 }(_errors.BaseMediaClientError);
 function isMobileUploadError(err) {
   return err instanceof MobileUploadError;

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

@@ -8,24 +8,23 @@ exports.PollingError = void 0;
 exports.isPollingError = isPollingError;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, 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 PollingError = exports.PollingError = /*#__PURE__*/function (_BaseMediaClientError) {
-  (0, _inherits2.default)(PollingError, _BaseMediaClientError);
-  var _super = _createSuper(PollingError);
   function PollingError(reason, attempts) {
     var _this;
     (0, _classCallCheck2.default)(this, PollingError);
-    _this = _super.call(this, reason);
+    _this = _callSuper(this, PollingError, [reason]);
     _this.reason = reason;
     _this.attempts = attempts;
     return _this;
   }
-  (0, _createClass2.default)(PollingError, [{
+  (0, _inherits2.default)(PollingError, _BaseMediaClientError);
+  return (0, _createClass2.default)(PollingError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
@@ -36,7 +35,6 @@ var PollingError = exports.PollingError = /*#__PURE__*/function (_BaseMediaClien
       };
     }
   }]);
-  return PollingError;
 }(_errors.BaseMediaClientError);
 function isPollingError(err) {
   return err instanceof PollingError;

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

@@ -54,7 +54,7 @@ var PollingFunction = exports.PollingFunction = /*#__PURE__*/function () {
     this.options = _objectSpread(_objectSpread({}, defaultPollingOptions), options);
     this.poll_intervalMs = this.options.poll_intervalMs;
   }
-  (0, _createClass2.default)(PollingFunction, [{
+  return (0, _createClass2.default)(PollingFunction, [{
     key: "execute",
     value: function () {
       var _execute = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(executor) {
@@ -141,5 +141,4 @@ var PollingFunction = exports.PollingFunction = /*#__PURE__*/function () {
       this.timeoutId = 0;
     }
   }]);
-  return PollingFunction;
 }();

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

@@ -8,25 +8,24 @@ exports.RequestError = void 0;
 exports.isRequestError = isRequestError;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, 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 RequestError = exports.RequestError = /*#__PURE__*/function (_BaseMediaClientError) {
-  (0, _inherits2.default)(RequestError, _BaseMediaClientError);
-  var _super = _createSuper(RequestError);
   function RequestError(reason, metadata, innerError) {
     var _this;
     (0, _classCallCheck2.default)(this, RequestError);
-    _this = _super.call(this, reason);
+    _this = _callSuper(this, RequestError, [reason]);
     _this.reason = reason;
     _this.metadata = metadata;
     _this.innerError = innerError;
     return _this;
   }
-  (0, _createClass2.default)(RequestError, [{
+  (0, _inherits2.default)(RequestError, _BaseMediaClientError);
+  return (0, _createClass2.default)(RequestError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
@@ -57,7 +56,6 @@ var RequestError = exports.RequestError = /*#__PURE__*/function (_BaseMediaClien
       };
     }
   }]);
-  return RequestError;
 }(_errors.BaseMediaClientError);
 function isRequestError(err) {
   return err instanceof RequestError;

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

@@ -12,6 +12,7 @@ exports.createProcessFetchResponse = createProcessFetchResponse;
 exports.createRequestErrorFromResponse = createRequestErrorFromResponse;
 exports.createRequestErrorReason = createRequestErrorReason;
 exports.createUrl = createUrl;
+exports.defaultShouldRetryError = void 0;
 exports.extendHeaders = extendHeaders;
 exports.extendTraceContext = void 0;
 exports.extractMediaHeaders = extractMediaHeaders;
@@ -61,8 +62,7 @@ var ZipkinHeaderKeys = exports.ZipkinHeaderKeys = {
   flags: 'x-b3-flags'
 };
 var mapTraceIdToRequestHeaders = function mapTraceIdToRequestHeaders(traceContext) {
-  var _ref;
-  return traceContext ? (_ref = {}, (0, _defineProperty2.default)(_ref, ZipkinHeaderKeys.traceId, traceContext.traceId), (0, _defineProperty2.default)(_ref, ZipkinHeaderKeys.spanId, traceContext.spanId), _ref) : {};
+  return traceContext ? (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ZipkinHeaderKeys.traceId, traceContext.traceId), ZipkinHeaderKeys.spanId, traceContext.spanId) : {};
 };
 function mapAuthToRequestHeaders(auth) {
   if (!auth) {
@@ -159,6 +159,10 @@ function createMapResponseToBlob(metadata) {
     };
   }();
 }
+var defaultShouldRetryError = exports.defaultShouldRetryError = function defaultShouldRetryError(err) {
+  var _err$metadata;
+  return isFetchNetworkError(err) || (0, _errors.isRequestError)(err) && !!(err !== null && err !== void 0 && (_err$metadata = err.metadata) !== null && _err$metadata !== void 0 && _err$metadata.statusCode) && err.metadata.statusCode >= 500;
+};
 var DEFAULT_RETRY_OPTIONS = exports.DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,
   // 1 second is generally a good timeout to start
@@ -182,6 +186,8 @@ function _fetchRetry() {
       startTimeoutInMs,
       maxAttempts,
       factor,
+      _options$shouldRetryE,
+      shouldRetryError,
       attempts,
       timeoutInMs,
       lastError,
@@ -192,7 +198,7 @@ function _fetchRetry() {
         case 0:
           overwriteOptions = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : {};
           options = _objectSpread(_objectSpread({}, DEFAULT_RETRY_OPTIONS), overwriteOptions);
-          startTimeoutInMs = options.startTimeoutInMs, maxAttempts = options.maxAttempts, factor = options.factor;
+          startTimeoutInMs = options.startTimeoutInMs, maxAttempts = options.maxAttempts, factor = options.factor, _options$shouldRetryE = options.shouldRetryError, shouldRetryError = _options$shouldRetryE === void 0 ? defaultShouldRetryError : _options$shouldRetryE;
           attempts = 0;
           timeoutInMs = startTimeoutInMs;
           waitAndBumpTimeout = /*#__PURE__*/function () {
@@ -237,7 +243,7 @@ function _fetchRetry() {
           }
           throw new _errors.RequestError('clientAbortedRequest', metadata, _context4.t0);
         case 18:
-          if (!(!isFetchNetworkError(_context4.t0) && !(0, _errors.isRequestError)(_context4.t0) || (0, _errors.isRequestError)(_context4.t0) && (!_context4.t0.metadata || !_context4.t0.metadata.statusCode || _context4.t0.metadata.statusCode < 500))) {
+          if (shouldRetryError(_context4.t0)) {
             _context4.next = 20;
             break;
           }

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

@@ -26,6 +26,8 @@ import { PollingFunction } from '../../utils/polling';
 import { isEmptyFile } from '../../utils/detectEmptyFile';
 import { mediaStore } from '@atlaskit/media-state';
 export { isFileFetcherError, FileFetcherError } from './error';
+const isCopySourceFileWithToken = token => !!token.authProvider;
+const isCopyDestinationWithToken = token => !!token.authProvider;
 export class FileFetcherImpl {
   constructor(mediaApi, store = mediaStore) {
     _defineProperty(this, "getErrorFileState", (error, id, occurrenceKey) => {
@@ -379,7 +381,7 @@ export class FileFetcherImpl {
       traceContext
     });
   }
-  async copyFile(source, destination, options = {}, traceContext) {
+  async copyFileWithToken(source, destination, traceContext) {
     const {
       authProvider,
       collection: sourceCollection,
@@ -391,10 +393,6 @@ export class FileFetcherImpl {
       replaceFileId,
       occurrenceKey
     } = destination;
-    const {
-      preview,
-      mimeType
-    } = options;
     const mediaStore = destination.mediaStore || new MediaApi({
       authProvider: destinationAuthProvider
     });
@@ -413,12 +411,44 @@ export class FileFetcherImpl {
       replaceFileId,
       occurrenceKey
     };
+    const {
+      data
+    } = await mediaStore.copyFileWithToken(body, params, traceContext);
+    return data;
+  }
+  async copyFileWithIntent(source, destination, traceContext) {
+    const res = await this.mediaApi.copyFile(source.id, {
+      sourceCollection: source.collection,
+      collection: destination.collection,
+      replaceFileId: destination.replaceFileId
+    }, traceContext);
+    const {
+      data
+    } = res;
+    return data;
+  }
+  async copyFile(source, destination, options = {}, traceContext) {
+    const {
+      id
+    } = source;
+    const {
+      collection: destinationCollectionName,
+      replaceFileId,
+      occurrenceKey
+    } = destination;
+    const {
+      preview,
+      mimeType
+    } = options;
     const cache = getFileStreamsCache();
     let processingSubscription;
     try {
-      const {
-        data: copiedFile
-      } = await mediaStore.copyFileWithToken(body, params, traceContext);
+      let copiedFile;
+      if (isCopySourceFileWithToken(source) && isCopyDestinationWithToken(destination)) {
+        copiedFile = await this.copyFileWithToken(source, destination, traceContext);
+      } else {
+        copiedFile = await this.copyFileWithIntent(source, destination, traceContext);
+      }
 
       // if we were passed a "mimeType", we propagate it into copiedFileWithMimeType
       const copiedFileWithMimeType = {

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

@@ -2,8 +2,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { isClientBasedAuth } from '@atlaskit/media-core';
 import { FILE_CACHE_MAX_AGE, MAX_RESOLUTION } from '../../constants';
 import { getArtifactUrl } from '../../models/artifacts';
-import { request } from '../../utils/request';
-import { createUrl, createMapResponseToJson, createMapResponseToBlob, extendTraceContext } from '../../utils/request/helpers';
+import { isRequestError, request } from '../../utils/request';
+import { createUrl, createMapResponseToJson, createMapResponseToBlob, defaultShouldRetryError, extendTraceContext } from '../../utils/request/helpers';
 import { mapToMediaCdnUrl } from '../../utils/mediaCdn';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
 import { ChunkHashAlgorithm } from '@atlaskit/media-core';
@@ -365,7 +365,15 @@ export class MediaStore {
       body: JSON.stringify({
         id
       }),
-      traceContext
+      traceContext,
+      clientOptions: {
+        retryOptions: {
+          shouldRetryError: err => {
+            var _err$metadata;
+            return defaultShouldRetryError(err) || isRequestError(err) && (err === null || err === void 0 ? void 0 : (_err$metadata = err.metadata) === null || _err$metadata === void 0 ? void 0 : _err$metadata.statusCode) === 401;
+          }
+        }
+      }
     };
     return this.request('/v2/file/copy', options).then(createMapResponseToJson(metadata));
   }

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

@@ -100,6 +100,10 @@ export function createMapResponseToBlob(metadata) {
     }
   };
 }
+export const defaultShouldRetryError = err => {
+  var _err$metadata;
+  return isFetchNetworkError(err) || isRequestError(err) && !!(err !== null && err !== void 0 && (_err$metadata = err.metadata) !== null && _err$metadata !== void 0 && _err$metadata.statusCode) && err.metadata.statusCode >= 500;
+};
 export const DEFAULT_RETRY_OPTIONS = {
   startTimeoutInMs: 1000,
   // 1 second is generally a good timeout to start
@@ -126,7 +130,8 @@ export async function fetchRetry(functionToRetry, metadata, overwriteOptions = {
   const {
     startTimeoutInMs,
     maxAttempts,
-    factor
+    factor,
+    shouldRetryError = defaultShouldRetryError
   } = options;
   let attempts = 0;
   let timeoutInMs = startTimeoutInMs;
@@ -146,7 +151,7 @@ export async function fetchRetry(functionToRetry, metadata, overwriteOptions = {
       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)) {
+      if (!shouldRetryError(err)) {
         throw err;
       }
       await waitAndBumpTimeout();

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

@@ -1,27 +1,26 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 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";
+import _inherits from "@babel/runtime/helpers/inherits";
 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) { _defineProperty(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 _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
 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 = _callSuper(this, FileFetcherError, [reason]);
     _this.reason = reason;
     _this.id = id;
     _this.metadata = metadata;
     return _this;
   }
-  _createClass(FileFetcherError, [{
+  _inherits(FileFetcherError, _BaseMediaClientError);
+  return _createClass(FileFetcherError, [{
     key: "attributes",
     get: function get() {
       var reason = this.reason,
@@ -43,7 +42,6 @@ export var FileFetcherError = /*#__PURE__*/function (_BaseMediaClientError) {
       });
     }
   }]);
-  return FileFetcherError;
 }(BaseMediaClientError);
 export function isFileFetcherError(err) {
   return err instanceof FileFetcherError;