@uploadcare/upload-client 2.2.0 → 3.0.0

package/README.md

@@ -81,8 +81,8 @@ You can track uploading progress:
 
 ```javascript
 const fileUUID = 'edfdf045-34c0-4087-bbdd-e3834921f890'
-const onProgress = ({ value }) => {
-  console.log(value)
+const onProgress = ({ isComputable, value }) => {
+  console.log(isComputable, value)
 }
 
 client
@@ -90,6 +90,10 @@ client
   .then(file => console.log(file.uuid))
 ```
 
+Note that `isComputable` flag can be `false` is some cases of uploading from the URL.
+If we can't calculate the file size, progress info will look like `{ isComputable: false }` without a `value`.
+Successful uploading progress will be always `{ isComputable: true, value: 1 }`.
+
 You can cancel file uploading and track this event:
 
 ```javascript
@@ -183,7 +187,7 @@ Also, you can use low-level wrappers to call the API endpoints directly:
 ```javascript
 import { base, AbortController } from '@uploadcare/upload-client'
 
-const onProgress = ({ value }) => console.log(value)
+const onProgress = ({ isComputable, value }) => console.log(isComputable, value)
 const abortController = new AbortController()
 
 base(fileData, { onProgress, signal: abortController }) // fileData must be `Blob` or `File` or `Buffer`
@@ -303,7 +307,7 @@ of `API secret key` and `secureExpire`.
 
 Stands for the Unix time to which the signature is valid, e.g., `1454902434`.
 
