@atlaskit/media-client 28.0.3 → 28.0.5

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/media-client
 
+## 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
+
+- [#151581](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151581)
+  [`906487ee4e09a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/906487ee4e09a) -
+  fix media viewer for video when no 1280 artifact available
+- Updated dependencies
+
 ## 28.0.3
 
 ### Patch Changes

package/dist/cjs/models/artifacts.js

@@ -7,10 +7,11 @@ exports.getArtifactUrl = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isCommercial = require("../utils/isCommercial");
 var getArtifactUrl = exports.getArtifactUrl = function getArtifactUrl(artifacts, prop) {
-  var _artifacts$prop2;
-  if ((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform.media-cdn-delivery')) {
-    var _artifacts$prop;
-    return "".concat((_artifacts$prop = artifacts[prop]) === null || _artifacts$prop === void 0 ? void 0 : _artifacts$prop.url, "/cdn");
+  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) {
+    var _artifacts$prop2;
+    return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }
-  return (_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url;
+  return (_artifacts$prop3 = artifacts[prop]) === null || _artifacts$prop3 === void 0 ? void 0 : _artifacts$prop3.url;
 };

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/models/artifacts.js

@@ -1,10 +1,11 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isCommercial } from '../utils/isCommercial';
 export const getArtifactUrl = (artifacts, prop) => {
-  var _artifacts$prop2;
-  if (isCommercial() && fg('platform.media-cdn-delivery')) {
-    var _artifacts$prop;
-    return `${(_artifacts$prop = artifacts[prop]) === null || _artifacts$prop === void 0 ? void 0 : _artifacts$prop.url}/cdn`;
+  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) {
+    var _artifacts$prop2;
+    return `${(_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url}/cdn`;
   }
-  return (_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url;
+  return (_artifacts$prop3 = artifacts[prop]) === null || _artifacts$prop3 === void 0 ? void 0 : _artifacts$prop3.url;
 };

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/models/artifacts.js

@@ -1,10 +1,11 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { isCommercial } from '../utils/isCommercial';
 export var getArtifactUrl = function getArtifactUrl(artifacts, prop) {
-  var _artifacts$prop2;
-  if (isCommercial() && fg('platform.media-cdn-delivery')) {
-    var _artifacts$prop;
-    return "".concat((_artifacts$prop = artifacts[prop]) === null || _artifacts$prop === void 0 ? void 0 : _artifacts$prop.url, "/cdn");
+  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) {
+    var _artifacts$prop2;
+    return "".concat((_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url, "/cdn");
   }
-  return (_artifacts$prop2 = artifacts[prop]) === null || _artifacts$prop2 === void 0 ? void 0 : _artifacts$prop2.url;
+  return (_artifacts$prop3 = artifacts[prop]) === null || _artifacts$prop3 === void 0 ? void 0 : _artifacts$prop3.url;
 };

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.3",
+	"version": "28.0.5",
 	"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.5.0",
+		"@atlaskit/media-common": "^11.6.0",
 		"@atlaskit/platform-feature-flags": "0.3.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",