@atlaskit/media-client 33.3.0 → 33.3.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/media-client
 
+## 33.3.1
+
+### Patch Changes
+
+- [#159106](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159106)
+  [`aee0b27cf6dd2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/aee0b27cf6dd2) -
+  Fixed getVideoDurations to correctly use the full URL for the artifacts
+
 ## 33.3.0
 
 ### Minor Changes

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

@@ -253,7 +253,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2.default)(this, "getDurationOfVideo", /*#__PURE__*/function () {
       var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(id, collectionName) {
-        var fileState, aritfactUrl, artifactPath, res, arrayBuffer, uint8Array, mvhdBytes, mvhdIndex, i, j, dataView, start, timeScale, duration, videoLength;
+        var fileState, artifactUrlString, artifactUrl, artifactPath, res, arrayBuffer, uint8Array, mvhdBytes, mvhdIndex, i, j, dataView, start, timeScale, duration, videoLength;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -270,86 +270,87 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               _context4.next = 7;
               return _this.getArtifactURL(fileState.artifacts, 'video.mp4');
             case 7:
-              aritfactUrl = _context4.sent;
-              artifactPath = new URL(aritfactUrl).pathname;
-              _context4.next = 11;
+              artifactUrlString = _context4.sent;
+              artifactUrl = new URL(artifactUrlString);
+              artifactPath = "".concat(artifactUrl.pathname).concat(artifactUrl.search);
+              _context4.next = 12;
               return _this.mediaApi.request(artifactPath, {
                 headers: {
                   Range: 'bytes=0-199'
                 }
               });
-            case 11:
+            case 12:
               res = _context4.sent;
-              _context4.next = 14;
+              _context4.next = 15;
               return res.arrayBuffer();
-            case 14:
+            case 15:
               arrayBuffer = _context4.sent;
               uint8Array = new Uint8Array(arrayBuffer);
               mvhdBytes = new Uint8Array([109, 118, 104, 100]); // "mvhd" in ASCII
               mvhdIndex = -1;
               i = 0;
-            case 19:
+            case 20:
               if (!(i <= uint8Array.length - mvhdBytes.length)) {
-                _context4.next = 34;
+                _context4.next = 35;
                 break;
               }
               mvhdIndex = i;
               j = 0;
-            case 22:
+            case 23:
               if (!(j < mvhdBytes.length)) {
-                _context4.next = 29;
+                _context4.next = 30;
                 break;
               }
               if (!(uint8Array[i + j] !== mvhdBytes[j])) {
-                _context4.next = 26;
+                _context4.next = 27;
                 break;
               }
               mvhdIndex = -1;
-              return _context4.abrupt("break", 29);
-            case 26:
+              return _context4.abrupt("break", 30);
+            case 27:
               j++;
-              _context4.next = 22;
+              _context4.next = 23;
               break;
-            case 29:
+            case 30:
               if (!(mvhdIndex !== -1)) {
-                _context4.next = 31;
+                _context4.next = 32;
                 break;
               }
-              return _context4.abrupt("break", 34);
-            case 31:
+              return _context4.abrupt("break", 35);
+            case 32:
               i++;
-              _context4.next = 19;
+              _context4.next = 20;
               break;
-            case 34:
+            case 35:
               if (!(mvhdIndex === -1)) {
-                _context4.next = 36;
+                _context4.next = 37;
                 break;
               }
               throw new Error('Unable to find mvhd bytes');
-            case 36:
+            case 37:
               // Create DataView for reading big-endian integers
               dataView = new DataView(arrayBuffer);
               start = mvhdIndex + 16; // Skip atom header and version/flags
               // Check if we have enough bytes to read timescale and duration
               if (!(start + 8 > arrayBuffer.byteLength)) {
-                _context4.next = 40;
+                _context4.next = 41;
                 break;
               }
               return _context4.abrupt("return", 0);
-            case 40:
+            case 41:
               // flase as second parameter indicates big-endian 32-bit integers
               timeScale = dataView.getUint32(start, false);
               duration = dataView.getUint32(start + 4, false);
               if (!(timeScale === 0)) {
-                _context4.next = 44;
+                _context4.next = 45;
                 break;
               }
               throw new Error('Timescale is invalid');
-            case 44:
+            case 45:
               // get the video length in seconds
               videoLength = Math.floor(duration / timeScale);
               return _context4.abrupt("return", videoLength);
-            case 46:
+            case 47:
             case "end":
               return _context4.stop();
           }

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

@@ -462,8 +462,6 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
     value: function () {
       var _getArtifactURL = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(artifacts, artifactName, collectionName) {
         var maxAge,
-          _artifacts$artifactNa,
-          cdnUrl,
           artifactUrl,
           auth,
           options,
@@ -472,29 +470,30 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               maxAge = _args9.length > 3 && _args9[3] !== undefined ? _args9[3] : _constants.FILE_CACHE_MAX_AGE;
-              if (!((0, _isCommercial.isCommercial)() && (0, _platformFeatureFlags.fg)('platform_media_cdn_delivery'))) {
-                _context9.next = 5;
-                break;
-              }
-              cdnUrl = (_artifacts$artifactNa = artifacts[artifactName]) === null || _artifacts$artifactNa === void 0 ? void 0 : _artifacts$artifactNa.cdnUrl;
-              if (!cdnUrl) {
-                _context9.next = 5;
-                break;
-              }
-              return _context9.abrupt("return", cdnUrl);
-            case 5:
+              // ----- WARNING ----------
+              // DO NOT USE!!!!!
+              // artifact.cdnUrl fails in Jira.
+              // ----------------------------------
+              // getArtifactURL returns a constructed url PATH, not the full Media/CDN Url.
+              // We use the provided cdnUrl from metadata first.
+              /* if (isCommercial() && fg('platform_media_cdn_delivery')) {
+              	const cdnUrl = artifacts[artifactName]?.cdnUrl;
+              	if (cdnUrl) {
+              		return cdnUrl;
+              	}
+              } */
               artifactUrl = (0, _artifacts.getArtifactUrl)(artifacts, artifactName);
               if (artifactUrl) {
-                _context9.next = 8;
+                _context9.next = 4;
                 break;
               }
               throw new Error("artifact ".concat(artifactName, " not found"));
-            case 8:
-              _context9.next = 10;
+            case 4:
+              _context9.next = 6;
               return this.resolveAuth({
                 collectionName: collectionName
               });
-            case 10:
+            case 6:
               auth = _context9.sent;
               options = {
                 params: {
@@ -504,7 +503,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 auth: auth
               };
               return _context9.abrupt("return", (0, _helpers.createUrl)((0, _mediaCdn.mapToMediaCdnUrl)(artifactUrl, auth.token), options));
-            case 13:
+            case 9:
             case "end":
               return _context9.stop();
           }

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

@@ -166,8 +166,9 @@ export class FileFetcherImpl {
       if (fileState.status !== 'processed' || fileState.mediaType !== 'video' || !fileState.artifacts['video.mp4']) {
         throw new Error('File is not a video');
       }
-      const aritfactUrl = await this.getArtifactURL(fileState.artifacts, 'video.mp4');
-      const artifactPath = new URL(aritfactUrl).pathname;
+      const artifactUrlString = await this.getArtifactURL(fileState.artifacts, 'video.mp4');
+      const artifactUrl = new URL(artifactUrlString);
+      const artifactPath = `${artifactUrl.pathname}${artifactUrl.search}`;
       const res = await this.mediaApi.request(artifactPath, {
         headers: {
           Range: 'bytes=0-199'

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

@@ -282,15 +282,19 @@ export class MediaStore {
     return mapToMediaCdnUrl(createUrl(`${auth.baseUrl}/file/${id}/${binaryEndpoint}`, options), auth.token);
   }
   async getArtifactURL(artifacts, artifactName, collectionName, maxAge = FILE_CACHE_MAX_AGE) {
+    // ----- WARNING ----------
+    // DO NOT USE!!!!!
+    // artifact.cdnUrl fails in Jira.
+    // ----------------------------------
     // getArtifactURL returns a constructed url PATH, not the full Media/CDN Url.
     // We use the provided cdnUrl from metadata first.
-    if (isCommercial() && fg('platform_media_cdn_delivery')) {
-      var _artifacts$artifactNa;
-      const cdnUrl = (_artifacts$artifactNa = artifacts[artifactName]) === null || _artifacts$artifactNa === void 0 ? void 0 : _artifacts$artifactNa.cdnUrl;
-      if (cdnUrl) {
-        return cdnUrl;
-      }
-    }
+    /* if (isCommercial() && fg('platform_media_cdn_delivery')) {
+    	const cdnUrl = artifacts[artifactName]?.cdnUrl;
+    	if (cdnUrl) {
+    		return cdnUrl;
+    	}
+    } */
+
     const artifactUrl = getArtifactUrl(artifacts, artifactName);
     if (!artifactUrl) {
       throw new Error(`artifact ${artifactName} not found`);

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

@@ -235,7 +235,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
     }());
     _defineProperty(this, "getDurationOfVideo", /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id, collectionName) {
-        var fileState, aritfactUrl, artifactPath, res, arrayBuffer, uint8Array, mvhdBytes, mvhdIndex, i, j, dataView, start, timeScale, duration, videoLength;
+        var fileState, artifactUrlString, artifactUrl, artifactPath, res, arrayBuffer, uint8Array, mvhdBytes, mvhdIndex, i, j, dataView, start, timeScale, duration, videoLength;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -252,86 +252,87 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               _context4.next = 7;
               return _this.getArtifactURL(fileState.artifacts, 'video.mp4');
             case 7:
-              aritfactUrl = _context4.sent;
-              artifactPath = new URL(aritfactUrl).pathname;
-              _context4.next = 11;
+              artifactUrlString = _context4.sent;
+              artifactUrl = new URL(artifactUrlString);
+              artifactPath = "".concat(artifactUrl.pathname).concat(artifactUrl.search);
+              _context4.next = 12;
               return _this.mediaApi.request(artifactPath, {
                 headers: {
                   Range: 'bytes=0-199'
                 }
               });
-            case 11:
+            case 12:
               res = _context4.sent;
-              _context4.next = 14;
+              _context4.next = 15;
               return res.arrayBuffer();
-            case 14:
+            case 15:
               arrayBuffer = _context4.sent;
               uint8Array = new Uint8Array(arrayBuffer);
               mvhdBytes = new Uint8Array([109, 118, 104, 100]); // "mvhd" in ASCII
               mvhdIndex = -1;
               i = 0;
-            case 19:
+            case 20:
               if (!(i <= uint8Array.length - mvhdBytes.length)) {
-                _context4.next = 34;
+                _context4.next = 35;
                 break;
               }
               mvhdIndex = i;
               j = 0;
-            case 22:
+            case 23:
               if (!(j < mvhdBytes.length)) {
-                _context4.next = 29;
+                _context4.next = 30;
                 break;
               }
               if (!(uint8Array[i + j] !== mvhdBytes[j])) {
-                _context4.next = 26;
+                _context4.next = 27;
                 break;
               }
               mvhdIndex = -1;
-              return _context4.abrupt("break", 29);
-            case 26:
+              return _context4.abrupt("break", 30);
+            case 27:
               j++;
-              _context4.next = 22;
+              _context4.next = 23;
               break;
-            case 29:
+            case 30:
               if (!(mvhdIndex !== -1)) {
-                _context4.next = 31;
+                _context4.next = 32;
                 break;
               }
-              return _context4.abrupt("break", 34);
-            case 31:
+              return _context4.abrupt("break", 35);
+            case 32:
               i++;
-              _context4.next = 19;
+              _context4.next = 20;
               break;
-            case 34:
+            case 35:
               if (!(mvhdIndex === -1)) {
-                _context4.next = 36;
+                _context4.next = 37;
                 break;
               }
               throw new Error('Unable to find mvhd bytes');
-            case 36:
+            case 37:
               // Create DataView for reading big-endian integers
               dataView = new DataView(arrayBuffer);
               start = mvhdIndex + 16; // Skip atom header and version/flags
               // Check if we have enough bytes to read timescale and duration
               if (!(start + 8 > arrayBuffer.byteLength)) {
-                _context4.next = 40;
+                _context4.next = 41;
                 break;
               }
               return _context4.abrupt("return", 0);
-            case 40:
+            case 41:
               // flase as second parameter indicates big-endian 32-bit integers
               timeScale = dataView.getUint32(start, false);
               duration = dataView.getUint32(start + 4, false);
               if (!(timeScale === 0)) {
-                _context4.next = 44;
+                _context4.next = 45;
                 break;
               }
               throw new Error('Timescale is invalid');
-            case 44:
+            case 45:
               // get the video length in seconds
               videoLength = Math.floor(duration / timeScale);
               return _context4.abrupt("return", videoLength);
-            case 46:
+            case 47:
             case "end":
               return _context4.stop();
           }

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

@@ -456,8 +456,6 @@ export var MediaStore = /*#__PURE__*/function () {
     value: function () {
       var _getArtifactURL = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(artifacts, artifactName, collectionName) {
         var maxAge,
-          _artifacts$artifactNa,
-          cdnUrl,
           artifactUrl,
           auth,
           options,
@@ -466,29 +464,30 @@ export var MediaStore = /*#__PURE__*/function () {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               maxAge = _args9.length > 3 && _args9[3] !== undefined ? _args9[3] : FILE_CACHE_MAX_AGE;
-              if (!(isCommercial() && fg('platform_media_cdn_delivery'))) {
-                _context9.next = 5;
-                break;
-              }
-              cdnUrl = (_artifacts$artifactNa = artifacts[artifactName]) === null || _artifacts$artifactNa === void 0 ? void 0 : _artifacts$artifactNa.cdnUrl;
-              if (!cdnUrl) {
-                _context9.next = 5;
-                break;
-              }
-              return _context9.abrupt("return", cdnUrl);
-            case 5:
+              // ----- WARNING ----------
+              // DO NOT USE!!!!!
+              // artifact.cdnUrl fails in Jira.
+              // ----------------------------------
+              // getArtifactURL returns a constructed url PATH, not the full Media/CDN Url.
+              // We use the provided cdnUrl from metadata first.
+              /* if (isCommercial() && fg('platform_media_cdn_delivery')) {
+              	const cdnUrl = artifacts[artifactName]?.cdnUrl;
+              	if (cdnUrl) {
+              		return cdnUrl;
+              	}
+              } */
               artifactUrl = getArtifactUrl(artifacts, artifactName);
               if (artifactUrl) {
-                _context9.next = 8;
+                _context9.next = 4;
                 break;
               }
               throw new Error("artifact ".concat(artifactName, " not found"));
-            case 8:
-              _context9.next = 10;
+            case 4:
+              _context9.next = 6;
               return this.resolveAuth({
                 collectionName: collectionName
               });
-            case 10:
+            case 6:
               auth = _context9.sent;
               options = {
                 params: {
@@ -498,7 +497,7 @@ export var MediaStore = /*#__PURE__*/function () {
                 auth: auth
               };
               return _context9.abrupt("return", createUrl(mapToMediaCdnUrl(artifactUrl, auth.token), options));
-            case 13:
+            case 9:
             case "end":
               return _context9.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "33.3.0",
+	"version": "33.3.1",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,7 +35,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/chunkinator": "^7.0.0",
-		"@atlaskit/media-common": "^12.0.0",
+		"@atlaskit/media-common": "^12.1.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/media-core": "^36.1.0",
 		"@atlaskit/media-state": "^1.6.0",
 		"@atlaskit/ssr": "workspace:^",
-		"@atlaskit/tokens": "^4.8.0",
+		"@atlaskit/tokens": "^4.9.0",
 		"@atlassian/feature-flags-test-utils": "^0.3.0",
 		"@emotion/react": "^11.7.1",
 		"@types/deep-equal": "^1.0.1",