@uploadcare/upload-client 4.3.0 → 5.0.0

package/dist/index.browser.js

@@ -27,11 +27,118 @@ const onCancel = (signal, callback) => {
     }
 };
 
+function isObject(o) {
+    return Object.prototype.toString.call(o) === '[object Object]';
+}
+
+const SEPARATOR = /\W|_/g;
+function camelizeString(text) {
+    return text
+        .split(SEPARATOR)
+        .map((word, index) => word.charAt(0)[index > 0 ? 'toUpperCase' : 'toLowerCase']() +
+        word.slice(1))
+        .join('');
+}
+function camelizeArrayItems(array, { ignoreKeys } = { ignoreKeys: [] }) {
+    if (!Array.isArray(array)) {
+        return array;
+    }
+    return array.map((item) => camelizeKeys(item, { ignoreKeys }));
+}
+function camelizeKeys(source, { ignoreKeys } = { ignoreKeys: [] }) {
+    if (Array.isArray(source)) {
+        return camelizeArrayItems(source, { ignoreKeys });
+    }
+    if (!isObject(source)) {
+        return source;
+    }
+    const result = {};
+    for (const key of Object.keys(source)) {
+        let value = source[key];
+        if (ignoreKeys.includes(key)) {
+            result[key] = value;
+            continue;
+        }
+        if (isObject(value)) {
+            value = camelizeKeys(value, { ignoreKeys });
+        }
+        else if (Array.isArray(value)) {
+            value = camelizeArrayItems(value, { ignoreKeys });
+        }
+        result[camelizeString(key)] = value;
+    }
+    return result;
+}
+
+/**
+ * setTimeout as Promise.
+ *
+ * @param {number} ms Timeout in milliseconds.
+ */
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
+function getUserAgent$1({ libraryName, libraryVersion, userAgent, publicKey = '', integration = '' }) {
+    const languageName = 'JavaScript';
+    if (typeof userAgent === 'string') {
+        return userAgent;
+    }
+    if (typeof userAgent === 'function') {
+        return userAgent({
+            publicKey,
+            libraryName,
+            libraryVersion,
+            languageName,
+            integration
+        });
+    }
+    const mainInfo = [libraryName, libraryVersion, publicKey]
+        .filter(Boolean)
+        .join('/');
+    const additionInfo = [languageName, integration].filter(Boolean).join('; ');
+    return `${mainInfo} (${additionInfo})`;
+}
+
+const defaultOptions = {
+    factor: 2,
+    time: 100
+};
+function retrier(fn, options = defaultOptions) {
+    let attempts = 0;
+    function runAttempt(fn) {
+        const defaultDelayTime = Math.round(options.time * options.factor ** attempts);
+        const retry = (ms) => delay(ms ?? defaultDelayTime).then(() => {
+            attempts += 1;
+            return runAttempt(fn);
+        });
+        return fn({
+            attempt: attempts,
+            retry
+        });
+    }
+    return runAttempt(fn);
+}
+
+class UploadcareNetworkError extends Error {
+    constructor(progressEvent) {
+        super();
+        this.name = 'UploadcareNetworkError';
+        this.message = 'Network error';
+        Object.setPrototypeOf(this, UploadcareNetworkError.prototype);
+        this.originalProgressEvent = progressEvent;
+    }
+}
+
 const request = ({ method, url, data, headers = {}, signal, onProgress }) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     const requestMethod = method?.toUpperCase() || 'GET';
     let aborted = false;
-    xhr.open(requestMethod, url);
+    /**
+     * Force synchronous flag to be off
+     * Some chrome versions gets `InvalidAccessError` error when we set `responseType`
+     * See https://xhr.spec.whatwg.org/#synchronous-flag
+     * and https://bugs.chromium.org/p/chromium/issues/detail?id=1346628
+     */
+    xhr.open(requestMethod, url, true);
     if (headers) {
         Object.entries(headers).forEach((entry) => {
             const [key, value] = entry;
@@ -86,11 +193,11 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
             });
         }
     };
