@uploadcare/upload-client 5.2.0 → 6.0.0

package/dist/index.browser.js

@@ -1,32 +1,3 @@
-class UploadClientError extends Error {
-    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;
-        Object.setPrototypeOf(this, UploadClientError.prototype);
-    }
-}
-const cancelError = (message = 'Request canceled') => {
-    const error = new UploadClientError(message);
-    error.isCancel = true;
-    return error;
-};
-
-const onCancel = (signal, callback) => {
-    if (signal) {
-        if (signal.aborted) {
-            Promise.resolve().then(callback);
-        }
-        else {
-            signal.addEventListener('abort', () => callback(), { once: true });
-        }
-    }
-};
-
 function isObject(o) {
     return Object.prototype.toString.call(o) === '[object Object]';
 }
@@ -128,6 +99,64 @@ class UploadcareNetworkError extends Error {
     }
 }
 
+const onCancel = (signal, callback) => {
+    if (signal) {
+        if (signal.aborted) {
+            Promise.resolve().then(callback);
+        }
+        else {
+            signal.addEventListener('abort', () => callback(), { once: true });
+        }
+    }
+};
+
+class CancelError extends Error {
+    constructor(message = 'Request canceled') {
+        super(message);
+        this.isCancel = true;
+        Object.setPrototypeOf(this, CancelError.prototype);
+    }
+}
+
+const DEFAULT_INTERVAL = 500;
+const poll = ({ check, interval = DEFAULT_INTERVAL, timeout, signal }) => new Promise((resolve, reject) => {
+    let tickTimeoutId;
+    let timeoutId;
+    onCancel(signal, () => {
+        tickTimeoutId && clearTimeout(tickTimeoutId);
+        reject(new CancelError('Poll cancelled'));
+    });
+    if (timeout) {
+        timeoutId = setTimeout(() => {
+            tickTimeoutId && clearTimeout(tickTimeoutId);
+            reject(new CancelError('Timed out'));
+        }, timeout);
+    }
+    const tick = () => {
+        try {
+            Promise.resolve(check(signal))
+                .then((result) => {
+                if (result) {
+                    timeoutId && clearTimeout(timeoutId);
+                    resolve(result);
+                }
+                else {
+                    tickTimeoutId = setTimeout(tick, interval);
+                }
+            })
+                .catch((error) => {
+                timeoutId && clearTimeout(timeoutId);
+                reject(error);
+            });
+        }
+        catch (error) {
+            timeoutId && clearTimeout(timeoutId);
+            reject(error);
+        }
+    };
+    tickTimeoutId = setTimeout(tick, 0);
+});
+
 const request = ({ method, url, data, headers = {}, signal, onProgress }) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     const requestMethod = method?.toUpperCase() || 'GET';
@@ -151,7 +180,7 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
     onCancel(signal, () => {
         aborted = true;
         xhr.abort();
-        reject(cancelError());
+        reject(new CancelError());
     });
     xhr.onload = () => {
         if (xhr.status != 200) {
@@ -355,7 +384,7 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '5.2.0';
+var version = '6.0.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -367,6 +396,19 @@ function getUserAgent(options) {
     });
 }
 
+class UploadClientError extends Error {
+    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;
+        Object.setPrototypeOf(this, UploadClientError.prototype);
+    }
+}
+
 const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 const DEFAULT_NETWORK_ERROR_TIMEOUT = 1000;
@@ -732,33 +774,6 @@ class UploadcareFile {
     }
 }
 
