migrations (1)

Author: SandroMaglione

apps/client/src/lib/hooks/use-metadata.ts

@@ -0,0 +1,17 @@
+import { Metadata } from "@local/schema";
+import { Effect } from "effect";
+import { RuntimeClient } from "../runtime-client";
+import { useDexieQuery } from "../use-dexie-query";
+import { hookQuery } from "./hook-query";
+
+export const useMetadata = ({ workspaceId }: { workspaceId: string }) => {
+  return useDexieQuery(
+    () =>
+      RuntimeClient.runPromise(
+        hookQuery({ workspaceId }).pipe(
+          Effect.map((snapshot) => [snapshot.metadata])
+        )
+      ),
+    Metadata
+  );
+};

apps/client/src/lib/runtime-client.ts

@@ -2,6 +2,7 @@ import { Layer, ManagedRuntime } from "effect";
 import { ApiClient } from "./api-client";
 import { Dexie } from "./dexie";
 import { LoroStorage } from "./services/loro-storage";
+import { Migration } from "./services/migration";
 import { Sync } from "./services/sync";
 import { TempWorkspace } from "./services/temp-workspace";
 import { WorkspaceManager } from "./services/workspace-manager";
@@ -12,7 +13,8 @@ const MainLayer = Layer.mergeAll(
   WorkspaceManager.Default,
   TempWorkspace.Default,
   LoroStorage.Default,
-  Sync.Default
+  Sync.Default,
+  Migration.Default
 );
 
 export const RuntimeClient = ManagedRuntime.make(MainLayer);

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

@@ -0,0 +1,45 @@
+import { LoroDocMigration, SnapshotToLoroDoc } from "@local/schema";
+import { Data, Effect, Schema, type ParseResult } from "effect";
+import { TempWorkspace } from "./temp-workspace";
+
+class MigrationError extends Data.TaggedError("MigrationError")<{
+  parseError: ParseResult.ParseError;
+}> {}
+
+export class Migration extends Effect.Service<Migration>()("Migration", {
+  dependencies: [TempWorkspace.Default],
+  effect: Effect.gen(function* () {
+    const temp = yield* TempWorkspace;
+    return {
+      migrate: temp.getAll.pipe(
+        Effect.flatMap((workspaces) =>
+          Effect.all(
+            workspaces.map((workspace) =>
+              Effect.gen(function* () {
+                const doc = yield* Schema.decode(SnapshotToLoroDoc)(
+                  workspace.snapshot
+                );
+
+                const newDoc = yield* Schema.decode(LoroDocMigration)(doc).pipe(
+                  Effect.catchTag(
+                    "ParseError",
+                    (parseError) => new MigrationError({ parseError })
+                  )
+                );
+
+                const newSnapshot =
+                  yield* Schema.encode(SnapshotToLoroDoc)(newDoc);
+
+                yield* temp.put({
+                  workspaceId: workspace.workspaceId,
+                  snapshot: newSnapshot,
+                  snapshotId: workspace.snapshotId,
+                });
+              })
+            )
+          )
+        )
+      ),
+    };
+  }),
+}) {}

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

@@ -1,3 +1,4 @@
+import type { LoroSchema } from "@local/schema";
 import { Effect, flow, Option } from "effect";
 import { LoroDoc } from "loro-crdt";
 import { ApiClient } from "../api-client";
@@ -77,7 +78,7 @@ export class Sync extends Effect.Service<Sync>()("Sync", {
                       )
                     );
 
