@uploadcare/upload-client 2.0.0-alpha.7 → 2.1.0

package/dist/index.browser.cjs

@@ -52,10 +52,11 @@ function __spreadArrays() {
 
 var UploadClientError = /** @class */ (function (_super) {
     __extends(UploadClientError, _super);
-    function UploadClientError(message, request, response, headers) {
+    function UploadClientError(message, code, request, response, headers) {
         var _this = _super.call(this) || this;
         _this.name = 'UploadClientError';
         _this.message = message;
+        _this.code = code;
         _this.request = request;
         _this.response = response;
         _this.headers = headers;
@@ -163,20 +164,27 @@ var request = function (_a) {
     });
 };
 
+function identity(obj) {
+    return obj;
+}
+
+var transformFile = identity;
 var getFormData = (function () { return new FormData(); });
 
+var isFileTuple = function (tuple) {
+    return tuple[0] === 'file';
+};
 function buildFormData(body) {
     var formData = getFormData();
-    var isTriple = function (tuple) {
-        return tuple[0] === 'file';
-    };
     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 (isTriple(tuple)) {
-            formData.append(tuple[0], tuple[1], tuple[2]);
+        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]);
@@ -234,16 +242,33 @@ var defaultSettings = {
 var defaultContentType = 'application/octet-stream';
 var defaultFilename = 'original';
 
-var version = '1.1.2';
+var version = '2.1.0';
 
 /**
  * Returns User Agent based on version and settings.
  */
 function getUserAgent(_a) {
-    var _b = _a === void 0 ? {} : _a, _c = _b.publicKey, publicKey = _c === void 0 ? '' : _c, _d = _b.integration, integration = _d === void 0 ? '' : _d;
-    var mainInfo = [version, publicKey].filter(Boolean).join('/');
-    var additionInfo = ['JavaScript', integration].filter(Boolean).join('; ');
-    return "UploadcareUploadClient/" + mainInfo + " (" + additionInfo + ")";
+    var _b = _a === void 0 ? {} : _a, userAgent = _b.userAgent, _c = _b.publicKey, publicKey = _c === void 0 ? '' : _c, _d = _b.integration, integration = _d === void 0 ? '' : _d;
+    var libraryName = 'UploadcareUploadClient';
+    var libraryVersion = version;
+    var languageName = 'JavaScript';
+    if (typeof userAgent === 'string') {
+        return userAgent;
+    }
+    if (typeof userAgent === 'function') {
+        return userAgent({
+            publicKey: publicKey,
+            libraryName: libraryName,
+            libraryVersion: libraryVersion,
+            languageName: languageName,
+            integration: integration
+        });
+    }
+    var mainInfo = [libraryName, libraryVersion, publicKey]
+        .filter(Boolean)
+        .join('/');
+    var additionInfo = [languageName, integration].filter(Boolean).join('; ');
+    return mainInfo + " (" + additionInfo + ")";
 }
 
 var SEPARATOR = /\W|_/g;
@@ -306,7 +331,7 @@ function retrier(fn, options) {
     return runAttempt(fn);
 }
 
-var REQUEST_WAS_THROTTLED_CODE = 429;
+var REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 var DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 function getTimeoutFromThrottledRequest(error) {
     var headers = (error || {}).headers;
@@ -318,9 +343,8 @@ function retryIfThrottled(fn, retryThrottledMaxTimes) {
     return retrier(function (_a) {
         var attempt = _a.attempt, retry = _a.retry;
         return fn().catch(function (error) {
-            var _a;
             if ('response' in error &&
-                ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.statusCode) === REQUEST_WAS_THROTTLED_CODE &&
+                (error === null || error === void 0 ? void 0 : error.code) === REQUEST_WAS_THROTTLED_CODE &&
                 attempt < retryThrottledMaxTimes) {
                 return retry(getTimeoutFromThrottledRequest(error));
             }
@@ -334,7 +358,7 @@ function retryIfThrottled(fn, retryThrottledMaxTimes) {
  * 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, _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;
     return retryIfThrottled(function () {
         var _a;
         return request({
@@ -343,7 +367,7 @@ function base(file, _a) {
                 jsonerrors: 1
             }),
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                '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],
@@ -362,7 +386,7 @@ function base(file, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -379,14 +403,13 @@ var TypeEnum;
 /**
  * Uploading files from URL.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key", "source_url", "check_URL_duplicates", "save_URL_duplicates"]}] */
 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, _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;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             url: getUrl(baseURL, '/from_url/', {
                 jsonerrors: 1,
@@ -405,7 +428,7 @@ function fromUrl(sourceUrl, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -429,12 +452,18 @@ var isErrorResponse = function (response) {
  * Checking upload status and working with file tokens.
  */
 function fromUrlStatus(token, _a) {
-    var _b = _a === void 0 ? {} : _a, publicKey = _b.publicKey, _c = _b.baseURL, baseURL = _c === void 0 ? defaultSettings.baseURL : _c, signal = _b.signal, integration = _b.integration, _d = _b.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
+    var _b = _a === void 0 ? {} : _a, publicKey = _b.publicKey, _c = _b.baseURL, baseURL = _c === void 0 ? defaultSettings.baseURL : _c, signal = _b.signal, integration = _b.integration, userAgent = _b.userAgent, _d = _b.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
     return retryIfThrottled(function () {
         return request({
             method: 'GET',
             headers: publicKey
-                ? { 'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration }) }
+                ? {
+                    'X-UC-User-Agent': getUserAgent({
+                        publicKey: publicKey,
+                        integration: integration,
+                        userAgent: userAgent
+                    })
+                }
                 : undefined,
             url: getUrl(baseURL, '/from_url/status/', {
                 jsonerrors: 1,
@@ -445,7 +474,7 @@ function fromUrlStatus(token, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response && !isErrorResponse(response)) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, undefined, request, response, headers);
             }
             else {
                 return response;
@@ -457,14 +486,13 @@ function fromUrlStatus(token, _a) {
 /**
  * Create files group.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key"]}] */
 function group(uuids, _a) {
-    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, jsonpCallback = _a.jsonpCallback, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, signal = _a.signal, source = _a.source, integration = _a.integration, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
+    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, jsonpCallback = _a.jsonpCallback, secureSignature = _a.secureSignature, secureExpire = _a.secureExpire, signal = _a.signal, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             url: getUrl(baseURL, '/group/', {
                 jsonerrors: 1,
@@ -480,7 +508,7 @@ function group(uuids, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -492,14 +520,13 @@ function group(uuids, _a) {
 /**
  * Get info about group.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key", "group_id"]}] */
 function groupInfo(id, _a) {
-    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, signal = _a.signal, source = _a.source, integration = _a.integration, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
+    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, signal = _a.signal, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
     return retryIfThrottled(function () {
         return request({
             method: 'GET',
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             url: getUrl(baseURL, '/group/info/', {
                 jsonerrors: 1,
@@ -512,7 +539,7 @@ function groupInfo(id, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -524,14 +551,13 @@ function groupInfo(id, _a) {
 /**
  * Returns a JSON dictionary holding file info.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key", "file_id"]}] */
 function info(uuid, _a) {
-    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, signal = _a.signal, source = _a.source, integration = _a.integration, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
+    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, signal = _a.signal, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, _c = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _c === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _c;
     return retryIfThrottled(function () {
         return request({
             method: 'GET',
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             url: getUrl(baseURL, '/info/', {
                 jsonerrors: 1,
@@ -544,7 +570,7 @@ function info(uuid, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -557,13 +583,13 @@ 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, _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;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
             url: getUrl(baseURL, '/multipart/start/', { jsonerrors: 1 }),
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             data: buildFormData([
                 ['filename', fileName !== null && fileName !== void 0 ? fileName : defaultFilename],
@@ -581,7 +607,7 @@ function multipartStart(size, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 // convert to array
@@ -596,15 +622,10 @@ function multipartStart(size, _a) {
  * Complete multipart uploading.
  */
 function multipartUpload(part, url, _a) {
-    var publicKey = _a.publicKey, signal = _a.signal, onProgress = _a.onProgress, integration = _a.integration;
+    var signal = _a.signal, onProgress = _a.onProgress;
     return request({
         method: 'PUT',
         url: url,
-        headers: {
-            'X-UC-User-Agent': publicKey
-                ? getUserAgent({ publicKey: publicKey, integration: integration })
-                : undefined
-        },
         data: part,
         onProgress: onProgress,
         signal: signal
@@ -625,13 +646,13 @@ function multipartUpload(part, url, _a) {
  * Complete multipart uploading.
  */
 function multipartComplete(uuid, _a) {
-    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, _c = _a.source, source = _c === void 0 ? 'local' : _c, signal = _a.signal, integration = _a.integration, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
+    var publicKey = _a.publicKey, _b = _a.baseURL, baseURL = _b === void 0 ? defaultSettings.baseURL : _b, _c = _a.source, source = _c === void 0 ? 'local' : _c, signal = _a.signal, integration = _a.integration, userAgent = _a.userAgent, _d = _a.retryThrottledRequestMaxTimes, retryThrottledRequestMaxTimes = _d === void 0 ? defaultSettings.retryThrottledRequestMaxTimes : _d;
     return retryIfThrottled(function () {
         return request({
             method: 'POST',
             url: getUrl(baseURL, '/multipart/complete/', { jsonerrors: 1 }),
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey: publicKey, integration: integration, userAgent: userAgent })
             },
             data: buildFormData([
                 ['uuid', uuid],
@@ -643,7 +664,7 @@ function multipartComplete(uuid, _a) {
             var data = _a.data, headers = _a.headers, request = _a.request;
             var response = camelizeKeys(JSON.parse(data));
             if ('error' in response) {
-                throw new UploadClientError("[" + response.error.statusCode + "] " + response.error.content, request, response.error, headers);
+                throw new UploadClientError(response.error.content, response.error.errorCode, request, response, headers);
             }
             else {
                 return response;
@@ -659,6 +680,7 @@ var UploadcareFile = /** @class */ (function () {
         this.size = null;
         this.isStored = null;
         this.isImage = null;
+        this.mimeType = null;
         this.cdnUrl = null;
         this.cdnUrlModifiers = null;
         this.originalUrl = null;
@@ -677,6 +699,7 @@ var UploadcareFile = /** @class */ (function () {
         this.size = fileInfo.size;
         this.isStored = fileInfo.isStored;
         this.isImage = fileInfo.isImage;
+        this.mimeType = fileInfo.mimeType;
         this.cdnUrl = cdnUrl;
         this.cdnUrlModifiers = cdnUrlModifiers;
         this.originalUrl = originalUrl;
@@ -718,7 +741,7 @@ var poll = function (_a) {
 };
 
 function isReadyPoll(_a) {
-    var file = _a.file, publicKey = _a.publicKey, baseURL = _a.baseURL, source = _a.source, integration = _a.integration, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, signal = _a.signal, onProgress = _a.onProgress;
+    var file = _a.file, publicKey = _a.publicKey, baseURL = _a.baseURL, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, signal = _a.signal, onProgress = _a.onProgress;
     return poll({
         check: function (signal) {
             return info(file, {
@@ -727,6 +750,7 @@ function isReadyPoll(_a) {
                 signal: signal,
                 source: source,
                 integration: integration,
+                userAgent: userAgent,
                 retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
             }).then(function (response) {
                 if (response.isReady) {
@@ -741,7 +765,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, 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;
     return base(file, {
         publicKey: publicKey,
         fileName: fileName,
@@ -753,6 +777,7 @@ var uploadFromObject = function (file, _a) {
         onProgress: onProgress,
         source: source,
         integration: integration,
+        userAgent: userAgent,
         retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
     })
         .then(function (_a) {
@@ -763,6 +788,7 @@ var uploadFromObject = function (file, _a) {
             baseURL: baseURL,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
             onProgress: onProgress,
             signal: signal
@@ -874,7 +900,7 @@ var Pusher = /** @class */ (function () {
                 _this.queue = [];
             });
             this.ws.addEventListener('message', function (e) {
-                var data = JSON.parse(e.data);
+                var data = JSON.parse(e.data.toString());
                 switch (data.event) {
                     case 'pusher:connection_established': {
                         _this.emmitter.emit('connected', undefined);
@@ -970,19 +996,20 @@ var preconnect = function (key) {
 };
 
 function pollStrategy(_a) {
-    var token = _a.token, publicKey = _a.publicKey, baseURL = _a.baseURL, integration = _a.integration, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, onProgress = _a.onProgress, signal = _a.signal;
+    var token = _a.token, publicKey = _a.publicKey, baseURL = _a.baseURL, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, onProgress = _a.onProgress, signal = _a.signal;
     return poll({
         check: function (signal) {
             return fromUrlStatus(token, {
                 publicKey: publicKey,
                 baseURL: baseURL,
                 integration: integration,
+                userAgent: userAgent,
                 retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
                 signal: signal
             }).then(function (response) {
                 switch (response.status) {
                     case Status.Error: {
-                        return new UploadClientError(response.error);
+                        return new UploadClientError(response.error, response.errorCode);
                     }
                     case Status.Waiting: {
                         return false;
@@ -1010,7 +1037,7 @@ function pollStrategy(_a) {
     });
 }
 var pushStrategy = function (_a) {
-    var token = _a.token, pusherKey = _a.pusherKey, signal = _a.signal, stopRace = _a.stopRace, onProgress = _a.onProgress;
+    var token = _a.token, pusherKey = _a.pusherKey, signal = _a.signal, onProgress = _a.onProgress;
     return new Promise(function (resolve, reject) {
         var pusher = getPusher(pusherKey);
         var unsubErrorHandler = pusher.onError(reject);
@@ -1020,10 +1047,9 @@ var pushStrategy = function (_a) {
         };
         onCancel(signal, function () {
             destroy();
-            reject(cancelError('pisher cancelled'));
+            reject(cancelError('pusher cancelled'));
         });
         pusher.subscribe(token, function (result) {
-            stopRace();
             switch (result.status) {
                 case Status.Progress: {
                     if (onProgress) {
@@ -1040,14 +1066,14 @@ var pushStrategy = function (_a) {
                 }
                 case Status.Error: {
                     destroy();
-                    reject(new UploadClientError(result.msg));
+                    reject(new UploadClientError(result.msg, result.error_code));
                 }
             }
         });
     });
 };
 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, 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;
     return Promise.resolve(preconnect(pusherKey))
         .then(function () {
         return fromUrl(sourceUrl, {
@@ -1062,8 +1088,14 @@ var uploadFromUrl = function (sourceUrl, _a) {
             signal: signal,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
         });
+    })
+        .catch(function (error) {
+        var pusher = getPusher(pusherKey);
+        pusher === null || pusher === void 0 ? void 0 : pusher.disconnect();
+        return Promise.reject(error);
     })
         .then(function (urlResponse) {
         if (urlResponse.type === TypeEnum.FileInfo) {
@@ -1078,17 +1110,17 @@ var uploadFromUrl = function (sourceUrl, _a) {
                         publicKey: publicKey,
                         baseURL: baseURL,
                         integration: integration,
+                        userAgent: userAgent,
                         retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
                         onProgress: onProgress,
                         signal: signal
                     });
                 },
                 function (_a) {
-                    var stopRace = _a.stopRace, signal = _a.signal;
+                    var signal = _a.signal;
                     return pushStrategy({
                         token: urlResponse.token,
                         pusherKey: pusherKey,
-                        stopRace: stopRace,
                         signal: signal,
                         onProgress: onProgress
                     });
@@ -1107,6 +1139,7 @@ var uploadFromUrl = function (sourceUrl, _a) {
             publicKey: publicKey,
             baseURL: baseURL,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
             onProgress: onProgress,
             signal: signal
@@ -1116,13 +1149,14 @@ var uploadFromUrl = function (sourceUrl, _a) {
 };
 
 var uploadFromUploaded = function (uuid, _a) {
-    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN;
+    var publicKey = _a.publicKey, fileName = _a.fileName, baseURL = _a.baseURL, signal = _a.signal, onProgress = _a.onProgress, source = _a.source, integration = _a.integration, userAgent = _a.userAgent, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, baseCDN = _a.baseCDN;
     return info(uuid, {
         publicKey: publicKey,
         baseURL: baseURL,
         signal: signal,
         source: source,
         integration: integration,
+        userAgent: userAgent,
         retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
     })
         .then(function (fileInfo) { return new UploadcareFile(fileInfo, { baseCDN: baseCDN, fileName: fileName }); })
@@ -1176,6 +1210,18 @@ var isMultipart = function (fileSize, multipartMinFileSize) {
     return fileSize >= multipartMinFileSize;
 };
 
+var sliceChunk = function (file, index, fileSize, chunkSize) {
+    var start = chunkSize * index;
+    var end = Math.min(start + chunkSize, fileSize);
+    return file.slice(start, end);
+};
+
+function prepareChunks(file, fileSize, chunkSize) {
+    return function (index) {
+        return sliceChunk(file, index, fileSize, chunkSize);
+    };
+}
+
 var runWithConcurrency = function (concurrency, tasks) {
     return new Promise(function (resolve, reject) {
         var results = [];
@@ -1211,11 +1257,6 @@ var runWithConcurrency = function (concurrency, tasks) {
     });
 };
 
-var getChunk = function (file, index, fileSize, chunkSize) {
-    var start = chunkSize * index;
-    var end = Math.min(start + chunkSize, fileSize);
-    return file.slice(start, end);
-};
 var uploadPartWithRetry = function (chunk, url, _a) {
     var publicKey = _a.publicKey, onProgress = _a.onProgress, signal = _a.signal, integration = _a.integration, multipartMaxAttempts = _a.multipartMaxAttempts;
     return retrier(function (_a) {
@@ -1234,7 +1275,7 @@ 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, 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;
     var size = fileSize || getFileSize(file);
     var progressValues;
     var createProgressHandler = function (size, index) {
@@ -1263,14 +1304,16 @@ var uploadMultipart = function (file, _a) {
         signal: signal,
         source: source,
         integration: integration,
+        userAgent: userAgent,
         retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
     })
         .then(function (_a) {
         var uuid = _a.uuid, parts = _a.parts;
+        var getChunk = prepareChunks(file, size, multipartChunkSize);
         return Promise.all([
             uuid,
             runWithConcurrency(maxConcurrentRequests, parts.map(function (url, index) { return function () {
-                return uploadPartWithRetry(getChunk(file, index, size, multipartChunkSize), url, {
+                return uploadPartWithRetry(getChunk(index), url, {
                     publicKey: publicKey,
                     onProgress: createProgressHandler(parts.length, index),
                     signal: signal,
@@ -1287,6 +1330,7 @@ var uploadMultipart = function (file, _a) {
             baseURL: baseURL,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
         });
     })
@@ -1301,6 +1345,7 @@ var uploadMultipart = function (file, _a) {
                 baseURL: baseURL,
                 source: source,
                 integration: integration,
+                userAgent: userAgent,
                 retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
                 onProgress: onProgress,
                 signal: signal
@@ -1314,7 +1359,7 @@ 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, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, _c = _a.multipartChunkSize, multipartChunkSize = _c === void 0 ? defaultSettings.multipartChunkSize : _c, _d = _a.baseCDN, baseCDN = _d === void 0 ? defaultSettings.baseCDN : _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, 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;
     if (isFileData(data)) {
         var fileSize = getFileSize(data);
         if (isMultipart(fileSize)) {
@@ -1322,6 +1367,7 @@ function uploadFile(data, _a) {
                 publicKey: publicKey,
                 contentType: contentType,
                 multipartChunkSize: multipartChunkSize,
+                multipartMaxAttempts: multipartMaxAttempts,
                 fileName: fileName,
                 baseURL: baseURL,
                 secureSignature: secureSignature,
@@ -1331,6 +1377,8 @@ function uploadFile(data, _a) {
                 onProgress: onProgress,
                 source: source,
                 integration: integration,
+                userAgent: userAgent,
+                maxConcurrentRequests: maxConcurrentRequests,
                 retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
                 baseCDN: baseCDN
             });
@@ -1346,6 +1394,7 @@ function uploadFile(data, _a) {
             onProgress: onProgress,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
             baseCDN: baseCDN
         });
@@ -1355,6 +1404,9 @@ function uploadFile(data, _a) {
             publicKey: publicKey,
             fileName: fileName,
             baseURL: baseURL,
+            baseCDN: baseCDN,
+            checkForUrlDuplicates: checkForUrlDuplicates,
+            saveUrlForRecurrentUploads: saveUrlForRecurrentUploads,
             secureSignature: secureSignature,
             secureExpire: secureExpire,
             store: store,
@@ -1362,8 +1414,9 @@ function uploadFile(data, _a) {
             onProgress: onProgress,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
-            baseCDN: baseCDN
+            pusherKey: pusherKey
         });
     }
     if (isUuid(data)) {
@@ -1375,6 +1428,7 @@ function uploadFile(data, _a) {
             onProgress: onProgress,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
             baseCDN: baseCDN
         });
@@ -1389,8 +1443,7 @@ var UploadcareGroup = /** @class */ (function () {
         this.filesCount = groupInfo.filesCount;
         this.totalSize = Object.values(groupInfo.files).reduce(function (acc, file) { return acc + file.size; }, 0);
         this.isStored = !!groupInfo.datetimeStored;
-        this.isImage = !!Object.values(groupInfo.files).filter(function (file) { return file.isImage; })
-            .length;
+        this.isImage = !!Object.values(groupInfo.files).filter(function (file) { return file.isImage; }).length;
         this.cdnUrl = groupInfo.cdnUrl;
         this.files = files;
         this.createdAt = groupInfo.datetimeCreated;
@@ -1437,7 +1490,7 @@ var isUrlArray = function (data) {
 };
 
 function uploadFileGroup(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, retryThrottledRequestMaxTimes = _a.retryThrottledRequestMaxTimes, contentType = _a.contentType, _c = _a.multipartChunkSize, multipartChunkSize = _c === void 0 ? defaultSettings.multipartChunkSize : _c, _d = _a.baseCDN, baseCDN = _d === void 0 ? defaultSettings.baseCDN : _d, jsonpCallback = _a.jsonpCallback, defaultEffects = _a.defaultEffects;
+    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, _c = _a.multipartChunkSize, multipartChunkSize = _c === void 0 ? defaultSettings.multipartChunkSize : _c, _d = _a.baseCDN, baseCDN = _d === void 0 ? defaultSettings.baseCDN : _d, jsonpCallback = _a.jsonpCallback, defaultEffects = _a.defaultEffects;
     if (!isFileDataArray(data) && !isUrlArray(data) && !isUuidArray(data)) {
         throw new TypeError("Group uploading from \"" + data + "\" is not supported");
     }
@@ -1470,6 +1523,7 @@ function uploadFileGroup(data, _a) {
             onProgress: createProgressHandler(filesCount, index),
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes,
             contentType: contentType,
             multipartChunkSize: multipartChunkSize,
@@ -1493,6 +1547,7 @@ function uploadFileGroup(data, _a) {
             signal: signal,
             source: source,
             integration: integration,
+            userAgent: userAgent,
             retryThrottledRequestMaxTimes: retryThrottledRequestMaxTimes
         }).then(function (groupInfo) { return new UploadcareGroup(groupInfo, filesInGroup); });
     });
@@ -1561,6 +1616,8 @@ var UploadClient = /** @class */ (function () {
 
 exports.AbortController = AbortController;
 exports.UploadClient = UploadClient;
+exports.UploadcareFile = UploadcareFile;
+exports.UploadcareGroup = UploadcareGroup;
 exports.base = base;
 exports.fromUrl = fromUrl;
 exports.fromUrlStatus = fromUrlStatus;
@@ -1570,5 +1627,9 @@ exports.info = info;
 exports.multipartComplete = multipartComplete;
 exports.multipartStart = multipartStart;
 exports.multipartUpload = multipartUpload;
+exports.uploadBase = uploadFromObject;
 exports.uploadFile = uploadFile;
 exports.uploadFileGroup = uploadFileGroup;
+exports.uploadFromUploaded = uploadFromUploaded;
+exports.uploadFromUrl = uploadFromUrl;
+exports.uploadMultipart = uploadMultipart;