@atlaskit/media-client 39.1.4 → 39.1.6

package/AGENTS.md

@@ -49,8 +49,8 @@ first, edit, then `kg.py edit <path> --message "<reason>"`.
 
 - Peer dependencies: `@atlaskit/media-core`, `@atlaskit/media-state`
 - Key internal dependencies: `@atlaskit/chunkinator`, `@atlaskit/media-common`
-- 8 feature flags registered (see `package.json` → `platform-feature-flags`)
+- 10 feature flags registered (see `package.json` → `platform-feature-flags`)
 - Notable flags: `platform_media_cdn_delivery`, `platform_media_cdn_single_host`,
-  `platform_media_auth_provider_analytics`
+  `platform_media_auth_provider_analytics`, `platform_media_unique_external_upload_name`
 - All new behaviour changes must be behind a feature gate (`fg()` from
   `@atlaskit/platform-feature-flags`)

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/media-client
 
+## 39.1.6
+
+### Patch Changes
+
+- Updated dependencies
+
+## 39.1.5
+
+### Patch Changes
+
+- [`0d4a7d7340b59`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0d4a7d7340b59) -
+  `uploadExternal` now derives a collision-resistant filename for external uploads, behind the
+  `platform_media_unique_external_upload_name` feature gate. Endpoint-style source URLs such as
+  `/binary` previously produced an identical filename for every image, so publishing collapsed the
+  copied page attachments into several versions of a single attachment. The generated name keeps the
+  source extension when the URL supplies one and otherwise derives it from the response MIME type.
+  Anonymised uploads are unchanged.
+
 ## 39.1.4
 
 ### Patch Changes

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

@@ -22,6 +22,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mime = require("mime");
 var _map = require("rxjs/operators/map");
 var _Subscription = require("rxjs/Subscription");
@@ -32,6 +33,7 @@ var _mediaTypeUtils = require("@atlaskit/media-common/mediaTypeUtils");
 var _authToOwner = require("@atlaskit/media-core/auth-to-owner");
 var _mediaStore = require("@atlaskit/media-state/media-store");
 var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _constants = require("../../constants");
 var _fileStreamsCache = require("../../file-streams-cache");
 var _globalMediaEventEmitter = require("../../globalMediaEventEmitter");
@@ -74,6 +76,36 @@ var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
 var isCopyDestinationWithToken = function isCopyDestinationWithToken(token) {
   return !!token.authProvider;
 };
+var EXTERNAL_UPLOAD_FALLBACK_STEM = 'image';
+// Only used to resolve relative urls so their path can be read; never requested.
+var EXTERNAL_UPLOAD_URL_BASE = 'https://media.invalid';
+
+// A leading dot names a file rather than an extension, so `.gitignore` splits to a stem.
+var splitExtension = function splitExtension(name) {
+  var index = name.lastIndexOf('.');
+  return index > 0 ? [name.slice(0, index), name.slice(index)] : [name, ''];
+};
+
+// Publishing copies media into page attachments keyed by filename, and same-named files collapse
+// into versions of a single attachment. External URLs are frequently endpoint-style (for example
+// `/binary`), so the stem is made unique before the upload reaches Media Services.
+var buildExternalUploadName = function buildExternalUploadName(url, anonymizeFilename) {
+  if (anonymizeFilename) {
+    return crypto.randomUUID();
+  }
+  if (!(0, _fg.fg)('platform_media_unique_external_upload_name')) {
+    return url.split('/').pop() || '';
+  }
+
+  // Reading the path drops any query string, which would otherwise be captured as part of the
+  // extension and suppress the MIME-derived fallback.
+  var urlName = new URL(url, EXTERNAL_UPLOAD_URL_BASE).pathname.split('/').pop() || '';
+  var _splitExtension = splitExtension(urlName),
+    _splitExtension2 = (0, _slicedToArray2.default)(_splitExtension, 2),
+    stem = _splitExtension2[0],
+    extension = _splitExtension2[1];
+  return "".concat(stem || EXTERNAL_UPLOAD_FALLBACK_STEM, "-").concat(crypto.randomUUID()).concat(extension);
+};
 var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
   function FileFetcherImpl(mediaApi) {
     var _this = this;
@@ -613,7 +645,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                   return _ref0.apply(this, arguments);
                 };
               }());
