nuxt-upload-kit 0.1.21 → 0.1.22

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-upload-kit",
   "configKey": "uploadKit",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/composables/useUploadKit/plugins/storage/azure-datalake.d.ts

@@ -5,11 +5,15 @@ export interface AzureDataLakeOptions {
      */
     sasURL?: string;
     /**
-     * Function to dynamically fetch SAS URL
-     * Use this to handle token expiration/refreshing.
-     * If provided, it will be called before every file operation.
+     * Function to dynamically fetch SAS URL.
+     *
+     * The plugin auto-detects whether you return a directory or file SAS:
+     * - Directory SAS (sr=d): Cached and reused for batch uploads
+     * - File SAS (sr=b): Called per file for granular access control
+     *
+     * @param storageKey - The intended storage path for the file
      */
-    getSASUrl?: () => Promise<string>;
+    getSASUrl?: (storageKey: string) => Promise<string>;
     /**
      * Optional subdirectory path within the container
      * @example "uploads/images"
@@ -25,6 +29,7 @@ export interface AzureDataLakeOptions {
     pathHttpHeaders?: Omit<PathHttpHeaders, "contentType">;
     /**
      * Automatically try to create the directory if it doesn't exist.
+     * Only applies when using directory-level SAS.
      * Disable this if your SAS token only has 'Write' (Blob) permissions
      * and not 'Create' (Directory) permissions.
      * @default true

package/dist/runtime/composables/useUploadKit/plugins/storage/azure-datalake.js

@@ -1,11 +1,19 @@
 import { ref } from "vue";
-import { DataLakeDirectoryClient } from "@azure/storage-file-datalake";
+import { DataLakeDirectoryClient, DataLakeFileClient } from "@azure/storage-file-datalake";
 import { defineStorageAdapter } from "../../types.js";
 export const PluginAzureDataLake = defineStorageAdapter((options) => {
   const sasURL = ref(options.sasURL || "");
   let refreshPromise = null;
-  const directoryCheckedCache = /* @__PURE__ */ new Set();
-  const getBasePathFromSasUrl = (url) => {
+  let detectedMode = null;
+  const detectSasMode = (url) => {
+    try {
+      const sr = new URL(url).searchParams.get("sr");
+      return sr === "d" ? "directory" : "file";
+    } catch {
+      return "directory";
+    }
+  };
+  const getBlobPathFromUrl = (url) => {
     try {
       const parsed = new URL(url);
       const parts = parsed.pathname.split("/").filter(Boolean);
@@ -14,16 +22,15 @@ export const PluginAzureDataLake = defineStorageAdapter((options) => {
       return "";
     }
   };
-  const buildFullStorageKey = (filename) => {
-    const basePath = getBasePathFromSasUrl(sasURL.value);
+  const buildFullStorageKey = (filename, forRequest = false) => {
+    if (forRequest && detectedMode === "file") {
+      const parts2 = [options.path, filename].filter(Boolean);
+      return parts2.join("/");
+    }
+    const basePath = getBlobPathFromUrl(sasURL.value);
     const parts = [basePath, options.path, filename].filter(Boolean);
     return parts.join("/");
   };
-  if (options.getSASUrl && !options.sasURL) {
-    options.getSASUrl().then((url) => {
-      sasURL.value = url;
-    });
-  }
   const isTokenExpired = (urlStr, bufferMinutes = 5) => {
     if (!urlStr) return true;
     try {
@@ -37,36 +44,57 @@ export const PluginAzureDataLake = defineStorageAdapter((options) => {
       return true;
     }
   };
-  const getFileClient = async (fullBlobPath) => {
-    if (options.getSASUrl && isTokenExpired(sasURL.value)) {
-      refreshPromise ??= options.getSASUrl().then((url) => {
+  const getSasUrlForFile = async (storageKey) => {
+    if (options.sasURL) {
+      detectedMode ??= detectSasMode(options.sasURL);
+      return options.sasURL;
+    }
+    if (!options.getSASUrl) {
+      throw new Error("Either sasURL or getSASUrl must be provided");
+    }
+    if (detectedMode === "file") return options.getSASUrl(storageKey);
+    if (!detectedMode) {
+      const url = await options.getSASUrl(storageKey);
+      detectedMode = detectSasMode(url);
+      sasURL.value = url;
+      if (import.meta.dev) console.debug(`[Azure Storage] Auto-detected SAS mode: ${detectedMode}`);
+      if (detectedMode === "file") return url;
+    }
+    if (isTokenExpired(sasURL.value)) {
+      refreshPromise ??= options.getSASUrl(storageKey).then((url) => {
         refreshPromise = null;
+        sasURL.value = url;
         return url;
       });
-      sasURL.value = await refreshPromise;
+      await refreshPromise;
     }
-    const basePath = getBasePathFromSasUrl(sasURL.value);
+    return sasURL.value;
+  };
+  const getFileClientFromDirectory = async (sasUrl, fullBlobPath) => {
+    const basePath = getBlobPathFromUrl(sasUrl);
     const relativePath = basePath && fullBlobPath.startsWith(basePath + "/") ? fullBlobPath.slice(basePath.length + 1) : fullBlobPath;
     const pathParts = relativePath.split("/");
     const filename = pathParts.pop();
     const dirPath = pathParts.join("/");
-    let dir = new DataLakeDirectoryClient(sasURL.value);
+    let dir = new DataLakeDirectoryClient(sasUrl);
     if (dirPath) {
       dir = dir.getSubdirectoryClient(dirPath);
-      const shouldCreateDir = options.autoCreateDirectory ?? true;
-      if (shouldCreateDir && !directoryCheckedCache.has(dirPath)) {
+      if (options.autoCreateDirectory ?? true) {
         try {
           await dir.createIfNotExists();
-          directoryCheckedCache.add(dirPath);
-        } catch (error) {
-          if (import.meta.dev) {
-            console.debug(`Azure directory already exists or couldn't be created: ${dirPath}`, error);
-          }
+        } catch {
         }
       }
     }
     return dir.getFileClient(filename);
   };
+  const getFileClient = async (storageKey) => {
+    const sasUrl = await getSasUrlForFile(storageKey);
+    if (detectedMode === "file") {
+      return new DataLakeFileClient(sasUrl);
+    }
+    return getFileClientFromDirectory(sasUrl, storageKey);
+  };
   return {
     id: "azure-datalake-storage",
     hooks: {
@@ -77,8 +105,8 @@ export const PluginAzureDataLake = defineStorageAdapter((options) => {
         if (file.source !== "local" || file.data === null) {
           throw new Error("Cannot upload remote file - no local data available");
         }
-        const storageKey = buildFullStorageKey(file.id);
-        const fileClient = await getFileClient(storageKey);
+        const requestKey = buildFullStorageKey(file.id, true);
+        const fileClient = await getFileClient(requestKey);
         await fileClient.upload(file.data, {
           metadata: {
             ...options.metadata,
@@ -95,9 +123,10 @@ export const PluginAzureDataLake = defineStorageAdapter((options) => {
             context.onProgress(uploadedPercentage);
           }
         });
+        const actualStorageKey = getBlobPathFromUrl(fileClient.url) || requestKey;
         return {
           url: fileClient.url,
-          storageKey
+          storageKey: actualStorageKey
         };
       },
       /**

package/dist/runtime/composables/useUploadKit/plugins/storage/firebase-storage.d.ts

@@ -34,17 +34,6 @@ export interface FirebaseStorageOptions {
      * @example "attachment; filename=file.pdf"
      */
     contentDisposition?: string;
-    /**
-     * Number of retry attempts for failed operations
-     * @default 3
-     */
-    retries?: number;
-    /**
-     * Initial delay between retries in milliseconds
-     * Uses exponential backoff: delay * (2 ^ attempt)
-     * @default 1000 (1 second)
-     */
-    retryDelay?: number;
 }
 export interface FirebaseStorageUploadResult {
     /**

package/dist/runtime/composables/useUploadKit/plugins/storage/firebase-storage.js

@@ -7,30 +7,6 @@ import {
 } from "firebase/storage";
 import { defineStorageAdapter } from "../../types.js";
 export const PluginFirebaseStorage = defineStorageAdapter((options) => {
-  const maxRetries = options.retries ?? 3;
-  const initialRetryDelay = options.retryDelay ?? 1e3;
-  async function withRetry(operation, operationName) {
-    let lastError;
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      try {
-        return await operation();
-      } catch (error) {
-        lastError = error;
-        if (attempt === maxRetries) {
-          break;
-        }
-        const delay = initialRetryDelay * Math.pow(2, attempt);
-        if (import.meta.dev) {
-          console.warn(
-            `[Firebase Storage] ${operationName} failed (attempt ${attempt + 1}/${maxRetries + 1}). Retrying in ${delay}ms...`,
-            error
-          );
-        }
-        await new Promise((resolve) => setTimeout(resolve, delay));
-      }
-    }
-    throw new Error(`[Firebase Storage] ${operationName} failed after ${maxRetries + 1} attempts: ${lastError?.message}`);
-  }
   const buildFullStorageKey = (filename) => {
     if (options.path) {
       const cleanPath = options.path.replace(/^\/+/, "").replace(/\/+$/, "");
@@ -89,32 +65,27 @@ export const PluginFirebaseStorage = defineStorageAdapter((options) => {
           throw new Error("Cannot upload remote file - no local data available");
         }
         const storageKey = buildFullStorageKey(file.id);
-        return withRetry(
-          () => uploadToFirebase(storageKey, file.data, file.mimeType, file.name, context.onProgress),
-          `Upload file "${file.name}"`
-        );
+        return uploadToFirebase(storageKey, file.data, file.mimeType, file.name, context.onProgress);
       },
       /**
        * Get remote file metadata from Firebase Storage.
        * Expects the full storageKey (e.g., "uploads/images/filename.jpg").
        */
       async getRemoteFile(storageKey, _context) {
-        return withRetry(async () => {
-          const fileRef = getStorageRef(storageKey);
-          const [metadata, downloadURL] = await Promise.all([getMetadata(fileRef), getDownloadURL(fileRef)]);
-          return {
-            size: metadata.size,
-            mimeType: metadata.contentType || "application/octet-stream",
-            remoteUrl: downloadURL,
-            uploadResult: {
-              url: downloadURL,
-              storageKey,
-              bucket: metadata.bucket,
-              generation: metadata.generation,
-              md5Hash: metadata.md5Hash
-            }
-          };
-        }, `Get remote file "${storageKey}"`);
+        const fileRef = getStorageRef(storageKey);
+        const [metadata, downloadURL] = await Promise.all([getMetadata(fileRef), getDownloadURL(fileRef)]);
+        return {
+          size: metadata.size,
+          mimeType: metadata.contentType || "application/octet-stream",
+          remoteUrl: downloadURL,
+          uploadResult: {
+            url: downloadURL,
+            storageKey,
+            bucket: metadata.bucket,
+            generation: metadata.generation,
+            md5Hash: metadata.md5Hash
+          }
+        };
       },
       /**
        * Delete file from Firebase Storage.
@@ -123,15 +94,11 @@ export const PluginFirebaseStorage = defineStorageAdapter((options) => {
       async remove(file, _context) {
         const storageKey = file.storageKey;
         if (!storageKey) {
-          if (import.meta.dev) {
-            console.debug(`[Firebase Storage] Skipping delete for file "${file.name}" - no storageKey`);
-          }
+          if (import.meta.dev) console.debug(`[Firebase Storage] Skipping delete for file "${file.name}" - no storageKey`);
           return;
         }
-        return withRetry(async () => {
-          const fileRef = getStorageRef(storageKey);
-          await deleteObject(fileRef);
-        }, `Delete file "${file.name}"`);
+        const fileRef = getStorageRef(storageKey);
+        await deleteObject(fileRef);
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-upload-kit",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "A powerful, plugin-based file upload manager for Nuxt applications",
   "license": "MIT",
   "repository": "https://github.com/genu/nuxt-upload-kit.git",
@@ -34,12 +34,27 @@
       "import": "./dist/providers/firebase.mjs"
     }
   },
+  "scripts": {
+    "prepack": "nuxt-module-build build",
+    "dev": "pnpm dev:prepare && nuxi dev playground",
+    "dev:build": "nuxi build playground",
+    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "format": "prettier --write .",
+    "format:check": "prettier --check .",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
+    "test:coverage": "vitest run --coverage",
+    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
+    "docs:dev": "nuxt dev docs --extends docus"
+  },
   "dependencies": {
     "mitt": "^3.0.1"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.980.0",
-    "@aws-sdk/lib-storage": "^3.980.0",
+    "@aws-sdk/client-s3": "3.982.0",
+    "@aws-sdk/lib-storage": "3.982.0",
     "@azure/storage-file-datalake": "^12.29.0",
     "@ffmpeg/ffmpeg": "0.12.15",
     "@ffmpeg/util": "0.12.2",
@@ -52,12 +67,11 @@
     "@types/node": "latest",
     "@vitejs/plugin-vue": "^6.0.4",
     "@vitest/coverage-v8": "^4.0.18",
-    "changelogen": "^0.6.2",
     "eslint": "^9.39.2",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-prettier": "5.5.5",
     "firebase": "^12.8.0",
-    "happy-dom": "^20.4.0",
+    "happy-dom": "20.5.0",
     "nuxt": "^4.3.0",
     "prettier": "^3.8.1",
     "typescript": "~5.9.3",
@@ -86,19 +100,5 @@
       "optional": true
     }
   },
-  "scripts": {
-    "dev": "pnpm dev:prepare && nuxi dev playground",
-    "dev:build": "nuxi build playground",
-    "dev:prepare": "nuxt-module-build build --stub && nuxt-module-build prepare && nuxi prepare playground",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
-    "release": "pnpm lint && pnpm test && pnpm prepack && changelogen --release && pnpm publish && git push --follow-tags",
-    "test": "vitest run",
-    "test:watch": "vitest watch",
-    "test:coverage": "vitest run --coverage",
-    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
-    "docs:dev": "nuxt dev docs --extends docus"
-  }
-}
+  "packageManager": "pnpm@10.28.2"
+}