@darseen/vaze 1.1.0 → 1.2.1

package/dist/index.js

@@ -1,3 +1,27 @@
+// src/utils/index.ts
+function constructFileUrls({
+  vazeUrl,
+  files
+}) {
+  const base = vazeUrl.endsWith("/") ? vazeUrl : `${vazeUrl}/`;
+  return files.map((file) => ({
+    ...file,
+    url: new URL(file.url, base).toString()
+  }));
+}
+function parseContentDispositionFilename(header) {
+  if (!header) return null;
+  const utf8Match = header.match(/filename\*=UTF-8''([^;]+)/i);
+  if (utf8Match?.[1]) {
+    try {
+      return decodeURIComponent(utf8Match[1]);
+    } catch {
+    }
+  }
+  const plainMatch = header.match(/filename="([^"]*)"/i);
+  return plainMatch?.[1] ?? null;
+}
+
 // src/base.ts
 var Base = class {
   apiKey;
@@ -16,7 +40,16 @@ var Base = class {
       );
     }
     this.apiKey = apiKey;
-    this.vazeUrl = vazeUrl;
+    this.vazeUrl = vazeUrl.endsWith("/") ? vazeUrl : `${vazeUrl}/`;
+  }
+  apiUrl(path, params) {
+    const url = new URL(path.replace(/^\//, ""), this.vazeUrl);
+    if (params) {
+      for (const [key, value] of Object.entries(params)) {
+        if (value !== void 0) url.searchParams.set(key, String(value));
+      }
+    }
+    return url.toString();
   }
   async request(method, url, body, headers) {
     try {
@@ -25,50 +58,84 @@ var Base = class {
         ...headers
       };
       const isFormData = body instanceof FormData;
-      if (!isFormData && !fetchHeaders["Content-Type"]) {
+      if (body !== void 0 && !isFormData && !fetchHeaders["Content-Type"]) {
         fetchHeaders["Content-Type"] = "application/json";
       }
       const response = await fetch(url, {
         method,
         headers: fetchHeaders,
-        body: isFormData ? body : JSON.stringify(body)
+        body: isFormData ? body : body !== void 0 ? JSON.stringify(body) : null
       });
-      return await response.json();
+      const contentType = response.headers.get("content-type") ?? "";
+      if (!contentType.includes("application/json")) {
+        return {
+          data: null,
+          error: {
+            message: `Unexpected non-JSON response from server (status ${response.status}).`
+          }
+        };
+      }
+      const result = await response.json();
+      if (!response.ok && !result.error) {
+        return {
+          data: null,
+          error: { message: `Request failed with status ${response.status}.` }
+        };
+      }
+      return result;
     } catch (error) {
-      console.log("Request error:", error);
       return {
         data: null,
         error: {
-          message: "An error occurred while making the request."
+          message: error instanceof Error ? error.message : "An error occurred while making the request."
+        }
+      };
+    }
+  }
+  async requestBlob(url) {
+    try {
+      const response = await fetch(url, {
+        headers: { "API-Key": this.apiKey }
+      });
+      const contentType = response.headers.get("content-type") ?? "";
+      if (!response.ok) {
+        if (contentType.includes("application/json")) {
+          const result = await response.json();
+          if (result.error) return { data: null, error: result.error };
+        }
+        return {
+          data: null,
+          error: { message: `Request failed with status ${response.status}.` }
+        };
+      }
+      return {
+        data: {
+          blob: await response.blob(),
+          filename: parseContentDispositionFilename(
+            response.headers.get("content-disposition")
+          ),
+          contentType
+        },
+        error: null
+      };
+    } catch (error) {
+      return {
+        data: null,
+        error: {
+          message: error instanceof Error ? error.message : "An error occurred while making the request."
         }
       };
     }
   }
 };
 
-// src/utils/index.ts
-function constructFileUrls({
-  vazeUrl,
-  files
-}) {
-  return files.map((file) => ({
-    ...file,
-    url: `${vazeUrl}/${file.url}`
-  }));
-}
-
 // src/files.ts
 var Files = class extends Base {
   async getAll(options) {
-    const url = new URL("/api/files", this.vazeUrl);
-    if (options) {
-      for (const [key, value] of Object.entries(options)) {
-        url.searchParams.set(key, value.toString());
-      }
-    }
+    const url = this.apiUrl("/api/files", options);
     const { error, data } = await this.request(
       "GET",
-      url.toString()
+      url
     );
     return {
       error,
@@ -81,11 +148,10 @@ var Files = class extends Base {
     };
   }
   async getById(id) {
-    const url = new URL(`/api/files`, this.vazeUrl);
-    url.searchParams.set("id", id);
+    const url = this.apiUrl("/api/files", { id });
     const { data, error } = await this.request(
       "GET",
-      url.toString()
+      url
     );
     return {
       error,
@@ -98,16 +164,10 @@ var Files = class extends Base {
     };
   }
   async getByName(name, options) {
-    const url = new URL(`/api/files`, this.vazeUrl);
-    url.searchParams.set("name", name);
-    if (options) {
-      for (const [key, value] of Object.entries(options)) {
-        url.searchParams.set(key, value.toString());
-      }
-    }
+    const url = this.apiUrl("/api/files", { name, ...options });
     const { error, data } = await this.request(
       "GET",
-      url.toString()
+      url
     );
     return {
       error,
@@ -121,17 +181,13 @@ var Files = class extends Base {
   }
   async upload(data) {
     const { files, folder } = data;
-    const url = new URL("/api/files", this.vazeUrl);
+    const url = this.apiUrl("/api/files");
     const formData = new FormData();
     if (folder) formData.append("folder", folder);
     files.forEach((file) => {
       formData.append("files", file);
     });
-    const { error, data: responseData } = await this.request(
-      "POST",
-      url.toString(),
-      formData
-    );
+    const { error, data: responseData } = await this.request("POST", url, formData);
     return {
       error,
       data: responseData ? {
@@ -142,26 +198,25 @@ var Files = class extends Base {
       } : null
     };
   }
+  async download(id) {
+    const url = this.apiUrl(`/api/files/download/${encodeURIComponent(id)}`);
+    return await this.requestBlob(url);
+  }
   async rename(data) {
-    const url = new URL(`/api/files`, this.vazeUrl);
-    return await this.request("PUT", url.toString(), data);
+    return await this.request("PUT", this.apiUrl("/api/files"), data);
   }
   async delete(id) {
-    const url = new URL(`/api/files`, this.vazeUrl);
-    return await this.request("DELETE", url.toString(), { id });
+    return await this.request("DELETE", this.apiUrl("/api/files"), {
+      id
+    });
   }
 };
 
 // src/folders.ts
 var Folders = class extends Base {
   async get(options) {
-    const url = new URL("/api/folders", this.vazeUrl);
-    if (options) {
-      for (const [key, value] of Object.entries(options)) {
-        url.searchParams.set(key, value.toString());
-      }
-    }
-    const { error, data } = await this.request("GET", url.toString());
+    const url = this.apiUrl("/api/folders", options);
+    const { error, data } = await this.request("GET", url);
     return {
       error,
       data: data ? {
@@ -174,18 +229,19 @@ var Folders = class extends Base {
     };
   }
   async create(folder) {
-    const url = new URL("/api/folders", this.vazeUrl);
-    return await this.request("POST", url.toString(), {
-      folder
-    });
+    return await this.request(
+      "POST",
+      this.apiUrl("/api/folders"),
+      { folder }
+    );
   }
   async rename(data) {
-    const url = new URL("/api/folders", this.vazeUrl);
-    return await this.request("PUT", url.toString(), data);
+    return await this.request("PUT", this.apiUrl("/api/folders"), data);
   }
   async delete(id) {
-    const url = new URL("/api/folders", this.vazeUrl);
-    return await this.request("DELETE", url.toString(), { id });
+    return await this.request("DELETE", this.apiUrl("/api/folders"), {
+      id
+    });
   }
 };
 
@@ -195,8 +251,14 @@ var Vaze = class extends Base {
   folders;
   constructor(options = {}) {
     super(options);
-    this.files = new Files();
-    this.folders = new Folders();
+    this.files = new Files(options);
+    this.folders = new Folders(options);
+  }
+  async health() {
+    return await this.request(
+      "GET",
+      this.apiUrl("/api/health")
+    );
   }
 };
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@darseen/vaze",
-  "version": "1.1.0",
-  "description": "Vaze Self-Hosted file storage and hosting service SKD.",
+  "version": "1.2.1",
+  "description": "Vaze Self-Hosted file storage and hosting service SDK.",
   "keywords": [
     "api",
     "sdk",
@@ -25,10 +25,22 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     }
   },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "devDependencies": {
     "@types/node": "^25.5.0",
     "rimraf": "^6.1.3",