@uploadcare/upload-client 6.18.2 → 6.18.3

package/dist/cjs/index.browser.cjs

@@ -405,7 +405,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1488,6 +1488,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1506,7 +1520,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/dist/cjs/index.node.cjs

@@ -435,7 +435,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1519,6 +1519,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1537,7 +1551,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/dist/cjs/index.react-native.cjs

@@ -413,7 +413,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1516,6 +1516,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1534,7 +1548,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/dist/esm/index.browser.mjs

@@ -403,7 +403,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1486,6 +1486,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1504,7 +1518,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/dist/esm/index.node.mjs

@@ -433,7 +433,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1517,6 +1517,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1535,7 +1549,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/dist/esm/index.react-native.mjs

@@ -411,7 +411,7 @@ const getUrl = (base, path, query) => {
     return url.toString();
 };
 
-var version = '6.18.2';
+var version = '6.18.3';
 
 const LIBRARY_NAME = 'UploadcareUploadClient';
 const LIBRARY_VERSION = version;
@@ -1514,6 +1514,20 @@ async function uploadFile(data, { publicKey, fileName, baseURL = defaultSettings
     throw new TypeError(`File uploading from "${data}" is not supported`);
 }
 
+const replaceUrlBase = (url, newBase) => {
+    try {
+        const originalUrl = new URL(url);
+        const baseUrl = new URL(newBase);
+        originalUrl.protocol = baseUrl.protocol;
+        originalUrl.hostname = baseUrl.hostname;
+        originalUrl.port = baseUrl.port;
+        return originalUrl.toString();
+    }
+    catch {
+        return url;
+    }
+};
+
 class UploadcareGroup {
     uuid;
     filesCount;
@@ -1532,7 +1546,7 @@ class UploadcareGroup {
         this.isStored = !!groupInfo.datetimeStored;
         this.isImage = !!Object.values(groupFiles).filter((file) => file.isImage)
             .length;
-        this.cdnUrl = groupInfo.cdnUrl;
+        this.cdnUrl = replaceUrlBase(groupInfo.cdnUrl, baseCDN);
         this.files = groupFiles.map((fileInfo) => new UploadcareFile(fileInfo, { baseCDN }));
         this.createdAt = groupInfo.datetimeCreated;
         this.storedAt = groupInfo.datetimeStored;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/upload-client",
-  "version": "6.18.2",
+  "version": "6.18.3",
   "description": "Library for work with Uploadcare Upload API",
   "type": "module",
   "module": "./dist/esm/index.node.mjs",
@@ -83,7 +83,7 @@
     "@types/koa__cors": "^5.0.0",
     "@types/koa__router": "^12.0.4",
     "@types/ws": "8.5.3",
-    "@uploadcare/api-client-utils": "^6.18.2",
+    "@uploadcare/api-client-utils": "^6.18.3",
     "chalk": "^4.1.2",
     "data-uri-to-buffer": "3.0.1",
     "dataurl-to-blob": "0.0.1",