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

package/dist/index.js

@@ -1,17 +1,18 @@
-import { request as request$1 } from 'http';
-import { request as request$2 } from 'https';
+import http from 'http';
+import https from 'https';
 import { parse } from 'url';
 import { Transform, Readable } from 'stream';
 import NodeFormData from 'form-data';
 import { AbortController } from 'abort-controller';
 export { AbortController } from 'abort-controller';
-import * as WebSocket from 'ws';
+import WebSocket from 'ws';
 
 class UploadClientError extends Error {
-    constructor(message, request, response, headers) {
+    constructor(message, code, request, response, headers) {
         super();
         this.name = 'UploadClientError';
         this.message = message;
+        this.code = code;
         this.request = request;
         this.response = response;
         this.headers = headers;
@@ -82,7 +83,7 @@ const request = (params) => {
             return undefined;
         }
     })
-        .then(length => new Promise((resolve, reject) => {
+        .then((length) => new Promise((resolve, reject) => {
         const isFormData = !!length;
         let aborted = false;
         const options = parse(url);
@@ -95,19 +96,19 @@ const request = (params) => {
                 length || data.length;
         }
         const req = options.protocol !== 'https:'
-            ? request$1(options)
-            : request$2(options);
+            ? http.request(options)
+            : https.request(options);
         onCancel(signal, () => {
             aborted = true;
             req.abort();
             reject(cancelError());
         });
-        req.on('response', res => {
+        req.on('response', (res) => {
             if (aborted)
                 return;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const resChunks = [];
-            res.on('data', data => {
+            res.on('data', (data) => {
                 resChunks.push(data);
             });
             res.on('end', () => resolve({
@@ -117,7 +118,7 @@ const request = (params) => {
                 request: params
             }));
         });
-        req.on('error', err => {
+        req.on('error', (err) => {
             if (aborted)
                 return;
             reject(err);
@@ -136,18 +137,25 @@ const request = (params) => {
     }));
 };
 
+function identity(obj) {
+    return obj;
+}
+
+const transformFile = identity;
 var getFormData = () => new NodeFormData();
 
+const isFileTuple = (tuple) => tuple[0] === 'file';
 function buildFormData(body) {
     const formData = getFormData();
-    const isTriple = (tuple) => tuple[0] === 'file';
     for (const tuple of body) {
         if (Array.isArray(tuple[1])) {
             // refactor this
-            tuple[1].forEach(val => val && formData.append(tuple[0] + '[]', `${val}`));
+            tuple[1].forEach((val) => val && formData.append(tuple[0] + '[]', `${val}`));
         }
-        else if (isTriple(tuple)) {
-            formData.append(tuple[0], tuple[1], tuple[2]);
+        else if (isFileTuple(tuple)) {
+            const name = tuple[2];
+            const file = transformFile(tuple[1]); // lgtm[js/superfluous-trailing-arguments]
+            formData.append(tuple[0], file, name);
         }
         else if (tuple[1] != null) {
             formData.append(tuple[0], `${tuple[1]}`);
@@ -159,9 +167,9 @@ function buildFormData(body) {
 const serializePair = (key, value) => typeof value !== 'undefined' ? `${key}=${encodeURIComponent(value)}` : null;
 const createQuery = (query) => Object.entries(query)
     .reduce((params, [key, value]) => params.concat(Array.isArray(value)
-    ? value.map(value => serializePair(`${key}[]`, value))
+    ? value.map((value) => serializePair(`${key}[]`, value))
     : serializePair(key, value)), [])
-    .filter(x => !!x)
+    .filter((x) => !!x)
     .join('&');
 const getUrl = (base, path, query) => [
     base,
@@ -192,15 +200,32 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '1.1.2';
+var version = '2.1.0';
 
 /**
  * Returns User Agent based on version and settings.
  */
-function getUserAgent({ publicKey = '', integration = '' } = {}) {
-    const mainInfo = [version, publicKey].filter(Boolean).join('/');
-    const additionInfo = ['JavaScript', integration].filter(Boolean).join('; ');
-    return `UploadcareUploadClient/${mainInfo} (${additionInfo})`;
+function getUserAgent({ userAgent, publicKey = '', integration = '' } = {}) {
+    const libraryName = 'UploadcareUploadClient';
+    const libraryVersion = version;
+    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 SEPARATOR = /\W|_/g;
@@ -234,7 +259,7 @@ function camelizeKeys(source) {
  *
  * @param {number} ms Timeout in milliseconds.
  */
-const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 const defaultOptions = {
     factor: 2,
@@ -256,7 +281,7 @@ function retrier(fn, options = defaultOptions) {
     return runAttempt(fn);
 }
 
-const REQUEST_WAS_THROTTLED_CODE = 429;
+const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 function getTimeoutFromThrottledRequest(error) {
     const { headers } = error || {};
@@ -266,9 +291,8 @@ function getTimeoutFromThrottledRequest(error) {
 }
 function retryIfThrottled(fn, retryThrottledMaxTimes) {
     return retrier(({ attempt, retry }) => fn().catch((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));
         }
@@ -280,7 +304,7 @@ function retryIfThrottled(fn, retryThrottledMaxTimes) {
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
-function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => {
         var _a;
         return request({
@@ -289,7 +313,7 @@ function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, se
                 jsonerrors: 1
             }),
             headers: {
-                'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+                'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
             },
             data: buildFormData([
                 ['file', file, (_a = fileName !== null && fileName !== void 0 ? fileName : file.name) !== null && _a !== void 0 ? _a : defaultFilename],
@@ -307,7 +331,7 @@ function base(file, { publicKey, fileName, baseURL = defaultSettings.baseURL, se
         }).then(({ data, headers, request }) => {
             const 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;
@@ -324,12 +348,11 @@ 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, { publicKey, baseURL = defaultSettings.baseURL, store, fileName, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, source = 'url', signal, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function fromUrl(sourceUrl, { publicKey, baseURL = defaultSettings.baseURL, store, fileName, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, source = 'url', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'POST',
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         url: getUrl(baseURL, '/from_url/', {
             jsonerrors: 1,
@@ -347,7 +370,7 @@ function fromUrl(sourceUrl, { publicKey, baseURL = defaultSettings.baseURL, stor
     }).then(({ data, headers, request }) => {
         const 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;
@@ -369,11 +392,17 @@ const isErrorResponse = (response) => {
 /**
  * Checking upload status and working with file tokens.
  */
-function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, signal, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes } = {}) {
+function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes } = {}) {
     return retryIfThrottled(() => request({
         method: 'GET',
         headers: publicKey
-            ? { 'X-UC-User-Agent': getUserAgent({ publicKey, integration }) }
+            ? {
+                'X-UC-User-Agent': getUserAgent({
+                    publicKey,
+                    integration,
+                    userAgent
+                })
+            }
             : undefined,
         url: getUrl(baseURL, '/from_url/status/', {
             jsonerrors: 1,
@@ -383,7 +412,7 @@ function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, si
     }).then(({ data, headers, request }) => {
         const 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;
@@ -394,12 +423,11 @@ function fromUrlStatus(token, { publicKey, baseURL = defaultSettings.baseURL, si
 /**
  * Create files group.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key"]}] */
-function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallback, secureSignature, secureExpire, signal, source, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallback, secureSignature, secureExpire, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'POST',
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         url: getUrl(baseURL, '/group/', {
             jsonerrors: 1,
@@ -414,7 +442,7 @@ function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallb
     }).then(({ data, headers, request }) => {
         const 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;
@@ -425,12 +453,11 @@ function group(uuids, { publicKey, baseURL = defaultSettings.baseURL, jsonpCallb
 /**
  * Get info about group.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key", "group_id"]}] */
-function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'GET',
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         url: getUrl(baseURL, '/group/info/', {
             jsonerrors: 1,
@@ -442,7 +469,7 @@ function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, s
     }).then(({ data, headers, request }) => {
         const 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;
@@ -453,12 +480,11 @@ function groupInfo(id, { publicKey, baseURL = defaultSettings.baseURL, signal, s
 /**
  * Returns a JSON dictionary holding file info.
  */
-/* eslint @typescript-eslint/camelcase: [2, {allow: ["pub_key", "file_id"]}] */
-function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, source, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'GET',
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         url: getUrl(baseURL, '/info/', {
             jsonerrors: 1,
@@ -470,7 +496,7 @@ function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, sour
     }).then(({ data, headers, request }) => {
         const 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;
@@ -481,12 +507,12 @@ function info(uuid, { publicKey, baseURL = defaultSettings.baseURL, signal, sour
 /**
  * Start multipart uploading.
  */
-function multipartStart(size, { publicKey, contentType, fileName, multipartChunkSize = defaultSettings.multipartChunkSize, baseURL = '', secureSignature, secureExpire, store, signal, source = 'local', integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function multipartStart(size, { publicKey, contentType, fileName, multipartChunkSize = defaultSettings.multipartChunkSize, baseURL = '', secureSignature, secureExpire, store, signal, source = 'local', integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'POST',
         url: getUrl(baseURL, '/multipart/start/', { jsonerrors: 1 }),
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         data: buildFormData([
             ['filename', fileName !== null && fileName !== void 0 ? fileName : defaultFilename],
@@ -503,11 +529,11 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
     }).then(({ data, headers, request }) => {
         const 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
-            response.parts = Object.keys(response.parts).map(key => response.parts[key]);
+            response.parts = Object.keys(response.parts).map((key) => response.parts[key]);
             return response;
         }
     }), retryThrottledRequestMaxTimes);
@@ -516,20 +542,15 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
 /**
  * Complete multipart uploading.
  */
-function multipartUpload(part, url, { publicKey, signal, onProgress, integration }) {
+function multipartUpload(part, url, { signal, onProgress }) {
     return request({
         method: 'PUT',
         url,
-        headers: {
-            'X-UC-User-Agent': publicKey
-                ? getUserAgent({ publicKey, integration })
-                : undefined
-        },
         data: part,
         onProgress,
         signal
     })
-        .then(result => {
+        .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
             onProgress({ value: 1 });
@@ -541,12 +562,12 @@ function multipartUpload(part, url, { publicKey, signal, onProgress, integration
 /**
  * Complete multipart uploading.
  */
-function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL, source = 'local', signal, integration, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
+function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL, source = 'local', signal, integration, userAgent, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes }) {
     return retryIfThrottled(() => request({
         method: 'POST',
         url: getUrl(baseURL, '/multipart/complete/', { jsonerrors: 1 }),
         headers: {
-            'X-UC-User-Agent': getUserAgent({ publicKey, integration })
+            'X-UC-User-Agent': getUserAgent({ publicKey, integration, userAgent })
         },
         data: buildFormData([
             ['uuid', uuid],
@@ -557,7 +578,7 @@ function multipartComplete(uuid, { publicKey, baseURL = defaultSettings.baseURL,
     }).then(({ data, headers, request }) => {
         const 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;
@@ -571,6 +592,7 @@ class UploadcareFile {
         this.size = null;
         this.isStored = null;
         this.isImage = null;
+        this.mimeType = null;
         this.cdnUrl = null;
         this.cdnUrlModifiers = null;
         this.originalUrl = null;
@@ -589,6 +611,7 @@ class UploadcareFile {
         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;
@@ -608,7 +631,7 @@ const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((re
     const tick = () => {
         try {
             Promise.resolve(check(signal))
-                .then(result => {
+                .then((result) => {
                 if (result) {
                     resolve(result);
                 }
@@ -616,7 +639,7 @@ const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((re
                     timeoutId = setTimeout(tick, interval);
                 }
             })
-                .catch(error => reject(error));
+                .catch((error) => reject(error));
         }
         catch (error) {
             reject(error);
@@ -625,16 +648,17 @@ const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((re
     timeoutId = setTimeout(tick, 0);
 });
 
-function isReadyPoll({ file, publicKey, baseURL, source, integration, retryThrottledRequestMaxTimes, signal, onProgress }) {
+function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, signal, onProgress }) {
     return poll({
-        check: signal => info(file, {
+        check: (signal) => info(file, {
             publicKey,
             baseURL,
             signal,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes
-        }).then(response => {
+        }).then((response) => {
             if (response.isReady) {
                 return response;
             }
@@ -645,7 +669,7 @@ function isReadyPoll({ file, publicKey, baseURL, source, integration, retryThrot
     });
 }
 
-const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, baseCDN }) => {
+const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN }) => {
     return base(file, {
         publicKey,
         fileName,
@@ -657,6 +681,7 @@ const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature,
         onProgress,
         source,
         integration,
+        userAgent,
         retryThrottledRequestMaxTimes
     })
         .then(({ file }) => {
@@ -666,12 +691,13 @@ const uploadFromObject = (file, { publicKey, fileName, baseURL, secureSignature,
             baseURL,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes,
             onProgress,
             signal
         });
     })
-        .then(fileInfo => new UploadcareFile(fileInfo, { baseCDN }));
+        .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 };
 
 const race = (fns, { signal } = {}) => {
@@ -683,21 +709,21 @@ const race = (fns, { signal } = {}) => {
         controllers.forEach((controller, index) => index !== i && controller.abort());
     };
     onCancel(signal, () => {
-        controllers.forEach(controller => controller.abort());
+        controllers.forEach((controller) => controller.abort());
     });
     return Promise.all(fns.map((fn, i) => {
         const stopRace = createStopRaceCallback(i);
         return Promise.resolve()
             .then(() => fn({ stopRace, signal: controllers[i].signal }))
-            .then(result => {
+            .then((result) => {
             stopRace();
             return result;
         })
-            .catch(error => {
+            .catch((error) => {
             lastError = error;
             return null;
         });
-    })).then(results => {
+    })).then((results) => {
         if (winnerIndex === null) {
             throw lastError;
         }
@@ -713,7 +739,7 @@ class Events {
     }
     emit(event, data) {
         var _a;
-        (_a = this.events[event]) === null || _a === void 0 ? void 0 : _a.forEach(fn => fn(data));
+        (_a = this.events[event]) === null || _a === void 0 ? void 0 : _a.forEach((fn) => fn(data));
     }
     on(event, callback) {
         this.events[event] = this.events[event] || [];
@@ -721,7 +747,7 @@ class Events {
     }
     off(event, callback) {
         if (callback) {
-            this.events[event] = this.events[event].filter(fn => fn !== callback);
+            this.events[event] = this.events[event].filter((fn) => fn !== callback);
         }
         else {
             this.events[event] = [];
@@ -754,16 +780,16 @@ class Pusher {
         if (!this.isConnected && !this.ws) {
             const pusherUrl = `wss://ws.pusherapp.com/app/${this.key}?protocol=5&client=js&version=1.12.2`;
             this.ws = new WebSocket(pusherUrl);
-            this.ws.addEventListener('error', error => {
+            this.ws.addEventListener('error', (error) => {
                 this.emmitter.emit('error', new Error(error.message));
             });
             this.emmitter.on('connected', () => {
                 this.isConnected = true;
-                this.queue.forEach(message => this.send(message.event, message.data));
+                this.queue.forEach((message) => this.send(message.event, message.data));
                 this.queue = [];
             });
-            this.ws.addEventListener('message', e => {
-                const data = JSON.parse(e.data);
+            this.ws.addEventListener('message', (e) => {
+                const data = JSON.parse(e.data.toString());
                 switch (data.event) {
                     case 'pusher:connection_established': {
                         this.emmitter.emit('connected', undefined);
@@ -831,7 +857,7 @@ class Pusher {
             this.send(message.event, message.data);
         }
         else {
-            this.queue = this.queue.filter(msg => msg.data.channel !== channel);
+            this.queue = this.queue.filter((msg) => msg.data.channel !== channel);
         }
         if (this.subscribers === 0) {
             this.disconnect();
@@ -855,18 +881,19 @@ const preconnect = (key) => {
     getPusher(key).connect();
 };
 
-function pollStrategy({ token, publicKey, baseURL, integration, retryThrottledRequestMaxTimes, onProgress, signal }) {
+function pollStrategy({ token, publicKey, baseURL, integration, userAgent, retryThrottledRequestMaxTimes, onProgress, signal }) {
     return poll({
-        check: signal => fromUrlStatus(token, {
+        check: (signal) => fromUrlStatus(token, {
             publicKey,
             baseURL,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes,
             signal
-        }).then(response => {
+        }).then((response) => {
             switch (response.status) {
                 case Status.Error: {
-                    return new UploadClientError(response.error);
+                    return new UploadClientError(response.error, response.errorCode);
                 }
                 case Status.Waiting: {
                     return false;
@@ -892,7 +919,7 @@ function pollStrategy({ token, publicKey, baseURL, integration, retryThrottledRe
         signal
     });
 }
-const pushStrategy = ({ token, pusherKey, signal, stopRace, onProgress }) => new Promise((resolve, reject) => {
+const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((resolve, reject) => {
     const pusher = getPusher(pusherKey);
     const unsubErrorHandler = pusher.onError(reject);
     const destroy = () => {
@@ -901,10 +928,9 @@ const pushStrategy = ({ token, pusherKey, signal, stopRace, onProgress }) => new
     };
     onCancel(signal, () => {
         destroy();
-        reject(cancelError('pisher cancelled'));
+        reject(cancelError('pusher cancelled'));
     });
-    pusher.subscribe(token, result => {
-        stopRace();
+    pusher.subscribe(token, (result) => {
         switch (result.status) {
             case Status.Progress: {
                 if (onProgress) {
@@ -921,12 +947,12 @@ const pushStrategy = ({ token, pusherKey, signal, stopRace, onProgress }) => new
             }
             case Status.Error: {
                 destroy();
-                reject(new UploadClientError(result.msg));
+                reject(new UploadClientError(result.msg, result.error_code));
             }
         }
     });
 });
-const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, store, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, pusherKey = defaultSettings.pusherKey }) => Promise.resolve(preconnect(pusherKey))
+const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, pusherKey = defaultSettings.pusherKey }) => Promise.resolve(preconnect(pusherKey))
     .then(() => fromUrl(sourceUrl, {
     publicKey,
     fileName,
@@ -939,9 +965,15 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
     signal,
     source,
     integration,
+    userAgent,
     retryThrottledRequestMaxTimes
 }))
-    .then(urlResponse => {
+    .catch((error) => {
+    const pusher = getPusher(pusherKey);
+    pusher === null || pusher === void 0 ? void 0 : pusher.disconnect();
+    return Promise.reject(error);
+})
+    .then((urlResponse) => {
     if (urlResponse.type === TypeEnum.FileInfo) {
         return urlResponse;
     }
@@ -952,47 +984,49 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
                 publicKey,
                 baseURL,
                 integration,
+                userAgent,
                 retryThrottledRequestMaxTimes,
                 onProgress,
                 signal
             }),
-            ({ stopRace, signal }) => pushStrategy({
+            ({ signal }) => pushStrategy({
                 token: urlResponse.token,
                 pusherKey,
-                stopRace,
                 signal,
                 onProgress
             })
         ], { signal });
     }
 })
-    .then(result => {
+    .then((result) => {
     if (result instanceof UploadClientError)
         throw result;
     return result;
 })
-    .then(result => isReadyPoll({
+    .then((result) => isReadyPoll({
     file: result.uuid,
     publicKey,
     baseURL,
     integration,
+    userAgent,
     retryThrottledRequestMaxTimes,
     onProgress,
     signal
 }))
-    .then(fileInfo => new UploadcareFile(fileInfo, { baseCDN }));
+    .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 
-const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, baseCDN }) => {
+const uploadFromUploaded = (uuid, { publicKey, fileName, baseURL, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, baseCDN }) => {
     return info(uuid, {
         publicKey,
         baseURL,
         signal,
         source,
         integration,
+        userAgent,
         retryThrottledRequestMaxTimes
     })
-        .then(fileInfo => new UploadcareFile(fileInfo, { baseCDN, fileName }))
-        .then(result => {
+        .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN, fileName }))
+        .then((result) => {
         // hack for node ¯\_(ツ)_/¯
         if (onProgress)
             onProgress({ value: 1 });
@@ -1041,6 +1075,16 @@ const isMultipart = (fileSize, multipartMinFileSize = defaultSettings.multipartM
     return fileSize >= multipartMinFileSize;
 };
 
+const sliceChunk = (file, index, fileSize, chunkSize) => {
+    const start = chunkSize * index;
+    const end = Math.min(start + chunkSize, fileSize);
+    return file.slice(start, end);
+};
+
+function prepareChunks(file, fileSize, chunkSize) {
+    return (index) => sliceChunk(file, index, fileSize, chunkSize);
+}
+
 const runWithConcurrency = (concurrency, tasks) => {
     return new Promise((resolve, reject) => {
         const results = [];
@@ -1064,7 +1108,7 @@ const runWithConcurrency = (concurrency, tasks) => {
                         resolve(results);
                     }
                 })
-                    .catch(error => {
+                    .catch((error) => {
                     rejected = true;
                     reject(error);
                 });
@@ -1076,23 +1120,18 @@ const runWithConcurrency = (concurrency, tasks) => {
     });
 };
 
-const getChunk = (file, index, fileSize, chunkSize) => {
-    const start = chunkSize * index;
-    const end = Math.min(start + chunkSize, fileSize);
-    return file.slice(start, end);
-};
 const uploadPartWithRetry = (chunk, url, { publicKey, onProgress, signal, integration, multipartMaxAttempts }) => retrier(({ attempt, retry }) => multipartUpload(chunk, url, {
     publicKey,
     onProgress,
     signal,
     integration
-}).catch(error => {
+}).catch((error) => {
     if (attempt < multipartMaxAttempts) {
         return retry();
     }
     throw error;
 }));
-const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, multipartMaxAttempts = defaultSettings.multipartMaxAttempts, baseCDN }) => {
+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) => {
@@ -1118,26 +1157,31 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
         signal,
         source,
         integration,
+        userAgent,
         retryThrottledRequestMaxTimes
     })
-        .then(({ uuid, parts }) => Promise.all([
-        uuid,
-        runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPartWithRetry(getChunk(file, index, size, multipartChunkSize), url, {
-            publicKey,
-            onProgress: createProgressHandler(parts.length, index),
-            signal,
-            integration,
-            multipartMaxAttempts
-        })))
-    ]))
+        .then(({ uuid, parts }) => {
+        const getChunk = prepareChunks(file, size, multipartChunkSize);
+        return Promise.all([
+            uuid,
+            runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPartWithRetry(getChunk(index), url, {
+                publicKey,
+                onProgress: createProgressHandler(parts.length, index),
+                signal,
+                integration,
+                multipartMaxAttempts
+            })))
+        ]);
+    })
         .then(([uuid]) => multipartComplete(uuid, {
         publicKey,
         baseURL,
         source,
         integration,
+        userAgent,
         retryThrottledRequestMaxTimes
     }))
-        .then(fileInfo => {
+        .then((fileInfo) => {
         if (fileInfo.isReady) {
             return fileInfo;
         }
@@ -1148,19 +1192,20 @@ const uploadMultipart = (file, { publicKey, fileName, fileSize, baseURL, secureS
                 baseURL,
                 source,
                 integration,
+                userAgent,
                 retryThrottledRequestMaxTimes,
                 onProgress,
                 signal
             });
         }
     })
-        .then(fileInfo => new UploadcareFile(fileInfo, { baseCDN }));
+        .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 };
 
 /**
  * Uploads file from provided data.
  */
-function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, baseCDN = defaultSettings.baseCDN }) {
+function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, contentType, multipartChunkSize, multipartMaxAttempts, maxConcurrentRequests, baseCDN = defaultSettings.baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, pusherKey }) {
     if (isFileData(data)) {
         const fileSize = getFileSize(data);
         if (isMultipart(fileSize)) {
@@ -1168,6 +1213,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
                 publicKey,
                 contentType,
                 multipartChunkSize,
+                multipartMaxAttempts,
                 fileName,
                 baseURL,
                 secureSignature,
@@ -1177,6 +1223,8 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
                 onProgress,
                 source,
                 integration,
+                userAgent,
+                maxConcurrentRequests,
                 retryThrottledRequestMaxTimes,
                 baseCDN
             });
@@ -1192,6 +1240,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             onProgress,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes,
             baseCDN
         });
@@ -1201,6 +1250,9 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             publicKey,
             fileName,
             baseURL,
+            baseCDN,
+            checkForUrlDuplicates,
+            saveUrlForRecurrentUploads,
             secureSignature,
             secureExpire,
             store,
@@ -1208,8 +1260,9 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             onProgress,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes,
-            baseCDN
+            pusherKey
         });
     }
     if (isUuid(data)) {
@@ -1221,6 +1274,7 @@ function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings.baseU
             onProgress,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes,
             baseCDN
         });
@@ -1235,8 +1289,7 @@ class UploadcareGroup {
         this.filesCount = groupInfo.filesCount;
         this.totalSize = Object.values(groupInfo.files).reduce((acc, file) => acc + file.size, 0);
         this.isStored = !!groupInfo.datetimeStored;
-        this.isImage = !!Object.values(groupInfo.files).filter(file => file.isImage)
-            .length;
+        this.isImage = !!Object.values(groupInfo.files).filter((file) => file.isImage).length;
         this.cdnUrl = groupInfo.cdnUrl;
         this.files = files;
         this.createdAt = groupInfo.datetimeCreated;
@@ -1278,7 +1331,7 @@ const isUrlArray = (data) => {
     return true;
 };
 
-function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, retryThrottledRequestMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, baseCDN = defaultSettings.baseCDN, jsonpCallback, defaultEffects }) {
+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, defaultEffects }) {
     if (!isFileDataArray(data) && !isUrlArray(data) && !isUuidArray(data)) {
         throw new TypeError(`Group uploading from "${data}" is not supported`);
     }
@@ -1307,12 +1360,13 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
         onProgress: createProgressHandler(filesCount, index),
         source,
         integration,
+        userAgent,
         retryThrottledRequestMaxTimes,
         contentType,
         multipartChunkSize,
         baseCDN
-    }))).then(files => {
-        const uuids = files.map(file => file.uuid);
+    }))).then((files) => {
+        const uuids = files.map((file) => file.uuid);
         const addDefaultEffects = (file) => {
             const cdnUrlModifiers = defaultEffects ? `-/${defaultEffects}` : null;
             const cdnUrl = `${file.urlBase}${cdnUrlModifiers || ''}`;
@@ -1329,8 +1383,9 @@ function uploadFileGroup(data, { publicKey, fileName, baseURL = defaultSettings.
             signal,
             source,
             integration,
+            userAgent,
             retryThrottledRequestMaxTimes
-        }).then(groupInfo => new UploadcareGroup(groupInfo, filesInGroup));
+        }).then((groupInfo) => new UploadcareGroup(groupInfo, filesInGroup));
     });
 }
 
@@ -1394,4 +1449,4 @@ class UploadClient {
     }
 }
 
-export { UploadClient, base, fromUrl, fromUrlStatus, group, groupInfo, info, multipartComplete, multipartStart, multipartUpload, uploadFile, uploadFileGroup };
+export { UploadClient, UploadcareFile, UploadcareGroup, base, fromUrl, fromUrlStatus, group, groupInfo, info, multipartComplete, multipartStart, multipartUpload, uploadFromObject as uploadBase, uploadFile, uploadFileGroup, uploadFromUploaded, uploadFromUrl, uploadMultipart };