-              initialName = anonymizeFilename ? crypto.randomUUID() : url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
+              initialName = buildExternalUploadName(url, anonymizeFilename); // we create a initial fileState with the minimum info that we have at this point
               fileState = {
                 status: 'processing',
                 name: initialName,
@@ -630,7 +662,7 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
               this.setFileState(id, fileState);
               return _context0.abrupt("return", new Promise( /*#__PURE__*/function () {
                 var _ref1 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(resolve, reject) {
-                  var blob, type, size, extension, name, file, mediaType, dimensions, _t4;
+                  var blob, type, size, extensionAllowed, _splitExtension3, _splitExtension4, existingExtension, extension, name, file, mediaType, dimensions, _t4;
                   return _regenerator.default.wrap(function (_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
                       case 0:
@@ -645,7 +677,9 @@ var FileFetcherImpl = exports.FileFetcherImpl = /*#__PURE__*/function () {
                         return _context9.abrupt("return", reject('Could not download remote file'));
                       case 2:
                         type = blob.type, size = blob.size;
-                        extension = anonymizeFilename && (0, _isExperimentEnabled.isExperimentEnabled)('cc_maui_polish_changes_batch_8') ? (0, _mime.getExtension)(type) : undefined;
+                        extensionAllowed = anonymizeFilename ? (0, _isExperimentEnabled.isExperimentEnabled)('cc_maui_polish_changes_batch_8') : (0, _fg.fg)('platform_media_unique_external_upload_name');
+                        _splitExtension3 = splitExtension(initialName), _splitExtension4 = (0, _slicedToArray2.default)(_splitExtension3, 2), existingExtension = _splitExtension4[1];
+                        extension = extensionAllowed && !existingExtension ? (0, _mime.getExtension)(type) : undefined;
                         name = extension ? "".concat(initialName, ".").concat(extension) : initialName;
                         file = {
                           content: blob,

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

@@ -12,6 +12,7 @@ import { getMediaTypeFromMimeType } from '@atlaskit/media-common/mediaTypeUtils'
 import { authToOwner } from '@atlaskit/media-core/auth-to-owner';
 import { mediaStore } from '@atlaskit/media-state/media-store';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { RECENTS_COLLECTION } from '../../constants';
 import { getFileStreamsCache } from '../../file-streams-cache';
 import { globalMediaEventEmitter } from '../../globalMediaEventEmitter';
@@ -50,6 +51,33 @@ export { FileFetcherError } from './FileFetcherError';
 export { isFileFetcherError } from './isFileFetcherError';
 const isCopySourceFileWithToken = token => !!token.authProvider;
 const isCopyDestinationWithToken = token => !!token.authProvider;
+const EXTERNAL_UPLOAD_FALLBACK_STEM = 'image';
+// Only used to resolve relative urls so their path can be read; never requested.
+const EXTERNAL_UPLOAD_URL_BASE = 'https://media.invalid';
+
+// A leading dot names a file rather than an extension, so `.gitignore` splits to a stem.
+const splitExtension = name => {
+  const index = name.lastIndexOf('.');
+  return index > 0 ? [name.slice(0, index), name.slice(index)] : [name, ''];
+};
+
+// Publishing copies media into page attachments keyed by filename, and same-named files collapse
+// into versions of a single attachment. External URLs are frequently endpoint-style (for example
+// `/binary`), so the stem is made unique before the upload reaches Media Services.
+const buildExternalUploadName = (url, anonymizeFilename) => {
+  if (anonymizeFilename) {
+    return crypto.randomUUID();
+  }
+  if (!fg('platform_media_unique_external_upload_name')) {
+    return url.split('/').pop() || '';
+  }
+
+  // Reading the path drops any query string, which would otherwise be captured as part of the
+  // extension and suppress the MIME-derived fallback.
+  const urlName = new URL(url, EXTERNAL_UPLOAD_URL_BASE).pathname.split('/').pop() || '';
+  const [stem, extension] = splitExtension(urlName);
+  return `${stem || EXTERNAL_UPLOAD_FALLBACK_STEM}-${crypto.randomUUID()}${extension}`;
+};
 export class FileFetcherImpl {
   constructor(mediaApi, store = mediaStore) {
     _defineProperty(this, "getErrorFileState", (error, id, occurrenceKey) => {
@@ -386,7 +414,7 @@ export class FileFetcherImpl {
         origin: 'remote'
       });
     });
-    const initialName = anonymizeFilename ? crypto.randomUUID() : url.split('/').pop() || '';
+    const initialName = buildExternalUploadName(url, anonymizeFilename);
     // we create a initial fileState with the minimum info that we have at this point
     const fileState = {
       status: 'processing',
@@ -411,7 +439,9 @@ export class FileFetcherImpl {
         type,
         size
       } = blob;
-      const extension = anonymizeFilename && isExperimentEnabled('cc_maui_polish_changes_batch_8') ? getExtension(type) : undefined;
+      const extensionAllowed = anonymizeFilename ? isExperimentEnabled('cc_maui_polish_changes_batch_8') : fg('platform_media_unique_external_upload_name');
+      const [, existingExtension] = splitExtension(initialName);
+      const extension = extensionAllowed && !existingExtension ? getExtension(type) : undefined;
       const name = extension ? `${initialName}.${extension}` : initialName;
       const file = {
         content: blob,

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

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -18,6 +19,7 @@ import { getMediaTypeFromMimeType } from '@atlaskit/media-common/mediaTypeUtils'
 import { authToOwner } from '@atlaskit/media-core/auth-to-owner';
 import { mediaStore } from '@atlaskit/media-state/media-store';
 import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { RECENTS_COLLECTION } from '../../constants';
 import { getFileStreamsCache } from '../../file-streams-cache';
 import { globalMediaEventEmitter } from '../../globalMediaEventEmitter';
@@ -60,6 +62,36 @@ var isCopySourceFileWithToken = function isCopySourceFileWithToken(token) {
 var isCopyDestinationWithToken = function isCopyDestinationWithToken(token) {
   return !!token.authProvider;
 };
+var EXTERNAL_UPLOAD_FALLBACK_STEM = 'image';
+// Only used to resolve relative urls so their path can be read; never requested.
+var EXTERNAL_UPLOAD_URL_BASE = 'https://media.invalid';
+
+// A leading dot names a file rather than an extension, so `.gitignore` splits to a stem.
+var splitExtension = function splitExtension(name) {
+  var index = name.lastIndexOf('.');
+  return index > 0 ? [name.slice(0, index), name.slice(index)] : [name, ''];
+};
+
+// Publishing copies media into page attachments keyed by filename, and same-named files collapse
+// into versions of a single attachment. External URLs are frequently endpoint-style (for example
+// `/binary`), so the stem is made unique before the upload reaches Media Services.
+var buildExternalUploadName = function buildExternalUploadName(url, anonymizeFilename) {
+  if (anonymizeFilename) {
+    return crypto.randomUUID();
+  }
+  if (!fg('platform_media_unique_external_upload_name')) {
+    return url.split('/').pop() || '';
+  }
+
+  // Reading the path drops any query string, which would otherwise be captured as part of the
+  // extension and suppress the MIME-derived fallback.
+  var urlName = new URL(url, EXTERNAL_UPLOAD_URL_BASE).pathname.split('/').pop() || '';
+  var _splitExtension = splitExtension(urlName),
+    _splitExtension2 = _slicedToArray(_splitExtension, 2),
+    stem = _splitExtension2[0],
+    extension = _splitExtension2[1];
+  return "".concat(stem || EXTERNAL_UPLOAD_FALLBACK_STEM, "-").concat(crypto.randomUUID()).concat(extension);
+};
 export var FileFetcherImpl = /*#__PURE__*/function () {
   function FileFetcherImpl(mediaApi) {
     var _this = this;
@@ -599,7 +631,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                   return _ref0.apply(this, arguments);
                 };
               }());
-              initialName = anonymizeFilename ? crypto.randomUUID() : url.split('/').pop() || ''; // we create a initial fileState with the minimum info that we have at this point
+              initialName = buildExternalUploadName(url, anonymizeFilename); // we create a initial fileState with the minimum info that we have at this point
               fileState = {
                 status: 'processing',
                 name: initialName,
@@ -616,7 +648,7 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
               this.setFileState(id, fileState);
               return _context0.abrupt("return", new Promise( /*#__PURE__*/function () {
                 var _ref1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(resolve, reject) {
-                  var blob, type, size, extension, name, file, mediaType, dimensions, _t4;
+                  var blob, type, size, extensionAllowed, _splitExtension3, _splitExtension4, existingExtension, extension, name, file, mediaType, dimensions, _t4;
                   return _regeneratorRuntime.wrap(function (_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
                       case 0:
@@ -631,7 +663,9 @@ export var FileFetcherImpl = /*#__PURE__*/function () {
                         return _context9.abrupt("return", reject('Could not download remote file'));
                       case 2:
                         type = blob.type, size = blob.size;
-                        extension = anonymizeFilename && isExperimentEnabled('cc_maui_polish_changes_batch_8') ? getExtension(type) : undefined;
+                        extensionAllowed = anonymizeFilename ? isExperimentEnabled('cc_maui_polish_changes_batch_8') : fg('platform_media_unique_external_upload_name');
+                        _splitExtension3 = splitExtension(initialName), _splitExtension4 = _slicedToArray(_splitExtension3, 2), existingExtension = _splitExtension4[1];
+                        extension = extensionAllowed && !existingExtension ? getExtension(type) : undefined;
                         name = extension ? "".concat(initialName, ".").concat(extension) : initialName;
                         file = {
                           content: blob,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/media-client",
-	"version": "39.1.4",
+	"version": "39.1.6",
 	"description": "Media API Web Client Library",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -26,7 +26,7 @@
 		"@atlaskit/media-common": "^14.6.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.2.0",
-		"@atlaskit/tmp-editor-statsig": "^225.0.0",
+		"@atlaskit/tmp-editor-statsig": "^226.0.0",
 		"@babel/runtime": "^7.0.0",
 		"dataloader": "^2.1.0",
 		"deep-equal": "^1.0.1",
@@ -87,6 +87,9 @@
 		"platform_media_filereader_error_surfacing": {
 			"type": "boolean",
 			"referenceOnly": true
+		},
+		"platform_media_unique_external_upload_name": {
+			"type": "boolean"
 		}
 	}
 }