nuxt-convex-module 0.13.0 → 0.14.1

package/dist/runtime/vue/composables/use-upload-queue.js

@@ -1,4 +1,5 @@
-import { computed, ref } from "vue";
+import { ConvexError } from "convex/values";
+import { computed, ref, toRaw } from "vue";
 import { useConvexOrThrow } from "../client.js";
 import { uploadFile } from "./use-upload.js";
 function normalizeFiles(input) {
@@ -16,6 +17,12 @@ export function useUploadQueue(generateUploadUrl, options = {}) {
   const concurrency = Math.max(1, Math.floor(options.concurrency ?? 3));
   const items = ref([]);
   const controllers = /* @__PURE__ */ new Map();
+  const afterDone = /* @__PURE__ */ new Set();
+  const resend = /* @__PURE__ */ new Set();
+  let running = 0;
+  let generation = 0;
+  let cutOff = 0;
+  let held = false;
   const activeCount = computed(
     () => items.value.filter((item) => item.status === "uploading").length
   );
@@ -30,43 +37,81 @@ export function useUploadQueue(generateUploadUrl, options = {}) {
   });
   function pump() {
     if (typeof XMLHttpRequest === "undefined") return;
-    let slots = concurrency - activeCount.value;
     for (const item of items.value) {
-      if (slots <= 0) break;
+      if (held || activeCount.value >= concurrency) break;
       if (item.status !== "pending") continue;
-      slots--;
       void run(item);
     }
   }
+  const isRefusal = options.isRefusal ?? ((error) => error instanceof ConvexError);
+  async function transfer(item, signal) {
+    if (options.prepare && item.prepared === null) {
+      item.stage = "prepare";
+      const prepared = await options.prepare(toRaw(item.file), item, signal);
+      signal.throwIfAborted();
+      item.prepared = prepared;
+    }
+    item.stage = "upload";
+    const url = await convex.mutation(generateUploadUrl, {});
+    const storageId = await uploadFile({
+      url,
+      // The blob itself, not a reactive proxy of it, wherever Vue would wrap one.
+      file: toRaw(item.prepared ?? item.file),
+      signal,
+      onProgress: (value) => {
+        item.progress = value;
+      }
+    });
+    item.progress = 1;
+    return storageId;
+  }
+  function refusal(failure, item) {
+    try {
+      return isRefusal(failure, item);
+    } catch {
+      return false;
+    }
+  }
+  function fail(item, caught, signal) {
+    const failure = caught instanceof Error ? caught : new Error(String(caught));
+    item.refused = !signal.aborted && refusal(failure, item);
+    if (item.refused && item.stage === "after") resend.add(item.id);
+    item.stage = null;
+    item.error = failure;
+    item.status = "error";
+    options.onItemError?.(failure, item);
+  }
   async function run(item) {
+    const own = generation;
+    running++;
     item.status = "uploading";
     const controller = new AbortController();
     controllers.set(item.id, controller);
+    const { signal } = controller;
     try {
-      const url = await convex.mutation(generateUploadUrl, {});
-      const storageId = await uploadFile({
-        url,
-        file: item.file,
-        signal: controller.signal,
-        onProgress: (value) => {
-          item.progress = value;
-        }
-      });
-      item.storageId = storageId;
-      item.progress = 1;
+      const storageId = item.storageId ??= await transfer(item, signal);
+      if (options.after && !afterDone.has(item.id)) {
+        item.stage = "after";
+        await options.after(storageId, item, signal);
+        afterDone.add(item.id);
+        signal.throwIfAborted();
+      }
+      item.stage = null;
       item.status = "success";
       await options.onItemSuccess?.(storageId, item);
     } catch (caught) {
-      const failure = caught instanceof Error ? caught : new Error(String(caught));
-      item.error = failure;
-      item.status = "error";
-      options.onItemError?.(failure, item);
+      fail(item, caught, signal);
     } finally {
-      controllers.delete(item.id);
-      if (pendingCount.value === 0 && activeCount.value === 0) {
-        options.onComplete?.(items.value);
+      if (own !== generation) {
+        if (--cutOff === 0 && items.value.length === 0) options.onComplete?.([]);
       } else {
-        pump();
+        running--;
+        if (controllers.get(item.id) === controller) controllers.delete(item.id);
+        if (pendingCount.value === 0 && running === 0) {
+          options.onComplete?.(items.value);
+        } else if (!signal.aborted) {
+          pump();
+        }
       }
     }
   }
@@ -80,12 +125,17 @@ export function useUploadQueue(generateUploadUrl, options = {}) {
         status: "pending",
         progress: 0,
         storageId: null,
-        error: null
+        error: null,
+        refused: false,
+        stage: null,
+        prepared: null
       }))
     );
