appflare 0.2.26 → 0.2.28

package/cli/templates/core/client/storage.ts

@@ -67,6 +67,26 @@ export function createStorageClient(
 ): StorageClient {
 	return {
 		upload: async (args) => {
+			let base64BodyToSend: string | undefined;
+
+			if (args.body instanceof File) {
+				const buffer = await args.body.arrayBuffer();
+				const bytes = new Uint8Array(buffer);
+				let binary = "";
+				const chunkSize = 8192;
+				for (let i = 0; i < bytes.length; i += chunkSize) {
+					const chunk = bytes.subarray(i, i + chunkSize);
+					binary += String.fromCharCode(...chunk);
+				}
+				base64BodyToSend = btoa(binary);
+			} else if (typeof args.body === "string") {
+				base64BodyToSend = btoa(args.body);
+			}
+
+			if (args.base64Body) {
+				base64BodyToSend = args.base64Body;
+			}
+
 			const headers = await createAuthorizedHeaders(
 				{
 					"content-type": "application/json",
@@ -77,7 +97,12 @@ export function createStorageClient(
 			const response = await request(\`\${endpoint}/storage/upload\`, {
 				method: "POST",
 				headers,
-				body: JSON.stringify(args),
+				body: JSON.stringify({
+					path: args.path,
+					contentType: args.contentType,
+					expiresIn: args.expiresIn,
+					base64Body: base64BodyToSend,
+				}),
 			});
 			if (!response.ok) {
 				throw new Error(await response.text());
@@ -105,24 +130,14 @@ export function createStorageClient(
 
 			return (await response.json()) as StorageSignedUrlResponse;
 		},
-		preview: async (args) => {
+		preview: (args) => {
 			const query = new URLSearchParams({
 				path: args.path,
 				...(typeof args.expiresIn === "number"
 					? { expiresIn: String(args.expiresIn) }
 					: {}),
 			});
-			const response = await request(
-				\`\${endpoint}/storage/preview?\${query.toString()}\`,
-				{
-					headers: await createAuthorizedHeaders(undefined, onGetAuthToken),
-				},
-			);
-			if (!response.ok) {
-				throw new Error(await response.text());
-			}
-
-			return (await response.json()) as StorageSignedUrlResponse;
+			return \`\${endpoint}/storage/download?\${query.toString()}\`;
 		},
 		delete: async (args) => {
 			const query = new URLSearchParams({

package/cli/templates/core/client/types.ts

@@ -148,6 +148,8 @@ export type StorageClient = {
 		path: string;
 		contentType?: string;
 		expiresIn?: number;
+		base64Body?: string;
+		body?: string | File;
 	}) => Promise<StorageSignedUrlResponse>;
 	download: (args: {
 		path: string;
@@ -157,7 +159,7 @@ export type StorageClient = {
 	preview: (args: {
 		path: string;
 		expiresIn?: number;
-	}) => Promise<StorageSignedUrlResponse>;
+	}) => string;
 	delete: (args: { path: string }) => Promise<{ ok: boolean; path: string }>;
 	list: (args?: {
 		prefix?: string;

package/cli/templates/handlers/generators/context/storage-api.ts

@@ -32,28 +32,6 @@ function createStorageApi(
 				contentType: args.contentType,
 			});
 
-			if (args.returnSignedUrlOnly) {
-				const currentBucket = requireBucket();
-				if (typeof currentBucket.createPresignedUrl !== "function") {
-					throw new Error("R2 createPresignedUrl is unavailable for this runtime binding");
-				}
-
-				const signedRequest = buildSignedRequest(
-					{
-						path,
-						method: "PUT",
-						contentType: args.contentType,
-						expiresIn: args.expiresIn,
-					},
-					path,
-				);
-				const signedUrl = await currentBucket.createPresignedUrl(signedRequest, {
-					expiresIn: args.expiresIn ?? 60 * 5,
-				});
-
-				return signedUrl.toString();
-			}
-
 			return requireBucket().put(path, args.body, {
 				httpMetadata: {
 					...(args.httpMetadata ?? {}),
@@ -98,36 +76,6 @@ function createStorageApi(
 				include: args.include,
 			});
 		},
-		signedUrl: async (args) => {
-			const path = normalizeStoragePath(args.path);
-			const requestMethod = args.method ?? "GET";
-			const method: StorageMethod =
-				requestMethod === "PUT"
-					? "put"
-					: requestMethod === "DELETE"
-						? "delete"
-						: args.downloadAsAttachment === false
-							? "preview"
-							: "download";
-
-			await assertAuthorized({
-				path: "/" + path,
-				method,
-				contentType: args.contentType,
-			});
-
-			const currentBucket = requireBucket();
-			if (typeof currentBucket.createPresignedUrl !== "function") {
-				throw new Error("R2 createPresignedUrl is unavailable for this runtime binding");
-			}
-
-			const signedRequest = buildSignedRequest(args, path);
-			const signedUrl = await currentBucket.createPresignedUrl(signedRequest, {
-				expiresIn: args.expiresIn ?? 60 * 5,
-			});
-
-			return signedUrl.toString();
-		},
 	};
 }
 `;

package/cli/templates/handlers/generators/registration/modules/storage.ts

@@ -37,25 +37,34 @@ export function registerGeneratedStorageRoutes(
 			const path = toStoragePath(String(body.path ?? ""));
 			const contentType =
 				typeof body.contentType === "string" ? body.contentType : undefined;
-			const expiresIn =
-				typeof body.expiresIn === "number" && body.expiresIn > 0
-					? Math.floor(body.expiresIn)
-					: undefined;
+			const encodedBody = typeof body.body === "string" ? body.body : undefined;
+			const base64Body = typeof body.base64Body === "string" ? body.base64Body : undefined;
+
+			if (!base64Body && !encodedBody) {
+				return c.json(
+					{ message: "File content is required. Provide either 'body' or 'base64Body' field." },
+					400,
+				);
+			}
+
+			const uploadBody = base64Body
+				? Uint8Array.from(atob(base64Body), (char) => char.charCodeAt(0))
+				: encodedBody
+					? Uint8Array.from(atob(encodedBody), (char) => char.charCodeAt(0))
+					: new Uint8Array();
 
-			const url = await ctx.storage.put({
+			await ctx.storage.put({
 				path,
-				body: "",
+				body: uploadBody,
 				contentType,
-				expiresIn,
-				returnSignedUrlOnly: true,
 			});
 
 			return c.json({
-				url,
+				url: null,
 				method: "PUT",
 				path,
 				contentType,
-				expiresIn: expiresIn ?? 300,
+				uploaded: true,
 			}, 200);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
@@ -74,28 +83,28 @@ export function registerGeneratedStorageRoutes(
 		try {
 			const path = readStoragePath(c);
 			const fileName = c.req.query("fileName") ?? undefined;
-			const expiresIn = parseExpiresIn(c.req.query("expiresIn"));
-			const url = await ctx.storage.signedUrl({
-				path,
-				method: "GET",
-				expiresIn,
-				downloadAsAttachment: true,
-				fileName,
-			});
+			
+			const file = await ctx.storage.get({ path });
+			if (!file) {
+				return c.json({ message: "File not found" }, 404);
+			}
 
-			return c.json({
-				url,
-				method: "GET",
-				path,
-				disposition: "attachment",
-			}, 200);
+			const headers: Record<string, string> = {};
+			if (file.contentType) {
+				headers["content-type"] = file.contentType;
+			}
+			if (fileName) {
+				headers["content-disposition"] = \`attachment; filename="\${fileName}"\`;
+			}
+
+			return c.body(file.body, 200, headers);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
 				return c.json(error.payload, error.status as any);
 			}
 
 			return c.json(
-				{ message: (error as Error).message ?? "Unable to create download URL" },
+				{ message: (error as Error).message ?? "Unable to download file" },
 				400,
 			);
 		}
@@ -106,19 +115,13 @@ export function registerGeneratedStorageRoutes(
 		try {
 			const path = readStoragePath(c);
 			const expiresIn = parseExpiresIn(c.req.query("expiresIn"));
-			const url = await ctx.storage.signedUrl({
-				path,
-				method: "GET",
-				expiresIn,
-				downloadAsAttachment: false,
-			});
-
-			return c.json({
-				url,
-				method: "GET",
-				path,
-				disposition: "inline",
-			}, 200);
+			
+			// For now, we'll return an error since signed URLs are not available
+			// In the future, we could implement direct file serving here
+			return c.json(
+				{ message: "Preview via signed URL is not available in this runtime. Use direct file access instead." },
+				501,
+			);
 		} catch (error) {
 			if (error instanceof AppflareHandledError) {
 				return c.json(error.payload, error.status as any);

package/cli/templates/handlers/generators/types/context.ts

@@ -49,7 +49,6 @@ export type AppflareStorage = {
 	get: (args: StorageGetArgs) => Promise<unknown | null>;
 	delete: (args: StorageDeleteArgs) => Promise<void>;
 	list: (args?: StorageListArgs) => Promise<unknown>;
-	signedUrl: (args: StorageSignedUrlArgs) => Promise<string>;
 };
 
 export type AppflareContext = {