@atlaskit/media-client 26.1.1 → 26.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/media-client
 
+## 26.2.0
+
+### Minor Changes
+
+- [#70414](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70414) [`2125e318f970`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2125e318f970) - Adding the option to use SHA256 for file uploads to ensure Media is FedRAMP compliant. If not specified the system will default to SHA1 to preserve backwards compatibiilty.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 26.1.2
+
+### Patch Changes
+
+- [#71336](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/71336) [`9abd05a91e25`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9abd05a91e25) - Fixed image load performance issue where setting max age in getFileImageURL params to undefined would override the default
+
 ## 26.1.1
 
 ### Patch Changes

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

@@ -11,6 +11,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 _eventemitter = require("eventemitter2");
+var _mediaCore = require("@atlaskit/media-core");
 var _mediaStore = require("./media-store");
 var _fileFetcher = require("./file-fetcher");
 var _stargateClient = require("./stargate-client");
@@ -30,7 +31,8 @@ var MediaClient = exports.MediaClient = /*#__PURE__*/function () {
     this.store = store;
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new _mediaStore.MediaStore({
       authProvider: mediaClientConfig.authProvider,
-      initialAuth: mediaClientConfig.initialAuth
+      initialAuth: mediaClientConfig.initialAuth,
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? _mediaCore.ChunkHashAlgorithm.Sha256 : _mediaCore.ChunkHashAlgorithm.Sha1
     });
     this.config = mediaClientConfig;
     this.file = new _fileFetcher.FileFetcherImpl(this.mediaStore, this.store);

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

@@ -16,18 +16,19 @@ var _artifacts = require("../../models/artifacts");
 var _request3 = require("../../utils/request");
 var _helpers = require("../../utils/request/helpers");
 var _resolveAuth = require("./resolveAuth");
+var _mediaCore = require("@atlaskit/media-core");
 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 MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
-var defaultImageOptions = {
-  'max-age': _constants.FILE_CACHE_MAX_AGE,
-  allowAnimated: true,
-  mode: 'crop'
-};
 var extendImageParams = function extendImageParams(params) {
+  var _params$maxAge, _params$allowAnimated, _params$mode;
   var fetchMaxRes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return _objectSpread(_objectSpread(_objectSpread({}, defaultImageOptions), params), fetchMaxRes ? {
+  return _objectSpread(_objectSpread({}, params), {}, {
+    'max-age': (_params$maxAge = params === null || params === void 0 ? void 0 : params['max-age']) !== null && _params$maxAge !== void 0 ? _params$maxAge : _constants.FILE_CACHE_MAX_AGE,
+    allowAnimated: (_params$allowAnimated = params === null || params === void 0 ? void 0 : params.allowAnimated) !== null && _params$allowAnimated !== void 0 ? _params$allowAnimated : true,
+    mode: (_params$mode = params === null || params === void 0 ? void 0 : params.mode) !== null && _params$mode !== void 0 ? _params$mode : 'crop'
+  }, fetchMaxRes ? {
     width: _constants.MAX_RESOLUTION,
     height: _constants.MAX_RESOLUTION
   } : {});
@@ -47,6 +48,7 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
       return (0, _resolveAuth.resolveInitialAuth)(_this.config.initialAuth);
     });
     this.config = config;
+    this._chunkHashAlgorithm = config.chunkHashAlgorithm || _mediaCore.ChunkHashAlgorithm.Sha1;
   }
   (0, _createClass2.default)(MediaStore, [{
     key: "removeCollectionFile",
@@ -109,7 +111,8 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
           collectionName: collectionName
         },
         params: {
-          createUpTo: createUpTo
+          createUpTo: createUpTo,
+          hashAlgorithm: this._chunkHashAlgorithm
         },
         headers: {
           Accept: 'application/json'
@@ -212,7 +215,10 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
                 },
                 headers: jsonHeaders,
                 body: JSON.stringify(body),
-                traceContext: traceContext
+                traceContext: traceContext,
+                params: {
+                  hashAlgorithm: this._chunkHashAlgorithm
+                }
               });
               return _context3.abrupt("return", this.request('/upload/createWithFiles', options).then((0, _helpers.createMapResponseToJson)(metadata)));
             case 5:
@@ -586,6 +592,11 @@ var MediaStore = exports.MediaStore = /*#__PURE__*/function () {
       }
       return request;
     }()
+  }, {
+    key: "chunkHashAlgorithm",
+    get: function get() {
+      return this._chunkHashAlgorithm;
+    }
   }]);
   return MediaStore;
 }();

