@atlaskit/media-viewer 54.5.45 → 54.5.46

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/media-viewer
 
+## 54.5.46
+
+### Patch Changes
+
+- [`6098ef66f20ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6098ef66f20ae) -
+  [BMPT-8184] Fix video viewer showing "Something went wrong" for videos that only have an SD
+  (`video_640.mp4`) artifact. The viewer now prefers the HD (`video_1280.mp4`) artifact and falls
+  back to the SD artifact when HD is unavailable, instead of failing when no HD rendition exists.
+  Behind the `platform_media_video_sd_fallback` feature gate.
+
 ## 54.5.45
 
 ### Patch Changes

package/dist/cjs/analytics/index.js

@@ -10,7 +10,7 @@ exports.packageVersion = exports.packageName = void 0;
 var _analytics = require("@atlaskit/media-common/analytics");
 var componentName = exports.component = exports.componentName = 'mediaViewer';
 var packageName = exports.packageName = "@atlaskit/media-viewer";
-var packageVersion = exports.packageVersion = "54.5.44";
+var packageVersion = exports.packageVersion = "54.5.45";
 function getFileAttributes(fileState) {
   if (!fileState) {
     return {

package/dist/cjs/analytics/ufoExperiences.js

@@ -13,7 +13,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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) { (0, _defineProperty2.default)(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; }
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "54.5.44";
+var packageVersion = "54.5.45";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/cjs/viewers/video.js

@@ -26,6 +26,7 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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 hdArtifact = 'video_1280.mp4';
+var sdArtifact = 'video_640.mp4';
 var VideoViewer = exports.VideoViewer = /*#__PURE__*/function (_BaseViewer) {
   function VideoViewer() {
     var _this;
@@ -132,58 +133,77 @@ var VideoViewer = exports.VideoViewer = /*#__PURE__*/function (_BaseViewer) {
     key: "init",
     value: function () {
       var _init = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _this$props4, mediaClient, item, collectionName, contentUrl, _t;
+        var _this$props4, mediaClient, item, collectionName, contentUrl, preferredArtifact, _t;
         return _regenerator.default.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _this$props4 = this.props, mediaClient = _this$props4.mediaClient, item = _this$props4.item, collectionName = _this$props4.collectionName;
               _context.prev = 1;
               if (!(item.status === 'processed')) {
-                _context.next = 4;
+                _context.next = 7;
                 break;
               }
+              if (!(0, _platformFeatureFlags.fg)('platform_media_video_sd_fallback')) {
+                _context.next = 3;
+                break;
+              }
+              // Prefer the HD artifact, but fall back to the SD artifact when the media
+              // processing pipeline did not produce an HD (video_1280.mp4) rendition — this
+              // commonly happens for small / low-resolution sources that only get an SD
+              // (video_640.mp4) rendition. Previously the viewer required the HD artifact and
+              // threw `videoviewer-missing-artefact` synchronously, surfacing a generic
+              // "Something went wrong" screen with no playback attempt for SD-only videos.
+              preferredArtifact = (0, _mediaClient.getArtifactUrl)(item.artifacts, hdArtifact) ? hdArtifact : sdArtifact;
               _context.next = 2;
-              return mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+              return mediaClient.file.getArtifactURL(item.artifacts, preferredArtifact, collectionName);
             case 2:
               contentUrl = _context.sent;
+              _context.next = 5;
+              break;
+            case 3:
+              _context.next = 4;
+              return mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+            case 4:
+              contentUrl = _context.sent;
+            case 5:
               if (contentUrl) {
-                _context.next = 3;
+                _context.next = 6;
                 break;
               }
               throw new _errors.MediaViewerError("videoviewer-missing-artefact");
-            case 3:
-              _context.next = 6;
+            case 6:
+              _context.next = 9;
               break;
-            case 4:
-              _context.next = 5;
+            case 7:
+              _context.next = 8;
               return (0, _getObjectUrlFromFileState.getObjectUrlFromFileState)(item);
-            case 5:
+            case 8:
               contentUrl = _context.sent;
               if (contentUrl) {
-                _context.next = 6;
+                _context.next = 9;
                 break;
               }
               this.setState({
                 content: _domain.Outcome.pending()
               });
               return _context.abrupt("return");
-            case 6:
+            case 9:
               this.setState({
                 content: _domain.Outcome.successful(contentUrl)
               });
-              _context.next = 8;
+              _context.next = 11;
               break;
-            case 7:
-              _context.prev = 7;
+            case 10:
+              _context.prev = 10;
               _t = _context["catch"](1);
               this.setState({
                 content: _domain.Outcome.failed(new _errors.MediaViewerError('videoviewer-fetch-url', _t instanceof Error ? _t : undefined))
               });
-            case 8:
+            case 11:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[1, 7]]);
+        }, _callee, this, [[1, 10]]);
       }));
       function init() {
         return _init.apply(this, arguments);

package/dist/es2019/analytics/index.js

@@ -1,7 +1,7 @@
 import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
 const componentName = 'mediaViewer';
 const packageName = "@atlaskit/media-viewer";
-const packageVersion = "54.5.44";
+const packageVersion = "54.5.45";
 export { packageName, packageVersion, componentName, componentName as component };
 export function getFileAttributes(fileState) {
   if (!fileState) {

package/dist/es2019/analytics/ufoExperiences.js

@@ -3,7 +3,7 @@ import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 const packageName = "@atlaskit/media-viewer";
-const packageVersion = "54.5.44";
+const packageVersion = "54.5.45";
 let ufoExperience;
 const getExperience = () => {
   if (!ufoExperience) {

package/dist/es2019/viewers/video.js

@@ -10,6 +10,7 @@ import { BaseViewer } from './base-viewer';
 import { getObjectUrlFromFileState } from '../utils/getObjectUrlFromFileState';
 import { fg } from '@atlaskit/platform-feature-flags';
 const hdArtifact = 'video_1280.mp4';
+const sdArtifact = 'video_640.mp4';
 export class VideoViewer extends BaseViewer {
   constructor(...args) {
     super(...args);
@@ -113,7 +114,18 @@ export class VideoViewer extends BaseViewer {
     try {
       let contentUrl;
       if (item.status === 'processed') {
-        contentUrl = await mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+        if (fg('platform_media_video_sd_fallback')) {
+          // Prefer the HD artifact, but fall back to the SD artifact when the media
+          // processing pipeline did not produce an HD (video_1280.mp4) rendition — this
+          // commonly happens for small / low-resolution sources that only get an SD
+          // (video_640.mp4) rendition. Previously the viewer required the HD artifact and
+          // threw `videoviewer-missing-artefact` synchronously, surfacing a generic
+          // "Something went wrong" screen with no playback attempt for SD-only videos.
+          const preferredArtifact = getArtifactUrl(item.artifacts, hdArtifact) ? hdArtifact : sdArtifact;
+          contentUrl = await mediaClient.file.getArtifactURL(item.artifacts, preferredArtifact, collectionName);
+        } else {
+          contentUrl = await mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+        }
         if (!contentUrl) {
           throw new MediaViewerError(`videoviewer-missing-artefact`);
         }

package/dist/esm/analytics/index.js

@@ -1,7 +1,7 @@
 import { ANALYTICS_MEDIA_CHANNEL, sanitiseAnalyticsPayload } from '@atlaskit/media-common/analytics';
 var componentName = 'mediaViewer';
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "54.5.44";
+var packageVersion = "54.5.45";
 export { packageName, packageVersion, componentName, componentName as component };
 export function getFileAttributes(fileState) {
   if (!fileState) {

package/dist/esm/analytics/ufoExperiences.js

@@ -6,7 +6,7 @@ import { getMediaEnvironment, getMediaRegion } from '@atlaskit/media-client';
 import { getFeatureFlagKeysAllProducts } from '@atlaskit/media-common';
 import { fg } from '@atlaskit/platform-feature-flags';
 var packageName = "@atlaskit/media-viewer";
-var packageVersion = "54.5.44";
+var packageVersion = "54.5.45";
 var ufoExperience;
 var getExperience = function getExperience() {
   if (!ufoExperience) {

package/dist/esm/viewers/video.js

@@ -19,6 +19,7 @@ import { BaseViewer } from './base-viewer';
 import { getObjectUrlFromFileState } from '../utils/getObjectUrlFromFileState';
 import { fg } from '@atlaskit/platform-feature-flags';
 var hdArtifact = 'video_1280.mp4';
+var sdArtifact = 'video_640.mp4';
 export var VideoViewer = /*#__PURE__*/function (_BaseViewer) {
   function VideoViewer() {
     var _this;
@@ -125,58 +126,77 @@ export var VideoViewer = /*#__PURE__*/function (_BaseViewer) {
     key: "init",
     value: function () {
       var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _this$props4, mediaClient, item, collectionName, contentUrl, _t;
+        var _this$props4, mediaClient, item, collectionName, contentUrl, preferredArtifact, _t;
         return _regeneratorRuntime.wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _this$props4 = this.props, mediaClient = _this$props4.mediaClient, item = _this$props4.item, collectionName = _this$props4.collectionName;
               _context.prev = 1;
               if (!(item.status === 'processed')) {
-                _context.next = 4;
+                _context.next = 7;
                 break;
               }
+              if (!fg('platform_media_video_sd_fallback')) {
+                _context.next = 3;
+                break;
+              }
+              // Prefer the HD artifact, but fall back to the SD artifact when the media
+              // processing pipeline did not produce an HD (video_1280.mp4) rendition — this
+              // commonly happens for small / low-resolution sources that only get an SD
+              // (video_640.mp4) rendition. Previously the viewer required the HD artifact and
+              // threw `videoviewer-missing-artefact` synchronously, surfacing a generic
+              // "Something went wrong" screen with no playback attempt for SD-only videos.
+              preferredArtifact = getArtifactUrl(item.artifacts, hdArtifact) ? hdArtifact : sdArtifact;
               _context.next = 2;
-              return mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+              return mediaClient.file.getArtifactURL(item.artifacts, preferredArtifact, collectionName);
             case 2:
               contentUrl = _context.sent;
+              _context.next = 5;
+              break;
+            case 3:
+              _context.next = 4;
+              return mediaClient.file.getArtifactURL(item.artifacts, hdArtifact, collectionName);
+            case 4:
+              contentUrl = _context.sent;
+            case 5:
               if (contentUrl) {
-                _context.next = 3;
+                _context.next = 6;
                 break;
               }
               throw new MediaViewerError("videoviewer-missing-artefact");
-            case 3:
-              _context.next = 6;
+            case 6:
+              _context.next = 9;
               break;
-            case 4:
-              _context.next = 5;
+            case 7:
+              _context.next = 8;
               return getObjectUrlFromFileState(item);
-            case 5:
+            case 8:
               contentUrl = _context.sent;
               if (contentUrl) {
-                _context.next = 6;
+                _context.next = 9;
                 break;
               }
               this.setState({
                 content: Outcome.pending()
               });
               return _context.abrupt("return");
-            case 6:
+            case 9:
               this.setState({
                 content: Outcome.successful(contentUrl)
               });
-              _context.next = 8;
+              _context.next = 11;
               break;
-            case 7:
-              _context.prev = 7;
+            case 10:
+              _context.prev = 10;
               _t = _context["catch"](1);
               this.setState({
                 content: Outcome.failed(new MediaViewerError('videoviewer-fetch-url', _t instanceof Error ? _t : undefined))
               });
-            case 8:
+            case 11:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[1, 7]]);
+        }, _callee, this, [[1, 10]]);
       }));
       function init() {
         return _init.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-viewer",
-	"version": "54.5.45",
+	"version": "54.5.46",
 	"description": "MediaViewer is Atlassian's powerful solution for viewing files on the web. It's both powerful and extendable yet easy-to-integrate",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -141,6 +141,9 @@
 		"platform_media_archive_zip_guard": {
 			"type": "boolean"
 		},
+		"platform_media_video_sd_fallback": {
+			"type": "boolean"
+		},
 		"platform_media_unsupported_mime_routing": {
 			"type": "boolean"
 		}