feat(blob): Add multipart option

packages/blob/package.json

@@ -25,7 +25,8 @@
   "module": "./dist/index.js",
   "browser": {
     "undici": "./dist/undici-browser.js",
-    "crypto": "./dist/crypto-browser.js"
+    "crypto": "./dist/crypto-browser.js",
+    "stream": "./dist/stream-browser.js"
   },
   "typesVersions": {
     "*": {
@@ -39,7 +40,7 @@
   ],
   "scripts": {
     "build": "tsup && pnpm run copy-shims",
-    "copy-shims": "cp src/undici-browser.js dist/undici-browser.js && cp src/crypto-browser.js dist/crypto-browser.js",
+    "copy-shims": "cp src/*-browser.js dist/",
     "dev": "pnpm run copy-shims && tsup --watch --clean=false",
     "lint": "eslint --max-warnings=0 .",
     "prepublishOnly": "pnpm run build",

packages/blob/src/client.ts

@@ -62,6 +62,7 @@ export interface UploadOptions {
    * Additional data which will be sent to your `handleUpload` route.
    */
   clientPayload?: string;
+  multipart?: boolean;
 }
 
 /**
@@ -103,7 +104,8 @@ export const upload = createPutMethod<UploadOptions>({
     const clientToken = await retrieveClientToken({
       handleUploadUrl: options.handleUploadUrl,
       pathname,
-      clientPayload: options.clientPayload,
+      clientPayload: options.clientPayload ?? null,
+      multipart: options.multipart ?? false,
     });
     return clientToken;
   },
@@ -211,13 +213,18 @@ const EventTypes = {
 
 interface GenerateClientTokenEvent {
   type: (typeof EventTypes)['generateClientToken'];
-  payload: { pathname: string; callbackUrl: string; clientPayload?: string };
+  payload: {
+    pathname: string;
+    callbackUrl: string;
+    multipart: boolean;
+    clientPayload: string | null;
+  };
 }
 interface UploadCompletedEvent {
   type: (typeof EventTypes)['uploadCompleted'];
   payload: {
     blob: PutBlobResult;
-    tokenPayload?: string;
+    tokenPayload?: string | null;
   };
 }
 
@@ -229,7 +236,8 @@ export interface HandleUploadOptions {
   body: HandleUploadBody;
   onBeforeGenerateToken: (
     pathname: string,
-    clientPayload?: string,
+    clientPayload: string | null,
+    multipart: boolean,
   ) => Promise<
     Pick<
       GenerateClientTokenOptions,
@@ -238,7 +246,7 @@ export interface HandleUploadOptions {
       | 'validUntil'
       | 'addRandomSuffix'
       | 'cacheControlMaxAge'
-    > & { tokenPayload?: string }
+    > & { tokenPayload?: string | null }
   >;
   onUploadCompleted: (body: UploadCompletedEvent['payload']) => Promise<void>;
   token?: string;
@@ -260,9 +268,18 @@ export async function handleUpload({
   const type = body.type;
   switch (type) {
     case 'blob.generate-client-token': {
-      const { pathname, callbackUrl, clientPayload } = body.payload;
-      const payload = await onBeforeGenerateToken(pathname, clientPayload);
+      const { pathname, callbackUrl, clientPayload, multipart } = body.payload;
+      const payload = await onBeforeGenerateToken(
+        pathname,
+        clientPayload,
+        multipart,
+      );
       const tokenPayload = payload.tokenPayload ?? clientPayload;
+      const defaultTokenDurationInSeconds = multipart ? 60 * 60 : 10 * 60;
+      const now = new Date();
+      const validUntil =
+        payload.validUntil ??
+        now.setSeconds(now.getSeconds() + defaultTokenDurationInSeconds);
 
       return {
         type,
@@ -274,6 +291,7 @@ export async function handleUpload({
             callbackUrl,
             tokenPayload,
           },
+          validUntil,
         }),
       };
     }
@@ -309,7 +327,8 @@ export async function handleUpload({
 async function retrieveClientToken(options: {
   pathname: string;
   handleUploadUrl: string;
-  clientPayload?: string;
+  clientPayload: string | null;
+  multipart: boolean;
 }): Promise<string> {
   const { handleUploadUrl, pathname } = options;
   const url = isAbsoluteUrl(handleUploadUrl)
@@ -322,6 +341,7 @@ async function retrieveClientToken(options: {
       pathname,
       callbackUrl: url,
       clientPayload: options.clientPayload,
+      multipart: options.multipart,
     },
   };
 
@@ -400,7 +420,7 @@ export interface GenerateClientTokenOptions extends BlobCommandOptions {
   pathname: string;
   onUploadCompleted?: {
     callbackUrl: string;
-    tokenPayload?: string;
+    tokenPayload?: string | null;
   };
   maximumSizeInBytes?: number;
   allowedContentTypes?: string[];

packages/blob/src/helpers.ts

@@ -32,6 +32,7 @@ export interface CreateBlobCommandOptions extends BlobCommandOptions {
    * @defaultvalue 365 * 24 * 60 * 60 (1 Year)
    */
   cacheControlMaxAge?: number;
+  multipart?: boolean;
 }
 
 export function getTokenFromOptionsOrEnv(options?: BlobCommandOptions): string {