Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
Store content type before upload (#1619)
Bogdan Chadkin810a87b9901c
diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex b215392306..8c4716b270 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -110,7 +110,6 @@ const uploadAsset = async ({authToken,projectId,assetId,- type,file,onCompleted,onError,@@ -118,7 +117,6 @@ const uploadAsset = async ({authToken: undefined | string;projectId: string;assetId: string;- type: string;file: File;onCompleted: (data: UploadData) => void;onError: (error: string) => void;@@ -127,6 +125,7 @@ const uploadAsset = async ({const metaFormData = new FormData();metaFormData.append("projectId", projectId);metaFormData.append("assetId", assetId);+ metaFormData.append("type", file.type);// sanitizeS3Key here is just because of https://github.com/remix-run/remix/issues/4443// should be removed after fixmetaFormData.append("filename", sanitizeS3Key(file.name));@@ -141,7 +140,7 @@ const uploadAsset = async ({}const uploadFormData = new FormData();- uploadFormData.append(type, file, metaData.name);+ uploadFormData.append("file", file, metaData.name);const uploadResponse = await fetch(restAssetsUploadPath({ name: metaData.name }),{@@ -200,7 +199,6 @@ export const useUploadAsset = () => {projectId,assetId,file: fileData.file,- type,onCompleted: (data) => {URL.revokeObjectURL(fileData.objectURL);deleteUploadingFileData(assetId);diff --git a/apps/builder/app/routes/rest.assets.tsx b/apps/builder/app/routes/rest.assets.tsxindex 2e38ebb484..dd067cee33 100644--- a/apps/builder/app/routes/rest.assets.tsx+++ b/apps/builder/app/routes/rest.assets.tsx@@ -29,14 +29,21 @@ export const action = async (props: ActionArgs) => {const formData = await request.formData();const projectId = formData.get("projectId") as string;const assetId = formData.get("assetId") as string;+ const type = formData.get("type") as string;const filename = formData.get("filename") as string;- if (projectId === null || assetId === null || filename === null) {+ if (+ projectId === null ||+ assetId === null ||+ type === null ||+ filename === null+ ) {throw Error("Project id, asset id or filename are missing");}const name = await createUploadName({projectId,assetId,+ type,filename,maxAssetsPerProject: MaxAssets.parse(env.MAX_ASSETS_PER_PROJECT),},diff --git a/packages/asset-uploader/src/client.ts b/packages/asset-uploader/src/client.tsindex d045a50486..ebd9acec12 100644--- a/packages/asset-uploader/src/client.ts+++ b/packages/asset-uploader/src/client.ts@@ -1,6 +1,10 @@import type { AssetData } from "./utils/get-asset-data";export type AssetClient = {- uploadFile: (request: Request) => Promise<AssetData>;+ uploadFile: (+ name: string,+ type: string,+ request: Request+ ) => Promise<AssetData>;deleteFile: (name: string) => Promise<void>;};diff --git a/packages/asset-uploader/src/clients/fs/fs.ts b/packages/asset-uploader/src/clients/fs/fs.tsindex 602b49674e..d02b37b7f4 100644--- a/packages/asset-uploader/src/clients/fs/fs.ts+++ b/packages/asset-uploader/src/clients/fs/fs.ts@@ -9,8 +9,10 @@ type FsClientOptions = {export const createFsClient = (options: FsClientOptions): AssetClient => {return {- uploadFile: (request) =>+ uploadFile: (name, type, request) =>uploadToFs({+ name,+ type,request,maxSize: options.maxUploadSize,fileDirectory: options.fileDirectory,diff --git a/packages/asset-uploader/src/clients/fs/upload.ts b/packages/asset-uploader/src/clients/fs/upload.tsindex 2381e4e38f..a8d1e41f95 100644--- a/packages/asset-uploader/src/clients/fs/upload.ts+++ b/packages/asset-uploader/src/clients/fs/upload.ts@@ -7,18 +7,17 @@ import {import { Location } from "@webstudio-is/prisma-client";import { AssetData, getAssetData } from "../../utils/get-asset-data";-const AssetsFromFs = z.array(z.instanceof(NodeOnDiskFile));--/**- * Do not change. Upload code assumes its 1.- */-const MAX_FILES_PER_REQUEST = 1;+const AssetFromFs = z.instanceof(NodeOnDiskFile);export const uploadToFs = async ({+ name,+ type,request,maxSize,fileDirectory,}: {+ name: string;+ type: string;request: Request;maxSize: number;fileDirectory: string;@@ -31,23 +30,14 @@ export const uploadToFs = async ({const formData = await parseMultipartFormData(request, uploadHandler);- const formDataImages = AssetsFromFs.parse(formData.getAll("image"));- const formDataFonts = AssetsFromFs.parse(formData.getAll("font"));- const formDataAll = [...formDataImages, ...formDataFonts].slice(- 0,- MAX_FILES_PER_REQUEST- );-- const assets = formDataAll.map(async (asset) =>- getAssetData({- type: formDataFonts.includes(asset) ? "font" : "image",- size: asset.size,- data: new Uint8Array(await asset.arrayBuffer()),- location: Location.FS,- })- );+ const file = AssetFromFs.parse(formData.get("file"));- const assetsData = await Promise.all(assets);+ const assetData = await getAssetData({+ type: type.startsWith("image") ? "image" : "font",+ size: file.size,+ data: new Uint8Array(await file.arrayBuffer()),+ location: Location.FS,+ });- return assetsData[0];+ return assetData;};diff --git a/packages/asset-uploader/src/clients/s3/s3.ts b/packages/asset-uploader/src/clients/s3/s3.tsindex 694a302a7c..cf27c4a4b8 100644--- a/packages/asset-uploader/src/clients/s3/s3.ts+++ b/packages/asset-uploader/src/clients/s3/s3.ts@@ -23,9 +23,11 @@ export const createS3Client = (options: S3ClientOptions): AssetClient => {},});- const uploadFile: AssetClient["uploadFile"] = async (request) => {+ const uploadFile: AssetClient["uploadFile"] = async (name, type, request) => {return await uploadToS3({client,+ name,+ type,request,maxSize: options.maxUploadSize,bucket: options.bucket,diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex a66c99f1c2..bf70f62ec2 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -1,6 +1,5 @@import { z } from "zod";import {- type UploadHandlerPart,unstable_parseMultipartFormData as parseMultipartFormData,MaxPartSizeExceededError,} from "@remix-run/node";@@ -21,12 +20,16 @@ const MAX_FILES_PER_REQUEST = 1;export const uploadToS3 = async ({client,+ name,+ type,request,maxSize,bucket,acl,}: {client: S3Client;+ name: string;+ type: string;request: Request;maxSize: number;bucket: string;@@ -34,48 +37,46 @@ export const uploadToS3 = async ({}): Promise<AssetData> => {const uploadHandler = createUploadHandler(MAX_FILES_PER_REQUEST, client);- const formData = await parseMultipartFormData(- request,- (file: UploadHandlerPart) =>- uploadHandler({- file,- maxSize,- bucket,- acl,- })- );-- const imagesFormData = formData.getAll("image") as Array<string>;- const fontsFormData = formData.getAll("font") as Array<string>;-- const assetsData = [...imagesFormData, ...fontsFormData]- .slice(0, MAX_FILES_PER_REQUEST)- .map((dataString) => {- return AssetData.parse(JSON.parse(dataString));+ const formData = await parseMultipartFormData(request, async (file) => {+ // Do not parse if it's not a file+ if (file.filename === undefined) {+ return;+ }+ return uploadHandler({+ name,+ type,+ data: file.data,+ maxSize,+ bucket,+ acl,});+ });- return assetsData[0];+ const file = formData.get("file") as string;++ const assetData = AssetData.parse(JSON.parse(file));++ return assetData;};const createUploadHandler = (maxFiles: number, client: S3Client) => {let count = 0;return async ({- file,+ name,+ type,+ data: dataStream,maxSize,bucket,acl,}: {- file: UploadHandlerPart;+ name: string;+ type: string;+ data: AsyncIterable<Uint8Array>;maxSize: number;bucket: string;acl?: string;}): Promise<string | undefined> => {- if (file.filename === undefined) {- // Do not parse if it's not a file- return;- }-if (count >= maxFiles) {// Do not throw, just ignore the file// In case of throw we need to delete previously uploaded files@@ -84,37 +85,29 @@ const createUploadHandler = (maxFiles: number, client: S3Client) => {count++;- if (!file.data) {- throw new Error("Your asset seems to be empty");- }-// @todo this is going to put the entire file in memory// this has to be a stream that goes directly to s3// Size check has to happen as you stream and interrupted when size is too big// Also check if S3 client has an option to check the size limit- const data = await toUint8Array(file.data);+ const data = await toUint8Array(dataStream);if (data.byteLength > maxSize) {- throw new MaxPartSizeExceededError(file.name, maxSize);+ throw new MaxPartSizeExceededError(name, maxSize);}- const fileName = file.filename;-- const uniqueFilename = fileName;-// if there is no ACL passed we do not default since some providers do not support itconst ACL = acl ? { ACL: acl } : {};const params: PutObjectCommandInput = {...ACL,Bucket: bucket,- Key: uniqueFilename,+ Key: name,Body: data,- ContentType: file.contentType,+ ContentType: type,CacheControl: "public, max-age=31536004,immutable",Metadata: {// encodeURIComponent is needed to support special characters like Cyrillic- filename: encodeURIComponent(fileName) || "unnamed",+ filename: encodeURIComponent(name) || "unnamed",},};@@ -122,12 +115,8 @@ const createUploadHandler = (maxFiles: number, client: S3Client) => {AssetsUploadedSuccess.parse(await upload.done());- const type = file.contentType.startsWith("image")- ? ("image" as const)- : ("font" as const);-const assetData = await getAssetData({- type,+ type: type.startsWith("image") ? "image" : "font",size: data.byteLength,data,location: Location.REMOTE,diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.tsindex f809796406..8309954aa8 100644--- a/packages/asset-uploader/src/upload.ts+++ b/packages/asset-uploader/src/upload.ts@@ -12,6 +12,7 @@ import { formatAsset } from "./utils/format-asset";type UploadData = {projectId: string;assetId: string;+ type: string;filename: string;maxAssetsPerProject: number;};@@ -22,7 +23,7 @@ export const createUploadName = async (data: UploadData,context: AppContext) => {- const { projectId, maxAssetsPerProject, assetId, filename } = data;+ const { projectId, maxAssetsPerProject, assetId, type, filename } = data;const canEdit = await authorizeProject.hasProjectPermit({ projectId, permit: "edit" },context@@ -85,13 +86,14 @@ export const createUploadName = async (create: {name,status: "UPLOADING",- format: "unknown",+ // store content type in related field+ format: type,size: 0,},},// @todo remove once legacy fields are removed from schemastatus: "UPLOADING",- format: "unknown",+ format: type,size: 0,},});@@ -103,6 +105,11 @@ export const uploadFile = async (client: AssetClient) => {const asset = await prisma.asset.findFirst({+ select: {+ id: true,+ projectId: true,+ file: true,+ },where: {name,file: {@@ -116,7 +123,7 @@ export const uploadFile = async (}try {- const assetData = await client.uploadFile(request);+ const assetData = await client.uploadFile(name, asset.file.format, request);const { meta, format, location, size } = assetData;const dbAsset = await prisma.asset.update({select: {