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
fix: Explain asset count limits (#6149)
Oleg Isonena836f29a69d5
diff --git a/apps/builder/app/services/asset-rest.server.test.ts b/apps/builder/app/services/asset-rest.server.test.tsindex 3e25acb09e..e199c341c5 100644--- a/apps/builder/app/services/asset-rest.server.test.ts+++ b/apps/builder/app/services/asset-rest.server.test.ts@@ -3,6 +3,7 @@ import { TRPCError } from "@trpc/server";import {AssetRepositoryConflictError,AssetRepositoryNotFoundError,+ AssetUploadCountLimitError,} from "@webstudio-is/asset-uploader/server";import { assetFolders } from "@webstudio-is/sdk";import { assetResourceLimits } from "@webstudio-is/sdk/asset-resource-limits";@@ -30,6 +31,7 @@ describe("Assets REST responses", () => {[new TRPCError({ code: "FORBIDDEN" }), 403],[new AssetRepositoryNotFoundError("missing"), 404],[new AssetRepositoryConflictError("conflict"), 409],+ [new AssetUploadCountLimitError(50), 409],[new AssetRestRangeError("bad range"), 416],[new AssetRestPayloadTooLargeError("too large"), 413],[new AssetUploadSizeLimitError("post.md", 10), 413],diff --git a/apps/builder/app/services/asset-rest.server.ts b/apps/builder/app/services/asset-rest.server.tsindex c7c4b99d8d..1dc42a72f8 100644--- a/apps/builder/app/services/asset-rest.server.ts+++ b/apps/builder/app/services/asset-rest.server.ts@@ -8,6 +8,7 @@ import {AssetRepositoryConflictError,AssetRepositoryNotFoundError,AssetRevisionConflictError,+ AssetUploadCountLimitError,AssetUploadSizeLimitError,PostgresAssetRepository,} from "@webstudio-is/asset-uploader/server";@@ -184,7 +185,8 @@ const getAssetRestErrorStatus = (error: unknown) => {}if (error instanceof AssetRepositoryConflictError ||- error instanceof AssetRevisionConflictError+ error instanceof AssetRevisionConflictError ||+ error instanceof AssetUploadCountLimitError) {return 409;}diff --git a/packages/asset-uploader/src/upload.test.ts b/packages/asset-uploader/src/upload.test.tsindex 84d7837b71..13417e70d6 100644--- a/packages/asset-uploader/src/upload.test.ts+++ b/packages/asset-uploader/src/upload.test.ts@@ -7,7 +7,11 @@ import {testContext,} from "@webstudio-is/postgrest/testing";import type { AppContext } from "@webstudio-is/trpc-interface/index.server";-import { createUploadTicket, uploadFile } from "./upload";+import {+ AssetUploadCountLimitError,+ createUploadTicket,+ uploadFile,+} from "./upload";import { PostgresAssetRepository } from "./asset-repository";const server = createTestServer();@@ -426,7 +430,7 @@ describe("createUploadTicket", () => {},createContext())- ).rejects.toThrow("The maximum number of assets per project is 350.");+ ).rejects.toBeInstanceOf(AssetUploadCountLimitError);expect(insertedAsset).toBe(false);expect(restoredFile).toBe(false);});@@ -591,7 +595,7 @@ describe("createUploadTicket", () => {createContext(),() => "asset-2")- ).rejects.toThrow("The maximum number of assets per project is 350.");+ ).rejects.toBeInstanceOf(AssetUploadCountLimitError);});test("uses project owner's asset limit for shared workspace projects", async () => {diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.tsindex eff6c4b414..0da7e72493 100644--- a/packages/asset-uploader/src/upload.ts+++ b/packages/asset-uploader/src/upload.ts@@ -30,6 +30,14 @@ export type CreateUploadTicketInput = {contentHash?: string;};+export class AssetUploadCountLimitError extends Error {+ constructor(maxAssetsPerProject: number) {+ super(+ `The maximum number of assets per project is ${maxAssetsPerProject}.`+ );+ }+}+const UPLOADING_STALE_TIMEOUT = 1000 * 60 * 30; // 30 minutesconst maxCreateUploadTicketAttempts = 3;const contentHashUploadPollInterval = 100;@@ -81,9 +89,7 @@ const assertAssetCapacity = async (projectId: string, context: AppContext) => {);const count = (assetCount.count ?? 0) + (uploadingCount.count ?? 0);if (count >= maxAssetsPerProject) {- throw new Error(- `The maximum number of assets per project is ${maxAssetsPerProject}.`- );+ throw new AssetUploadCountLimitError(maxAssetsPerProject);}};