glitch-javascript-sdk 1.4.4 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glitch-javascript-sdk",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "description": "Javascript SDK for Glitch",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/util/Requests.ts

@@ -150,35 +150,34 @@ class Requests {
         .join('&');
       url = `${url}?${queryString}`;
     }
-
+  
     // Prepare FormData
     const formData = new FormData();
     formData.append(filename, file);
-
+  
     if (Requests.community_id) {
       data = {
         ...data,
         communities: [Requests.community_id],
       };
     }
-
+  
     for (let key in data) {
       formData.append(key, data[key]);
     }
-
+  
     // Prepare headers
     let headers: { [key: string]: string } = {
       'Content-Type': 'multipart/form-data',
     };
-
+  
     if (Requests.authToken) {
       headers['Authorization'] = `Bearer ${Requests.authToken}`;
     }
-
-    // Format URL
-    url = url.replace(/\/\//g, '/');
-    const uri = `${Requests.baseUrl}${url}`.replace(/\/\//g, '/');
-
+  
+    // Construct the full URL properly
+    const uri = new URL(url, Requests.baseUrl).href;
+  
     // Make the request
     return axios({
       method: 'POST',
@@ -188,7 +187,7 @@ class Requests {
       onUploadProgress,
     });
   }
-
+  
   public static uploadBlob<T>(
     url: string,
     filename: string,
@@ -197,6 +196,11 @@ class Requests {
     params?: Record<string, any>,
     onUploadProgress?: (progressEvent: AxiosProgressEvent) => void
   ): AxiosPromise<Response<T>> {
+
+    if (!url.startsWith('/api')) {
+      url = `/api${url}`;
+    }
+
     // Process URL and params
     if (params && Object.keys(params).length > 0) {
       const queryString = Object.entries(params)
@@ -204,35 +208,34 @@ class Requests {
         .join('&');
       url = `${url}?${queryString}`;
     }
-
+  
     // Prepare FormData
     const formData = new FormData();
     formData.append(filename, blob);
-
+  
     if (Requests.community_id) {
       data = {
         ...data,
         communities: [Requests.community_id],
       };
     }
-
+  
     for (let key in data) {
       formData.append(key, data[key]);
     }
-
+  
     // Prepare headers
     let headers: { [key: string]: string } = {
       'Content-Type': 'multipart/form-data',
     };
-
+  
     if (Requests.authToken) {
       headers['Authorization'] = `Bearer ${Requests.authToken}`;
     }
-
-    // Format URL
-    url = url.replace(/\/\//g, '/');
-    const uri = `${url}`.replace(/\/\//g, '/');
-
+  
+    // Construct the full URL properly
+    const uri = new URL(url, Requests.baseUrl).href;
+  
     // Make the request
     return axios({
       method: 'POST',
@@ -242,7 +245,7 @@ class Requests {
       onUploadProgress,
     });
   }
-
+  
 
   // Method adapted for browser environments
 
@@ -254,6 +257,10 @@ class Requests {
     chunkSize?: number, // Default chunk size of 1MB
   ): Promise<void> {
 
+    if (!uploadUrl.startsWith('/api')) {
+      uploadUrl = `/api${uploadUrl}`;
+    }
+
     if (!chunkSize) {
       chunkSize = 1024 * 1024
     }
@@ -286,7 +293,7 @@ class Requests {
       }
 
       // Construct the full URL if necessary or use a method to determine the base URL
-      const fullUploadUrl = `${uploadUrl}`;
+      const fullUploadUrl = `${Requests.baseUrl}${uploadUrl}`;
 
       // Make sure the authorization token is included if required
       const headers: { [key: string]: string } = {};