-                    const doc = new LoroDoc();
+                    const doc = new LoroDoc<LoroSchema>();
                     doc.import(response.snapshot);
                     yield* Effect.all([
                       manager.put({

apps/client/src/lib/services/temp-workspace.ts

@@ -9,6 +9,10 @@ export class TempWorkspace extends Effect.Service<TempWorkspace>()(
     effect: Effect.gen(function* () {
       const { query } = yield* Dexie;
       return {
+        getAll: query((_) => _.temp_workspace.toArray()).pipe(
+          Effect.flatMap(Schema.decode(Schema.Array(TempWorkspaceTable)))
+        ),
+
         put: (params: typeof TempWorkspaceTable.Type) =>
           Schema.encode(TempWorkspaceTable)(params).pipe(
             Effect.flatMap((data) => query((_) => _.temp_workspace.put(data)))

apps/client/src/routes/$workspaceId/index.tsx

@@ -4,6 +4,7 @@ import { createFileRoute, Link } from "@tanstack/react-router";
 import { Effect } from "effect";
 import { startTransition, useEffect } from "react";
 import { useActivity } from "../../lib/hooks/use-activity";
+import { useMetadata } from "../../lib/hooks/use-metadata";
 import { RuntimeClient } from "../../lib/runtime-client";
 import { LoroStorage } from "../../lib/services/loro-storage";
 import { WorkspaceManager } from "../../lib/services/workspace-manager";
@@ -41,6 +42,9 @@ export const Route = createFileRoute("/$workspaceId/")({
 function RouteComponent() {
   const workspace = Route.useLoaderData();
 
+  const { data: metadata } = useMetadata({
+    workspaceId: workspace.workspaceId,
+  });
   const { data, error, loading } = useActivity({
     workspaceId: workspace.workspaceId,
   });
@@ -50,13 +54,15 @@ function RouteComponent() {
     Effect.gen(function* () {
       const loroStorage = yield* LoroStorage;
 
-      const name = formData.get("name") as string;
+      const firstName = formData.get("firstName") as string;
+      const lastName = formData.get("lastName") as string;
 
       yield* loroStorage.insertActivity({
         workspaceId: workspace.workspaceId,
         value: {
           id: crypto.randomUUID(),
-          name,
+          firstName,
+          lastName,
         },
       });
     })
@@ -89,6 +95,7 @@ function RouteComponent() {
 
   return (
     <div>
+      <pre>{JSON.stringify(metadata)}</pre>
       <Link
         to="/$workspaceId/token"
         params={{ workspaceId: workspace.workspaceId }}
@@ -109,7 +116,8 @@ function RouteComponent() {
       </button>
 
       <form action={onAdd}>
-        <input type="text" name="name" />
+        <input type="text" name="firstName" />
+        <input type="text" name="lastName" />
         <button type="submit">Add activity</button>
       </form>
 
@@ -118,7 +126,8 @@ function RouteComponent() {
         {error && <pre>{JSON.stringify(error, null, 2)}</pre>}
         {(data ?? []).map((activity) => (
           <div key={activity.id}>
-            <label>Name {activity.name}</label>
+            <p>First name: {activity.firstName}</p>
+            <p>Last name: {activity.lastName}</p>
           </div>
         ))}
       </div>

apps/client/src/routes/__root.tsx

@@ -9,7 +9,11 @@ export const Route = createRootRoute({
     RuntimeClient.runPromise(
       Effect.gen(function* () {
         const { initClient } = yield* Dexie;
-        return yield* initClient;
+        // const { migrate } = yield* Migration;
+
+        const clientId = yield* initClient;
+        // yield* migrate;
+        return clientId;
       })
     ),
 });

apps/client/src/workers/sync.ts

@@ -1,6 +1,8 @@
 import { WorkerRunner } from "@effect/platform";
 import { BrowserWorkerRunner } from "@effect/platform-browser";
+import type { LoroSchema } from "@local/schema";
 import { Effect, Layer } from "effect";
+import { LoroDoc } from "loro-crdt";
 import { RuntimeClient } from "../lib/runtime-client";
 import { Sync } from "../lib/services/sync";
 import { TempWorkspace } from "../lib/services/temp-workspace";
@@ -26,6 +28,10 @@ const WorkerLive = WorkerRunner.layerSerialized(WorkerMessage, {
       });
 
       if (tempUpdates !== undefined) {
+        const docI = new LoroDoc<LoroSchema>();
+        docI.import(tempUpdates.snapshot);
+        yield* Effect.log("Doc", tempUpdates, docI.toJSON());
+
         yield* push({
           workspaceId: workspace.workspaceId,
           snapshot: tempUpdates.snapshot,

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

@@ -5,6 +5,7 @@ import { DateTime, Effect, Layer, Schema } from "effect";
 import { tokenTable, workspaceTable } from "../db/schema";
 import { AuthorizationLive } from "../middleware/authorization";
 import { MasterAuthorizationLive } from "../middleware/master-authorization";
+import { VersionCheckLive } from "../middleware/version-check";
 import { Drizzle } from "../services/drizzle";
 import { Jwt } from "../services/jwt";
 
@@ -234,6 +235,7 @@ export const SyncAuthGroupLive = HttpApiBuilder.group(
     Drizzle.Default,
     AuthorizationLive,
     MasterAuthorizationLive,
+    VersionCheckLive,
     Jwt.Default,
   ])
 );

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

@@ -2,11 +2,16 @@ import { HttpApiBuilder } from "@effect/platform";
 import { SnapshotToLoroDoc } from "@local/schema";
 import { AuthWorkspace, SyncApi } from "@local/sync";
 import { and, desc, eq, gt, isNull, or } from "drizzle-orm";
-import { Array, Effect, Layer, Schema } from "effect";
+import { Array, Data, Effect, Layer, Schema } from "effect";
 import { tokenTable, workspaceTable } from "../db/schema";
 import { AuthorizationLive } from "../middleware/authorization";
+import { VersionCheckLive } from "../middleware/version-check";
 import { Drizzle } from "../services/drizzle";
 
+class InvalidVersionError extends Data.TaggedError("InvalidVersionError")<{
+  reason: "missing" | "outdated";
+}> {}
+
 export const SyncDataGroupLive = HttpApiBuilder.group(
   SyncApi,
   "syncData",
@@ -132,4 +137,4 @@ export const SyncDataGroupLive = HttpApiBuilder.group(
           )
         );
     })
-).pipe(Layer.provide([Drizzle.Default, AuthorizationLive]));
+).pipe(Layer.provide([Drizzle.Default, AuthorizationLive, VersionCheckLive]));