Skip to content

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.

fix: Resolve version mismatch error for post-transaction issues (#2563)

Ivan Starkov71a480c85770
diff --git a/apps/builder/app/routes/rest.patch.ts b/apps/builder/app/routes/rest.patch.ts
index 10939dc847..f456177f61 100644
--- a/apps/builder/app/routes/rest.patch.ts
+++ b/apps/builder/app/routes/rest.patch.ts
@@ -58,6 +58,12 @@ export const action = async ({ request }: ActionArgs) => {
return { errors: "Project id required" };
}
+ const lastTransactionId = transactions.at(-1)?.transactionId;
+
+ if (lastTransactionId === undefined) {
+ return { errors: "Transaction array must not be empty." };
+ }
+
const context = await createContext(request);
const canEdit = await authorizeProject.hasProjectPermit(
{ projectId, permit: "edit" },
@@ -78,6 +84,13 @@ export const action = async ({ request }: ActionArgs) => {
const serverVersion = build.version;
if (clientVersion !== serverVersion) {
+ // Check if a retry attempt is made with a previously successful transaction.
+ // This can occur if the connection was lost or an error occurred post-transaction completion,
+ // leaving the client in an erroneous state and prompting a retry.
+ if (lastTransactionId === build.lastTransactionId) {
+ return { status: "ok" };
+ }
+
return {
status: "version_mismatched",
};
@@ -183,6 +196,7 @@ export const action = async ({ request }: ActionArgs) => {
// save build data when all patches applied
const dbBuildData: Parameters<typeof prisma.build.update>[0]["data"] = {
version: clientVersion + 1,
+ lastTransactionId,
};
if (buildData.pages) {
@@ -249,9 +263,12 @@ export const action = async ({ request }: ActionArgs) => {
version: clientVersion,
},
});
+
// ensure only build with client version is updated
// to avoid race conditions
if (count === 0) {
+ // We don't validate if lastTransactionId matches the user's transaction ID here, as we've already done so earlier.
+ // Given the sequential nature of messages from a single client, this situation is deemed improbable.
return {
status: "version_mismatched",
};
diff --git a/packages/prisma-client/prisma/migrations/20231105075338_add-last-transaction-id/migration.sql b/packages/prisma-client/prisma/migrations/20231105075338_add-last-transaction-id/migration.sql
new file mode 100644
index 0000000000..013cf0090b
--- /dev/null
+++ b/packages/prisma-client/prisma/migrations/20231105075338_add-last-transaction-id/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Build" ADD COLUMN "lastTransactionId" TEXT;
+
diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prisma
index 8ed446b4a3..6af5400630 100644
--- a/packages/prisma-client/prisma/schema.prisma
+++ b/packages/prisma-client/prisma/schema.prisma
@@ -86,11 +86,12 @@ enum PublishStatus {
}
model Build {
- id String @unique @default(uuid())
- version Int @default(0)
- createdAt DateTime @default(now())
- updatedAt DateTime @default(now()) @updatedAt
- pages String
+ id String @unique @default(uuid())
+ version Int @default(0)
+ lastTransactionId String?
+ createdAt DateTime @default(now())
+ updatedAt DateTime @default(now()) @updatedAt
+ pages String
project Project @relation(fields: [projectId], references: [id])
projectId String