@atlaskit/media-client 28.0.4 → 28.0.6

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/media-client
 
+## 28.0.6
+
+### Patch Changes
+
+- [#156328](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/156328)
+  [`91ea9df3f02c3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/91ea9df3f02c3) -
+  migrate media CDN FFs to Statsig
+- [#157454](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/157454)
+  [`94e18b08d21d2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/94e18b08d21d2) -
+  add config for authProviderTimeout to media-client to override default timeout
+
+## 28.0.5
+
+### Patch Changes
+
+- [#155484](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/155484)
+  [`958e4ecdf8ab7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/958e4ecdf8ab7) -
+  add nonMediaError reason to media-client
+
 ## 28.0.4
 
 ### Patch Changes

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

@@ -32,7 +32,8 @@ var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new _mediaStore.MediaStore({
       authProvider: mediaClientConfig.authProvider,
       initialAuth: mediaClientConfig.initialAuth,
-      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? _mediaCore.ChunkHashAlgorithm.Sha256 : _mediaCore.ChunkHashAlgorithm.Sha1
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? _mediaCore.ChunkHashAlgorithm.Sha256 : _mediaCore.ChunkHashAlgorithm.Sha1,
+      authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
     });
     this.config = mediaClientConfig;
     this.file = new _fileFetcher.FileFetcherImpl(this.mediaStore, this.store);

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

@@ -42,7 +42,7 @@ var jsonHeaders = {
 };
 var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
   var result = endpoint;
-  if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery')) {
+  if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) {
     if ((0, _isCommercial.isCommercial)()) {
       result += '/cdn';
     }
@@ -54,7 +54,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
     var _this = this;
     (0, _classCallCheck2.default)(this, MediaStore);
     (0, _defineProperty2.default)(this, "resolveAuth", function (authContext) {
-      return (0, _resolveAuth.resolveAuth)(_this.config.authProvider, authContext);
+      return (0, _resolveAuth.resolveAuth)(_this.config.authProvider, authContext, _this.config.authProviderTimeout);
     });
     (0, _defineProperty2.default)(this, "resolveInitialAuth", function () {
       return (0, _resolveAuth.resolveInitialAuth)(_this.config.initialAuth);

package/dist/cjs/models/artifacts.js

@@ -9,7 +9,7 @@ var _isCommercial = require("../utils/isCommercial");
 var getArtifactUrl = exports.getArtifactUrl = function getArtifactUrl(artifacts, prop) {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if ((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if ((0, _isCommercial.isCommercial)() && ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }

package/dist/cjs/utils/mediaCdn.js

@@ -23,7 +23,7 @@ function mapToMediaCdnUrl(url, token) {
     return url;
   }
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if ((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') && (0, _platformFeatureFlags.fg)('platform.media-cdn-single-host')) {
+  if (((0, _platformFeatureFlags.fg)('platform.media-cdn-delivery') || (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery')) && ((0, _platformFeatureFlags.fg)('platform.media-cdn-single-host') || (0, _platformFeatureFlags.fg)('platform_media_cdn_single_host'))) {
     try {
       var parsedUrl = new URL(url);
       var cdnHost = MEDIA_CDN_MAP[parsedUrl.host];

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

@@ -285,8 +285,15 @@ function createRequestErrorReason(statusCode) {
 }
 function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
-  var reason = createRequestErrorReason(statusCode);
-  return new _errors.RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
+
+  // with media-cdn single host feature on ('platform.media-cdn-single-host'), media will make a call to Cloudfront before dt-api-filestore, where 'x-media-region' and 'x-media-env' are set. The absence of these headers indicates a Cloudfront error.
+  var _extractMediaHeaders = extractMediaHeaders(response),
+    mediaRegion = _extractMediaHeaders.mediaRegion,
+    mediaEnv = _extractMediaHeaders.mediaEnv;
+  var reason = mediaRegion === 'unknown' || mediaEnv === 'unknown' ? 'nonMediaError' : createRequestErrorReason(statusCode);
+  return new _errors.RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv,
     statusCode: statusCode
   }));
 }

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

@@ -15,7 +15,8 @@ export class MediaClient {
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
       authProvider: mediaClientConfig.authProvider,
       initialAuth: mediaClientConfig.initialAuth,
-      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1,
+      authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
     });
     this.config = mediaClientConfig;
     this.file = new FileFetcherImpl(this.mediaStore, this.store);

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

@@ -31,7 +31,7 @@ const jsonHeaders = {
 };
 const cdnFeatureFlag = endpoint => {
   let result = endpoint;
-  if (fg('platform.media-cdn-delivery')) {
+  if (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) {
     if (isCommercial()) {
       result += '/cdn';
     }
@@ -40,7 +40,7 @@ const cdnFeatureFlag = endpoint => {
 };
 export class MediaStore {
   constructor(config) {
-    _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext));
+    _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext, this.config.authProviderTimeout));
     _defineProperty(this, "resolveInitialAuth", () => resolveInitialAuth(this.config.initialAuth));
     this.config = config;
     this._chunkHashAlgorithm = config.chunkHashAlgorithm || ChunkHashAlgorithm.Sha1;

package/dist/es2019/models/artifacts.js

@@ -3,7 +3,7 @@ import { isCommercial } from '../utils/isCommercial';
 export const getArtifactUrl = (artifacts, prop) => {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (isCommercial() && fg('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if (isCommercial() && (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return `${(_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url}/cdn`;
   }

package/dist/es2019/utils/mediaCdn.js

@@ -16,7 +16,7 @@ export function mapToMediaCdnUrl(url, token) {
     return url;
   }
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (fg('platform.media-cdn-delivery') && fg('platform.media-cdn-single-host')) {
+  if ((fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (fg('platform.media-cdn-single-host') || fg('platform_media_cdn_single_host'))) {
     try {
       const parsedUrl = new URL(url);
       const cdnHost = MEDIA_CDN_MAP[parsedUrl.host];

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

@@ -183,10 +183,17 @@ export function createRequestErrorFromResponse(metadata, response) {
   const {
     status: statusCode
   } = response;
-  const reason = createRequestErrorReason(statusCode);
+
+  // with media-cdn single host feature on ('platform.media-cdn-single-host'), media will make a call to Cloudfront before dt-api-filestore, where 'x-media-region' and 'x-media-env' are set. The absence of these headers indicates a Cloudfront error.
+  const {
+    mediaRegion,
+    mediaEnv
+  } = extractMediaHeaders(response);
+  const reason = mediaRegion === 'unknown' || mediaEnv === 'unknown' ? 'nonMediaError' : createRequestErrorReason(statusCode);
   return new RequestError(reason, {
     ...metadata,
-    ...extractMediaHeaders(response),
+    mediaRegion,
+    mediaEnv,
     statusCode
   });
 }

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

@@ -22,7 +22,8 @@ export var MediaClient = /*#__PURE__*/function () {
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
       authProvider: mediaClientConfig.authProvider,
       initialAuth: mediaClientConfig.initialAuth,
-      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1,
+      authProviderTimeout: mediaClientConfig.authProviderTimeoutMs
     });
     this.config = mediaClientConfig;
     this.file = new FileFetcherImpl(this.mediaStore, this.store);

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

@@ -36,7 +36,7 @@ var jsonHeaders = {
 };
 var cdnFeatureFlag = function cdnFeatureFlag(endpoint) {
   var result = endpoint;
-  if (fg('platform.media-cdn-delivery')) {
+  if (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) {
     if (isCommercial()) {
       result += '/cdn';
     }
@@ -48,7 +48,7 @@ export var MediaStore = /*#__PURE__*/function () {
     var _this = this;
     _classCallCheck(this, MediaStore);
     _defineProperty(this, "resolveAuth", function (authContext) {
-      return resolveAuth(_this.config.authProvider, authContext);
+      return resolveAuth(_this.config.authProvider, authContext, _this.config.authProviderTimeout);
     });
     _defineProperty(this, "resolveInitialAuth", function () {
       return resolveInitialAuth(_this.config.initialAuth);

package/dist/esm/models/artifacts.js

@@ -3,7 +3,7 @@ import { isCommercial } from '../utils/isCommercial';
 export var getArtifactUrl = function getArtifactUrl(artifacts, prop) {
   var _artifacts$prop, _artifacts$prop3;
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (isCommercial() && fg('platform.media-cdn-delivery') && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
+  if (isCommercial() && (fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (_artifacts$prop = artifacts[prop]) !== null && _artifacts$prop !== void 0 && _artifacts$prop.url) {
     var _artifacts$prop2;
     return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }

package/dist/esm/utils/mediaCdn.js

@@ -16,7 +16,7 @@ export function mapToMediaCdnUrl(url, token) {
     return url;
   }
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  if (fg('platform.media-cdn-delivery') && fg('platform.media-cdn-single-host')) {
+  if ((fg('platform.media-cdn-delivery') || fg('platform_media_cdn_delivery')) && (fg('platform.media-cdn-single-host') || fg('platform_media_cdn_single_host'))) {
     try {
       var parsedUrl = new URL(url);
       var cdnHost = MEDIA_CDN_MAP[parsedUrl.host];

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

@@ -263,8 +263,15 @@ export function createRequestErrorReason(statusCode) {
 }
 export function createRequestErrorFromResponse(metadata, response) {
   var statusCode = response.status;
-  var reason = createRequestErrorReason(statusCode);
-  return new RequestError(reason, _objectSpread(_objectSpread(_objectSpread({}, metadata), extractMediaHeaders(response)), {}, {
+
+  // with media-cdn single host feature on ('platform.media-cdn-single-host'), media will make a call to Cloudfront before dt-api-filestore, where 'x-media-region' and 'x-media-env' are set. The absence of these headers indicates a Cloudfront error.
+  var _extractMediaHeaders = extractMediaHeaders(response),
+    mediaRegion = _extractMediaHeaders.mediaRegion,
+    mediaEnv = _extractMediaHeaders.mediaEnv;
+  var reason = mediaRegion === 'unknown' || mediaEnv === 'unknown' ? 'nonMediaError' : createRequestErrorReason(statusCode);
+  return new RequestError(reason, _objectSpread(_objectSpread({}, metadata), {}, {
+    mediaRegion: mediaRegion,
+    mediaEnv: mediaEnv,
     statusCode: statusCode
   }));
 }

package/dist/types/models/errors/types.d.ts

@@ -1,4 +1,4 @@
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'nonMediaError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export interface MediaClientErrorAttributes {
     reason: MediaClientErrorReason;
 }

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

@@ -35,7 +35,7 @@ export type CreateUrlOptions = {
     readonly params?: RequestParams;
     readonly auth?: Auth;
 };
-export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
+export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'nonMediaError' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
 export type RequestErrorMetadata = RequestMetadata & {
     readonly attempts?: number;
     readonly clientExhaustedRetries?: boolean;

package/dist/types-ts4.5/models/errors/types.d.ts

@@ -1,4 +1,4 @@
-export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
+export type MediaClientErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError' | 'nonMediaError' | 'failedAuthProvider' | 'tokenExpired' | 'missingInitialAuth' | 'emptyAuth' | 'authProviderTimedOut' | 'invalidFileId' | 'emptyItems' | 'zeroVersionFile' | 'emptyFileName' | 'pollingMaxAttemptsExceeded' | 'fileSizeExceedsLimit' | 'deprecatedEndpoint';
 export interface MediaClientErrorAttributes {
     reason: MediaClientErrorReason;
 }

package/dist/types-ts4.5/utils/request/types.d.ts

@@ -35,7 +35,7 @@ export type CreateUrlOptions = {
     readonly params?: RequestParams;
     readonly auth?: Auth;
 };
-export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
+export type RequestErrorReason = 'clientOffline' | 'clientAbortedRequest' | 'clientTimeoutRequest' | 'nonMediaError' | 'serverInvalidBody' | 'serverBadRequest' | 'serverUnauthorized' | 'serverForbidden' | 'serverNotFound' | 'serverRateLimited' | 'serverInternalError' | 'serverBadGateway' | 'serverUnexpectedError';
 export type RequestErrorMetadata = RequestMetadata & {
     readonly attempts?: number;
     readonly clientExhaustedRetries?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "28.0.4",
+	"version": "28.0.6",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/chunkinator": "^6.1.0",
-		"@atlaskit/media-common": "^11.6.0",
+		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/platform-feature-flags": "0.3.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
@@ -89,6 +89,12 @@
 		},
 		"platform.media-cdn-single-host": {
 			"type": "boolean"
+		},
+		"platform_media_cdn_single_host": {
+			"type": "boolean"
+		},
+		"platform_media_cdn_delivery": {
+			"type": "boolean"
 		}
 	}
 }