-const DEFAULT_INTERVAL = 500;
-const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((resolve, reject) => {
-    let timeoutId;
-    onCancel(signal, () => {
-        timeoutId && clearTimeout(timeoutId);
-        reject(cancelError('Poll cancelled'));
-    });
-    const tick = () => {
-        try {
-            Promise.resolve(check(signal))
-                .then((result) => {
-                if (result) {
-                    resolve(result);
-                }
-                else {
-                    timeoutId = setTimeout(tick, interval);
-                }
-            })
-                .catch((error) => reject(error));
-        }
-        catch (error) {
-            reject(error);
-        }
-    };
-    timeoutId = setTimeout(tick, 0);
-});
-
 function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, signal, onProgress }) {
     return poll({
         check: (signal) => info(file, {
@@ -1056,7 +1071,7 @@ const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((
     };
     onCancel(signal, () => {
         destroy();
-        reject(cancelError('pusher cancelled'));
+        reject(new CancelError('pusher cancelled'));
     });
     pusher.subscribe(token, (result) => {
         switch (result.status) {

package/dist/index.node.js

@@ -5,23 +5,106 @@ import { Transform, Readable } from 'stream';
 import NodeFormData from 'form-data';
 import WebSocket from 'ws';
 
-class UploadClientError extends Error {
-    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;
-        Object.setPrototypeOf(this, UploadClientError.prototype);
+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 cancelError = (message = 'Request canceled') => {
-    const error = new UploadClientError(message);
-    error.isCancel = true;
-    return error;
+
+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 onCancel = (signal, callback) => {
     if (signal) {
@@ -34,6 +117,53 @@ const onCancel = (signal, callback) => {
     }
 };
 
+class CancelError extends Error {
+    constructor(message = 'Request canceled') {
+        super(message);
+        this.isCancel = true;
+        Object.setPrototypeOf(this, CancelError.prototype);
+    }
+}
+
+const DEFAULT_INTERVAL = 500;
+const poll = ({ check, interval = DEFAULT_INTERVAL, timeout, signal }) => new Promise((resolve, reject) => {
+    let tickTimeoutId;
+    let timeoutId;
+    onCancel(signal, () => {
+        tickTimeoutId && clearTimeout(tickTimeoutId);
+        reject(new CancelError('Poll cancelled'));
+    });
+    if (timeout) {
+        timeoutId = setTimeout(() => {
+            tickTimeoutId && clearTimeout(tickTimeoutId);
+            reject(new CancelError('Timed out'));
+        }, timeout);
+    }
+    const tick = () => {
+        try {
+            Promise.resolve(check(signal))
+                .then((result) => {
+                if (result) {
+                    timeoutId && clearTimeout(timeoutId);
+                    resolve(result);
+                }
+                else {
+                    tickTimeoutId = setTimeout(tick, interval);
+                }
+            })
+                .catch((error) => {
+                timeoutId && clearTimeout(timeoutId);
+                reject(error);
+            });
+        }
+        catch (error) {
+            timeoutId && clearTimeout(timeoutId);
+            reject(error);
+        }
+    };
+    tickTimeoutId = setTimeout(tick, 0);
+});
+
 // ProgressEmitter is a simple PassThrough-style transform stream which keeps
 // track of the number of bytes which have been piped through it and will
 // invoke the `onprogress` function whenever new number are available.
@@ -102,7 +232,7 @@ const request = (params) => {
         onCancel(signal, () => {
             aborted = true;
             req.abort();
-            reject(cancelError());
+            reject(new CancelError());
         });
         req.on('response', (res) => {
             if (aborted)
@@ -282,108 +412,7 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '5.2.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);
-}
-
-class UploadcareNetworkError extends Error {
-    constructor(progressEvent) {
-        super();
-        this.name = 'UploadcareNetworkError';
-        this.message = 'Network error';
-        Object.setPrototypeOf(this, UploadcareNetworkError.prototype);
-        this.originalProgressEvent = progressEvent;
-    }
-}
+var version = '6.0.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -395,6 +424,19 @@ function getUserAgent(options) {
     });
 }
 
+class UploadClientError extends Error {
+    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;
+        Object.setPrototypeOf(this, UploadClientError.prototype);
+    }
+}
+
 const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 const DEFAULT_NETWORK_ERROR_TIMEOUT = 1000;
@@ -760,33 +802,6 @@ class UploadcareFile {
     }
 }
 
-const DEFAULT_INTERVAL = 500;
-const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((resolve, reject) => {
-    let timeoutId;
-    onCancel(signal, () => {
-        timeoutId && clearTimeout(timeoutId);
-        reject(cancelError('Poll cancelled'));
-    });
-    const tick = () => {
-        try {
-            Promise.resolve(check(signal))
-                .then((result) => {
-                if (result) {
-                    resolve(result);
-                }
-                else {
-                    timeoutId = setTimeout(tick, interval);
-                }
-            })
-                .catch((error) => reject(error));
-        }
-        catch (error) {
-            reject(error);
-        }
-    };
-    timeoutId = setTimeout(tick, 0);
-});
-
 function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, signal, onProgress }) {
     return poll({
         check: (signal) => info(file, {
@@ -1082,7 +1097,7 @@ const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((
     };
     onCancel(signal, () => {
         destroy();
-        reject(cancelError('pusher cancelled'));
+        reject(new CancelError('pusher cancelled'));
     });
     pusher.subscribe(token, (result) => {
         switch (result.status) {

package/dist/index.react-native.js

@@ -1,32 +1,3 @@
-class UploadClientError extends Error {
-    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;
-        Object.setPrototypeOf(this, UploadClientError.prototype);
-    }
-}
-const cancelError = (message = 'Request canceled') => {
-    const error = new UploadClientError(message);
-    error.isCancel = true;
-    return error;
-};
-
-const onCancel = (signal, callback) => {
-    if (signal) {
-        if (signal.aborted) {
-            Promise.resolve().then(callback);
-        }
-        else {
-            signal.addEventListener('abort', () => callback(), { once: true });
-        }
-    }
-};
-
 function isObject(o) {
     return Object.prototype.toString.call(o) === '[object Object]';
 }
@@ -128,6 +99,64 @@ class UploadcareNetworkError extends Error {
     }
 }
 
+const onCancel = (signal, callback) => {
+    if (signal) {
+        if (signal.aborted) {
+            Promise.resolve().then(callback);
+        }
+        else {
+            signal.addEventListener('abort', () => callback(), { once: true });
+        }
+    }
+};
+
+class CancelError extends Error {
+    constructor(message = 'Request canceled') {
+        super(message);
+        this.isCancel = true;
+        Object.setPrototypeOf(this, CancelError.prototype);
+    }
+}
+
+const DEFAULT_INTERVAL = 500;
+const poll = ({ check, interval = DEFAULT_INTERVAL, timeout, signal }) => new Promise((resolve, reject) => {
+    let tickTimeoutId;
+    let timeoutId;
+    onCancel(signal, () => {
+        tickTimeoutId && clearTimeout(tickTimeoutId);
+        reject(new CancelError('Poll cancelled'));
+    });
+    if (timeout) {
+        timeoutId = setTimeout(() => {
+            tickTimeoutId && clearTimeout(tickTimeoutId);
+            reject(new CancelError('Timed out'));
+        }, timeout);
+    }
+    const tick = () => {
+        try {
+            Promise.resolve(check(signal))
+                .then((result) => {
+                if (result) {
+                    timeoutId && clearTimeout(timeoutId);
+                    resolve(result);
+                }
+                else {
+                    tickTimeoutId = setTimeout(tick, interval);
+                }
+            })
+                .catch((error) => {
+                timeoutId && clearTimeout(timeoutId);
+                reject(error);
+            });
+        }
+        catch (error) {
+            timeoutId && clearTimeout(timeoutId);
+            reject(error);
+        }
+    };
+    tickTimeoutId = setTimeout(tick, 0);
+});
+
 const request = ({ method, url, data, headers = {}, signal, onProgress }) => new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     const requestMethod = method?.toUpperCase() || 'GET';
@@ -151,7 +180,7 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
     onCancel(signal, () => {
         aborted = true;
         xhr.abort();
-        reject(cancelError());
+        reject(new CancelError());
     });
     xhr.onload = () => {
         if (xhr.status != 200) {
@@ -358,7 +387,7 @@ const defaultSettings = {
 const defaultContentType = 'application/octet-stream';
 const defaultFilename = 'original';
 
-var version = '5.2.0';
+var version = '6.0.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -370,6 +399,19 @@ function getUserAgent(options) {
     });
 }
 
+class UploadClientError extends Error {
+    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;
+        Object.setPrototypeOf(this, UploadClientError.prototype);
+    }
+}
+
 const REQUEST_WAS_THROTTLED_CODE = 'RequestThrottledError';
 const DEFAULT_RETRY_AFTER_TIMEOUT = 15000;
 const DEFAULT_NETWORK_ERROR_TIMEOUT = 1000;
@@ -735,33 +777,6 @@ class UploadcareFile {
     }
 }
 
-const DEFAULT_INTERVAL = 500;
-const poll = ({ check, interval = DEFAULT_INTERVAL, signal }) => new Promise((resolve, reject) => {
-    let timeoutId;
-    onCancel(signal, () => {
-        timeoutId && clearTimeout(timeoutId);
-        reject(cancelError('Poll cancelled'));
-    });
-    const tick = () => {
-        try {
-            Promise.resolve(check(signal))
-                .then((result) => {
-                if (result) {
-                    resolve(result);
-                }
-                else {
-                    timeoutId = setTimeout(tick, interval);
-                }
-            })
-                .catch((error) => reject(error));
-        }
-        catch (error) {
-            reject(error);
-        }
-    };
-    timeoutId = setTimeout(tick, 0);
-});
-
 function isReadyPoll({ file, publicKey, baseURL, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, signal, onProgress }) {
     return poll({
         check: (signal) => info(file, {
@@ -1059,7 +1074,7 @@ const pushStrategy = ({ token, pusherKey, signal, onProgress }) => new Promise((
     };
     onCancel(signal, () => {
         destroy();
-        reject(cancelError('pusher cancelled'));
+        reject(new CancelError('pusher cancelled'));
     });
     pusher.subscribe(token, (result) => {
         switch (result.status) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/index.node.js",
@@ -78,7 +78,7 @@
     "koa-body": "5.0.0",
     "mock-socket": "9.0.3",
     "start-server-and-test": "1.14.0",
-    "@uploadcare/api-client-utils": "^5.2.0",
+    "@uploadcare/api-client-utils": "^6.0.0",
     "chalk": "^4.1.2"
   },
   "dependencies": {