package/dist/cjs/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+Object.defineProperty(exports, "ChunkHashAlgorithm", {
+  enumerable: true,
+  get: function get() {
+    return _mediaCore.ChunkHashAlgorithm;
+  }
+});
 Object.defineProperty(exports, "FileFetcherError", {
   enumerable: true,
   get: function get() {
@@ -338,4 +344,5 @@ var _globalMediaEventEmitter = require("./globalMediaEventEmitter");
 var _url = require("./utils/url");
 var _mediaSubscribable = require("./utils/mediaSubscribable");
 var _constants = require("./constants");
-var _fileStreamsCache = require("./file-streams-cache");
+var _fileStreamsCache = require("./file-streams-cache");
+var _mediaCore = require("@atlaskit/media-core");

package/dist/cjs/uploader/index.js

@@ -16,14 +16,14 @@ var _constants = require("../constants");
 var _calculateChunkSize = require("./calculateChunkSize");
 // TODO: Allow to pass multiple files
 
-var hashingFunction = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(blob) {
+var _hashingFunction = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(blob, hashAlgorithm) {
     var hasher;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return (0, _hasherCreator.createHasher)();
+          return (0, _hasherCreator.createHasher)(hashAlgorithm);
         case 2:
           hasher = _context.sent;
           return _context.abrupt("return", hasher.hash(blob));
@@ -33,7 +33,7 @@ var hashingFunction = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function hashingFunction(_x) {
+  return function hashingFunction(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -63,7 +63,7 @@ var createUploadingFunction = function createUploadingFunction(store, deferredUp
         }
       }, _callee2);
     }));
-    return function (_x2) {
+    return function (_x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -96,7 +96,7 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
         }
       }, _callee3);
     }));
-    return function (_x3) {
+    return function (_x4) {
       return _ref3.apply(this, arguments);
     };
   }();
@@ -132,7 +132,7 @@ var createFileFromUpload = /*#__PURE__*/function () {
       }
     }, _callee4);
   }));
-  return function createFileFromUpload(_x4, _x5, _x6, _x7, _x8) {
+  return function createFileFromUpload(_x5, _x6, _x7, _x8, _x9) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -161,7 +161,9 @@ var uploadFile = exports.uploadFile = function uploadFile(file, store, uploadabl
     };
   }
   var chunkinatorObservable = (0, _chunkinator.chunkinator)(content, {
-    hashingFunction: hashingFunction,
+    hashingFunction: function hashingFunction(blob) {
+      return _hashingFunction(blob, store.chunkHashAlgorithm);
+    },
     hashingConcurrency: 5,
     chunkSize: chunkSize,
     uploadingConcurrency: 3,

package/dist/cjs/utils/hashing/hasherCreator.js

@@ -8,54 +8,75 @@ Object.defineProperty(exports, "__esModule", {
 exports.destroyHasher = exports.createHasher = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _mediaCore = require("@atlaskit/media-core");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var hasher = null;
+var sha256Hasher = null;
 var destroyHasher = exports.destroyHasher = function destroyHasher() {
   return hasher = null;
 };
 var createHasher = exports.createHasher = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var numWorkers, _yield$import, WorkerHasher, _yield$import2, SimpleHasher;
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(algorithm) {
+    var numWorkers, _yield$import, SimpleHasher, _yield$import2, WorkerHasher, _yield$import3, _SimpleHasher;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           numWorkers = 3;
-          if (hasher) {
-            _context.next = 17;
+          if (!(algorithm === _mediaCore.ChunkHashAlgorithm.Sha256)) {
+            _context.next = 11;
+            break;
+          }
+          if (sha256Hasher) {
+            _context.next = 8;
             break;
           }
-          _context.prev = 2;
           _context.next = 5;
           return Promise.resolve().then(function () {
-            return _interopRequireWildcard(require('./workerHasher'));
+            return _interopRequireWildcard(require('./sha256SimpleHasher'));
           });
         case 5:
           _yield$import = _context.sent;
-          WorkerHasher = _yield$import.WorkerHasher;
+          SimpleHasher = _yield$import.SimpleHasher;
+          sha256Hasher = new SimpleHasher();
+        case 8:
+          return _context.abrupt("return", sha256Hasher);
+        case 11:
+          if (hasher) {
+            _context.next = 27;
+            break;
+          }
+          _context.prev = 12;
+          _context.next = 15;
+          return Promise.resolve().then(function () {
+            return _interopRequireWildcard(require('./workerHasher'));
+          });
+        case 15:
+          _yield$import2 = _context.sent;
+          WorkerHasher = _yield$import2.WorkerHasher;
           hasher = new WorkerHasher(numWorkers);
-          _context.next = 17;
+          _context.next = 27;
           break;
-        case 10:
-          _context.prev = 10;
-          _context.t0 = _context["catch"](2);
-          _context.next = 14;
+        case 20:
+          _context.prev = 20;
+          _context.t0 = _context["catch"](12);
+          _context.next = 24;
           return Promise.resolve().then(function () {
             return _interopRequireWildcard(require('./simpleHasher'));
           });
-        case 14:
-          _yield$import2 = _context.sent;
-          SimpleHasher = _yield$import2.SimpleHasher;
-          hasher = new SimpleHasher();
-        case 17:
+        case 24:
+          _yield$import3 = _context.sent;
+          _SimpleHasher = _yield$import3.SimpleHasher;
+          hasher = new _SimpleHasher();
+        case 27:
           return _context.abrupt("return", hasher);
-        case 18:
+        case 28:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 10]]);
+    }, _callee, null, [[12, 20]]);
   }));