-    xhr.onerror = () => {
+    xhr.onerror = (progressEvent) => {
         if (aborted)
             return;
         // only triggers if the request couldn't be made at all
-        reject(new Error('Network error'));
+        reject(new UploadcareNetworkError(progressEvent));
     };
     if (onProgress && typeof onProgress === 'function') {
         xhr.upload.onprogress = (event) => {
@@ -221,7 +328,7 @@ const buildSearchParams = (query) => {
 };
 const getUrl = (base, path, query) => {
     const url = new URL(base);
-    url.pathname = path;
+    url.pathname = (url.pathname + path).replace('//', '/');
     if (query) {
         url.search = buildSearchParams(query);
     }
@@ -237,109 +344,18 @@ const defaultSettings = {
     baseURL: 'https://upload.uploadcare.com',
     maxContentLength: 50 * 1024 * 1024,
     retryThrottledRequestMaxTimes: 1,
+    retryNetworkErrorMaxTimes: 3,
     multipartMinFileSize: 25 * 1024 * 1024,
     multipartChunkSize: 5 * 1024 * 1024,
     multipartMinLastPartSize: 1024 * 1024,
     maxConcurrentRequests: 4,
-    multipartMaxAttempts: 3,
     pollingTimeoutMilliseconds: 10000,
     pusherKey: '79ae88bd931ea68464d9'
 };
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '4.3.0';
-
-function isObject(o) {
-    return Object.prototype.toString.call(o) === '[object Object]';
-}
-
-const SEPARATOR = /\W|_/g;
-function camelizeString(text) {
-    return text
-        .split(SEPARATOR)
-        .map((word, index) => word.charAt(0)[index > 0 ? 'toUpperCase' : 'toLowerCase']() +
-        word.slice(1))
-        .join('');
-}
-function camelizeArrayItems(array, { ignoreKeys } = { ignoreKeys: [] }) {
-    if (!Array.isArray(array)) {
-        return array;
-    }
-    return array.map((item) => camelizeKeys(item, { ignoreKeys }));
-}
-function camelizeKeys(source, { ignoreKeys } = { ignoreKeys: [] }) {
-    if (Array.isArray(source)) {
-        return camelizeArrayItems(source, { ignoreKeys });
-    }
-    if (!isObject(source)) {
-        return source;
-    }
-    const result = {};
-    for (const key of Object.keys(source)) {
-        let value = source[key];
-        if (ignoreKeys.includes(key)) {
-            result[key] = value;
-            continue;
-        }
-        if (isObject(value)) {
-            value = camelizeKeys(value, { ignoreKeys });
-        }
-        else if (Array.isArray(value)) {
-            value = camelizeArrayItems(value, { ignoreKeys });
-        }
-        result[camelizeString(key)] = value;
-    }
-    return result;
-}
-
-/**
- * setTimeout as Promise.
- *
- * @param {number} ms Timeout in milliseconds.
- */
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
-function getUserAgent$1({ libraryName, libraryVersion, userAgent, publicKey = '', integration = '' }) {
-    const languageName = 'JavaScript';
-    if (typeof userAgent === 'string') {
-        return userAgent;
-    }
-    if (typeof userAgent === 'function') {
-        return userAgent({
-            publicKey,
-            libraryName,
-            libraryVersion,
-            languageName,
-            integration
-        });
-    }
-    const mainInfo = [libraryName, libraryVersion, publicKey]
-        .filter(Boolean)
-        .join('/');
-    const additionInfo = [languageName, integration].filter(Boolean).join('; ');
-    return `${mainInfo} (${additionInfo})`;
-}
-
-const defaultOptions = {
-    factor: 2,
-    time: 100
-};
-function retrier(fn, options = defaultOptions) {
-    let attempts = 0;
-    function runAttempt(fn) {
-        const defaultDelayTime = Math.round(options.time * options.factor ** attempts);
-        const retry = (ms) => delay(ms ?? defaultDelayTime).then(() => {
-            attempts += 1;
-            return runAttempt(fn);
-        });
-        return fn({
-            attempt: attempts,
-            retry
-        });
-    }
-    return runAttempt(fn);
-}
+var version = '5.0.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -352,20 +368,26 @@ function getUserAgent(options) {
 }
 
 const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
-const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
+const DEFAULT_THROTTLED_TIMEOUT = 15000;
+const DEFAULT_NETWORK_ERROR_TIMEOUT = 1000;
 function getTimeoutFromThrottledRequest(error) {
     const { headers } = error || {};
     return ((headers &&
         Number.parseInt(headers['x-throttle-wait-seconds']) * 1000) ||
-        DEFAULT_RETRY_AFTER_TIMEOUT);
+        DEFAULT_THROTTLED_TIMEOUT);
 }
-function retryIfThrottled(fn, retryThrottledMaxTimes) {
+function retryIfFailed(fn, options) {
+    const { retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes } = options;
     return retrier(({ attempt, retry }) => fn().catch((error) => {
         if ('response' in error &&
             error?.code === REQUEST_WAS_THROTTLED_CODE &&
-            attempt < retryThrottledMaxTimes) {
+            attempt < retryThrottledRequestMaxTimes) {
             return retry(getTimeoutFromThrottledRequest(error));
         }
+        if (error instanceof UploadcareNetworkError &&
+            attempt < retryNetworkErrorMaxTimes) {
+            return retry((attempt + 1) * DEFAULT_NETWORK_ERROR_TIMEOUT);
+        }
         throw error;
     }));
 }
@@ -378,8 +400,8 @@ function getStoreValue(store) {
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
-function base(file, { publicKey, fileName, contentType, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
-    return retryIfThrottled(() => request({
+function base(file, { publicKey, fileName, contentType, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes, metadata }) {
+    return retryIfFailed(() => request({
         method: 'POST',
         url: getUrl(baseURL, '/base/', {
             jsonerrors: 1
@@ -410,7 +432,7 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
 var TypeEnum;
@@ -421,8 +443,8 @@ var TypeEnum;
 /**
  * Uploading files from URL.
  */
-function fromUrl(sourceUrl, { publicKey, baseURL = defaultSettings.baseURL, store, fileName, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, source = 'url', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
-    return retryIfThrottled(() => request({
+function fromUrl(sourceUrl, { publicKey, baseURL = defaultSettings.baseURL, store, fileName, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, source = 'url', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes, metadata }) {
+    return retryIfFailed(() => request({
         method: 'POST',
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
@@ -449,7 +471,7 @@ function fromUrl(sourceUrl, { publicKey, baseURL = defaultSettings.baseURL, stor
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
 var Status;
@@ -466,8 +488,8 @@ const isErrorResponse = (response) => {
 /**
  * Checking upload status and working with file tokens.
  */
-function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes } = {}) {
-    return retryIfThrottled(() => request({
+function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes } = {}) {
+    return retryIfFailed(() => request({
         method: 'GET',
         headers: publicKey
             ? {
@@ -491,14 +513,14 @@ function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, si
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
 /**
  * Create files group.
  */
-function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallback, secureSignature, secureExpire, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
-    return retryIfThrottled(() => request({
+function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallback, secureSignature, secureExpire, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+    return retryIfFailed(() => request({
         method: 'POST',
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
@@ -521,14 +543,14 @@ function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallb
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryNetworkErrorMaxTimes, retryThrottledRequestMaxTimes });
 }
 
 /**
  * Get info about group.
  */
-function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
-    return retryIfThrottled(() => request({
+function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+    return retryIfFailed(() => request({
         method: 'GET',
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
@@ -548,14 +570,14 @@ function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, s
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes });
 }
 
 /**
  * Returns a JSON dictionary holding file info.
  */
-function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
-    return retryIfThrottled(() => request({
+function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+    return retryIfFailed(() => request({
         method: 'GET',
         headers: {
             'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
@@ -575,14 +597,14 @@ function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, sour
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes });
 }
 
 /**
  * Start multipart uploading.
  */
-function multipartStart(size, { publicKey, contentType, fileName, multipartChunkSize = defaultSettings.multipartChunkSize, baseURL = '', secureSignature, secureExpire, store, signal, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, metadata }) {
-    return retryIfThrottled(() => request({
+function multipartStart(size, { publicKey, contentType, fileName, multipartChunkSize = defaultSettings.multipartChunkSize, baseURL = '', secureSignature, secureExpire, store, signal, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes, metadata }) {
+    return retryIfFailed(() => request({
         method: 'POST',
         url: getUrl(baseURL, '/multipart/start/', { jsonerrors: 1 }),
         headers: {
@@ -611,14 +633,14 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
             response.parts = Object.keys(response.parts).map((key) => response.parts[key]);
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes });
 }
 
 /**
  * Complete multipart uploading.
  */
-function multipartUpload(part, url, { signal, onProgress }) {
-    return request({
+function multipartUpload(part, url, { signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+    return retryIfFailed(() => request({
         method: 'PUT',
         url,
         data: part,
@@ -635,14 +657,17 @@ function multipartUpload(part, url, { signal, onProgress }) {
             });
         return result;
     })
-        .then(({ status }) => ({ code: status }));
+        .then(({ status }) => ({ code: status })), {
+        retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes
+    });
 }
 
 /**
  * Complete multipart uploading.
  */
-function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL, source = 'local', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
-    return retryIfThrottled(() => request({
+function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL, source = 'local', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+    return retryIfFailed(() => request({
         method: 'POST',
         url: getUrl(baseURL, '/multipart/complete/', { jsonerrors: 1 }),
         headers: {
@@ -662,7 +687,7 @@ function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL,
         else {
             return response;
         }
-    }), retryThrottledRequestMaxTimes);
+    }), { retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes });
 }
 
 class UploadcareFile {
@@ -729,7 +754,7 @@ const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((re
     timeoutId = setTimeout(tick, 0);
 });
 
-function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, signal, onProgress }) {
+function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, signal, onProgress }) {
     return poll({
         check: (signal) => info(file, {
             publicKey,
@@ -738,7 +763,8 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
             source,
             integration,
             userAgent,
-            retryThrottledRequestMaxTimes
+            retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes
         }).then((response) => {
             if (response.isReady) {
                 return response;
@@ -750,7 +776,7 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent,
     });
 }
 
-const uploadDirect = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN, metadata }) => {
+const uploadDirect = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, baseCDN, metadata }) => {
     return base(file, {
         publicKey,
         fileName,
@@ -765,6 +791,7 @@ const uploadDirect = (file, { publicKey, fileName, baseURL, secureSignature, sec
         integration,
         userAgent,
         retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes,
         metadata
     })
         .then(({ file }) => {
@@ -776,6 +803,7 @@ const uploadDirect = (file, { publicKey, fileName, baseURL, secureSignature, sec
             integration,
             userAgent,
             retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes,
             onProgress,
             signal
         });
@@ -963,7 +991,7 @@ const preconnect = (key) => {
     getPusher(key).connect();
 };
 
-function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retryThrottledRequestMaxTimes, onProgress, signal }) {
+function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, onProgress, signal }) {
     return poll({
         check: (signal) => fromUrlStatus(token, {
             publicKey,
@@ -971,6 +999,7 @@ function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retry
             integration,
             userAgent,
             retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes,
             signal
         }).then((response) => {
             switch (response.status) {
@@ -1121,7 +1150,7 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
 }))
     .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 
-const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN }) => {
+const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, baseCDN }) => {
     return info(uuid, {
         publicKey,
         baseURL,
@@ -1129,7 +1158,8 @@ const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProg
         source,
         integration,
         userAgent,
-        retryThrottledRequestMaxTimes
+        retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes
     })
         .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN, fileName }))
         .then((result) => {
@@ -1201,18 +1231,15 @@ const runWithConcurrency = (concurrency, tasks) => {
     });
 };
 
-const uploadPartWithRetry = (chunk, url, { publicKey, onProgress, signal, integration, multipartMaxAttempts }) => retrier(({ attempt, retry }) => multipartUpload(chunk, url, {
+const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
     publicKey,
     onProgress,
     signal,
-    integration
-}).catch((error) => {
-    if (attempt < multipartMaxAttempts) {
-        return retry();
-    }
-    throw error;
-}));
-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, metadata }) => {
+    integration,
+    retryThrottledRequestMaxTimes,
+    retryNetworkErrorMaxTimes
+});
+const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, baseCDN, metadata }) => {
     const size = fileSize || getFileSize(file);
     let progressValues;
     const createProgressHandler = (totalChunks, chunkIdx) => {
@@ -1246,18 +1273,20 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
         integration,
         userAgent,
         retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes,
         metadata
     })
         .then(({ uuid, parts }) => {
         const getChunk = prepareChunks(file, size, multipartChunkSize);
         return Promise.all([
             uuid,
-            runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPartWithRetry(getChunk(index), url, {
+            runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPart(getChunk(index), url, {
                 publicKey,
                 onProgress: createProgressHandler(parts.length, index),
                 signal,
                 integration,
-                multipartMaxAttempts
+                retryThrottledRequestMaxTimes,
+                retryNetworkErrorMaxTimes
             })))
         ]);
     })
@@ -1267,7 +1296,8 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
         source,
         integration,
         userAgent,
-        retryThrottledRequestMaxTimes
+        retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes
     }))
         .then((fileInfo) => {
         if (fileInfo.isReady) {
@@ -1282,6 +1312,7 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
                 integration,
                 userAgent,
                 retryThrottledRequestMaxTimes,
+                retryNetworkErrorMaxTimes,
                 onProgress,
                 signal
             });
@@ -1293,7 +1324,7 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
 /**
  * Uploads file from provided data.
  */
-function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartMinFileSize, multipartChunkSize, multipartMaxAttempts, maxConcurrentRequests, baseCDN = defaultSettings.baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, pusherKey, metadata }) {
+function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartMinFileSize, multipartChunkSize, maxConcurrentRequests, baseCDN = defaultSettings.baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, pusherKey, metadata }) {
     if (isFileData(data)) {
         const fileSize = getFileSize(data);
         if (isMultipart(fileSize, multipartMinFileSize)) {
@@ -1301,7 +1332,6 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
                 publicKey,
                 contentType,
                 multipartChunkSize,
-                multipartMaxAttempts,
                 fileName,
                 baseURL,
                 secureSignature,
@@ -1314,6 +1344,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
                 userAgent,
                 maxConcurrentRequests,
                 retryThrottledRequestMaxTimes,
+                retryNetworkErrorMaxTimes,
                 baseCDN,
                 metadata
             });
@@ -1332,6 +1363,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             integration,
             userAgent,
             retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes,
             baseCDN,
             metadata
         });
@@ -1353,6 +1385,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             integration,
             userAgent,
             retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes,
             pusherKey,
             metadata
         });
@@ -1368,6 +1401,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             integration,
             userAgent,
             retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes,
             baseCDN
         });
     }
@@ -1423,7 +1457,7 @@ const isUrlArray = (data) => {
     return true;
 };
 
-function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, baseCDN = defaultSettings.baseCDN, jsonpCallback }) {
+function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, baseCDN = defaultSettings.baseCDN, jsonpCallback }) {
     if (!isFileDataArray(data) && !isUrlArray(data) && !isUuidArray(data)) {
         throw new TypeError(`Group uploading from "${data}" is not supported`);
     }
@@ -1460,6 +1494,7 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
         integration,
         userAgent,
         retryThrottledRequestMaxTimes,
+        retryNetworkErrorMaxTimes,
         contentType,
         multipartChunkSize,
         baseCDN
@@ -1475,7 +1510,8 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             source,
             integration,
             userAgent,
-            retryThrottledRequestMaxTimes
+            retryThrottledRequestMaxTimes,
+            retryNetworkErrorMaxTimes
         })
             .then((groupInfo) => new UploadcareGroup(groupInfo, files))
             .then((group) => {
@@ -1548,4 +1584,4 @@ class UploadClient {
     }
 }
 
-export { UploadClient, UploadClientError, UploadcareFile, UploadcareGroup, base, fromUrl, fromUrlStatus, getUserAgent$1 as getUserAgent, group, groupInfo, info, multipartComplete, multipartStart, multipartUpload, uploadDirect, uploadFile, uploadFileGroup, uploadFromUploaded, uploadFromUrl, uploadMultipart };
+export { UploadClient, UploadClientError, UploadcareFile, UploadcareGroup, UploadcareNetworkError, base, fromUrl, fromUrlStatus, getUserAgent$1 as getUserAgent, group, groupInfo, info, multipartComplete, multipartStart, multipartUpload, uploadDirect, uploadFile, uploadFileGroup, uploadFromUploaded, uploadFromUrl, uploadMultipart };