@cedarjs/uploads 8.0.0-canary.3274 → 8.0.0-canary.3285

package/dist/web/createUppy.d.ts

@@ -37,8 +37,11 @@ export interface FsUppyOptions extends BaseUppyOptions {
     provider: 'fs';
     /** Full URL of the api's `POST {prefix}/fs` route, or a function returning it. */
     endpoint: string | (() => string);
-    /** The upload token to send. Called per request so a refreshed token is used. */
-    getUploadToken: () => string | null;
+    /**
+     * The upload token to send with `file`. Called per request, so each file
+     * can carry a different token.
+     */
+    getUploadToken: (file: Pick<CedarUppyFile, 'id'>) => string | null;
 }
 export type CreateUppyOptions = S3UppyOptions | FsUppyOptions;
 /** Response body of the api's `POST {prefix}/fs` route. */
@@ -49,6 +52,20 @@ export interface FsUploadResponseBody {
         filename: string;
     }[];
 }
+/**
+ * Applies a profile's constraints to `uppy` as restrictions. The file-count
+ * limit is checked against the files still waiting to upload, not every file
+ * in the queue: each upload batch gets a token of its own, so files that
+ * already finished uploading do not count against the next batch. Uppy's own
+ * `maxNumberOfFiles` counts finished files too, so it is not used.
+ *
+ * The limit is added on top of the instance's current `onBeforeFileAdded`
+ * callback, which still runs first: returning `false` from it rejects the
+ * file, and returning a file object adds that file instead. Calling this
+ * again with new constraints replaces the limit without wrapping the same
+ * callback twice.
+ */
+export declare function applyUploadConstraints(uppy: CedarUppy, constraints: UploadConstraints): void;
 /**
  * Creates an Uppy instance pre-configured for one of Cedar's upload flows.
  * Direct-to-S3 uploads use `@uppy/aws-s3` with the presigned URLs the api

package/dist/web/createUppy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createUppy.d.ts","sourceRoot":"","sources":["../../src/web/createUppy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAC7B,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAErD,wEAAwE;AACxE,MAAM,MAAM,SAAS,GAAG,IAAI,CAAA;AAE5B,4CAA4C;AAC5C,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErD,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,eAAe,CAAA;AAElD,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACtC,sEAAsE;IACtE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,QAAQ,EAAE,IAAI,CAAA;IACd;;;OAGG;IACH,mBAAmB,EAAE,CACnB,IAAI,EAAE,aAAa,KAChB,OAAO,CAAC,yBAAyB,CAAC,CAAA;CACxC;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,QAAQ,EAAE,IAAI,CAAA;IACd,kFAAkF;IAClF,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAA;IACjC,iFAAiF;IACjF,cAAc,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;CACpC;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,aAAa,CAAA;AAE7D,2DAA2D;AAC3D,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAC5D;AAcD;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,CA2EpB;AAED,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAInE"}
+{"version":3,"file":"createUppy.d.ts","sourceRoot":"","sources":["../../src/web/createUppy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,YAAY,CAAA;AAC7B,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAErD,wEAAwE;AACxE,MAAM,MAAM,SAAS,GAAG,IAAI,CAAA;AAE5B,4CAA4C;AAC5C,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAA;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AAErD,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,eAAe,CAAA;AAElD,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,WAAW,CAAC,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACtC,sEAAsE;IACtE,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,MAAM,CAAA;IACX,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,QAAQ,EAAE,IAAI,CAAA;IACd;;;OAGG;IACH,mBAAmB,EAAE,CACnB,IAAI,EAAE,aAAa,KAChB,OAAO,CAAC,yBAAyB,CAAC,CAAA;CACxC;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,QAAQ,EAAE,IAAI,CAAA;IACd,kFAAkF;IAClF,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAA;IACjC;;;OAGG;IACH,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,MAAM,GAAG,IAAI,CAAA;CACnE;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,aAAa,CAAA;AAE7D,2DAA2D;AAC3D,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAC5D;AAUD;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,iBAAiB,QAwC/B;AAED;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,SAAS,CAAC,CA2EpB;AAED,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAInE"}

package/dist/web/createUppy.js

@@ -2,23 +2,44 @@ import Uppy from "@uppy/core";
 import { UPLOAD_TOKEN_HEADER } from "../constants.js";
 import { UPLOAD_TOKEN_HEADER as UPLOAD_TOKEN_HEADER2 } from "../constants.js";
 const DEFAULT_FS_UPLOAD_PATH = "/upload/fs";
-function restrictionsFor(constraints) {
-  if (!constraints) {
-    return {};
-  }
-  return {
-    allowedFileTypes: constraints.allowedMimeTypes,
-    maxFileSize: constraints.maxFileSize,
-    maxNumberOfFiles: constraints.maxFiles
+const wrappedCallbacks = /* @__PURE__ */ new WeakMap();
+function applyUploadConstraints(uppy, constraints) {
+  const current = uppy.opts.onBeforeFileAdded;
+  const inner = current ? wrappedCallbacks.get(current) ?? current : void 0;
+  const onBeforeFileAdded = (file, files) => {
+    const result = inner ? inner(file, files) : !Object.hasOwn(files, file.id);
+    if (result === false) {
+      return false;
+    }
+    const pending = Object.values(files).filter(
+      (queued) => !queued.isGhost && !queued.progress.uploadComplete
+    );
+    if (pending.length >= constraints.maxFiles) {
+      uppy.info(
+        uppy.i18n("youCanOnlyUploadX", { smart_count: constraints.maxFiles }),
+        "error"
+      );
+      return false;
+    }
+    return result;
   };
+  if (inner) {
+    wrappedCallbacks.set(onBeforeFileAdded, inner);
+  }
+  uppy.setOptions({
+    restrictions: {
+      allowedFileTypes: constraints.allowedMimeTypes,
+      maxFileSize: constraints.maxFileSize
+    },
+    onBeforeFileAdded
+  });
 }
 async function createUppy(options) {
   const { constraints, autoProceed = true, debug = false } = options;
-  const uppy = new Uppy({
-    autoProceed,
-    debug,
-    restrictions: restrictionsFor(constraints)
-  });
+  const uppy = new Uppy({ autoProceed, debug });
+  if (constraints) {
+    applyUploadConstraints(uppy, constraints);
+  }
   if (options.provider === "s3") {
     const { default: AwsS3 } = await import("@uppy/aws-s3");
     uppy.use(AwsS3, {
@@ -52,9 +73,9 @@ async function createUppy(options) {
     formData: true,
     fieldName: "file",
     bundle: false,
-    headers: () => {
+    headers: (file) => {
       const headers = {};
-      const token = options.getUploadToken();
+      const token = options.getUploadToken(file);
       if (token) {
         headers[UPLOAD_TOKEN_HEADER] = token;
       }
@@ -77,6 +98,7 @@ function getCedarUploadId(file) {
 export {
   DEFAULT_FS_UPLOAD_PATH,
   UPLOAD_TOKEN_HEADER2 as UPLOAD_TOKEN_HEADER,
+  applyUploadConstraints,
   createUppy,
   getCedarUploadId
 };

package/dist/web/hooks/useFsUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFsUpload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useFsUpload.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/E,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACpC,CAAA;AAWD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,aAAa,GACd,EAAE,kBAAkB,GAAG,iBAAiB,CAyDxC"}
+{"version":3,"file":"useFsUpload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useFsUpload.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/E,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACpC,CAAA;AAWD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,QAAQ,EACR,gBAAgB,EAChB,aAAa,GACd,EAAE,kBAAkB,GAAG,iBAAiB,CA6ExC"}

package/dist/web/hooks/useFsUpload.js

@@ -12,7 +12,8 @@ function useFsUpload({
   onUploadComplete,
   onUploadError
 }) {
-  const { requestToken, getToken, constraints } = useUploadToken({ profile });
+  const { requestToken, acquireToken, hasUsableToken, constraints } = useUploadToken({ profile });
+  const fileTokens = useRef(/* @__PURE__ */ new Map());
   const endpointRef = useRef(endpoint ?? defaultEndpoint());
   useEffect(() => {
     endpointRef.current = endpoint ?? defaultEndpoint();
@@ -22,7 +23,7 @@ function useFsUpload({
       provider: "fs",
       constraints,
       endpoint: () => endpointRef.current,
-      getUploadToken: getToken
+      getUploadToken: (file) => fileTokens.current.get(file.id) ?? null
     }),
     constraints,
     { onUploadComplete, onUploadError }
@@ -33,24 +34,35 @@ function useFsUpload({
       return;
     }
     const onFileAdded = () => {
-      if (!getToken()) {
+      if (!hasUsableToken()) {
         requestToken().catch((e) => {
           onUploadError?.(e instanceof Error ? e : new Error(String(e)));
         });
       }
     };
-    const ensureToken = async () => {
-      if (!getToken()) {
-        await requestToken();
+    const assignTokens = async (fileIDs) => {
+      if (fileIDs.length === 0) {
+        return;
+      }
+      const token = await acquireToken(fileIDs.length);
+      for (const fileID of fileIDs) {
+        fileTokens.current.set(fileID, token);
+      }
+    };
+    const onFileRemoved = (file) => {
+      if (file) {
+        fileTokens.current.delete(file.id);
       }
     };
     uppy.on("file-added", onFileAdded);
-    uppy.addPreProcessor(ensureToken);
+    uppy.on("file-removed", onFileRemoved);
+    uppy.addPreProcessor(assignTokens);
     return () => {
       uppy.off("file-added", onFileAdded);
-      uppy.removePreProcessor(ensureToken);
+      uppy.off("file-removed", onFileRemoved);
+      uppy.removePreProcessor(assignTokens);
     };
-  }, [uppy, getToken, requestToken, onUploadError]);
+  }, [uppy, acquireToken, hasUsableToken, requestToken, onUploadError]);
   return { ...upload, requestToken };
 }
 export {

package/dist/web/hooks/useS3Upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useS3Upload.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/E,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,yEAAyE;IACzE,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACpC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,OAAc,EACd,gBAAgB,EAChB,aAAa,GACd,EAAE,kBAAkB,GAAG,iBAAiB,CAwHxC"}
+{"version":3,"file":"useS3Upload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useS3Upload.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE/E,MAAM,WAAW,kBAAmB,SAAQ,mBAAmB;IAC7D,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;IACf;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,MAAM,iBAAiB,GAAG,gBAAgB,GAAG;IACjD,yEAAyE;IACzE,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CACpC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,EAC1B,OAAO,EACP,OAAc,EACd,gBAAgB,EAChB,aAAa,GACd,EAAE,kBAAkB,GAAG,iBAAiB,CAiIxC"}

package/dist/web/hooks/useS3Upload.js

@@ -10,12 +10,12 @@ function useS3Upload({
   onUploadComplete,
   onUploadError
 }) {
-  const { requestToken, getToken, constraints } = useUploadToken({ profile });
+  const { requestToken, acquireToken, hasUsableToken, constraints } = useUploadToken({ profile });
   const [createPresignedUploadUrl] = useMutation(CREATE_PRESIGNED_UPLOAD_URL);
   const [confirmUpload] = useMutation(CONFIRM_UPLOAD);
   const getUploadParameters = useCallback(
     async (file) => {
-      const uploadToken = getToken() ?? await requestToken();
+      const uploadToken = await acquireToken();
       const result = await createPresignedUploadUrl({
         variables: {
           input: {
@@ -32,7 +32,7 @@ function useS3Upload({
       }
       return data;
     },
-    [createPresignedUploadUrl, getToken, requestToken]
+    [createPresignedUploadUrl, acquireToken]
   );
   const getUploadParametersRef = useRef(getUploadParameters);
   useEffect(() => {
@@ -53,7 +53,7 @@ function useS3Upload({
       return;
     }
     const onFileAdded = () => {
-      if (!getToken()) {
+      if (!hasUsableToken()) {
         requestToken().catch((e) => {
           onUploadError?.(e instanceof Error ? e : new Error(String(e)));
         });
@@ -91,7 +91,14 @@ function useS3Upload({
       uppy.off("file-added", onFileAdded);
       uppy.removePostProcessor(confirmAll);
     };
-  }, [uppy, confirm, confirmUpload, getToken, requestToken, onUploadError]);
+  }, [
+    uppy,
+    confirm,
+    confirmUpload,
+    hasUsableToken,
+    requestToken,
+    onUploadError
+  ]);
   return { ...upload, requestToken };
 }
 export {

package/dist/web/hooks/useUploadToken.d.ts

@@ -10,6 +10,19 @@ export interface UseUploadTokenResult {
      * in-flight request.
      */
     requestToken: () => Promise<string>;
+    /**
+     * Resolves with a token that can still create `fileCount` files (default
+     * 1) and counts them against it. Reuses the current token while it has
+     * files left and is not about to expire, and fetches a fresh one
+     * otherwise. Call it once per file (or once per batch, with the batch
+     * size) right before the token is sent.
+     */
+    acquireToken: (fileCount?: number) => Promise<string>;
+    /**
+     * Whether the current token is unexpired and has at least one file left,
+     * so the next `acquireToken()` call can resolve without a request.
+     */
+    hasUsableToken: () => boolean;
     /**
      * Returns the most recently fetched token, or `null`, without triggering
      * a render. Meant for event handlers and Uppy callbacks.
@@ -25,10 +38,23 @@ export interface UseUploadTokenResult {
     loading: boolean;
     error: ErrorLike | undefined;
 }
+/**
+ * Reads the lifetime (`exp - iat`, in milliseconds) from a signed token's
+ * claims without verifying it. The lifetime is anchored to the client's
+ * clock when the token is requested, so clock skew between browser and server
+ * does not matter. Returns `null` for a token whose claims cannot be read.
+ */
+export declare function readTokenLifetimeMs(token: string): number | null;
 /**
  * Fetches upload tokens for a profile from the `requestUploadToken` query.
  * Tokens expire, so the query runs with `fetchPolicy: 'no-cache'` and only
- * when `requestToken()` is called, never on mount.
+ * when a token is needed, never on mount.
+ *
+ * A token expires and can only create `maxFiles` files, so the hook tracks
+ * both for the current token. `acquireToken()` hands the token out only
+ * while it has files left and is not about to expire, and fetches a fresh
+ * one otherwise, which lets one mounted component upload any number of
+ * times.
  */
 export declare function useUploadToken({ profile, }: UseUploadTokenOptions): UseUploadTokenResult;
 //# sourceMappingURL=useUploadToken.d.ts.map

package/dist/web/hooks/useUploadToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUploadToken.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useUploadToken.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAGV,iBAAiB,EAClB,MAAM,eAAe,CAAA;AAEtB,MAAM,WAAW,qBAAqB;IACpC,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACnC;;;OAGG;IACH,QAAQ,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;IAC7B,kDAAkD;IAClD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB;;;OAGG;IACH,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,GACR,EAAE,qBAAqB,GAAG,oBAAoB,CA4E9C"}
+{"version":3,"file":"useUploadToken.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useUploadToken.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAI/C,OAAO,KAAK,EAGV,iBAAiB,EAClB,MAAM,eAAe,CAAA;AAEtB,MAAM,WAAW,qBAAqB;IACpC,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACnC;;;;;;OAMG;IACH,YAAY,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;IACrD;;;OAGG;IACH,cAAc,EAAE,MAAM,OAAO,CAAA;IAC7B;;;OAGG;IACH,QAAQ,EAAE,MAAM,MAAM,GAAG,IAAI,CAAA;IAC7B,kDAAkD;IAClD,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB;;;OAGG;IACH,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;CAC7B;AA+BD;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA0BhE;AA2BD;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,EAC7B,OAAO,GACR,EAAE,qBAAqB,GAAG,oBAAoB,CAoH9C"}

package/dist/web/hooks/useUploadToken.js

@@ -1,6 +1,45 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useLazyQuery } from "@apollo/client/react";
 import { REQUEST_UPLOAD_TOKEN } from "../graphql.js";
+const EXPIRY_MARGIN_MS = 3e4;
+function decodeBase64Url(value) {
+  const base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+  const padded = base64.padEnd(
+    base64.length + (4 - base64.length % 4) % 4,
+    "="
+  );
+  return atob(padded);
+}
+function readTokenLifetimeMs(token) {
+  const [, claims] = token.split(".");
+  if (!claims) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(decodeBase64Url(claims));
+    if (typeof parsed === "object" && parsed !== null && "exp" in parsed && "iat" in parsed && typeof parsed.exp === "number" && typeof parsed.iat === "number" && parsed.exp > parsed.iat) {
+      return (parsed.exp - parsed.iat) * 1e3;
+    }
+  } catch {
+  }
+  return null;
+}
+function expiresAtFor(token, requestedAt) {
+  const lifetime = readTokenLifetimeMs(token);
+  if (lifetime === null) {
+    return null;
+  }
+  return requestedAt + lifetime - Math.min(EXPIRY_MARGIN_MS, lifetime / 2);
+}
+function canCreate(state, fileCount) {
+  if (!state) {
+    return false;
+  }
+  if (state.expiresAt !== null && Date.now() >= state.expiresAt) {
+    return false;
+  }
+  return state.used === 0 || state.used + fileCount <= state.maxFiles;
+}
 function useUploadToken({
   profile
 }) {
@@ -23,6 +62,7 @@ function useUploadToken({
     }
     const requestedProfile = profile;
     const request = (async () => {
+      const requestedAt = Date.now();
       const result = await execute({ variables: { profile: requestedProfile } });
       if (requestedProfile !== profileRef.current) {
         throw new Error(
@@ -36,7 +76,12 @@ function useUploadToken({
       if (!data) {
         throw new Error("The upload token query returned no data.");
       }
-      tokenRef.current = data.token;
+      tokenRef.current = {
+        token: data.token,
+        maxFiles: data.maxFiles,
+        used: 0,
+        expiresAt: expiresAtFor(data.token, requestedAt)
+      };
       setToken(data.token);
       setConstraints({
         allowedMimeTypes: data.allowedMimeTypes,
@@ -52,9 +97,33 @@ function useUploadToken({
     inFlight.current = request;
     return request;
   }, [execute, profile]);
-  const getToken = useCallback(() => tokenRef.current, []);
-  return { requestToken, getToken, token, constraints, loading, error };
+  const acquireToken = useCallback(
+    async (fileCount = 1) => {
+      for (; ; ) {
+        const current = tokenRef.current;
+        if (current && canCreate(current, fileCount)) {
+          current.used += fileCount;
+          return current.token;
+        }
+        await requestToken();
+      }
+    },
+    [requestToken]
+  );
+  const hasUsableToken = useCallback(() => canCreate(tokenRef.current, 1), []);
+  const getToken = useCallback(() => tokenRef.current?.token ?? null, []);
+  return {
+    requestToken,
+    acquireToken,
+    hasUsableToken,
+    getToken,
+    token,
+    constraints,
+    loading,
+    error
+  };
 }
 export {
+  readTokenLifetimeMs,
   useUploadToken
 };

package/dist/web/hooks/useUppyUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUppyUpload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useUppyUpload.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEtD,MAAM,WAAW,mBAAmB;IAClC,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAChD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,IAAI,EAAE,SAAS,GAAG,IAAI,CAAA;IACtB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,WAAW,EAAE,OAAO,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAChC,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,mBAAmB,GACvD,gBAAgB,CAoGlB"}
+{"version":3,"file":"useUppyUpload.d.ts","sourceRoot":"","sources":["../../../src/web/hooks/useUppyUpload.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEtD,MAAM,WAAW,mBAAmB;IAClC,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAChD,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAA;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,8DAA8D;IAC9D,IAAI,EAAE,SAAS,GAAG,IAAI,CAAA;IACtB,gEAAgE;IAChE,gBAAgB,EAAE,MAAM,EAAE,CAAA;IAC1B,WAAW,EAAE,OAAO,CAAA;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,OAAO,CAAC,SAAS,CAAC,EAChC,WAAW,EAAE,iBAAiB,GAAG,IAAI,EACrC,EAAE,gBAAgB,EAAE,aAAa,EAAE,EAAE,mBAAmB,GACvD,gBAAgB,CA8FlB"}

package/dist/web/hooks/useUppyUpload.js

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from "react";
-import { getCedarUploadId } from "../createUppy.js";
+import { applyUploadConstraints, getCedarUploadId } from "../createUppy.js";
 function useUppyUpload(create, constraints, { onUploadComplete, onUploadError }) {
   const [uppy, setUppy] = useState(null);
   const [completedUploads, setCompletedUploads] = useState([]);
@@ -33,13 +33,7 @@ function useUppyUpload(create, constraints, { onUploadComplete, onUploadError })
     if (!uppy || !constraints) {
       return;
     }
-    uppy.setOptions({
-      restrictions: {
-        allowedFileTypes: constraints.allowedMimeTypes,
-        maxFileSize: constraints.maxFileSize,
-        maxNumberOfFiles: constraints.maxFiles
-      }
-    });
+    applyUploadConstraints(uppy, constraints);
   }, [uppy, constraints]);
   useEffect(() => {
     if (!uppy) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/uploads",
-  "version": "8.0.0-canary.3274",
+  "version": "8.0.0-canary.3285",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -43,9 +43,9 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/api": "8.0.0-canary.3274",
-    "@cedarjs/context": "8.0.0-canary.3274",
-    "@cedarjs/graphql-server": "8.0.0-canary.3274",
+    "@cedarjs/api": "8.0.0-canary.3285",
+    "@cedarjs/context": "8.0.0-canary.3285",
+    "@cedarjs/graphql-server": "8.0.0-canary.3285",
     "@fastify/multipart": "9.4.0",
     "graphql": "16.14.2",
     "mime-types": "2.1.35"
@@ -55,8 +55,8 @@
     "@arethetypeswrong/cli": "0.18.5",
     "@aws-sdk/client-s3": "3.1139.0",
     "@aws-sdk/s3-request-presigner": "3.1139.0",
-    "@cedarjs/framework-tools": "8.0.0-canary.3274",
-    "@cedarjs/web": "8.0.0-canary.3274",
+    "@cedarjs/framework-tools": "8.0.0-canary.3285",
+    "@cedarjs/web": "8.0.0-canary.3285",
     "@prisma/adapter-better-sqlite3": "7.10.0",
     "@prisma/client": "7.10.0",
     "@testing-library/dom": "10.4.2",
@@ -90,7 +90,7 @@
     "@apollo/client": "4.3.1",
     "@aws-sdk/client-s3": "^3.0.0",
     "@aws-sdk/s3-request-presigner": "^3.0.0",
-    "@cedarjs/web": "8.0.0-canary.3274",
+    "@cedarjs/web": "8.0.0-canary.3285",
     "@uppy/aws-s3": "^6.0.0",
     "@uppy/core": "^6.0.0",
     "@uppy/dashboard": "^6.0.0",