-  return function createHasher() {
+  return function createHasher(_x) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/cjs/utils/hashing/sha256SimpleHasher.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SimpleHasher = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _jsSha = require("js-sha256");
+var SimpleHasher = exports.SimpleHasher = /*#__PURE__*/function () {
+  function SimpleHasher() {
+    (0, _classCallCheck2.default)(this, SimpleHasher);
+  }
+  (0, _createClass2.default)(SimpleHasher, [{
+    key: "hash",
+    value: function hash(blob) {
+      return new Promise(function (resolve, reject) {
+        var reader = new FileReader();
+        reader.readAsArrayBuffer(blob);
+        reader.onload = function () {
+          var _reader$result;
+          resolve("sha256-".concat(_jsSha.sha256.create().update((_reader$result = reader.result) !== null && _reader$result !== void 0 ? _reader$result : '').hex()));
+        };
+        reader.onerror = reject;
+      });
+    }
+  }]);
+  return SimpleHasher;
+}();

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

@@ -1,4 +1,5 @@
 import { EventEmitter2 } from 'eventemitter2';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 import { MediaStore as MediaApi } from './media-store';
 import { FileFetcherImpl } from './file-fetcher';
 import { StargateClient } from './stargate-client';
@@ -13,7 +14,8 @@ export class MediaClient {
     this.store = store;
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
       authProvider: mediaClientConfig.authProvider,
-      initialAuth: mediaClientConfig.initialAuth
+      initialAuth: mediaClientConfig.initialAuth,
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
     });
     this.config = mediaClientConfig;
     this.file = new FileFetcherImpl(this.mediaStore, this.store);

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

