@atlaskit/media-client 25.1.0 → 26.1.0

package/dist/cjs/uploader/index.js

@@ -37,29 +37,26 @@ var hashingFunction = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var createProbingFunction = function createProbingFunction(store, deferredUploadId, collectionName, traceContext) {
+var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName, traceContext) {
   return /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(chunks) {
-      var response, results;
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(chunk) {
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.t0 = store;
-            _context2.t1 = hashedChunks(chunks);
-            _context2.next = 4;
+            _context2.t1 = chunk.hash;
+            _context2.t2 = chunk.blob;
+            _context2.next = 5;
             return deferredUploadId;
-          case 4:
-            _context2.t2 = _context2.sent;
-            _context2.t3 = collectionName;
-            _context2.t4 = traceContext;
-            _context2.next = 9;
-            return _context2.t0.probeChunks.call(_context2.t0, _context2.t1, _context2.t2, _context2.t3, _context2.t4);
-          case 9:
-            response = _context2.sent;
-            results = response.data.results;
-            return _context2.abrupt("return", Object.values(results).map(function (result) {
-              return result.exists;
-            }));
+          case 5:
+            _context2.t3 = _context2.sent;
+            _context2.t4 = chunk.partNumber;
+            _context2.t5 = collectionName;
+            _context2.t6 = traceContext;
+            _context2.next = 11;
+            return _context2.t0.uploadChunk.call(_context2.t0, _context2.t1, _context2.t2, _context2.t3, _context2.t4, _context2.t5, _context2.t6);
+          case 11:
+            return _context2.abrupt("return", _context2.sent);
           case 12:
           case "end":
             return _context2.stop();
@@ -71,75 +68,44 @@ var createProbingFunction = function createProbingFunction(store, deferredUpload
     };
   }();
 };
-var createUploadingFunction = function createUploadingFunction(store, deferredUploadId, collectionName, traceContext) {
+var createProcessingFunction = function createProcessingFunction(store, deferredUploadId, collection, traceContext) {
+  var offset = 0;
   return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunk) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(chunks) {
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.t0 = store;
-            _context3.t1 = chunk.hash;
-            _context3.t2 = chunk.blob;
-            _context3.next = 5;
-            return deferredUploadId;
-          case 5:
-            _context3.t3 = _context3.sent;
-            _context3.t4 = chunk.partNumber;
-            _context3.t5 = collectionName;
-            _context3.t6 = traceContext;
-            _context3.next = 11;
-            return _context3.t0.uploadChunk.call(_context3.t0, _context3.t1, _context3.t2, _context3.t3, _context3.t4, _context3.t5, _context3.t6);
-          case 11:
-            return _context3.abrupt("return", _context3.sent);
-          case 12:
-          case "end":
-            return _context3.stop();
-        }
-      }, _callee3);
-    }));
-    return function (_x3) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-};
-var createProcessingFunction = function createProcessingFunction(store, deferredUploadId, collection, traceContext) {
-  var offset = 0;
-  return /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(chunks) {
-      return _regenerator.default.wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
-          case 0:
-            _context4.t0 = store;
-            _context4.next = 3;
+            _context3.next = 3;
             return deferredUploadId;
           case 3:
-            _context4.t1 = _context4.sent;
-            _context4.t2 = {
+            _context3.t1 = _context3.sent;
+            _context3.t2 = {
               chunks: hashedChunks(chunks),
               offset: offset
             };
-            _context4.t3 = collection;
-            _context4.t4 = traceContext;
-            _context4.next = 9;
-            return _context4.t0.appendChunksToUpload.call(_context4.t0, _context4.t1, _context4.t2, _context4.t3, _context4.t4);
+            _context3.t3 = collection;
+            _context3.t4 = traceContext;
+            _context3.next = 9;
+            return _context3.t0.appendChunksToUpload.call(_context3.t0, _context3.t1, _context3.t2, _context3.t3, _context3.t4);
           case 9:
             offset += chunks.length;
           case 10:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4);
+      }, _callee3);
     }));
