@livestore/sync-electric 0.3.0-dev.12 → 0.3.0-dev.14

package/src/index.ts

@@ -1,7 +1,8 @@
-import type { SyncBackend } from '@livestore/common'
+import type { IsOfflineError, SyncBackend } from '@livestore/common'
 import { InvalidPullError, InvalidPushError } from '@livestore/common'
 import type { EventId } from '@livestore/common/schema'
 import { MutationEvent } from '@livestore/common/schema'
+import { notYetImplemented, shouldNeverHappen } from '@livestore/utils'
 import type { Scope } from '@livestore/utils/effect'
 import {
   Chunk,
@@ -16,128 +17,207 @@ import {
   SubscriptionRef,
 } from '@livestore/utils/effect'
 
+import * as ApiSchema from './api-schema.js'
+
+export * as ApiSchema from './api-schema.js'
+
 /*
 Example data:
 
-[{"key":"\"public\".\"events\"/\"1\"","value":{"id":"1","mutation":"test","args_json":"{\"test\":\"test\"}","schema_hash":"1","created_at":"2024-09-07T10:05:31.445Z"},"headers":{"operation":"insert","relation":["public","events"]},"offset":"0_0"}
-,{"key":"\"public\".\"events\"/\"1725703554783\"","value":{"id":"1725703554783","mutation":"test","args_json":"{\"test\":\"test\"}","schema_hash":"1","created_at":"2024-09-07T10:05:54.783Z"},"headers":{"operation":"insert","relation":["public","events"]},"offset":"0_0"}
-,{"headers":{"control":"up-to-date"}}]
+[
+    {
+        "value": {
+            "args": "{\"id\": \"127c3df4-0855-4587-ae75-14463f4a3aa0\", \"text\": \"1\"}",
+            "clientId": "S_YOa",
+            "id": "0",
+            "mutation": "todoCreated",
+            "parentId": "-1"
+        },
+        "key": "\"public\".\"events_9069baf0_b3e6_42f7_980f_188416eab3fx3\"/\"0\"",
+        "headers": {
+            "last": true,
+            "relation": [
+                "public",
+                "events_9069baf0_b3e6_42f7_980f_188416eab3fx3"
+            ],
+            "operation": "insert",
+            "lsn": 27294160,
+            "op_position": 0,
+            "txids": [
+                753
+            ]
+        }
+    },
+    {
+        "headers": {
+            "control": "up-to-date",
+            "global_last_seen_lsn": 27294160
+        }
+    }
+]
+
 
 Also see: https://github.com/electric-sql/electric/blob/main/packages/typescript-client/src/client.ts
 
 */
 
+const MutationEventGlobalFromStringRecord = Schema.Struct({
+  id: Schema.NumberFromString,
+  parentId: Schema.NumberFromString,
+  mutation: Schema.String,
+  args: Schema.parseJson(Schema.Any),
+  clientId: Schema.String,
+  sessionId: Schema.optional(Schema.String),
+}).pipe(
+  Schema.transform(MutationEvent.AnyEncodedGlobal, {
+    decode: (_) => _,
+    encode: (_) => _,
+  }),
+)
+
 const ResponseItem = Schema.Struct({
-  /** Postgres path (e.g. "public.events/1") */
+  /** Postgres path (e.g. `"public"."events_9069baf0_b3e6_42f7_980f_188416eab3fx3"/"0"`) */
   key: Schema.optional(Schema.String),
-  value: Schema.optional(MutationEvent.AnyEncodedGlobal),
-  headers: Schema.Record({ key: Schema.String, value: Schema.Any }),
-  offset: Schema.optional(Schema.String),
+  value: Schema.optional(MutationEventGlobalFromStringRecord),
+  headers: Schema.Union(
+    Schema.Struct({
+      operation: Schema.Union(Schema.Literal('insert'), Schema.Literal('update'), Schema.Literal('delete')),
+      relation: Schema.Array(Schema.String),
+    }),
+    Schema.Struct({
+      control: Schema.String,
+    }),
+  ),
 })
 
 const ResponseHeaders = Schema.Struct({
-  'x-electric-shape-id': Schema.String,
-  // 'x-electric-schema': Schema.parseJson(Schema.Any),
+  'electric-handle': Schema.String,
+  // 'electric-schema': Schema.parseJson(Schema.Any),
   /** e.g. 26799576_0 */
-  'x-electric-chunk-last-offset': Schema.String,
+  'electric-offset': Schema.String,
 })
 
 export const syncBackend = {} as any
 
-export const ApiPushEventPayload = Schema.TaggedStruct('sync-electric.PushEvent', {
-  storeId: Schema.String,
-  batch: Schema.Array(MutationEvent.AnyEncodedGlobal),
-})
+export const syncBackendOptions = <TOptions extends SyncBackendOptions>(options: TOptions) => options
 
-export const ApiInitRoomPayload = Schema.TaggedStruct('sync-electric.InitRoom', {
-  storeId: Schema.String,
-})
+export const makeElectricUrl = (electricHost: string, searchParams: URLSearchParams) => {
+  const endpointUrl = `${electricHost}/v1/shape`
+  const argsResult = Schema.decodeUnknownEither(Schema.Struct({ args: Schema.parseJson(ApiSchema.PullPayload) }))(
+    Object.fromEntries(searchParams.entries()),
+  )
 
-export const ApiPayload = Schema.Union(ApiPushEventPayload, ApiInitRoomPayload)
+  if (argsResult._tag === 'Left') {
+    return shouldNeverHappen('Invalid search params', searchParams)
+  }
 
-export const syncBackendOptions = <TOptions extends SyncBackendOptions>(options: TOptions) => options
+  const args = argsResult.right.args
+  const tableName = toTableName(args.storeId)
+  const url =
+    args.handle._tag === 'None'
+      ? `${endpointUrl}?table=${tableName}&offset=-1`
+      : `${endpointUrl}?table=${tableName}&offset=${args.handle.value.offset}&handle=${args.handle.value.handle}&live=true`
+
+  return { url, storeId: args.storeId, needsInit: args.handle._tag === 'None' }
+}
 
 export interface SyncBackendOptions {
-  /**
-   * The host of the Electric server
-   *
-   * @example "https://localhost:3000"
-   */
-  electricHost: string
   storeId: string
   /**
-   * The POST endpoint to push events to
+   * The endpoint to pull/push events. Pull is a `GET` request, push is a `POST` request.
+   * Usually this endpoint is part of your API layer to proxy requests to the Electric server
+   * e.g. to implement auth, rate limiting, etc.
    *
-   * @example "/api/push-event"
-   * @example "https://api.myapp.com/push-event"
+   * @example "/api/electric"
+   * @example { push: "/api/push-event", pull: "/api/pull-event" }
    */
-  pushEventEndpoint: string
+  endpoint:
+    | string
+    | {
+        push: string
+        pull: string
+      }
 }
 
+export const SyncMetadata = Schema.Struct({
+  offset: Schema.String,
+  // TODO move this into some kind of "global" sync metadata as it's the same for each event
+  handle: Schema.String,
+})
+
 type SyncMetadata = {
   offset: string
   // TODO move this into some kind of "global" sync metadata as it's the same for each event
-  shapeId: string
+  handle: string
 }
 
 export const makeSyncBackend = ({
-  electricHost,
   storeId,
-  pushEventEndpoint,
+  endpoint,
 }: SyncBackendOptions): Effect.Effect<SyncBackend<SyncMetadata>, never, Scope.Scope> =>
   Effect.gen(function* () {
-    const endpointUrl = `${electricHost}/v1/shape/events_${storeId}`
-
     const isConnected = yield* SubscriptionRef.make(true)
-
-    const initRoom = HttpClientRequest.schemaBodyJson(ApiInitRoomPayload)(
-      HttpClientRequest.post(pushEventEndpoint),
-      ApiInitRoomPayload.make({ storeId }),
-    ).pipe(Effect.andThen(HttpClient.execute))
+    const pullEndpoint = typeof endpoint === 'string' ? endpoint : endpoint.pull
+    const pushEndpoint = typeof endpoint === 'string' ? endpoint : endpoint.push
 
     // TODO check whether we still need this
     const pendingPushDeferredMap = new Map<EventId.GlobalEventId, Deferred.Deferred<SyncMetadata>>()
 
-    const pull = (args: Option.Option<SyncMetadata>) =>
+    const pull = (
+      handle: Option.Option<SyncMetadata>,
+    ): Effect.Effect<
+      Option.Option<
+        readonly [
+          Chunk.Chunk<{ metadata: Option.Option<SyncMetadata>; mutationEventEncoded: MutationEvent.AnyEncodedGlobal }>,
+          Option.Option<SyncMetadata>,
+        ]
+      >,
+      InvalidPullError | IsOfflineError,
+      HttpClient.HttpClient
+    > =>
       Effect.gen(function* () {
-        const url =
-          args._tag === 'None'
-            ? `${endpointUrl}?offset=-1`
-            : `${endpointUrl}?offset=${args.value.offset}&shape_id=${args.value.shapeId}&live=true`
-
-        const resp = yield* HttpClient.get(url).pipe(
-          Effect.tapErrorTag('ResponseError', (error) =>
-            // TODO handle 409 error when the shapeId you request no longer exists for whatever reason.
-            // The correct behavior here is to refetch the shape from scratch and to reset the local state.
-            error.response.status === 400 ? initRoom : Effect.fail(error),
-          ),
-          Effect.retry({ times: 1 }),
+        const argsJson = yield* Schema.encode(Schema.parseJson(ApiSchema.PullPayload))(
+          ApiSchema.PullPayload.make({ storeId, handle }),
         )
+        const url = `${pullEndpoint}?args=${argsJson}`
+
+        const resp = yield* HttpClient.get(url)
 
         const headers = yield* HttpClientResponse.schemaHeaders(ResponseHeaders)(resp)
-        const nextCursor = {
-          offset: headers['x-electric-chunk-last-offset'],
-          shapeId: headers['x-electric-shape-id'],
+        const nextHandle = {
+          offset: headers['electric-offset'],
+          handle: headers['electric-handle'],
+        }
+
+        // TODO handle case where Electric shape is not found for a given handle
+        // https://electric-sql.com/openapi.html#/paths/~1v1~1shape/get
+        // {
+        // "message": "The shape associated with this shape_handle and offset was not found. Resync to fetch the latest shape",
+        // "shape_handle": "2494_84241",
+        // "offset": "-1"
+        // }
+        if (resp.status === 409) {
+          // TODO: implementation plan:
+          // start pulling events from scratch with the new handle and ignore the "old events"
+          // until we found a new event, then, continue with the new handle
+          return notYetImplemented(`Electric shape not found for handle ${nextHandle.handle}`)
         }
 
         // Electric completes the long-poll request after ~20 seconds with a 204 status
         // In this case we just retry where we left off
         if (resp.status === 204) {
-          return Option.some([Chunk.empty(), Option.some(nextCursor)] as const)
+          return Option.some([Chunk.empty(), Option.some(nextHandle)] as const)
         }
 
-        const body = yield* HttpClientResponse.schemaBodyJson(Schema.Array(ResponseItem))(resp)
+        const body = yield* HttpClientResponse.schemaBodyJson(Schema.Array(ResponseItem), {
+          onExcessProperty: 'preserve',
+        })(resp)
 
         const items = body
-          .filter((item) => item.value !== undefined)
+          .filter((item) => item.value !== undefined && (item.headers as any).operation === 'insert')
           .map((item) => ({
-            metadata: Option.some({ offset: item.offset!, shapeId: nextCursor.shapeId }),
-            mutationEventEncoded: {
-              mutation: item.value!.mutation,
-              args: JSON.parse(item.value!.args),
-              id: item.value!.id,
-              parentId: item.value!.parentId,
-            },
+            metadata: Option.some({ offset: nextHandle.offset!, handle: nextHandle.handle }),
+            mutationEventEncoded: item.value! as MutationEvent.AnyEncodedGlobal,
           }))
 
         // // TODO implement proper `remaining` handling
@@ -147,16 +227,14 @@ export const makeSyncBackend = ({
         //   return Option.none()
         // }
 
-        const [newItems, pendingPushItems] = Chunk.fromIterable(items).pipe(
-          Chunk.partition((item) => pendingPushDeferredMap.has(item.mutationEventEncoded.id)),
-        )
-
-        for (const item of pendingPushItems) {
-          const deferred = pendingPushDeferredMap.get(item.mutationEventEncoded.id)!
-          yield* Deferred.succeed(deferred, Option.getOrThrow(item.metadata))
+        for (const item of items) {
+          const deferred = pendingPushDeferredMap.get(item.mutationEventEncoded.id)
+          if (deferred !== undefined) {
+            yield* Deferred.succeed(deferred, Option.getOrThrow(item.metadata))
+          }
         }
 
-        return Option.some([newItems, Option.some(nextCursor)] as const)
+        return Option.some([Chunk.fromIterable(items), Option.some(nextHandle)] as const)
       }).pipe(
         Effect.scoped,
         Effect.mapError((cause) => InvalidPullError.make({ message: cause.toString() })),
@@ -184,9 +262,9 @@ export const makeSyncBackend = ({
             deferreds.push(deferred)
           }
 
-          const resp = yield* HttpClientRequest.schemaBodyJson(ApiPushEventPayload)(
-            HttpClientRequest.post(pushEventEndpoint),
-            ApiPushEventPayload.make({ storeId, batch }),
+          const resp = yield* HttpClientRequest.schemaBodyJson(ApiSchema.PushPayload)(
+            HttpClientRequest.post(pushEndpoint),
+            ApiSchema.PushPayload.make({ storeId, batch }),
           ).pipe(
             Effect.andThen(HttpClient.execute),
             Effect.andThen(HttpClientResponse.schemaBodyJson(Schema.Struct({ success: Schema.Boolean }))),
@@ -213,3 +291,15 @@ export const makeSyncBackend = ({
       isConnected,
     } satisfies SyncBackend<SyncMetadata>
   })
+
+/**
+ * Needs to be bumped when the storage format changes (e.g. mutationLogTable schema changes)
+ *
+ * Changing this version number will lead to a "soft reset".
+ */
+export const PERSISTENCE_FORMAT_VERSION = 3
+
+export const toTableName = (storeId: string) => {
+  const escapedStoreId = storeId.replaceAll(/[^a-zA-Z0-9_]/g, '_')
+  return `mutation_log_${PERSISTENCE_FORMAT_VERSION}_${escapedStoreId}`
+}