@@ -5,17 +5,16 @@ import { getArtifactUrl } from '../../models/artifacts';
 import { request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 const MEDIA_API_REGION = 'media-api-region';
 const MEDIA_API_ENVIRONMENT = 'media-api-environment';
-const defaultImageOptions = {
-  'max-age': FILE_CACHE_MAX_AGE,
-  allowAnimated: true,
-  mode: 'crop'
-};
 const extendImageParams = (params, fetchMaxRes = false) => {
+  var _params$maxAge, _params$allowAnimated, _params$mode;
   return {
-    ...defaultImageOptions,
     ...params,
+    'max-age': (_params$maxAge = params === null || params === void 0 ? void 0 : params['max-age']) !== null && _params$maxAge !== void 0 ? _params$maxAge : FILE_CACHE_MAX_AGE,
+    allowAnimated: (_params$allowAnimated = params === null || params === void 0 ? void 0 : params.allowAnimated) !== null && _params$allowAnimated !== void 0 ? _params$allowAnimated : true,
+    mode: (_params$mode = params === null || params === void 0 ? void 0 : params.mode) !== null && _params$mode !== void 0 ? _params$mode : 'crop',
     ...(fetchMaxRes ? {
       width: MAX_RESOLUTION,
       height: MAX_RESOLUTION
@@ -31,6 +30,7 @@ export class MediaStore {
     _defineProperty(this, "resolveAuth", authContext => resolveAuth(this.config.authProvider, authContext));
     _defineProperty(this, "resolveInitialAuth", () => resolveInitialAuth(this.config.initialAuth));
     this.config = config;
+    this._chunkHashAlgorithm = config.chunkHashAlgorithm || ChunkHashAlgorithm.Sha1;
   }
   async removeCollectionFile(id, collectionName, occurrenceKey, traceContext) {
     const metadata = {
@@ -72,7 +72,8 @@ export class MediaStore {
         collectionName
       },
       params: {
-        createUpTo
+        createUpTo,
+        hashAlgorithm: this._chunkHashAlgorithm
       },
       headers: {
         Accept: 'application/json'
@@ -141,7 +142,10 @@ export class MediaStore {
       },
       headers: jsonHeaders,
       body: JSON.stringify(body),
-      traceContext
+      traceContext,
+      params: {
+        hashAlgorithm: this._chunkHashAlgorithm
+      }
     };
     return this.request('/upload/createWithFiles', options).then(createMapResponseToJson(metadata));
   }
@@ -343,6 +347,9 @@ export class MediaStore {
     setKeyValueInSessionStorage(MEDIA_API_ENVIRONMENT, response.headers.get('x-media-env'));
     return response;
   }
+  get chunkHashAlgorithm() {
+    return this._chunkHashAlgorithm;
+  }
 }
 const getValueFromSessionStorage = key => {
   return window && window.sessionStorage && window.sessionStorage.getItem(key) || undefined;

package/dist/es2019/index.js

@@ -21,4 +21,5 @@ export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString } from './utils/url';
 export { createMediaSubscribable, fromObservable } from './utils/mediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants';
-export { getFileStreamsCache } from './file-streams-cache';
+export { getFileStreamsCache } from './file-streams-cache';
+export { ChunkHashAlgorithm } from '@atlaskit/media-core';

package/dist/es2019/uploader/index.js

@@ -8,8 +8,8 @@ import { calculateChunkSize, fileSizeError } from './calculateChunkSize';
 
 // TODO: Allow to pass multiple files
 
-const hashingFunction = async blob => {
-  const hasher = await createHasher();
+const hashingFunction = async (blob, hashAlgorithm) => {
+  const hasher = await createHasher(hashAlgorithm);
   return hasher.hash(blob);
 };
 const createUploadingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunk => {
@@ -82,7 +82,7 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks, tra
     };
   }
   const chunkinatorObservable = chunkinator(content, {
-    hashingFunction,
+    hashingFunction: blob => hashingFunction(blob, store.chunkHashAlgorithm),
     hashingConcurrency: 5,
     chunkSize,
     uploadingConcurrency: 3,

package/dist/es2019/utils/hashing/hasherCreator.js

@@ -1,8 +1,19 @@
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 let hasher = null;
+let sha256Hasher = null;
 export const destroyHasher = () => hasher = null;
-export const createHasher = async () => {
+export const createHasher = async algorithm => {
   const numWorkers = 3;
-  if (!hasher) {
+  if (algorithm === ChunkHashAlgorithm.Sha256) {
+    if (!sha256Hasher) {
+      // TODO this needs to support worker sha256 hasher as well
+      const {
+        SimpleHasher
+      } = await import('./sha256SimpleHasher');
+      sha256Hasher = new SimpleHasher();
+    }
+    return sha256Hasher;
+  } else if (!hasher) {
     try {
       const {
         WorkerHasher

package/dist/es2019/utils/hashing/sha256SimpleHasher.js

@@ -0,0 +1,14 @@
+import { sha256 } from 'js-sha256';
+export class SimpleHasher {
+  hash(blob) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsArrayBuffer(blob);
+      reader.onload = () => {
+        var _reader$result;
+        resolve(`sha256-${sha256.create().update((_reader$result = reader.result) !== null && _reader$result !== void 0 ? _reader$result : '').hex()}`);
+      };
+      reader.onerror = reject;
+    });
+  }
+}

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

@@ -3,6 +3,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { EventEmitter2 } from 'eventemitter2';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 import { MediaStore as MediaApi } from './media-store';
 import { FileFetcherImpl } from './file-fetcher';
 import { StargateClient } from './stargate-client';
@@ -20,7 +21,8 @@ export var MediaClient = /*#__PURE__*/function () {
     this.store = store;
     this.mediaStore = mediaApi !== null && mediaApi !== void 0 ? mediaApi : new MediaApi({
       authProvider: mediaClientConfig.authProvider,
-      initialAuth: mediaClientConfig.initialAuth
+      initialAuth: mediaClientConfig.initialAuth,
+      chunkHashAlgorithm: mediaClientConfig.useSha256ForUploads ? ChunkHashAlgorithm.Sha256 : ChunkHashAlgorithm.Sha1
     });
     this.config = mediaClientConfig;
     this.file = new FileFetcherImpl(this.mediaStore, this.store);

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

@@ -11,16 +11,17 @@ import { getArtifactUrl } from '../../models/artifacts';
 import { request as _request } from '../../utils/request';
 import { createUrl, createMapResponseToJson, createMapResponseToBlob } from '../../utils/request/helpers';
 import { resolveAuth, resolveInitialAuth } from './resolveAuth';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 var MEDIA_API_REGION = 'media-api-region';
 var MEDIA_API_ENVIRONMENT = 'media-api-environment';
-var defaultImageOptions = {
-  'max-age': FILE_CACHE_MAX_AGE,
-  allowAnimated: true,
-  mode: 'crop'
-};
 var extendImageParams = function extendImageParams(params) {
+  var _params$maxAge, _params$allowAnimated, _params$mode;
   var fetchMaxRes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  return _objectSpread(_objectSpread(_objectSpread({}, defaultImageOptions), params), fetchMaxRes ? {
+  return _objectSpread(_objectSpread({}, params), {}, {
+    'max-age': (_params$maxAge = params === null || params === void 0 ? void 0 : params['max-age']) !== null && _params$maxAge !== void 0 ? _params$maxAge : FILE_CACHE_MAX_AGE,
+    allowAnimated: (_params$allowAnimated = params === null || params === void 0 ? void 0 : params.allowAnimated) !== null && _params$allowAnimated !== void 0 ? _params$allowAnimated : true,
+    mode: (_params$mode = params === null || params === void 0 ? void 0 : params.mode) !== null && _params$mode !== void 0 ? _params$mode : 'crop'
+  }, fetchMaxRes ? {
     width: MAX_RESOLUTION,
     height: MAX_RESOLUTION
   } : {});
@@ -40,6 +41,7 @@ export var MediaStore = /*#__PURE__*/function () {
       return resolveInitialAuth(_this.config.initialAuth);
     });
     this.config = config;
+    this._chunkHashAlgorithm = config.chunkHashAlgorithm || ChunkHashAlgorithm.Sha1;
   }
   _createClass(MediaStore, [{
     key: "removeCollectionFile",
@@ -102,7 +104,8 @@ export var MediaStore = /*#__PURE__*/function () {
           collectionName: collectionName
         },
         params: {
-          createUpTo: createUpTo
+          createUpTo: createUpTo,
+          hashAlgorithm: this._chunkHashAlgorithm
         },
         headers: {
           Accept: 'application/json'
@@ -205,7 +208,10 @@ export var MediaStore = /*#__PURE__*/function () {
                 },
                 headers: jsonHeaders,
                 body: JSON.stringify(body),
-                traceContext: traceContext
+                traceContext: traceContext,
+                params: {
+                  hashAlgorithm: this._chunkHashAlgorithm
+                }
               });
               return _context3.abrupt("return", this.request('/upload/createWithFiles', options).then(createMapResponseToJson(metadata)));
             case 5:
@@ -579,6 +585,11 @@ export var MediaStore = /*#__PURE__*/function () {
       }
       return request;
     }()
+  }, {
+    key: "chunkHashAlgorithm",
+    get: function get() {
+      return this._chunkHashAlgorithm;
+    }
   }]);
   return MediaStore;
 }();

package/dist/esm/index.js

@@ -21,4 +21,5 @@ export { globalMediaEventEmitter } from './globalMediaEventEmitter';
 export { isMediaBlobUrl, getAttrsFromUrl, addFileAttrsToUrl, objectToQueryString } from './utils/url';
 export { createMediaSubscribable, fromObservable } from './utils/mediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants';
-export { getFileStreamsCache } from './file-streams-cache';
+export { getFileStreamsCache } from './file-streams-cache';
+export { ChunkHashAlgorithm } from '@atlaskit/media-core';

package/dist/esm/uploader/index.js

@@ -10,14 +10,14 @@ import { calculateChunkSize, fileSizeError } from './calculateChunkSize';
 
 // TODO: Allow to pass multiple files
 
-var hashingFunction = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(blob) {
+var _hashingFunction = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(blob, hashAlgorithm) {
     var hasher;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return createHasher();
+          return createHasher(hashAlgorithm);
         case 2:
           hasher = _context.sent;
           return _context.abrupt("return", hasher.hash(blob));
@@ -27,7 +27,7 @@ var hashingFunction = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function hashingFunction(_x) {
+  return function hashingFunction(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -57,7 +57,7 @@ var createUploadingFunction = function createUploadingFunction(store, deferredUp
         }
       }, _callee2);
     }));
-    return function (_x2) {
+    return function (_x3) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -90,7 +90,7 @@ var createProcessingFunction = function createProcessingFunction(store, deferred
         }
       }, _callee3);
     }));
-    return function (_x3) {
+    return function (_x4) {
       return _ref3.apply(this, arguments);
     };
   }();
@@ -126,7 +126,7 @@ var createFileFromUpload = /*#__PURE__*/function () {
       }
     }, _callee4);
   }));