-    return function (_x4) {
-      return _ref4.apply(this, arguments);
+    return function (_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
 };
 var createFileFromUpload = /*#__PURE__*/function () {
-  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(file, store, uploadableFileUpfrontIds, uploadId, traceContext) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(file, store, uploadableFileUpfrontIds, uploadId, traceContext) {
     var collection, name, mimeType, id, occurrenceKey, body;
-    return _regenerator.default.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           collection = file.collection, name = file.name, mimeType = file.mimeType;
           id = uploadableFileUpfrontIds.id, occurrenceKey = uploadableFileUpfrontIds.occurrenceKey;
@@ -155,19 +121,19 @@ var createFileFromUpload = /*#__PURE__*/function () {
             name: name,
             mimeType: mimeType
           };
-          return _context5.abrupt("return", store.createFileFromUpload(body, {
+          return _context4.abrupt("return", store.createFileFromUpload(body, {
             occurrenceKey: occurrenceKey,
             collection: collection,
             replaceFileId: id
           }, traceContext));
         case 4:
         case "end":
-          return _context5.stop();
+          return _context4.stop();
       }
-    }, _callee5);
+    }, _callee4);
   }));
-  return function createFileFromUpload(_x5, _x6, _x7, _x8, _x9) {
-    return _ref5.apply(this, arguments);
+  return function createFileFromUpload(_x4, _x5, _x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
   };
 }();
 var uploadFile = exports.uploadFile = function uploadFile(file, store, uploadableFileUpfrontIds, callbacks, traceContext) {
@@ -197,11 +163,9 @@ var uploadFile = exports.uploadFile = function uploadFile(file, store, uploadabl
   var chunkinatorObservable = (0, _chunkinator.chunkinator)(content, {
     hashingFunction: hashingFunction,
     hashingConcurrency: 5,
-    probingBatchSize: 100,
     chunkSize: chunkSize,
     uploadingConcurrency: 3,
     uploadingFunction: createUploadingFunction(store, deferredUploadId, collection, traceContext),
-    probingFunction: createProbingFunction(store, deferredUploadId, collection, traceContext),
     processingBatchSize: _constants.PROCESSING_BATCH_SIZE,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection, traceContext)
   }, {

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

@@ -100,27 +100,6 @@ export class MediaStore {
     };
     await this.request(`/chunk/${etag}`, options);
   }
-  probeChunks(chunks, uploadId, collectionName, traceContext) {
-    const metadata = {
-      method: 'POST',
-      endpoint: '/chunk/probe'
-    };
-    const options = {
-      ...metadata,
-      params: {
-        uploadId
-      },
-      authContext: {
-        collectionName
-      },
-      headers: jsonHeaders,
-      body: JSON.stringify({
-        chunks
-      }),
-      traceContext
-    };
-    return this.request(`/chunk/probe`, options).then(createMapResponseToJson(metadata));
-  }
   createFileFromUpload(body, params = {}, traceContext) {
     const metadata = {
       method: 'POST',

package/dist/es2019/test-helpers/MockedMediaApi/MockedMediaApi.js

@@ -1,6 +1,6 @@
 import { getMediaFile, normaliseInput } from './helpers';
 const getMediaApi = ({
-  getFileItem
+  getItem
 }) => ({
   // --------------------------------------------------------
   // UPLOAD ENDPOINTS - None is supported
@@ -11,9 +11,6 @@ const getMediaApi = ({
   }) => {
     throw new Error('500 - MockedMediaApi.touchFiles: method not implemented');
   },
-  probeChunks: async (...args) => {
-    throw new Error('500 - MockedMediaApi.probeChunks: method not implemented');
-  },
   uploadChunk: async (_etag, _blob, uploadId) => {
     throw new Error('500 - MockedMediaApi.uploadChunk: method not implemented');
   },
@@ -40,7 +37,7 @@ const getMediaApi = ({
   // --------------------------------------------------------
 
   getFile: async fileId => {
-    const fileItem = getFileItem(fileId);
+    const fileItem = getItem(fileId);
     if (!fileItem) {
       throw new Error('404 - MockedMediaApi.getFile: file not found');
     }
@@ -49,7 +46,7 @@ const getMediaApi = ({
     };
   },
   getItems: async ids => {
-    const items = ids.map(id => getFileItem(id)).filter(fileState => !!fileState);
+    const items = ids.map(id => getItem(id)).filter(fileState => !!fileState);
     return {
       data: {
         items
@@ -73,7 +70,7 @@ const getMediaApi = ({
     throw new Error('500 - MockedMediaApi.getFileImageURLSync: method not implemented');
   },
   getFileBinaryURL: async id => {
-    const fileItem = getFileItem(id);
+    const fileItem = getItem(id);
     if (!fileItem) {
       throw new Error('404 - MockedMediaApi.getFileBinaryURL: file not found');
     }
@@ -95,7 +92,7 @@ const getMediaApi = ({
   // BINARY ENDPOINTS
   // --------------------------------------------------------
   getImage: async fileId => {
-    const fileItem = getFileItem(fileId);
+    const fileItem = getItem(fileId);
     if (!fileItem) {
       throw new Error('404 - MockedMediaApi.getImage: file not found');
     }
@@ -113,7 +110,7 @@ const getMediaApi = ({
   // TODO
   copyFileWithToken: async body => {
     const fileId = body.sourceFile.id;
-    const fileItem = getFileItem(fileId);
+    const fileItem = getItem(fileId);
     if (!fileItem) {
       throw new Error('404 - MockedMediaApi.copyFileWithToken: file not found');
     }
@@ -144,21 +141,21 @@ const getMediaApi = ({
  */
 export const createMockedMediaApi = initialFileItems => {
   const storedFileItems = new Map();
-  const getFileItem = fileId => storedFileItems.get(fileId);
-  const setFileItems = fileItems => {
+  const getItem = fileId => storedFileItems.get(fileId);
+  const setItems = fileItems => {
     const normalised = normaliseInput(fileItems);
     normalised.forEach(fileItem => storedFileItems.set(fileItem.id, fileItem));
   };
   if (initialFileItems) {
-    setFileItems(initialFileItems);
+    setItems(initialFileItems);
   }
   const mediaApi = getMediaApi({
-    setFileItems,
-    getFileItem
+    setItems,
+    getItem
   });
   return {
-    setFileItems,
-    getFileItem,
+    setItems,
+    getItem,
     mediaApi
   };
 };

package/dist/es2019/test-helpers/MockedMediaApi/helpers.js

@@ -138,7 +138,7 @@ export const createUploadingFileState = ({
     mimeType,
     createdAt
   }
-}, progress) => ({
+}, progress, binary) => ({
   status: 'uploading',
   progress,
   id,
@@ -148,7 +148,7 @@ export const createUploadingFileState = ({
   mimeType,
   createdAt,
   preview: {
-    value: new Blob(['some-content'], {
+    value: binary || new Blob(['some-content'], {
       type: mimeType
     })
   }

package/dist/es2019/uploader/index.js

@@ -12,11 +12,6 @@ const hashingFunction = async blob => {
   const hasher = await createHasher();
   return hasher.hash(blob);
 };
-const createProbingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunks => {
-  const response = await store.probeChunks(hashedChunks(chunks), await deferredUploadId, collectionName, traceContext);
-  const results = response.data.results;
-  return Object.values(results).map(result => result.exists);
-};
 const createUploadingFunction = (store, deferredUploadId, collectionName, traceContext) => async chunk => {
   return await store.uploadChunk(chunk.hash, chunk.blob, await deferredUploadId, chunk.partNumber, collectionName, traceContext);
 };
@@ -89,11 +84,9 @@ export const uploadFile = (file, store, uploadableFileUpfrontIds, callbacks, tra
   const chunkinatorObservable = chunkinator(content, {
     hashingFunction,
     hashingConcurrency: 5,
-    probingBatchSize: 100,
     chunkSize,
     uploadingConcurrency: 3,
     uploadingFunction: createUploadingFunction(store, deferredUploadId, collection, traceContext),
-    probingFunction: createProbingFunction(store, deferredUploadId, collection, traceContext),
     processingBatchSize: PROCESSING_BATCH_SIZE,
     processingFunction: createProcessingFunction(store, deferredUploadId, collection, traceContext)
   }, {

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

@@ -147,28 +147,6 @@ export var MediaStore = /*#__PURE__*/function () {
       }
       return uploadChunk;
     }()
-  }, {
-    key: "probeChunks",
-    value: function probeChunks(chunks, uploadId, collectionName, traceContext) {
-      var metadata = {
-        method: 'POST',
-        endpoint: '/chunk/probe'
-      };
-      var options = _objectSpread(_objectSpread({}, metadata), {}, {
-        params: {
-          uploadId: uploadId
-        },
-        authContext: {
-          collectionName: collectionName
-        },
-        headers: jsonHeaders,
-        body: JSON.stringify({
-          chunks: chunks
-        }),
-        traceContext: traceContext
-      });
-      return this.request("/chunk/probe", options).then(createMapResponseToJson(metadata));
-    }
   }, {
     key: "createFileFromUpload",
     value: function createFileFromUpload(body) {