@uploadcare/upload-client 6.1.0 → 6.2.0

package/README.md

@@ -259,13 +259,6 @@ multipartComplete(
 ): Promise<FileInfo>
 ```
 
-```typescript
-multipart(
-  file: File | Buffer | Blob,
-  options: MultipartOptions
-): Promise<FileInfo>
-```
-
 ### Settings
 
 #### `publicKey: string`

package/dist/index.browser.js

@@ -390,7 +390,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.1.0';
+var version = '6.2.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -455,7 +455,10 @@ const getFileName = (file) => {
 };
 
 function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+    if (typeof store === 'undefined' || store === 'auto') {
+        return 'auto';
+    }
+    return store ? '1' : '0';
 }
 
 /**
@@ -701,14 +704,17 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
 /**
  * Complete multipart uploading.
  */
-function multipartUpload(part, url, { signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+function multipartUpload(part, url, { contentType, signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
     return retryIfFailed(() => request({
         method: 'PUT',
         url,
         data: part,
         // Upload request can't be non-computable because we always know exact size
         onProgress: onProgress,
-        signal
+        signal,
+        headers: {
+            'Content-Type': contentType || defaultContentType
+        }
     })
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
@@ -1303,8 +1309,9 @@ const prepareChunks = async (file, fileSize, chunkSize) => {
     return (index) => sliceChunk(file, index, fileSize, chunkSize);
 };
 
-const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
+const uploadPart = (chunk, url, { publicKey, contentType, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
     publicKey,
+    contentType,
     onProgress,
     signal,
     integration,
@@ -1332,9 +1339,10 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             });
         };
     };
+    contentType || (contentType = getContentType(file));
     return multipartStart(size, {
         publicKey,
-        contentType: contentType || getContentType(file),
+        contentType,
         fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
@@ -1354,6 +1362,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             uuid,
             runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPart(getChunk(index), url, {
                 publicKey,
+                contentType,
                 onProgress: createProgressHandler(parts.length, index),
                 signal,
                 integration,

package/dist/index.d.ts

@@ -71,6 +71,7 @@ export declare type ContentInfo = {
 	video?: VideoInfo;
 };
 export declare type Metadata = Record<string, string>;
+export declare type StoreValue = "auto" | boolean;
 export interface DefaultSettings {
 	baseCDN: string;
 	baseURL: string;
@@ -88,7 +89,7 @@ export interface Settings extends Partial<DefaultSettings> {
 	publicKey: string;
 	fileName?: string;
 	contentType?: string;
-	store?: boolean;
+	store?: StoreValue;
 	secureSignature?: string;
 	secureExpire?: string;
 	integration?: string;
@@ -155,7 +156,7 @@ export declare type BaseOptions = {
 	baseURL?: string;
 	secureSignature?: string;
 	secureExpire?: string;
-	store?: boolean;
+	store?: StoreValue;
 	contentType?: string;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback;
@@ -187,7 +188,7 @@ export declare type FromUrlResponse = FromUrlSuccessResponse;
 export declare type FromUrlOptions = {
 	publicKey: string;
 	baseURL?: string;
-	store?: boolean;
+	store?: StoreValue;
 	fileName?: string;
 	checkForUrlDuplicates?: boolean;
 	saveUrlForRecurrentUploads?: boolean;
@@ -298,7 +299,7 @@ export declare type MultipartStartOptions = {
 	baseURL?: string;
 	secureSignature?: string;
 	secureExpire?: string;
-	store?: boolean;
+	store?: StoreValue;
 	multipartChunkSize?: number;
 	signal?: AbortSignal;
 	source?: string;
@@ -319,6 +320,7 @@ export declare type MultipartStartResponse = {
 export function multipartStart(size: number, { publicKey, contentType, fileName, multipartChunkSize, baseURL, secureSignature, secureExpire, store, signal, source, integration, userAgent, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes, metadata }: MultipartStartOptions): Promise<MultipartStartResponse>;
 export declare type MultipartUploadOptions = {
 	publicKey?: string;
+	contentType?: string;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback<ComputableProgressInfo>;
 	integration?: string;
@@ -331,7 +333,7 @@ export declare type MultipartUploadResponse = {
 /**
  * Complete multipart uploading.
  */
-export function multipartUpload(part: SupportedFileInput, url: MultipartPart, { signal, onProgress, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }: MultipartUploadOptions): Promise<MultipartUploadResponse>;
+export function multipartUpload(part: SupportedFileInput, url: MultipartPart, { contentType, signal, onProgress, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }: MultipartUploadOptions): Promise<MultipartUploadResponse>;
 export declare type MultipartCompleteOptions = {
 	publicKey: string;
 	baseURL?: string;
@@ -372,7 +374,7 @@ export declare type FileFromOptions = {
 	baseURL?: string;
 	secureSignature?: string;
 	secureExpire?: string;
-	store?: boolean;
+	store?: StoreValue;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback;
 	source?: string;
@@ -400,7 +402,7 @@ export declare type DirectOptions = {
 	baseURL?: string;
 	secureSignature?: string;
 	secureExpire?: string;
-	store?: boolean;
+	store?: StoreValue;
 	contentType?: string;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback;
@@ -442,7 +444,7 @@ export declare type MultipartOptions = {
 	baseURL?: string;
 	secureSignature?: string;
 	secureExpire?: string;
-	store?: boolean;
+	store?: StoreValue;
 	signal?: AbortSignal;
 	onProgress?: ProgressCallback<ComputableProgressInfo>;
 	source?: string;

package/dist/index.node.js

@@ -418,7 +418,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.1.0';
+var version = '6.2.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -483,7 +483,10 @@ const getFileName = (file) => {
 };
 
 function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+    if (typeof store === 'undefined' || store === 'auto') {
+        return 'auto';
+    }
+    return store ? '1' : '0';
 }
 
 /**
@@ -729,14 +732,17 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
 /**
  * Complete multipart uploading.
  */
-function multipartUpload(part, url, { signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+function multipartUpload(part, url, { contentType, signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
     return retryIfFailed(() => request({
         method: 'PUT',
         url,
         data: part,
         // Upload request can't be non-computable because we always know exact size
         onProgress: onProgress,
-        signal
+        signal,
+        headers: {
+            'Content-Type': contentType || defaultContentType
+        }
     })
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
@@ -1329,8 +1335,9 @@ const prepareChunks = async (file, fileSize, chunkSize) => {
     return (index) => sliceChunk(file, index, fileSize, chunkSize);
 };
 
-const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
+const uploadPart = (chunk, url, { publicKey, contentType, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
     publicKey,
+    contentType,
     onProgress,
     signal,
     integration,
@@ -1358,9 +1365,10 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             });
         };
     };
+    contentType || (contentType = getContentType(file));
     return multipartStart(size, {
         publicKey,
-        contentType: contentType || getContentType(file),
+        contentType,
         fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
@@ -1380,6 +1388,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             uuid,
             runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPart(getChunk(index), url, {
                 publicKey,
+                contentType,
                 onProgress: createProgressHandler(parts.length, index),
                 signal,
                 integration,

package/dist/index.react-native.js

@@ -398,7 +398,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.1.0';
+var version = '6.2.0';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -463,7 +463,10 @@ const getFileName = (file) => {
 };
 
 function getStoreValue(store) {
-    return typeof store === 'undefined' ? 'auto' : store ? '1' : '0';
+    if (typeof store === 'undefined' || store === 'auto') {
+        return 'auto';
+    }
+    return store ? '1' : '0';
 }
 
 /**
@@ -709,14 +712,17 @@ function multipartStart(size, { publicKey, contentType, fileName, multipartChunk
 /**
  * Complete multipart uploading.
  */
-function multipartUpload(part, url, { signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
+function multipartUpload(part, url, { contentType, signal, onProgress, retryThrottledRequestMaxTimes = defaultSettings.retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes = defaultSettings.retryNetworkErrorMaxTimes }) {
     return retryIfFailed(() => request({
         method: 'PUT',
         url,
         data: part,
         // Upload request can't be non-computable because we always know exact size
         onProgress: onProgress,
-        signal
+        signal,
+        headers: {
+            'Content-Type': contentType || defaultContentType
+        }
     })
         .then((result) => {
         // hack for node ¯\_(ツ)_/¯
@@ -1331,8 +1337,9 @@ const prepareChunks = async (file, fileSize, chunkSize) => {
     };
 };
 
-const uploadPart = (chunk, url, { publicKey, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
+const uploadPart = (chunk, url, { publicKey, contentType, onProgress, signal, integration, retryThrottledRequestMaxTimes, retryNetworkErrorMaxTimes }) => multipartUpload(chunk, url, {
     publicKey,
+    contentType,
     onProgress,
     signal,
     integration,
@@ -1360,9 +1367,10 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             });
         };
     };
+    contentType || (contentType = getContentType(file));
     return multipartStart(size, {
         publicKey,
-        contentType: contentType || getContentType(file),
+        contentType,
         fileName: fileName || getFileName(file),
         baseURL,
         secureSignature,
@@ -1382,6 +1390,7 @@ const uploadMultipart = async (file, { publicKey, fileName, fileSize, baseURL, s
             uuid,
             runWithConcurrency(maxConcurrentRequests, parts.map((url, index) => () => uploadPart(getChunk(index), url, {
                 publicKey,
+                contentType,
                 onProgress: createProgressHandler(parts.length, index),
                 signal,
                 integration,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "6.1.0",
+  "version": "6.2.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": "^6.1.0",
+    "@uploadcare/api-client-utils": "^6.2.0",
     "chalk": "^4.1.2"
   },
   "dependencies": {