-  return function createFileFromUpload(_x4, _x5, _x6, _x7, _x8) {
+  return function createFileFromUpload(_x5, _x6, _x7, _x8, _x9) {
     return _ref4.apply(this, arguments);
   };
 }();
@@ -155,7 +155,9 @@ export var uploadFile = function uploadFile(file, store, uploadableFileUpfrontId
     };
   }
   var chunkinatorObservable = chunkinator(content, {
-    hashingFunction: hashingFunction,
+    hashingFunction: function hashingFunction(blob) {
+      return _hashingFunction(blob, store.chunkHashAlgorithm);
+    },
     hashingConcurrency: 5,
     chunkSize: chunkSize,
     uploadingConcurrency: 3,

package/dist/esm/utils/hashing/hasherCreator.js

@@ -1,47 +1,66 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 var hasher = null;
+var sha256Hasher = null;
 export var destroyHasher = function destroyHasher() {
   return hasher = null;
 };
 export var createHasher = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var numWorkers, _yield$import, WorkerHasher, _yield$import2, SimpleHasher;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(algorithm) {
+    var numWorkers, _yield$import, SimpleHasher, _yield$import2, WorkerHasher, _yield$import3, _SimpleHasher;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           numWorkers = 3;
-          if (hasher) {
-            _context.next = 17;
+          if (!(algorithm === ChunkHashAlgorithm.Sha256)) {
+            _context.next = 11;
+            break;
+          }
+          if (sha256Hasher) {
+            _context.next = 8;
             break;
           }
-          _context.prev = 2;
           _context.next = 5;
-          return import('./workerHasher');
+          return import('./sha256SimpleHasher');
         case 5:
           _yield$import = _context.sent;
-          WorkerHasher = _yield$import.WorkerHasher;
+          SimpleHasher = _yield$import.SimpleHasher;
+          sha256Hasher = new SimpleHasher();
+        case 8:
+          return _context.abrupt("return", sha256Hasher);
+        case 11:
+          if (hasher) {
+            _context.next = 27;
+            break;
+          }
+          _context.prev = 12;
+          _context.next = 15;
+          return import('./workerHasher');
+        case 15:
+          _yield$import2 = _context.sent;
+          WorkerHasher = _yield$import2.WorkerHasher;
           hasher = new WorkerHasher(numWorkers);
-          _context.next = 17;
+          _context.next = 27;
           break;
-        case 10:
-          _context.prev = 10;
-          _context.t0 = _context["catch"](2);
-          _context.next = 14;
+        case 20:
+          _context.prev = 20;
+          _context.t0 = _context["catch"](12);
+          _context.next = 24;
           return import('./simpleHasher');
-        case 14:
-          _yield$import2 = _context.sent;
-          SimpleHasher = _yield$import2.SimpleHasher;
-          hasher = new SimpleHasher();
-        case 17:
+        case 24:
+          _yield$import3 = _context.sent;
+          _SimpleHasher = _yield$import3.SimpleHasher;
+          hasher = new _SimpleHasher();
+        case 27:
           return _context.abrupt("return", hasher);
-        case 18:
+        case 28:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 10]]);
+    }, _callee, null, [[12, 20]]);
   }));
