@uploadcare/upload-client 2.2.1-alpha.0 → 3.1.0

package/dist/index.cjs

@@ -112,7 +112,10 @@ var ProgressEmitter = /** @class */ (function (_super) {
     }
     ProgressEmitter.prototype._transform = function (chunk, encoding, callback) {
         this._position += chunk.length;
-        this._onprogress({ value: this._position / this.size });
+        this._onprogress({
+            isComputable: true,
+            value: this._position / this.size
+        });
         callback(null, chunk);
     };
     return ProgressEmitter;
@@ -215,28 +218,80 @@ function identity(obj) {
 var transformFile = identity;
 var getFormData = (function () { return new NodeFormData__default["default"](); });
 
-var isFileTuple = function (tuple) {
-    return tuple[0] === 'file';
+/**
+ * FileData type guard.
+ */
+var isFileData = function (data) {
+    return (data !== undefined &&
+        ((typeof Blob !== 'undefined' && data instanceof Blob) ||
+            (typeof File !== 'undefined' && data instanceof File) ||
+            (typeof Buffer !== 'undefined' && data instanceof Buffer)));
 };
-function buildFormData(body) {
-    var formData = getFormData();
-    var _loop_1 = function (tuple) {
-        if (Array.isArray(tuple[1])) {
-            // refactor this
-            tuple[1].forEach(function (val) { return val && formData.append(tuple[0] + '[]', "" + val); });
-        }
-        else if (isFileTuple(tuple)) {
-            var name_1 = tuple[2];
-            var file = transformFile(tuple[1]); // lgtm[js/superfluous-trailing-arguments]
-            formData.append(tuple[0], file, name_1);
-        }
-        else if (tuple[1] != null) {
-            formData.append(tuple[0], "" + tuple[1]);
+/**
+ * Uuid type guard.
+ */
+var isUuid = function (data) {
+    var UUID_REGEX = '[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}';
+    var regExp = new RegExp(UUID_REGEX);
+    return !isFileData(data) && regExp.test(data);
+};
+/**
+ * Url type guard.
+ *
+ * @param {NodeFile | BrowserFile | Url | Uuid} data
+ */
+var isUrl = function (data) {
+    var URL_REGEX = '^(?:\\w+:)?\\/\\/([^\\s\\.]+\\.\\S{2}|localhost[\\:?\\d]*)\\S*$';
+    var regExp = new RegExp(URL_REGEX);
+    return !isFileData(data) && regExp.test(data);
+};
+
+var isSimpleValue = function (value) {
+    return (typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'undefined');
+};
+var isObjectValue = function (value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+};
+var isFileValue = function (value) {
+    return !!value &&
+        typeof value === 'object' &&
+        'data' in value &&
+        isFileData(value.data);
+};
+function collectParams(params, inputKey, inputValue) {
+    if (isFileValue(inputValue)) {
+        var name_1 = inputValue.name;
+        var file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
+        params.push(name_1 ? [inputKey, file, name_1] : [inputKey, file]);
+    }
+    else if (isObjectValue(inputValue)) {
+        for (var _i = 0, _a = Object.entries(inputValue); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], value = _b[1];
+            if (typeof value !== 'undefined') {
+                params.push([inputKey + "[" + key + "]", String(value)]);
+            }
         }
-    };
-    for (var _i = 0, body_1 = body; _i < body_1.length; _i++) {
-        var tuple = body_1[_i];
-        _loop_1(tuple);
+    }
+    else if (isSimpleValue(inputValue) && inputValue) {
+        params.push([inputKey, inputValue.toString()]);
+    }
+}
+function getFormDataParams(options) {
+    var params = [];
+    for (var _i = 0, _a = Object.entries(options); _i < _a.length; _i++) {
+        var _b = _a[_i], key = _b[0], value = _b[1];
+        collectParams(params, key, value);
+    }
+    return params;
+}
+function buildFormData(options) {
+    var formData = getFormData();
+    var params = getFormDataParams(options);
+    for (var _i = 0, params_1 = params; _i < params_1.length; _i++) {
+        var param = params_1[_i];
+        formData.append.apply(formData, param);
     }
     return formData;
 }
@@ -244,13 +299,26 @@ function buildFormData(body) {
 var serializePair = function (key, value) {
     return typeof value !== 'undefined' ? key + "=" + encodeURIComponent(value) : null;
 };
+// TODO: generalize value transforming logic and use it here and inside `buildFormData`
 var createQuery = function (query) {
     return Object.entries(query)
         .reduce(function (params, _a) {
         var key = _a[0], value = _a[1];
-        return params.concat(Array.isArray(value)
-            ? value.map(function (value) { return serializePair(key + "[]", value); })
-            : serializePair(key, value));
+        var param;
+        if (typeof value === 'object' && !Array.isArray(value)) {
+            param = Object.entries(value)
+                .filter(function (entry) { return typeof entry[1] !== 'undefined'; })
+                .map(function (entry) {
+                return serializePair(key + "[" + entry[0] + "]", String(entry[1]));
+            });
+        }
+        else if (Array.isArray(value)) {
+            param = value.map(function (val) { return serializePair(key + "[]", val); });
+        }
+        else {
+            param = serializePair(key, value);
+        }
+        return params.concat(param);
     }, [])
         .filter(function (x) { return !!x; })
         .join('&');
@@ -286,7 +354,7 @@ var defaultSettings = {
 var defaultContentType = 'application/octet-stream';
 var defaultFilename = 'original';
 
-var version = '2.2.0';
+var version = '3.1.0';
 
 /**
  * Returns User Agent based on version and settings.
@@ -397,12 +465,16 @@ function retryIfThrottled(fn, retryThrottledMaxTimes) {
     });
 }
 
+function getStoreValue(store) {
+    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+}
+
 /**
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
 function base(file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
+    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, _c = _a.source, source = _c === void 0 ? 'local' : _c, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
     return retryIfThrottled(function () {
         var _a;
         return request({
@@ -413,17 +485,18 @@ function base(file, _a) {
             headers: {
                 'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
-            data: buildFormData([
-                ['file', file, (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename],
-                ['UPLOADCARE_PUB_KEY', publicKey],
-                [
-                    'UPLOADCARE_STORE',
-                    typeof store === 'undefined' ? 'auto' : store ? 1 : 0
-                ],
-                ['signature', secureSignature],
-                ['expire', secureExpire],
-                ['source', source]
-            ]),
+            data: buildFormData({
+                file: {
+                    data: file,
+                    name: (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename
+                },
+                UPLOADCARE_PUB_KEY: publicKey,
+                UPLOADCARE_STORE: getStoreValue(store),
+                signature: secureSignature,
+                expire: secureExpire,
+                source: source,
+                metadata: metadata
+            }),
             signal: signal,
             onProgress: onProgress
         }).then(function (_a) {
@@ -448,7 +521,7 @@ var TypeEnum;
  * Uploading files from URL.
  */
 function fromUrl(sourceUrl, _a) {
-    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, store = _a.store, fileName = _a.fileName, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, _c = _a.source, source = _c === void 0 ? 'url' : _c, signal = _a.signal, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
+    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, store = _a.store, fileName = _a.fileName, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, _c = _a.source, source = _c === void 0 ? 'url' : _c, signal = _a.signal, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d, metadata = _a.metadata;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
@@ -459,13 +532,14 @@ function fromUrl(sourceUrl, _a) {
                 jsonerrors: 1,
                 pub_key: publicKey,
                 source_url: sourceUrl,
-                store: typeof store === 'undefined' ? 'auto' : store ? 1 : undefined,
+                store: getStoreValue(store),
                 filename: fileName,
                 check_URL_duplicates: checkForUrlDuplicates ? 1 : undefined,
                 save_URL_duplicates: saveUrlForRecurrentUploads ? 1 : undefined,
                 signature: secureSignature,
                 expire: secureExpire,
-                source: source
+                source: source,
+                metadata: metadata
             }),
             signal: signal
         }).then(function (_a) {
@@ -627,7 +701,7 @@ function info(uuid, _a) {
  * Start multipart uploading.
  */
 function multipartStart(size, _a) {
-    var publicKey = _a.publicKey, contentType = _a.contentType, fileName = _a.fileName, _b = _a.multipartChunkSize, multipartChunkSize = _b === void 0 ? defaultSettings.multipartChunkSize : _b, _c = _a.baseURL, baseURL = _c === void 0 ? '' : _c, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, _d = _a.source, source = _d === void 0 ? 'local' : _d, integration = _a.integration, userAgent = _a.userAgent, _e = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _e === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _e;
+    var publicKey = _a.publicKey, contentType = _a.contentType, fileName = _a.fileName, _b = _a.multipartChunkSize, multipartChunkSize = _b === void 0 ? defaultSettings.multipartChunkSize : _b, _c = _a.baseURL, baseURL = _c === void 0 ? '' : _c, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, _d = _a.source, source = _d === void 0 ? 'local' : _d, integration = _a.integration, userAgent = _a.userAgent, _e = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _e === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _e, metadata = _a.metadata;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
@@ -635,17 +709,18 @@ function multipartStart(size, _a) {
             headers: {
                 'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
-            data: buildFormData([
-                ['filename', fileName !== null && fileName !== void 0 ? fileName : defaultFilename],
-                ['size', size],
-                ['content_type', contentType !== null && contentType !== void 0 ? contentType : defaultContentType],
-                ['part_size', multipartChunkSize],
-                ['UPLOADCARE_STORE', store ? '' : 'auto'],
-                ['UPLOADCARE_PUB_KEY', publicKey],
-                ['signature', secureSignature],
-                ['expire', secureExpire],
-                ['source', source]
-            ]),
+            data: buildFormData({
+                filename: fileName !== null && fileName !== void 0 ? fileName : defaultFilename,
+                size: size,
+                content_type: contentType !== null && contentType !== void 0 ? contentType : defaultContentType,
+                part_size: multipartChunkSize,
+                UPLOADCARE_STORE: getStoreValue(store),
+                UPLOADCARE_PUB_KEY: publicKey,
+                signature: secureSignature,
+                expire: secureExpire,
+                source: source,
+                metadata: metadata
+            }),
             signal: signal
         }).then(function (_a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
@@ -671,13 +746,17 @@ function multipartUpload(part, url, _a) {
         method: 'PUT',
         url: url,
         data: part,
+        // Upload request can't be non-computable because we always know exact size
         onProgress: onProgress,
         signal: signal
     })
         .then(function (result) {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     })
         .then(function (_a) {
@@ -698,11 +777,11 @@ function multipartComplete(uuid, _a) {
             headers: {
                 'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
-            data: buildFormData([
-                ['uuid', uuid],
-                ['UPLOADCARE_PUB_KEY', publicKey],
-                ['source', source]
-            ]),
+            data: buildFormData({
+                uuid: uuid,
+                UPLOADCARE_PUB_KEY: publicKey,
+                source: source
+            }),
             signal: signal
         }).then(function (_a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
@@ -731,6 +810,8 @@ var UploadcareFile = /** @class */ (function () {
         this.originalFilename = null;
         this.imageInfo = null;
         this.videoInfo = null;
+        this.contentInfo = null;
+        this.metadata = null;
         var uuid = fileInfo.uuid, s3Bucket = fileInfo.s3Bucket;
         var urlBase = s3Bucket
             ? "https://" + s3Bucket + ".s3.amazonaws.com/" + uuid + "/" + fileInfo.filename
@@ -750,6 +831,8 @@ var UploadcareFile = /** @class */ (function () {
         this.originalFilename = fileInfo.originalFilename;
         this.imageInfo = camelizeKeys(fileInfo.imageInfo);
         this.videoInfo = camelizeKeys(fileInfo.videoInfo);
+        this.contentInfo = camelizeKeys(fileInfo.contentInfo);
+        this.metadata = fileInfo.metadata || null;
     }
     return UploadcareFile;
 }());
@@ -800,7 +883,7 @@ function isReadyPoll(_a) {
                 if (response.isReady) {
                     return response;
                 }
-                onProgress && onProgress({ value: 1 });
+                onProgress && onProgress({ isComputable: true, value: 1 });
                 return false;
             });
         },
@@ -809,7 +892,7 @@ function isReadyPoll(_a) {
 }
 
 var uploadFromObject = function (file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN;
+    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN, metadata = _a.metadata;
     return base(file, {
         publicKey: publicKey,
         fileName: fileName,
@@ -822,7 +905,8 @@ var uploadFromObject = function (file, _a) {
         source: source,
         integration: integration,
         userAgent: userAgent,
-        retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
+        retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
+        metadata: metadata
     })
         .then(function (_a) {
         var file = _a.file;
@@ -1052,13 +1136,25 @@ function pollStrategy(_a) {
                         return new UploadClientError("Token \"" + token + "\" was not found.");
                     }
                     case Status.Progress: {
-                        if (onProgress)
-                            onProgress({ value: response.done / response.total });
+                        if (onProgress) {
+                            if (response.total === 'unknown') {
+                                onProgress({ isComputable: false });
+                            }
+                            else {
+                                onProgress({
+                                    isComputable: true,
+                                    value: response.done / response.total
+                                });
+                            }
+                        }
                         return false;
                     }
                     case Status.Success: {
                         if (onProgress)
-                            onProgress({ value: response.done / response.total });
+                            onProgress({
+                                isComputable: true,
+                                value: response.done / response.total
+                            });
                         return response;
                     }
                     default: {
@@ -1087,14 +1183,25 @@ var pushStrategy = function (_a) {
             switch (result.status) {
                 case Status.Progress: {
                     if (onProgress) {
-                        onProgress({ value: result.done / result.total });
+                        if (result.total === 'unknown') {
+                            onProgress({ isComputable: false });
+                        }
+                        else {
+                            onProgress({
+                                isComputable: true,
+                                value: result.done / result.total
+                            });
+                        }
                     }
                     break;
                 }
                 case Status.Success: {
                     destroy();
                     if (onProgress)
-                        onProgress({ value: result.done / result.total });
+                        onProgress({
+                            isComputable: true,
+                            value: result.done / result.total
+                        });
                     resolve(result);
                     break;
                 }
@@ -1107,7 +1214,7 @@ var pushStrategy = function (_a) {
     });
 };
 var uploadFromUrl = function (sourceUrl, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, baseCDN = _a.baseCDN, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, _b = _a.pusherKey, pusherKey = _b === void 0 ? defaultSettings.pusherKey : _b;
+    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, baseCDN = _a.baseCDN, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, _b = _a.pusherKey, pusherKey = _b === void 0 ? defaultSettings.pusherKey : _b, metadata = _a.metadata;
     return Promise.resolve(preconnect(pusherKey))
         .then(function () {
         return fromUrl(sourceUrl, {
@@ -1123,7 +1230,8 @@ var uploadFromUrl = function (sourceUrl, _a) {
             source: source,
             integration: integration,
             userAgent: userAgent,
-            retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
+            retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
+            metadata: metadata
         });
     })
         .catch(function (error) {
@@ -1197,39 +1305,14 @@ var uploadFromUploaded = function (uuid, _a) {
         .then(function (result) {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     });
 };
 
-/**
- * FileData type guard.
- */
-var isFileData = function (data) {
-    return (data !== undefined &&
-        ((typeof Blob !== 'undefined' && data instanceof Blob) ||
-            (typeof File !== 'undefined' && data instanceof File) ||
-            (typeof Buffer !== 'undefined' && data instanceof Buffer)));
-};
-/**
- * Uuid type guard.
- */
-var isUuid = function (data) {
-    var UUID_REGEX = '[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}';
-    var regExp = new RegExp(UUID_REGEX);
-    return !isFileData(data) && regExp.test(data);
-};
-/**
- * Url type guard.
- *
- * @param {NodeFile | BrowserFile | Url | Uuid} data
- */
-var isUrl = function (data) {
-    var URL_REGEX = '^(?:\\w+:)?\\/\\/([^\\s\\.]+\\.\\S{2}|localhost[\\:?\\d]*)\\S*$';
-    var regExp = new RegExp(URL_REGEX);
-    return !isFileData(data) && regExp.test(data);
-};
-
 /**
  * Get file size.
  */
@@ -1309,22 +1392,27 @@ var uploadPartWithRetry = function (chunk, url, _a) {
     });
 };
 var uploadMultipart = function (file, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, fileSize = _a.fileSize, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, _b = _a.multipartChunkSize, multipartChunkSize = _b === void 0 ? defaultSettings.multipartChunkSize : _b, _c = _a.maxConcurrentRequests, maxConcurrentRequests = _c === void 0 ? defaultSettings.maxConcurrentRequests : _c, _d = _a.multipartMaxAttempts, multipartMaxAttempts = _d === void 0 ? defaultSettings.multipartMaxAttempts : _d, baseCDN = _a.baseCDN;
+    var publicKey = _a.publicKey, fileName = _a.fileName, fileSize = _a.fileSize, baseURL = _a.baseURL, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, _b = _a.multipartChunkSize, multipartChunkSize = _b === void 0 ? defaultSettings.multipartChunkSize : _b, _c = _a.maxConcurrentRequests, maxConcurrentRequests = _c === void 0 ? defaultSettings.maxConcurrentRequests : _c, _d = _a.multipartMaxAttempts, multipartMaxAttempts = _d === void 0 ? defaultSettings.multipartMaxAttempts : _d, baseCDN = _a.baseCDN, metadata = _a.metadata;
     var size = fileSize || getFileSize(file);
     var progressValues;
-    var createProgressHandler = function (size, index) {
+    var createProgressHandler = function (totalChunks, chunkIdx) {
         if (!onProgress)
             return;
         if (!progressValues) {
-            progressValues = Array(size).fill(0);
+            progressValues = Array(totalChunks).fill(0);
         }
         var sum = function (values) {
             return values.reduce(function (sum, next) { return sum + next; }, 0);
         };
-        return function (_a) {
-            var value = _a.value;
-            progressValues[index] = value;
-            onProgress({ value: sum(progressValues) / size });
+        return function (info) {
+            if (!info.isComputable) {
+                return;
+            }
+            progressValues[chunkIdx] = info.value;
+            onProgress({
+                isComputable: true,
+                value: sum(progressValues) / totalChunks
+            });
         };
     };
     return multipartStart(size, {
@@ -1339,7 +1427,8 @@ var uploadMultipart = function (file, _a) {
         source: source,
         integration: integration,
         userAgent: userAgent,
-        retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
+        retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
+        metadata: metadata
     })
         .then(function (_a) {
         var uuid = _a.uuid, parts = _a.parts;
@@ -1393,10 +1482,10 @@ var uploadMultipart = function (file, _a) {
  * Uploads file from provided data.
  */
 function uploadFile(data, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, multipartChunkSize = _a.multipartChunkSize, multipartMaxAttempts = _a.multipartMaxAttempts, maxConcurrentRequests = _a.maxConcurrentRequests, _c = _a.baseCDN, baseCDN = _c === void 0 ? defaultSettings.baseCDN : _c, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, pusherKey = _a.pusherKey;
+    var publicKey = _a.publicKey, fileName = _a.fileName, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, store = _a.store, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, multipartMinFileSize = _a.multipartMinFileSize, multipartChunkSize = _a.multipartChunkSize, multipartMaxAttempts = _a.multipartMaxAttempts, maxConcurrentRequests = _a.maxConcurrentRequests, _c = _a.baseCDN, baseCDN = _c === void 0 ? defaultSettings.baseCDN : _c, checkForUrlDuplicates = _a.checkForUrlDuplicates, saveUrlForRecurrentUploads = _a.saveUrlForRecurrentUploads, pusherKey = _a.pusherKey, metadata = _a.metadata;
     if (isFileData(data)) {
         var fileSize = getFileSize(data);
-        if (isMultipart(fileSize)) {
+        if (isMultipart(fileSize, multipartMinFileSize)) {
             return uploadMultipart(data, {
                 publicKey: publicKey,
                 contentType: contentType,
@@ -1414,7 +1503,8 @@ function uploadFile(data, _a) {
                 userAgent: userAgent,
                 maxConcurrentRequests: maxConcurrentRequests,
                 retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
-                baseCDN: baseCDN
+                baseCDN: baseCDN,
+                metadata: metadata
             });
         }
         return uploadFromObject(data, {
@@ -1430,7 +1520,8 @@ function uploadFile(data, _a) {
             integration: integration,
             userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
-            baseCDN: baseCDN
+            baseCDN: baseCDN,
+            metadata: metadata
         });
     }
     if (isUrl(data)) {
@@ -1450,7 +1541,8 @@ function uploadFile(data, _a) {
             integration: integration,
             userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
-            pusherKey: pusherKey
+            pusherKey: pusherKey,
+            metadata: metadata
         });
     }
     if (isUuid(data)) {
@@ -1529,6 +1621,7 @@ function uploadFileGroup(data, _a) {
         throw new TypeError("Group uploading from \"" + data + "\" is not supported");
     }
     var progressValues;
+    var isStillComputable = true;
     var filesCount = data.length;
     var createProgressHandler = function (size, index) {
         if (!onProgress)
@@ -1539,10 +1632,14 @@ function uploadFileGroup(data, _a) {
         var normalize = function (values) {
             return values.reduce(function (sum, next) { return sum + next; }) / size;
         };
-        return function (_a) {
-            var value = _a.value;
-            progressValues[index] = value;
-            onProgress({ value: normalize(progressValues) });
+        return function (info) {
+            if (!info.isComputable || !isStillComputable) {
+                isStillComputable = false;
+                onProgress({ isComputable: false });
+                return;
+            }
+            progressValues[index] = info.value;
+            onProgress({ isComputable: true, value: normalize(progressValues) });
         };
     };
     return Promise.all(data.map(function (file, index) {
@@ -1583,7 +1680,12 @@ function uploadFileGroup(data, _a) {
             integration: integration,
             userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
-        }).then(function (groupInfo) { return new UploadcareGroup(groupInfo, filesInGroup); });
+        })
+            .then(function (groupInfo) { return new UploadcareGroup(groupInfo, filesInGroup); })
+            .then(function (group) {
+            onProgress && onProgress({ isComputable: true, value: 1 });
+            return group;
+        });
     });
 }