snapshotId unique for each client change

Author: SandroMaglione

apps/client/src/lib/schema.ts

@@ -1,4 +1,4 @@
-import { ClientId, WorkspaceId } from "@local/sync";
+import { ClientId, SnapshotId, WorkspaceId } from "@local/sync";
 import { Snapshot } from "@local/sync/loro";
 import { Schema } from "effect";
 
@@ -21,4 +21,5 @@ export class TempWorkspaceTable extends Schema.Class<TempWorkspaceTable>(
 )({
   workspaceId: WorkspaceId,
   snapshot: Snapshot,
+  snapshotId: SnapshotId,
 }) {}

apps/client/src/lib/services/loro-storage.ts

@@ -64,7 +64,11 @@ export class LoroStorage extends Effect.Service<LoroStorage>()("LoroStorage", {
                 from: new VersionVector(workspace.version),
               });
 
-        return yield* temp.put({ workspaceId, snapshot: snapshotExport });
+        return yield* temp.put({
+          workspaceId,
+          snapshot: snapshotExport,
+          snapshotId: crypto.randomUUID(),
+        });
       });
 
     return {

apps/client/src/lib/services/sync.ts

@@ -1,10 +1,10 @@
 import { Effect } from "effect";
+import { LoroDoc } from "loro-crdt";
 import { ApiClient } from "../api-client";
 import { Dexie } from "../dexie";
 import type { WorkspaceTable } from "../schema";
 import { TempWorkspace } from "./temp-workspace";
 import { WorkspaceManager } from "./workspace-manager";
-import { LoroDoc } from "loro-crdt";
 
 export class Sync extends Effect.Service<Sync>()("Sync", {
   dependencies: [
@@ -23,8 +23,10 @@ export class Sync extends Effect.Service<Sync>()("Sync", {
       push: ({
         snapshot,
         workspace,
+        snapshotId,
       }: {
         workspace: WorkspaceTable;
+        snapshotId: string;
         snapshot: globalThis.Uint8Array;
       }) =>
         Effect.gen(function* () {
@@ -38,7 +40,7 @@ export class Sync extends Effect.Service<Sync>()("Sync", {
                   path: {
                     workspaceId: workspace.workspaceId,
                   },
-                  payload: { clientId, snapshot },
+                  payload: { clientId, snapshot, snapshotId },
                 })
                 .pipe(
                   Effect.map((response) => ({
@@ -53,6 +55,7 @@ export class Sync extends Effect.Service<Sync>()("Sync", {
                   payload: {
                     clientId,
                     snapshot,
+                    snapshotId,
                     workspaceId: workspace.workspaceId,
                   },
                 })

apps/client/src/workers/live.ts

@@ -74,6 +74,7 @@ const main = (params: { workspaceId: string }) =>
                           yield* push({
                             workspace,
                             snapshot,
+                            snapshotId: message.snapshotId,
                           });
                         }
                       })

apps/client/src/workers/sync.ts

@@ -26,7 +26,11 @@ const WorkerLive = WorkerRunner.layerSerialized(WorkerMessage, {
       });
 
       if (tempUpdates !== undefined) {
-        yield* push({ snapshot: tempUpdates.snapshot, workspace });
+        yield* push({
+          workspace,
+          snapshot: tempUpdates.snapshot,
+          snapshotId: tempUpdates.snapshotId,
+        });
         yield* Effect.log("Sync completed");
       } else {
         yield* Effect.log("No sync updates");

…server/drizzle/0000_jazzy_shiver_man.sql …/server/drizzle/0000_parallel_jigsaw.sqlapps/server/drizzle/0000_jazzy_shiver_man.sql renamed to apps/server/drizzle/0000_parallel_jigsaw.sql apps/server/drizzle/0000_jazzy_shiver_man.sql renamed to apps/server/drizzle/0000_parallel_jigsaw.sql

@@ -20,6 +20,8 @@ CREATE TABLE "workspace" (
 	"workspaceId" uuid NOT NULL,
 	"ownerClientId" uuid NOT NULL,
 	"clientId" uuid NOT NULL,
+	"snapshotId" uuid NOT NULL,
 	"createdAt" timestamp DEFAULT now() NOT NULL,
-	"snapshot" "bytea" NOT NULL
+	"snapshot" "bytea" NOT NULL,
+	CONSTRAINT "workspace_snapshotId_unique" UNIQUE("snapshotId")
 );

apps/server/drizzle/meta/0000_snapshot.json

@@ -1,5 +1,5 @@
 {
-  "id": "b2e29f84-dda2-4aeb-bb8b-e99481c2f2c1",
+  "id": "710fed2b-4b98-4e23-b4d0-d6dc775c98fe",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "version": "7",
   "dialect": "postgresql",
@@ -133,6 +133,12 @@
           "primaryKey": false,
           "notNull": true
         },
+        "snapshotId": {
+          "name": "snapshotId",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
         "createdAt": {
           "name": "createdAt",
           "type": "timestamp",
@@ -150,7 +156,15 @@
       "indexes": {},
       "foreignKeys": {},
       "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
+      "uniqueConstraints": {
+        "workspace_snapshotId_unique": {
+          "name": "workspace_snapshotId_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "snapshotId"
+          ]
+        }
+      },
       "policies": {},
       "checkConstraints": {},
       "isRLSEnabled": false

apps/server/drizzle/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "7",
-      "when": 1740634258753,
-      "tag": "0000_jazzy_shiver_man",
+      "when": 1740722484842,
+      "tag": "0000_parallel_jigsaw",
       "breakpoints": true
     }
   ]

apps/server/src/db/schema.ts

@@ -19,6 +19,7 @@ export const workspaceTable = pgTable("workspace", {
   workspaceId: uuid().notNull(),
   ownerClientId: uuid().notNull(),
   clientId: uuid().notNull(),
+  snapshotId: uuid().notNull().unique(),
   createdAt: timestamp().notNull().defaultNow(),
   snapshot: bytea().notNull(),
 });

apps/server/src/group/sync-auth.ts

@@ -51,6 +51,7 @@ export const SyncAuthGroupLive = HttpApiBuilder.group(
                   clientId,
                   workspaceId,
                   ownerClientId: clientId,
+                  snapshotId: payload.snapshotId,
                 }),
             })({
               clientId: payload.clientId,