-#### `integration: string | CustomUserAgentFn`
+#### `userAgent: string | CustomUserAgentFn`
 
 ```typescript
 type CustomUserAgentOptions = {
@@ -321,6 +325,11 @@ type CustomUserAgentFn = (options: CustomUserAgentOptions) => string
 
 Defaults to `UploadcareUploadClient/${version}/${publicKey} (JavaScript; ${integration})`
 
+#### `integration: string`
+
+Integration value passed to the `X-UC-User-Agent` header.
+May be overrided with the custom user agent string or function.
+
 #### `checkForUrlDuplicates: boolean`
 
 Runs the duplicate check and provides the immediate-download behavior.
@@ -446,6 +455,6 @@ request at [hello@uploadcare.com][uc-email-hello].
 [badge-release-url]: https://github.com/uploadcare/uploadcare-upload-client/releases
 [npm-img]: http://img.shields.io/npm/v/@uploadcare/upload-client.svg
 [npm-url]: https://www.npmjs.org/package/@uploadcare/upload-client
-[badge-build]: https://img.shields.io/github/workflow/status/uploadcare/uploadcare-upload-client/Ship%20js%20trigger
-[build-url]: https://github.com/uploadcare/uploadcare-upload-client/actions?query=workflow%3A%22Ship+js+trigger%22
+[badge-build]: https://github.com/uploadcare/uploadcare-upload-client/actions/workflows/checks.yml/badge.svg
+[build-url]: https://github.com/uploadcare/uploadcare-upload-client/actions/workflows/checks.yml
 [uc-docs-upload-api]: https://uploadcare.com/docs/api_reference/upload/?utm_source=github&utm_campaign=uploadcare-upload-client

package/dist/index.browser.cjs

@@ -152,7 +152,15 @@ var request = function (_a) {
         };
         if (onProgress && typeof onProgress === 'function') {
             xhr.upload.onprogress = function (event) {
-                onProgress({ value: event.loaded / event.total });
+                if (event.lengthComputable) {
+                    onProgress({
+                        isComputable: true,
+                        value: event.loaded / event.total
+                    });
+                }
+                else {
+                    onProgress({ isComputable: false });
+                }
             };
         }
         if (data) {
@@ -242,7 +250,7 @@ var defaultSettings = {
 var defaultContentType = 'application/octet-stream';
 var defaultFilename = 'original';
 
-var version = '2.2.0';
+var version = '3.0.0';
 
 /**
  * Returns User Agent based on version and settings.
@@ -627,13 +635,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) {
@@ -756,7 +768,7 @@ function isReadyPoll(_a) {
                 if (response.isReady) {
                     return response;
                 }
-                onProgress && onProgress({ value: 1 });
+                onProgress && onProgress({ isComputable: true, value: 1 });
                 return false;
             });
         },
@@ -1018,13 +1030,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: {
@@ -1053,14 +1077,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;
                 }
@@ -1163,7 +1198,10 @@ var uploadFromUploaded = function (uuid, _a) {
         .then(function (result) {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     });
 };
@@ -1278,19 +1316,24 @@ 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 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, {
@@ -1495,6 +1538,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)
@@ -1505,10 +1549,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) {
@@ -1549,7 +1597,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;
+        });
     });
 }
 

package/dist/index.browser.js

@@ -94,7 +94,15 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
     };
     if (onProgress && typeof onProgress === 'function') {
         xhr.upload.onprogress = (event) => {
-            onProgress({ value: event.loaded / event.total });
+            if (event.lengthComputable) {
+                onProgress({
+                    isComputable: true,
+                    value: event.loaded / event.total
+                });
+            }
+            else {
+                onProgress({ isComputable: false });
+            }
         };
     }
     if (data) {
@@ -168,7 +176,7 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '2.2.0';
+var version = '3.0.0';
 
 /**
  * Returns User Agent based on version and settings.
@@ -515,13 +523,17 @@ function multipartUpload(part, url, { signal, onProgress }) {
         method: 'PUT',
         url,
         data: part,
-        onProgress,
+        // Upload request can't be non-computable because we always know exact size
+        onProgress: onProgress,
         signal
     })
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     })
         .then(({ status }) => ({ code: status }));
@@ -630,7 +642,7 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
             if (response.isReady) {
                 return response;
             }
-            onProgress && onProgress({ value: 1 });
+            onProgress && onProgress({ isComputable: true, value: 1 });
             return false;
         }),
         signal
@@ -880,13 +892,25 @@ function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retry
                     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: {
@@ -912,14 +936,25 @@ const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((
         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;
             }
@@ -1007,7 +1042,10 @@ const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProg
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     });
 };
@@ -1112,16 +1150,22 @@ const uploadPartWithRetry = (chunk, url, { publicKey, onProgress, signal, integr
 const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, multipartMaxAttempts = defaultSettings.multipartMaxAttempts, baseCDN }) => {
     const size = fileSize || getFileSize(file);
     let progressValues;
-    const createProgressHandler = (size, index) => {
+    const createProgressHandler = (totalChunks, chunkIdx) => {
         if (!onProgress)
             return;
         if (!progressValues) {
-            progressValues = Array(size).fill(0);
+            progressValues = Array(totalChunks).fill(0);
         }
         const sum = (values) => values.reduce((sum, next) => sum + next, 0);
-        return ({ value }) => {
-            progressValues[index] = value;
-            onProgress({ value: sum(progressValues) / size });
+        return (info) => {
+            if (!info.isComputable) {
+                return;
+            }
+            progressValues[chunkIdx] = info.value;
+            onProgress({
+                isComputable: true,
+                value: sum(progressValues) / totalChunks
+            });
         };
     };
     return multipartStart(size, {
@@ -1314,6 +1358,7 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
         throw new TypeError(`Group uploading from "${data}" is not supported`);
     }
     let progressValues;
+    let isStillComputable = true;
     const filesCount = data.length;
     const createProgressHandler = (size, index) => {
         if (!onProgress)
@@ -1322,9 +1367,14 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             progressValues = Array(size).fill(0);
         }
         const normalize = (values) => values.reduce((sum, next) => sum + next) / size;
-        return ({ value }) => {
-            progressValues[index] = value;
-            onProgress({ value: normalize(progressValues) });
+        return (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((file, index) => uploadFile(file, {
@@ -1363,7 +1413,12 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             integration,
             userAgent,
             retryThrottledRequestMaxTimes
-        }).then((groupInfo) => new UploadcareGroup(groupInfo, filesInGroup));
+        })
+            .then((groupInfo) => new UploadcareGroup(groupInfo, filesInGroup))
+            .then((group) => {
+            onProgress && onProgress({ isComputable: true, value: 1 });
+            return group;
+        });
     });
 }
 

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;
@@ -286,7 +289,7 @@ var defaultSettings = {
 var defaultContentType = 'application/octet-stream';
 var defaultFilename = 'original';
 
-var version = '2.2.0';
+var version = '3.0.0';
 
 /**
  * Returns User Agent based on version and settings.
@@ -671,13 +674,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) {
@@ -800,7 +807,7 @@ function isReadyPoll(_a) {
                 if (response.isReady) {
                     return response;
                 }
-                onProgress && onProgress({ value: 1 });
+                onProgress && onProgress({ isComputable: true, value: 1 });
                 return false;
             });
         },
@@ -1052,13 +1059,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 +1106,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;
                 }
@@ -1197,7 +1227,10 @@ var uploadFromUploaded = function (uuid, _a) {
         .then(function (result) {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     });
 };
@@ -1312,19 +1345,24 @@ 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 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, {
@@ -1529,6 +1567,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 +1578,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 +1626,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;
+        });
     });
 }
 

package/dist/index.js

@@ -48,7 +48,10 @@ class ProgressEmitter extends Transform {
     }
     _transform(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);
     }
 }
@@ -200,7 +203,7 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '2.2.0';
+var version = '3.0.0';
 
 /**
  * Returns User Agent based on version and settings.
@@ -547,13 +550,17 @@ function multipartUpload(part, url, { signal, onProgress }) {
         method: 'PUT',
         url,
         data: part,
-        onProgress,
+        // Upload request can't be non-computable because we always know exact size
+        onProgress: onProgress,
         signal
     })
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     })
         .then(({ status }) => ({ code: status }));
@@ -662,7 +669,7 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
             if (response.isReady) {
                 return response;
             }
-            onProgress && onProgress({ value: 1 });
+            onProgress && onProgress({ isComputable: true, value: 1 });
             return false;
         }),
         signal
@@ -902,13 +909,25 @@ function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retry
                     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: {
@@ -934,14 +953,25 @@ const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((
         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;
             }
@@ -1029,7 +1059,10 @@ const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProg
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
-            onProgress({ value: 1 });
+            onProgress({
+                isComputable: true,
+                value: 1
+            });
         return result;
     });
 };
@@ -1134,16 +1167,22 @@ const uploadPartWithRetry = (chunk, url, { publicKey, onProgress, signal, integr
 const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, multipartMaxAttempts = defaultSettings.multipartMaxAttempts, baseCDN }) => {
     const size = fileSize || getFileSize(file);
     let progressValues;
-    const createProgressHandler = (size, index) => {
+    const createProgressHandler = (totalChunks, chunkIdx) => {
         if (!onProgress)
             return;
         if (!progressValues) {
-            progressValues = Array(size).fill(0);
+            progressValues = Array(totalChunks).fill(0);
         }
         const sum = (values) => values.reduce((sum, next) => sum + next, 0);
-        return ({ value }) => {
-            progressValues[index] = value;
-            onProgress({ value: sum(progressValues) / size });
+        return (info) => {
+            if (!info.isComputable) {
+                return;
+            }
+            progressValues[chunkIdx] = info.value;
+            onProgress({
+                isComputable: true,
+                value: sum(progressValues) / totalChunks
+            });
         };
     };
     return multipartStart(size, {
@@ -1336,6 +1375,7 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
         throw new TypeError(`Group uploading from "${data}" is not supported`);
     }
     let progressValues;
+    let isStillComputable = true;
     const filesCount = data.length;
     const createProgressHandler = (size, index) => {
         if (!onProgress)
@@ -1344,9 +1384,14 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             progressValues = Array(size).fill(0);
         }
         const normalize = (values) => values.reduce((sum, next) => sum + next) / size;
-        return ({ value }) => {
-            progressValues[index] = value;
-            onProgress({ value: normalize(progressValues) });
+        return (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((file, index) => uploadFile(file, {
@@ -1385,7 +1430,12 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             integration,
             userAgent,
             retryThrottledRequestMaxTimes
-        }).then((groupInfo) => new UploadcareGroup(groupInfo, filesInGroup));
+        })
+            .then((groupInfo) => new UploadcareGroup(groupInfo, filesInGroup))
+            .then((group) => {
+            onProgress && onProgress({ isComputable: true, value: 1 });
+            return group;
+        });
     });
 }
 

package/dist/types.d.ts

@@ -70,9 +70,14 @@ export declare type Token = string;
 export declare type Uuid = string;
 export declare type GroupId = string;
 export declare type Url = string;
-export declare type ProgressCallback = (arg: {
+export declare type ComputableProgressInfo = {
+	isComputable: true;
 	value: number;
-}) => void;
+};
+export declare type UnknownProgressInfo = {
+	isComputable: false;
+};
+export declare type ProgressCallback<T = ComputableProgressInfo | UnknownProgressInfo> = (arg: T) => void;
 export interface DefaultSettings {
 	baseCDN: string;
 	baseURL: string;
@@ -185,7 +190,7 @@ export declare type StatusProgressResponse = {
 	status: Status.Progress;
 	size: number;
 	done: number;
-	total: number;
+	total: number | "unknown";
 };
 export declare type StatusErrorResponse = {
 	status: Status.Error;
@@ -262,7 +267,7 @@ declare function multipartStart(size: number, { publicKey, contentType, fileName
 export declare type MultipartUploadOptions = {
 	publicKey?: string;
 	signal?: AbortSignal;
-	onProgress?: ProgressCallback;
+	onProgress?: ProgressCallback<ComputableProgressInfo>;
 	integration?: string;
 	retryThrottledRequestMaxTimes?: number;
 };
@@ -345,7 +350,7 @@ export declare type MultipartOptions = {
 	secureExpire?: string;
 	store?: boolean;
 	signal?: AbortSignal;
-	onProgress?: ProgressCallback;
+	onProgress?: ProgressCallback<ComputableProgressInfo>;
 	source?: string;
 	integration?: string;
 	userAgent?: CustomUserAgent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "main": "dist/index.cjs",
@@ -14,13 +14,6 @@
     "./dist/index.cjs": "./dist/index.browser.cjs",
     "./dist/index.js": "./dist/index.browser.js"
   },
-  "exports": {
-    "./package.json": "./package.json",
-    ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
-    }
-  },
   "react-native": {
     "./lib/request/request.node.js": "./lib/request/request.browser.js",
     "./lib/tools/getFormData.node.js": "./lib/tools/getFormData.react-native.js",
@@ -29,7 +22,7 @@
   },
   "scripts": {
     "check-env-vars": "node ./checkvars.js",
-    "mock:start": "node --loader ts-node/esm.mjs ./mock-server/server.ts --silent",
+    "mock:start": "node --loader ts-node/esm ./mock-server/server.ts --silent",
     "clean": "rimraf dist",
     "lint": "eslint ./src ./mock-server --ext=ts",
     "test": "start-server-and-test mock:start :3000 test:jest",
@@ -98,7 +91,7 @@
     "shipjs": "0.24.0",
     "start-server-and-test": "1.11.7",
     "ts-jest": "26.4.1",
-    "ts-node": "9.1.1"
+    "ts-node": "10.5.0"
   },
   "dependencies": {
     "abort-controller": "^3.0.0",