@uploadcare/upload-client 6.0.1-alpha.9 → 6.1.0-alpha.0

package/README.md

@@ -23,6 +23,7 @@ Node.js and browser.
   - [High-Level API](#high-level-api)
   - [Low-Level API](#low-level-api)
   - [Settings](#settings)
+- [React Native](#react-native)
 - [Testing](#testing)
 - [Security issues](#security-issues)
 - [Feedback](#feedback)
@@ -124,7 +125,7 @@ interface UploadClient {
   getSettings(): Settings
 
   base(
-    file: NodeFile | BrowserFile,
+    file: Blob | File | Buffer | ReactNativeAsset,
     options: BaseOptions
   ): Promise<BaseResponse>
 
@@ -158,12 +159,12 @@ interface UploadClient {
   ): Promise<FileInfo>
 
   uploadFile(
-    data: NodeFile | BrowserFile | Url | Uuid,
+    data: Blob | File | Buffer | ReactNativeAsset | Url | Uuid,
     options: FileFromOptions
   ): Promise<UploadcareFile>
 
   uploadFileGroup(
-    data: (NodeFile | BrowserFile)[] | Url[] | Uuid[],
+    data: (Blob | File | Buffer | ReactNativeAsset)[] | Url[] | Uuid[],
     options: FileFromOptions & GroupFromOptions
   ): Promise<UploadcareGroup>
 }
@@ -208,7 +209,7 @@ List of all available API methods:
 
 ```typescript
 base(
-  file: NodeFile | BrowserFile,
+  file: Blob | File | Buffer | ReactNativeAsset,
   options: BaseOptions
 ): Promise<BaseResponse>
 ```
@@ -245,7 +246,7 @@ multipartStart(
 
 ```typescript
 multipartUpload(
-  part: Buffer | Blob,
+  part: Buffer | Blob | File,
   url: MultipartPart,
   options: MultipartUploadOptions
 ): Promise<MultipartUploadResponse>
@@ -288,6 +289,7 @@ Defaults to `https://upload.uploadcare.com`
 #### `fileName: string`
 
 You can specify an original filename.
+It could useful when file input does not contain filename.
 
 Defaults to `original`.
 
@@ -408,7 +410,7 @@ Defaults to `4`.
 
 ### `contentType: string`
 
-This setting is needed for correct multipart uploads.
+This option is useful when file input does not contain content type.
 
 Defaults to `application/octet-stream`.
 
@@ -426,6 +428,37 @@ Non-string values will be converted to `string`. `undefined` values will be igno
 
 See [docs][uc-file-metadata] and [REST API][uc-docs-metadata] for details.
 
+## React Native
+
+To be able to use `@uploadcare/upload-client` with React Native, you need to
+install [react-native-url-polyfill][react-native-url-polyfill].
+
+To prevent [`Error: Cannot create URL for blob`][react-native-url-polyfill-issue]
+errors you need to configure your Android app schema to accept blobs -
+have a look at this pull request for an example: [5985d7e][react-native-url-polyfill-example].
+
+You can use `ReactNativeAsset` as an input to the `@uploadcare/upload-client` like this:
+
+```ts
+type ReactNativeAsset = {
+  uri: string
+  type: string
+  name?: string
+}
+```
+
+```ts
+const asset = { uri: 'URI_TO_FILE', name: 'file.txt', type: 'text/plain' }
+uploadFile(asset, { publicKey: 'YOUR_PUBLIC_KEY' })
+```
+
+Or `Blob` like this:
+
+```ts
+const uri = 'URI_TO_FILE'
+const blob = await fetch(uri).then((res) => res.blob())
+uploadFile(blob, { publicKey: 'YOUR_PUBLIC_KEY' })
+```
 
 ## Testing
 
@@ -490,3 +523,6 @@ request at [hello@uploadcare.com][uc-email-hello].
 [uc-docs-upload-api]: https://uploadcare.com/docs/api_reference/upload/?utm_source=github&utm_campaign=uploadcare-js-api-clients
 [uc-docs-metadata]: https://uploadcare.com/api-refs/rest-api/v0.7.0/#tag/File-Metadata
 [uc-file-metadata]: https://uploadcare.com/docs/file-metadata/
+[react-native-url-polyfill]: https://github.com/charpeni/react-native-url-polyfill
+[react-native-url-polyfill-issue]: https://github.com/charpeni/react-native-url-polyfill/issues/284
+[react-native-url-polyfill-example]: https://github.com/charpeni/react-native-url-polyfill/commit/5985d7efc07b496b829883540d09c6f0be384387

package/dist/index.browser.js

@@ -269,7 +269,8 @@ const request = ({ method, url, data, headers = {}, signal, onProgress }) => new
     }
 });
 
-function identity(obj) {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function identity(obj, ..._args) {
     return obj;
 }
 
@@ -312,7 +313,7 @@ const isFileValue = (value) => !!value &&
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
         const { name, contentType } = inputValue;
-        const file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
+        const file = transformFile(inputValue.data, name, contentType);
         const options = getFileOptions({ name, contentType });
         params.push([inputKey, file, ...options]);
     }
@@ -432,27 +433,32 @@ function retryIfFailed(fn, options) {
 }
 
 const getContentType = (file) => {
+    let contentType = '';
     if (isBlob(file) || isFile(file) || isReactNativeAsset(file)) {
-        return file.type || defaultContentType;
+        contentType = file.type;
     }
-    if (isBuffer(file)) {
-        return defaultFilename;
+    if (contentType) {
+        return contentType;
     }
-    console.warn(`Unknown filename: ${file}. Using default filename: ${defaultFilename}`);
-    return defaultFilename;
+    console.warn(`Cannot determine content type. Using default content type: ${defaultContentType}`, file);
+    return defaultContentType;
 };
 
-const getFilename = (file) => {
-    if (isBlob(file) || isBuffer(file)) {
-        return defaultFilename;
+const getFileName = (file) => {
+    let filename = '';
+    if (isFile(file) && file.name) {
+        filename = file.name;
     }
-    if (isFile(file)) {
-        return file.name || defaultFilename;
+    else if (isBlob(file) || isBuffer(file)) {
+        filename = '';
     }
-    if (isReactNativeAsset(file)) {
-        return file.name || defaultFilename;
+    else if (isReactNativeAsset(file) && file.name) {
+        filename = file.name;
+    }
+    if (filename) {
+        return filename;
     }
-    console.warn(`Unknown file type: ${file}. Using default filename: ${defaultFilename}`);
+    console.warn(`Cannot determine filename. Using default filename: ${defaultFilename}`, file);
     return defaultFilename;
 };
 
@@ -476,7 +482,7 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         data: buildFormData({
             file: {
                 data: file,
-                name: fileName || getFilename(file),
+                name: fileName || getFileName(file),
                 contentType: contentType || getContentType(file)
             },
             UPLOADCARE_PUB_KEY: publicKey,
@@ -1211,7 +1217,7 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
     .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 
 const memo = new WeakMap();
-const getReactNativeBlob = async (asset) => {
+const getBlobFromReactNativeAsset = async (asset) => {
     if (memo.has(asset)) {
         return memo.get(asset);
     }
@@ -1228,10 +1234,10 @@ const getFileSize = async (file) => {
         return file.size;
     }
     if (isReactNativeAsset(file)) {
-        const blob = await getReactNativeBlob(file);
+        const blob = await getBlobFromReactNativeAsset(file);
         return blob.size;
     }
-    throw new Error(`Failed to get file size for file: ${file}`);
+    throw new Error(`Unknown file type. Cannot determine file size.`);
 };
 
 /**
@@ -1252,7 +1258,7 @@ const isUuid = (data) => {
 /**
  * Url type guard.
  *
- * @param {AnyFile | Url | Uuid} data
+ * @param {SupportedFileInput | Url | Uuid} data
  */
 const isUrl = (data) => {
     const URL_REGEX = '^(?:\\w+:)?\\/\\/([^\\s\\.]+\\.\\S{2}|localhost[\\:?\\d]*)\\S*$';
@@ -1314,7 +1320,7 @@ const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, re
     retryNetworkErrorMaxTimes
 });
 const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, baseCDN, metadata }) => {
-    const size = fileSize || await getFileSize(file);
+    const size = fileSize ?? (await getFileSize(file));
     let progressValues;
     const createProgressHandler = (totalChunks, chunkIdx) => {
         if (!onProgress)
@@ -1337,7 +1343,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
     return multipartStart(size, {
         publicKey,
         contentType: contentType || getContentType(file),
-        fileName: fileName || getFilename(file),
+        fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
         secureExpire,

package/dist/index.d.ts

@@ -70,6 +70,7 @@ export declare type ContentInfo = {
 	image?: ImageInfo;
 	video?: VideoInfo;
 };
+export declare type Metadata = Record<string, string>;
 export interface DefaultSettings {
 	baseCDN: string;
 	baseURL: string;
@@ -104,8 +105,8 @@ export declare type ReactNativeAsset = {
 	uri: string;
 	name?: string;
 };
-export declare type ReactNativeFile = ReactNativeAsset | Blob;
-export declare type AnyFile = BrowserFile | NodeFile | ReactNativeFile;
+export declare type SupportedFileInput = BrowserFile | NodeFile | ReactNativeAsset;
+export declare type Sliceable = BrowserFile | NodeFile;
 export declare type FileInfo = {
 	size: number;
 	done: number;
@@ -145,9 +146,6 @@ export declare type UnknownProgressInfo = {
 	isComputable: false;
 };
 export declare type ProgressCallback<T = ComputableProgressInfo | UnknownProgressInfo> = (arg: T) => void;
-export declare type Metadata = {
-	[key: string]: string;
-};
 export declare type BaseResponse = {
 	file: Uuid;
 };
@@ -172,8 +170,8 @@ export declare type BaseOptions = {
  * Performs file uploading request to Uploadcare Upload API.
  * Can be canceled and has progress.
  */
-export function base(file: AnyFile, { publicKey, fileName, contentType, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, metadata }: BaseOptions): Promise<BaseResponse>;
-declare enum TypeEnum {
+export function base(file: SupportedFileInput, { publicKey, fileName, contentType, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, metadata }: BaseOptions): Promise<BaseResponse>;
+export declare enum TypeEnum {
 	Token = "token",
 	FileInfo = "file_info"
 }
@@ -207,7 +205,7 @@ export declare type FromUrlOptions = {
  * Uploading files from URL.
  */
 export function fromUrl(sourceUrl: Url, { publicKey, baseURL, store, fileName, checkForUrlDuplicates, saveUrlForRecurrentUploads, secureSignature, secureExpire, source, signal, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, metadata }: FromUrlOptions): Promise<FromUrlSuccessResponse>;
-declare enum Status {
+export declare enum Status {
 	Unknown = "unknown",
 	Waiting = "waiting",
 	Progress = "progress",
@@ -333,7 +331,7 @@ export declare type MultipartUploadResponse = {
 /**
  * Complete multipart uploading.
  */
-export function multipartUpload(part: AnyFile, url: MultipartPart, { signal, onProgress, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }: MultipartUploadOptions): Promise<MultipartUploadResponse>;
+export function multipartUpload(part: SupportedFileInput, url: MultipartPart, { signal, onProgress, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }: MultipartUploadOptions): Promise<MultipartUploadResponse>;
 export declare type MultipartCompleteOptions = {
 	publicKey: string;
 	baseURL?: string;
@@ -368,6 +366,34 @@ export declare class UploadcareFile {
 		fileName?: string;
 	});
 }
+export declare type FileFromOptions = {
+	publicKey: string;
+	fileName?: string;
+	baseURL?: string;
+	secureSignature?: string;
+	secureExpire?: string;
+	store?: boolean;
+	signal?: AbortSignal;
+	onProgress?: ProgressCallback;
+	source?: string;
+	integration?: string;
+	userAgent?: CustomUserAgent;
+	retryThrottledRequestMaxTimes?: number;
+	retryNetworkErrorMaxTimes?: number;
+	contentType?: string;
+	multipartMinFileSize?: number;
+	multipartChunkSize?: number;
+	maxConcurrentRequests?: number;
+	baseCDN?: string;
+	checkForUrlDuplicates?: boolean;
+	saveUrlForRecurrentUploads?: boolean;
+	pusherKey?: string;
+	metadata?: Metadata;
+};
+/**
+ * Uploads file from provided data.
+ */
+export declare function uploadFile(data: SupportedFileInput | Url | Uuid, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartMinFileSize, multipartChunkSize, maxConcurrentRequests, baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, pusherKey, metadata }: FileFromOptions): Promise<UploadcareFile>;
 export declare type DirectOptions = {
 	publicKey: string;
 	fileName?: string;
@@ -386,7 +412,7 @@ export declare type DirectOptions = {
 	baseCDN?: string;
 	metadata?: Metadata;
 };
-export declare const uploadDirect: (file: AnyFile, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, baseCDN, metadata }: DirectOptions) => Promise<UploadcareFile>;
+export declare const uploadDirect: (file: SupportedFileInput, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, contentType, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, baseCDN, metadata }: DirectOptions) => Promise<UploadcareFile>;
 export declare type FromUploadedOptions = {
 	publicKey: string;
 	fileName?: string;
@@ -428,35 +454,7 @@ export declare type MultipartOptions = {
 	baseCDN?: string;
 	metadata?: Metadata;
 };
-export declare const uploadMultipart: (file: AnyFile, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize, maxConcurrentRequests, baseCDN, metadata }: MultipartOptions) => Promise<UploadcareFile>;
-export declare type FileFromOptions = {
-	publicKey: string;
-	fileName?: string;
-	baseURL?: string;
-	secureSignature?: string;
-	secureExpire?: string;
-	store?: boolean;
-	signal?: AbortSignal;
-	onProgress?: ProgressCallback;
-	source?: string;
-	integration?: string;
-	userAgent?: CustomUserAgent;
-	retryThrottledRequestMaxTimes?: number;
-	retryNetworkErrorMaxTimes?: number;
-	contentType?: string;
-	multipartMinFileSize?: number;
-	multipartChunkSize?: number;
-	maxConcurrentRequests?: number;
-	baseCDN?: string;
-	checkForUrlDuplicates?: boolean;
-	saveUrlForRecurrentUploads?: boolean;
-	pusherKey?: string;
-	metadata?: Metadata;
-};
-/**
- * Uploads file from provided data.
- */
-export declare function uploadFile(data: AnyFile | Url | Uuid, { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartMinFileSize, multipartChunkSize, maxConcurrentRequests, baseCDN, checkForUrlDuplicates, saveUrlForRecurrentUploads, pusherKey, metadata }: FileFromOptions): Promise<UploadcareFile>;
+export declare const uploadMultipart: (file: SupportedFileInput, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize, maxConcurrentRequests, baseCDN, metadata }: MultipartOptions) => Promise<UploadcareFile>;
 export declare class UploadcareGroup {
 	readonly uuid: GroupId;
 	readonly filesCount: string;
@@ -472,23 +470,23 @@ export declare class UploadcareGroup {
 export declare type GroupFromOptions = {
 	jsonpCallback?: string;
 };
-export function uploadFileGroup(data: AnyFile[] | Url[] | Uuid[], { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize, baseCDN, jsonpCallback }: FileFromOptions & GroupFromOptions): Promise<UploadcareGroup>;
+export declare function uploadFileGroup(data: SupportedFileInput[] | Url[] | Uuid[], { publicKey, fileName, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize, baseCDN, jsonpCallback }: FileFromOptions & GroupFromOptions): Promise<UploadcareGroup>;
 export declare class UploadClient {
 	private settings;
 	constructor(settings: Settings);
 	updateSettings(newSettings: Settings): void;
 	getSettings(): Settings;
-	base(file: AnyFile, options?: Partial<BaseOptions>): Promise<BaseResponse>;
+	base(file: SupportedFileInput, options?: Partial<BaseOptions>): Promise<BaseResponse>;
 	info(uuid: Uuid, options?: Partial<InfoOptions>): Promise<FileInfo>;
 	fromUrl(sourceUrl: Url, options?: Partial<FromUrlOptions>): Promise<FromUrlResponse>;
 	fromUrlStatus(token: Token, options?: Partial<FromUrlStatusOptions>): Promise<FromUrlStatusResponse>;
 	group(uuids: Uuid[], options?: Partial<GroupOptions>): Promise<GroupInfo>;
 	groupInfo(id: GroupId, options?: Partial<GroupInfoOptions>): Promise<GroupInfo>;
 	multipartStart(size: number, options?: Partial<MultipartStartOptions>): Promise<MultipartStartResponse>;
-	multipartUpload(part: BrowserFile | NodeFile, url: MultipartPart, options?: Partial<MultipartUploadOptions>): Promise<MultipartUploadResponse>;
+	multipartUpload(part: Sliceable, url: MultipartPart, options?: Partial<MultipartUploadOptions>): Promise<MultipartUploadResponse>;
 	multipartComplete(uuid: Uuid, options?: Partial<MultipartCompleteOptions>): Promise<FileInfo>;
-	uploadFile(data: AnyFile | Url | Uuid, options?: Partial<FileFromOptions>): Promise<UploadcareFile>;
-	uploadFileGroup(data: (AnyFile)[] | Url[] | Uuid[], options?: Partial<FileFromOptions & GroupFromOptions>): Promise<UploadcareGroup>;
+	uploadFile(data: SupportedFileInput | Url | Uuid, options?: Partial<FileFromOptions>): Promise<UploadcareFile>;
+	uploadFileGroup(data: SupportedFileInput[] | Url[] | Uuid[], options?: Partial<FileFromOptions & GroupFromOptions>): Promise<UploadcareGroup>;
 }
 export declare type Headers = {
 	[key: string]: string | string[] | undefined;
@@ -497,7 +495,7 @@ export declare type ErrorRequestInfo = {
 	method?: string;
 	url: string;
 	query?: string;
-	data?: NodeFormData | FormData | AnyFile;
+	data?: NodeFormData | FormData | SupportedFileInput;
 	headers?: Headers;
 };
 export declare type ErrorResponseInfo = {

package/dist/index.node.js

@@ -288,7 +288,8 @@ const request = (params) => {
     }));
 };
 
-function identity(obj) {
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function identity(obj, ..._args) {
     return obj;
 }
 
@@ -340,7 +341,7 @@ const isFileValue = (value) => !!value &&
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
         const { name, contentType } = inputValue;
-        const file = transformFile(inputValue.data); // lgtm [js/superfluous-trailing-arguments]
+        const file = transformFile(inputValue.data, name, contentType);
         const options = getFileOptions({ name, contentType });
         params.push([inputKey, file, ...options]);
     }
@@ -460,27 +461,32 @@ function retryIfFailed(fn, options) {
 }
 
 const getContentType = (file) => {
+    let contentType = '';
     if (isBlob(file) || isFile(file) || isReactNativeAsset(file)) {
-        return file.type || defaultContentType;
+        contentType = file.type;
     }
-    if (isBuffer(file)) {
-        return defaultFilename;
+    if (contentType) {
+        return contentType;
     }
-    console.warn(`Unknown filename: ${file}. Using default filename: ${defaultFilename}`);
-    return defaultFilename;
+    console.warn(`Cannot determine content type. Using default content type: ${defaultContentType}`, file);
+    return defaultContentType;
 };
 
-const getFilename = (file) => {
-    if (isBlob(file) || isBuffer(file)) {
-        return defaultFilename;
+const getFileName = (file) => {
+    let filename = '';
+    if (isFile(file) && file.name) {
+        filename = file.name;
     }
-    if (isFile(file)) {
-        return file.name || defaultFilename;
+    else if (isBlob(file) || isBuffer(file)) {
+        filename = '';
     }
-    if (isReactNativeAsset(file)) {
-        return file.name || defaultFilename;
+    else if (isReactNativeAsset(file) && file.name) {
+        filename = file.name;
+    }
+    if (filename) {
+        return filename;
     }
-    console.warn(`Unknown file type: ${file}. Using default filename: ${defaultFilename}`);
+    console.warn(`Cannot determine filename. Using default filename: ${defaultFilename}`, file);
     return defaultFilename;
 };
 
@@ -504,7 +510,7 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         data: buildFormData({
             file: {
                 data: file,
-                name: fileName || getFilename(file),
+                name: fileName || getFileName(file),
                 contentType: contentType || getContentType(file)
             },
             UPLOADCARE_PUB_KEY: publicKey,
@@ -1237,7 +1243,7 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
     .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 
 const memo = new WeakMap();
-const getReactNativeBlob = async (asset) => {
+const getBlobFromReactNativeAsset = async (asset) => {
     if (memo.has(asset)) {
         return memo.get(asset);
     }
@@ -1254,10 +1260,10 @@ const getFileSize = async (file) => {
         return file.size;
     }
     if (isReactNativeAsset(file)) {
-        const blob = await getReactNativeBlob(file);
+        const blob = await getBlobFromReactNativeAsset(file);
         return blob.size;
     }
-    throw new Error(`Failed to get file size for file: ${file}`);
+    throw new Error(`Unknown file type. Cannot determine file size.`);
 };
 
 /**
@@ -1278,7 +1284,7 @@ const isUuid = (data) => {
 /**
  * Url type guard.
  *
- * @param {AnyFile | Url | Uuid} data
+ * @param {SupportedFileInput | Url | Uuid} data
  */
 const isUrl = (data) => {
     const URL_REGEX = '^(?:\\w+:)?\\/\\/([^\\s\\.]+\\.\\S{2}|localhost[\\:?\\d]*)\\S*$';
@@ -1340,7 +1346,7 @@ const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, re
     retryNetworkErrorMaxTimes
 });
 const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, baseCDN, metadata }) => {
-    const size = fileSize || await getFileSize(file);
+    const size = fileSize ?? (await getFileSize(file));
     let progressValues;
     const createProgressHandler = (totalChunks, chunkIdx) => {
         if (!onProgress)
@@ -1363,7 +1369,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
     return multipartStart(size, {
         publicKey,
         contentType: contentType || getContentType(file),
-        fileName: fileName || getFilename(file),
+        fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
         secureExpire,

package/dist/index.react-native.js

@@ -302,7 +302,7 @@ const transformFile = (file, name, contentType) => {
         const uri = URL.createObjectURL(file);
         return { uri, name: name, type: file.type || contentType };
     }
-    throw new Error(`Unsupported file type: ${file}`);
+    throw new Error(`Unsupported file type.`);
 };
 var getFormData = () => new FormData();
 
@@ -321,7 +321,7 @@ const isFileValue = (value) => !!value &&
 function collectParams(params, inputKey, inputValue) {
     if (isFileValue(inputValue)) {
         const { name, contentType } = inputValue;
-        const file = transformFile(inputValue.data, name, contentType); // lgtm [js/superfluous-trailing-arguments]
+        const file = transformFile(inputValue.data, name, contentType);
         const options = getFileOptions();
         params.push([inputKey, file, ...options]);
     }
@@ -441,27 +441,32 @@ function retryIfFailed(fn, options) {
 }
 
 const getContentType = (file) => {
+    let contentType = '';
     if (isBlob(file) || isFile(file) || isReactNativeAsset(file)) {
-        return file.type || defaultContentType;
+        contentType = file.type;
     }
-    if (isBuffer(file)) {
-        return defaultFilename;
+    if (contentType) {
+        return contentType;
     }
-    console.warn(`Unknown filename: ${file}. Using default filename: ${defaultFilename}`);
-    return defaultFilename;
+    console.warn(`Cannot determine content type. Using default content type: ${defaultContentType}`, file);
+    return defaultContentType;
 };
 
-const getFilename = (file) => {
-    if (isBlob(file) || isBuffer(file)) {
-        return defaultFilename;
+const getFileName = (file) => {
+    let filename = '';
+    if (isFile(file) && file.name) {
+        filename = file.name;
     }
-    if (isFile(file)) {
-        return file.name || defaultFilename;
+    else if (isBlob(file) || isBuffer(file)) {
+        filename = '';
     }
-    if (isReactNativeAsset(file)) {
-        return file.name || defaultFilename;
+    else if (isReactNativeAsset(file) && file.name) {
+        filename = file.name;
+    }
+    if (filename) {
+        return filename;
     }
-    console.warn(`Unknown file type: ${file}. Using default filename: ${defaultFilename}`);
+    console.warn(`Cannot determine filename. Using default filename: ${defaultFilename}`, file);
     return defaultFilename;
 };
 
@@ -485,7 +490,7 @@ function base(file, { publicKey, fileName, contentType, baseURL = defaultSetting
         data: buildFormData({
             file: {
                 data: file,
-                name: fileName || getFilename(file),
+                name: fileName || getFileName(file),
                 contentType: contentType || getContentType(file)
             },
             UPLOADCARE_PUB_KEY: publicKey,
@@ -1220,7 +1225,7 @@ const uploadFromUrl = (sourceUrl, { publicKey, fileName, baseURL, baseCDN, check
     .then((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
 
 const memo = new WeakMap();
-const getReactNativeBlob = async (asset) => {
+const getBlobFromReactNativeAsset = async (asset) => {
     if (memo.has(asset)) {
         return memo.get(asset);
     }
@@ -1237,10 +1242,10 @@ const getFileSize = async (file) => {
         return file.size;
     }
     if (isReactNativeAsset(file)) {
-        const blob = await getReactNativeBlob(file);
+        const blob = await getBlobFromReactNativeAsset(file);
         return blob.size;
     }
-    throw new Error(`Failed to get file size for file: ${file}`);
+    throw new Error(`Unknown file type. Cannot determine file size.`);
 };
 
 /**
@@ -1261,7 +1266,7 @@ const isUuid = (data) => {
 /**
  * Url type guard.
  *
- * @param {AnyFile | Url | Uuid} data
+ * @param {SupportedFileInput | Url | Uuid} data
  */
 const isUrl = (data) => {
     const URL_REGEX = '^(?:\\w+:)?\\/\\/([^\\s\\.]+\\.\\S{2}|localhost[\\:?\\d]*)\\S*$';
@@ -1323,7 +1328,7 @@ const sliceChunk = (file, index, fileSize, chunkSize) => {
 const prepareChunks = async (file, fileSize, chunkSize) => {
     let blob;
     if (isReactNativeAsset(file)) {
-        blob = await getReactNativeBlob(file);
+        blob = await getBlobFromReactNativeAsset(file);
     }
     else {
         blob = file;
@@ -1343,7 +1348,7 @@ const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, re
     retryNetworkErrorMaxTimes
 });
 const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, secureSignature, secureExpire, store, signal, onProgress, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, contentType, multipartChunkSize = defaultSettings.multipartChunkSize, maxConcurrentRequests = defaultSettings.maxConcurrentRequests, baseCDN, metadata }) => {
-    const size = fileSize || await getFileSize(file);
+    const size = fileSize ?? (await getFileSize(file));
     let progressValues;
     const createProgressHandler = (totalChunks, chunkIdx) => {
         if (!onProgress)
@@ -1366,7 +1371,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
     return multipartStart(size, {
         publicKey,
         contentType: contentType || getContentType(file),
-        fileName: fileName || getFilename(file),
+        fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
         secureExpire,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "6.0.1-alpha.9",
+  "version": "6.1.0-alpha.0",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/index.node.js",
@@ -71,8 +71,8 @@
     "@types/ws": "8.5.3",
     "data-uri-to-buffer": "3.0.1",
     "dataurl-to-blob": "0.0.1",
-    "jest-environment-jsdom": "28.1.0",
-    "jest-websocket-mock": "2.3.0",
+    "jest-environment-jsdom": "29.3.1",
+    "jest-websocket-mock": "2.4.0",
     "koa": "2.13.4",
     "koa-add-trailing-slashes": "2.0.1",
     "koa-body": "5.0.0",