+    held = false;
     pump();
   }
   function cancel() {
+    held = true;
     for (const controller of controllers.values()) {
       controller.abort();
     }
@@ -93,11 +143,31 @@ export function useUploadQueue(generateUploadUrl, options = {}) {
   function remove(id) {
     controllers.get(id)?.abort();
     controllers.delete(id);
+    afterDone.delete(id);
+    resend.delete(id);
     items.value = items.value.filter((item) => item.id !== id);
+    pump();
+  }
+  function retry(id) {
+    for (const item of items.value) {
+      if (item.status !== "error" || id !== void 0 && item.id !== id) continue;
+      item.status = "pending";
+      item.error = null;
+      item.refused = false;
+      if (resend.delete(item.id)) item.storageId = null;
+      if (item.storageId === null) item.progress = 0;
+    }
+    held = false;
+    pump();
   }
   function clear() {
     cancel();
+    generation++;
+    cutOff += running;
+    running = 0;
     controllers.clear();
+    afterDone.clear();
+    resend.clear();
     items.value = [];
   }
   return {
@@ -109,7 +179,8 @@ export function useUploadQueue(generateUploadUrl, options = {}) {
     activeCount,
     cancel,
     remove,
-    clear
+    clear,
+    retry
   };
 }
 export const useConvexUploadQueue = useUploadQueue;

package/dist/runtime/vue/index.d.ts

@@ -88,6 +88,6 @@ export type { ConnectionState, OptimisticUpdate, QueryJournal, } from 'convex/br
 export type { FunctionReference, FunctionReference_future, FunctionArgs, FunctionReturnType, OptionalRestArgs, ArgsAndOptions, } from 'convex/server';
 export type { Value } from 'convex/values';
 export { useUpload, useConvexUpload, uploadFile, type VueUpload, type UseUploadOptions, type UploadFileOptions, type GenerateUploadUrl, type StorageId, } from './composables/use-upload.js';
-export { useUploadQueue, useConvexUploadQueue, type VueUploadQueue, type UseUploadQueueOptions, type UploadQueueItem, type UploadItemStatus, type EnqueueInput, } from './composables/use-upload-queue.js';
+export { useUploadQueue, useConvexUploadQueue, type VueUploadQueue, type UseUploadQueueOptions, type UploadQueueItem, type UploadItemStage, type UploadItemStatus, type EnqueueInput, } from './composables/use-upload-queue.js';
 export { useStorageUrl, useConvexStorageUrl, type GetStorageUrl, } from './composables/use-storage-url.js';
 export { ConvexImage } from './components/convex-image.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "nuxt-convex-module",
-  "version": "0.13.0",
+  "version": "0.14.1",
   "description": "Convex backend integration with live queries, mutations, actions, pagination, file storage and SSR, auto-imported and typed against your deployment. The same Vue client runs without Nuxt; Better Auth, Clerk, Auth0 and Polar are opt-in.",
   "repository": {
     "type": "git",
@@ -60,6 +60,10 @@
       "types": "./dist/runtime/nuxt/app.d.ts",
       "import": "./dist/runtime/nuxt/app.js"
     },
+    "./testing": {
+      "types": "./dist/runtime/nuxt/testing.d.ts",
+      "import": "./dist/runtime/nuxt/testing.js"
+    },
     "./better-auth/client": {
       "types": "./dist/runtime/better-auth/vue/index.d.ts",
       "import": "./dist/runtime/better-auth/vue/index.js"
@@ -115,6 +119,9 @@
       "app": [
         "./dist/runtime/nuxt/app.d.ts"
       ],
+      "testing": [
+        "./dist/runtime/nuxt/testing.d.ts"
+      ],
       "better-auth/client": [
         "./dist/runtime/better-auth/vue/index.d.ts"
       ],