-  return function createHasher() {
+  return function createHasher(_x) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/utils/hashing/sha256SimpleHasher.js

@@ -0,0 +1,23 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import { sha256 } from 'js-sha256';
+export var SimpleHasher = /*#__PURE__*/function () {
+  function SimpleHasher() {
+    _classCallCheck(this, SimpleHasher);
+  }
+  _createClass(SimpleHasher, [{
+    key: "hash",
+    value: function hash(blob) {
+      return new Promise(function (resolve, reject) {
+        var reader = new FileReader();
+        reader.readAsArrayBuffer(blob);
+        reader.onload = function () {
+          var _reader$result;
+          resolve("sha256-".concat(sha256.create().update((_reader$result = reader.result) !== null && _reader$result !== void 0 ? _reader$result : '').hex()));
+        };
+        reader.onerror = reject;
+      });
+    }
+  }]);
+  return SimpleHasher;
+}();

package/dist/types/client/media-store/MediaStore.d.ts

@@ -3,8 +3,10 @@ import { MediaTraceContext } from '@atlaskit/media-common';
 import { MediaFileArtifacts } from '@atlaskit/media-state';
 import type { ItemsPayload, ImageMetadata, MediaStoreResponse, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, RejectedTouchFile, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, TouchedFiles, MediaApi } from './types';
 import { MediaFile, MediaUpload } from '../../models/media';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export declare class MediaStore implements MediaApi {
     private readonly config;
+    private readonly _chunkHashAlgorithm;
     constructor(config: MediaApiConfig);
     removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;
@@ -28,6 +30,7 @@ export declare class MediaStore implements MediaApi {
     request(path: string, options?: MediaStoreRequestOptions, controller?: AbortController): Promise<Response>;
     resolveAuth: (authContext?: AuthContext) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
+    get chunkHashAlgorithm(): ChunkHashAlgorithm;
 }
 export declare const getMediaEnvironment: () => string | undefined;
 export declare const getMediaRegion: () => string | undefined;

package/dist/types/client/media-store/types.d.ts

@@ -3,6 +3,7 @@ import { MediaTraceContext } from '@atlaskit/media-common';
 import { MediaFileArtifacts } from '@atlaskit/media-state';
 import { MediaItemDetails, MediaFile, MediaUpload } from '../../models/media';
 import { ClientOptions, RequestHeaders, RequestMethod, RequestParams, RequestMetadata } from '../../utils/request/types';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export interface ResponseFileItem {
     id: string;
     type: 'file';
@@ -35,6 +36,7 @@ export type MediaStoreRequestOptions = RequestMetadata & {
     readonly body?: any;
     readonly clientOptions?: ClientOptions;
     readonly traceContext?: MediaTraceContext;
+    readonly ChunkhashAlgorithm?: ChunkHashAlgorithm;
 };
 export type MediaStoreCreateFileFromUploadParams = {
     readonly collection?: string;
@@ -137,7 +139,7 @@ export interface EmptyFile {
 }
 export interface MediaApi {
     removeCollectionFile: (id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext) => Promise<void>;
-    createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<MediaUpload[]>>;
+    createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext, chunkChunkHashAlgorithm?: ChunkHashAlgorithm) => Promise<MediaStoreResponse<MediaUpload[]>>;
     uploadChunk: (etag: string, blob: Blob, uploadId: string, partNumber: number, collectionName?: string, traceContext?: MediaTraceContext) => Promise<void>;
     createFileFromUpload: (body: MediaStoreCreateFileFromUploadBody, params: MediaStoreCreateFileFromUploadParams, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<MediaFile>>;
     getRejectedResponseFromDescriptor: (descriptor: TouchFileDescriptor, limit: number) => RejectedTouchFile;

package/dist/types/index.d.ts

@@ -43,3 +43,4 @@ export { createMediaSubscribable, fromObservable, } from './utils/mediaSubscriba
 export type { MediaSubscribable, MediaSubscription, MediaObserver, } from './utils/mediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants';
 export { getFileStreamsCache } from './file-streams-cache';
+export { ChunkHashAlgorithm } from '@atlaskit/media-core';

package/dist/types/utils/hashing/hasherCreator.d.ts

@@ -1,3 +1,4 @@
 import { Hasher } from './hasher';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export declare const destroyHasher: () => null;
-export declare const createHasher: () => Promise<Hasher>;
+export declare const createHasher: (algorithm: ChunkHashAlgorithm) => Promise<Hasher>;

package/dist/types/utils/hashing/sha256SimpleHasher.d.ts

@@ -0,0 +1,4 @@
+import { Hasher } from './hasher';
+export declare class SimpleHasher implements Hasher {
+    hash(blob: Blob): Promise<string>;
+}

package/dist/types-ts4.5/client/media-store/MediaStore.d.ts

@@ -3,8 +3,10 @@ import { MediaTraceContext } from '@atlaskit/media-common';
 import { MediaFileArtifacts } from '@atlaskit/media-state';
 import type { ItemsPayload, ImageMetadata, MediaStoreResponse, MediaStoreTouchFileParams, TouchFileDescriptor, MediaStoreTouchFileBody, RejectedTouchFile, MediaStoreRequestOptions, MediaStoreCreateFileFromUploadParams, MediaStoreCreateFileFromUploadBody, MediaStoreGetFileParams, MediaStoreGetFileImageParams, MediaStoreCopyFileWithTokenBody, MediaStoreCopyFileWithTokenParams, AppendChunksToUploadRequestBody, TouchedFiles, MediaApi } from './types';
 import { MediaFile, MediaUpload } from '../../models/media';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export declare class MediaStore implements MediaApi {
     private readonly config;
+    private readonly _chunkHashAlgorithm;
     constructor(config: MediaApiConfig);
     removeCollectionFile(id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext): Promise<void>;
     createUpload(createUpTo?: number, collectionName?: string, traceContext?: MediaTraceContext): Promise<MediaStoreResponse<MediaUpload[]>>;
@@ -28,6 +30,7 @@ export declare class MediaStore implements MediaApi {
     request(path: string, options?: MediaStoreRequestOptions, controller?: AbortController): Promise<Response>;
     resolveAuth: (authContext?: AuthContext) => Promise<Auth>;
     resolveInitialAuth: () => Auth;
+    get chunkHashAlgorithm(): ChunkHashAlgorithm;
 }
 export declare const getMediaEnvironment: () => string | undefined;
 export declare const getMediaRegion: () => string | undefined;

package/dist/types-ts4.5/client/media-store/types.d.ts

@@ -3,6 +3,7 @@ import { MediaTraceContext } from '@atlaskit/media-common';
 import { MediaFileArtifacts } from '@atlaskit/media-state';
 import { MediaItemDetails, MediaFile, MediaUpload } from '../../models/media';
 import { ClientOptions, RequestHeaders, RequestMethod, RequestParams, RequestMetadata } from '../../utils/request/types';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export interface ResponseFileItem {
     id: string;
     type: 'file';
@@ -35,6 +36,7 @@ export type MediaStoreRequestOptions = RequestMetadata & {
     readonly body?: any;
     readonly clientOptions?: ClientOptions;
     readonly traceContext?: MediaTraceContext;
+    readonly ChunkhashAlgorithm?: ChunkHashAlgorithm;
 };
 export type MediaStoreCreateFileFromUploadParams = {
     readonly collection?: string;
@@ -137,7 +139,7 @@ export interface EmptyFile {
 }
 export interface MediaApi {
     removeCollectionFile: (id: string, collectionName: string, occurrenceKey?: string, traceContext?: MediaTraceContext) => Promise<void>;
-    createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<MediaUpload[]>>;
+    createUpload: (createUpTo: number, collectionName?: string, traceContext?: MediaTraceContext, chunkChunkHashAlgorithm?: ChunkHashAlgorithm) => Promise<MediaStoreResponse<MediaUpload[]>>;
     uploadChunk: (etag: string, blob: Blob, uploadId: string, partNumber: number, collectionName?: string, traceContext?: MediaTraceContext) => Promise<void>;
     createFileFromUpload: (body: MediaStoreCreateFileFromUploadBody, params: MediaStoreCreateFileFromUploadParams, traceContext?: MediaTraceContext) => Promise<MediaStoreResponse<MediaFile>>;
     getRejectedResponseFromDescriptor: (descriptor: TouchFileDescriptor, limit: number) => RejectedTouchFile;

package/dist/types-ts4.5/index.d.ts

@@ -43,3 +43,4 @@ export { createMediaSubscribable, fromObservable, } from './utils/mediaSubscriba
 export type { MediaSubscribable, MediaSubscription, MediaObserver, } from './utils/mediaSubscribable';
 export { RECENTS_COLLECTION, MAX_RESOLUTION } from './constants';
 export { getFileStreamsCache } from './file-streams-cache';
+export { ChunkHashAlgorithm } from '@atlaskit/media-core';

package/dist/types-ts4.5/utils/hashing/hasherCreator.d.ts

@@ -1,3 +1,4 @@
 import { Hasher } from './hasher';
+import { ChunkHashAlgorithm } from '@atlaskit/media-core';
 export declare const destroyHasher: () => null;
-export declare const createHasher: () => Promise<Hasher>;
+export declare const createHasher: (algorithm: ChunkHashAlgorithm) => Promise<Hasher>;

package/dist/types-ts4.5/utils/hashing/sha256SimpleHasher.d.ts

@@ -0,0 +1,4 @@
+import { Hasher } from './hasher';
+export declare class SimpleHasher implements Hasher {
+    hash(blob: Blob): Promise<string>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/media-client",
-  "version": "26.1.1",
+  "version": "26.2.0",
   "description": "Media API Web Client Library",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,12 +36,13 @@
     }
   },
   "dependencies": {
-    "@atlaskit/chunkinator": "^5.0.0",
+    "@atlaskit/chunkinator": "^6.0.0",
     "@atlaskit/media-common": "^11.0.0",
     "@babel/runtime": "^7.0.0",
     "dataloader": "^2.0.0",
     "deep-equal": "^1.0.1",
     "eventemitter2": "^4.1.0",
+    "js-sha256": "^0.10.1",
     "lru_map": "^0.4.1",
     "rusha": "^0.8.13",
     "rxjs": "^5.5.0",
@@ -55,10 +56,10 @@
     "@atlaskit/media-state": "^1.0.0"
   },
   "devDependencies": {
-    "@atlaskit/media-core": "^34.1.0",
+    "@atlaskit/media-core": "^34.2.0",
     "@atlaskit/media-state": "^1.0.0",
     "@atlaskit/ssr": "*",
-    "@atlaskit/tokens": "^1.35.0",
+    "@atlaskit/tokens": "^1.36.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
     "@emotion/react": "^11.7.1",
     "@types/deep-equal": "^1.0.1",