@livestore/common 0.3.0-dev.11 → 0.3.0-dev.3

package/src/sync/{ClientSessionSyncProcessor.ts → client-session-sync-processor.ts}

@@ -1,13 +1,14 @@
 import { LS_DEV, shouldNeverHappen, TRACE_VERBOSE } from '@livestore/utils'
-import type { Runtime, Scope } from '@livestore/utils/effect'
+import type { Scope } from '@livestore/utils/effect'
 import { Effect, Schema, Stream } from '@livestore/utils/effect'
 import * as otel from '@opentelemetry/api'
 
-import type { ClientSession, UnexpectedError } from '../adapter-types.js'
+import type { Coordinator, UnexpectedError } from '../adapter-types.js'
 import * as EventId from '../schema/EventId.js'
 import { type LiveStoreSchema } from '../schema/mod.js'
 import * as MutationEvent from '../schema/MutationEvent.js'
-import { SyncState, updateSyncState } from './syncstate.js'
+import type { SyncState } from './syncstate.js'
+import { updateSyncState } from './syncstate.js'
 
 /**
  * Rebase behaviour:
@@ -20,18 +21,20 @@ import { SyncState, updateSyncState } from './syncstate.js'
  */
 export const makeClientSessionSyncProcessor = ({
   schema,
-  clientSession,
-  runtime,
+  initialLeaderHead,
+  pushToLeader,
+  pullFromLeader,
   applyMutation,
   rollback,
   refreshTables,
   span,
 }: {
   schema: LiveStoreSchema
-  clientSession: ClientSession
-  runtime: Runtime.Runtime<Scope.Scope>
+  initialLeaderHead: EventId.EventId
+  pushToLeader: (batch: ReadonlyArray<MutationEvent.AnyEncoded>) => void
+  pullFromLeader: Coordinator['mutations']['pull']
   applyMutation: (
-    mutationEventDecoded: MutationEvent.PartialAnyDecoded,
+    mutationEventDecoded: MutationEvent.PartialAny,
     options: { otelContext: otel.Context; withChangeset: boolean },
   ) => {
     writeTables: Set<string>
@@ -39,18 +42,19 @@ export const makeClientSessionSyncProcessor = ({
   }
   rollback: (changeset: Uint8Array) => void
   refreshTables: (tables: Set<string>) => void
+  // rebaseBehaviour: 'auto-rebase' | 'manual-rebase'
   span: otel.Span
 }): ClientSessionSyncProcessor => {
   const mutationEventSchema = MutationEvent.makeMutationEventSchemaMemo(schema)
 
   const syncStateRef = {
-    current: new SyncState({
-      localHead: clientSession.leaderThread.mutations.initialMutationEventId,
-      upstreamHead: clientSession.leaderThread.mutations.initialMutationEventId,
+    current: {
+      localHead: initialLeaderHead,
+      upstreamHead: initialLeaderHead,
       pending: [],
       // TODO init rollbackTail from leader to be ready for backend rebasing
       rollbackTail: [],
-    }),
+    } as SyncState,
   }
 
   const isLocalEvent = (mutationEventEncoded: MutationEvent.EncodedWithMeta) => {
@@ -100,10 +104,7 @@ export const makeClientSessionSyncProcessor = ({
       mutationEvent.meta.sessionChangeset = res.sessionChangeset
     }
 
-    // console.debug('pushToLeader', encodedMutationEvents.length, ...encodedMutationEvents.map((_) => _.toJSON()))
-    clientSession.leaderThread.mutations
-      .push(encodedMutationEvents)
-      .pipe(Effect.tapCauseLogPretty, Effect.provide(runtime), Effect.runFork)
+    pushToLeader(encodedMutationEvents)
 
     return { writeTables }
   }
@@ -111,13 +112,10 @@ export const makeClientSessionSyncProcessor = ({
   const otelContext = otel.trace.setSpan(otel.context.active(), span)
 
   const boot: ClientSessionSyncProcessor['boot'] = Effect.gen(function* () {
-    yield* clientSession.leaderThread.mutations.pull.pipe(
+    yield* pullFromLeader.pipe(
       Stream.tap(({ payload, remaining }) =>
         Effect.gen(function* () {
           // console.log('pulled payload from leader', { payload, remaining })
-          if (clientSession.devtools.enabled) {
-            yield* clientSession.devtools.pullLatch.await
-          }
 
           const updateResult = updateSyncState({
             syncState: syncStateRef.current,
@@ -157,10 +155,6 @@ export const makeClientSessionSyncProcessor = ({
                 event.meta.sessionChangeset = undefined
               }
             }
-
-            clientSession.leaderThread.mutations
-              .push(updateResult.newSyncState.pending)
-              .pipe(Effect.tapCauseLogPretty, Effect.provide(runtime), Effect.runFork)
           } else {
             span.addEvent('pull:advance', {
               payloadTag: payload._tag,
@@ -188,7 +182,6 @@ export const makeClientSessionSyncProcessor = ({
         }),
       ),
       Stream.runDrain,
-      Effect.forever, // NOTE Whenever the leader changes, we need to re-start the stream
       Effect.tapCauseLogPretty,
       Effect.forkScoped,
     )
@@ -203,7 +196,7 @@ export const makeClientSessionSyncProcessor = ({
 
 export interface ClientSessionSyncProcessor {
   push: (
-    batch: ReadonlyArray<MutationEvent.PartialAnyDecoded>,
+    batch: ReadonlyArray<MutationEvent.PartialAny>,
     options: { otelContext: otel.Context },
   ) => {
     writeTables: Set<string>

package/src/sync/index.ts

@@ -1,3 +1,3 @@
 export * from './sync.js'
 export * from './validate-push-payload.js'
-export * from './ClientSessionSyncProcessor.js'
+export * from './client-session-sync-processor.js'

package/src/sync/next/history-dag-common.ts

@@ -20,7 +20,7 @@ export const emptyHistoryDag = (): HistoryDag =>
   })
 
 // TODO consider making `ROOT_ID` parent to itself
-export const rootParentId = EventId.make({ global: EventId.ROOT.global - 1, local: EventId.localDefault })
+export const rootParentId = { global: EventId.ROOT.global - 1, local: 0 } satisfies EventId.EventId
 
 export type HistoryDagNode = {
   id: EventId.EventId

package/src/sync/next/rebase-events.ts

@@ -1,4 +1,4 @@
-import * as EventId from '../../schema/EventId.js'
+import type * as EventId from '../../schema/EventId.js'
 import type * as MutationEvent from '../../schema/MutationEvent.js'
 import type { MutationDef, MutationEventFactsSnapshot } from '../../schema/mutations.js'
 import {
@@ -19,13 +19,13 @@ export type RebaseInput = {
   newRemoteEvents: RebaseEventWithConflict[]
   pendingLocalEvents: RebaseEventWithConflict[]
   validate: (args: {
-    rebasedLocalEvents: MutationEvent.PartialAnyDecoded[]
+    rebasedLocalEvents: MutationEvent.PartialAny[]
     mutationDefs: Record<string, MutationDef.Any>
   }) => FactValidationResult
 }
 
 export type RebaseOutput = {
-  rebasedLocalEvents: MutationEvent.PartialAnyDecoded[]
+  rebasedLocalEvents: MutationEvent.PartialAny[]
 }
 
 export type RebaseFn = (input: RebaseInput) => RebaseOutput
@@ -48,7 +48,7 @@ export const rebaseEvents = ({
   newRemoteEvents: HistoryDagNode[]
   rebaseFn: RebaseFn
   currentFactsSnapshot: MutationEventFactsSnapshot
-}): ReadonlyArray<MutationEvent.AnyDecoded> => {
+}): MutationEvent.Any[] => {
   const initialSnapshot = new Map(currentFactsSnapshot)
   applyFactGroups(
     newRemoteEvents.map((event) => event.factsGroup),
@@ -89,10 +89,10 @@ export const rebaseEvents = ({
   return rebasedLocalEvents.map(
     (event, index) =>
       ({
-        id: EventId.make({ global: headGlobalId + index + 1, local: EventId.localDefault }),
-        parentId: EventId.make({ global: headGlobalId + index, local: EventId.localDefault }),
+        id: { global: headGlobalId + index + 1, local: 0 } satisfies EventId.EventId,
+        parentId: { global: headGlobalId + index, local: 0 } satisfies EventId.EventId,
         mutation: event.mutation,
         args: event.args,
-      }) satisfies MutationEvent.AnyDecoded,
+      }) satisfies MutationEvent.Any,
   )
 }

package/src/sync/next/test/mutation-fixtures.ts

@@ -140,9 +140,16 @@ export const toEventNodes = (
 
   let currentEventId: EventId.EventId = EventId.ROOT
 
+  const getNextEventId = (mutationDef: MutationDef.Any): EventId.EventId => {
+    if (mutationDef.options.localOnly) {
+      return { global: currentEventId.global, local: currentEventId.local + 1 }
+    }
+    return { global: currentEventId.global + 1, local: 0 }
+  }
+
   const eventNodes = partialEvents.map((partialEvent) => {
     const mutationDef = mutationDefs[partialEvent.mutation]!
-    const eventId = EventId.nextPair(currentEventId, mutationDef.options.localOnly).id
+    const eventId = getNextEventId(mutationDef)
     currentEventId = eventId
 
     const factsSnapshot = factsSnapshotForDag(historyDagFromNodes(nodesAcc, { skipFactsCheck: true }), undefined)
@@ -217,8 +224,8 @@ const getParentId = (eventId: EventId.EventId): EventId.EventId => {
   const localParentId = eventId.local - 1
 
   if (localParentId < 0) {
-    return EventId.make({ global: globalParentId - 1, local: EventId.localDefault })
+    return { global: globalParentId - 1, local: 0 }
   }
 
-  return EventId.make({ global: globalParentId, local: localParentId })
+  return { global: globalParentId, local: localParentId }
 }

package/src/sync/sync.ts

@@ -1,23 +1,12 @@
-import type { Effect, HttpClient, Option, Scope, Stream, SubscriptionRef } from '@livestore/utils/effect'
+import type { Effect, HttpClient, Option, Stream, SubscriptionRef } from '@livestore/utils/effect'
 import { Schema } from '@livestore/utils/effect'
 
-import type { UnexpectedError } from '../adapter-types.js'
-import type { InitialSyncOptions } from '../leader-thread/types.js'
 import * as EventId from '../schema/EventId.js'
 import type * as MutationEvent from '../schema/MutationEvent.js'
 
-/**
- * Those arguments can be used to implement multi-tenancy etc and are passed in from the store.
- */
-export type MakeBackendArgs = {
-  storeId: string
-  clientId: string
-}
-
-export type SyncOptions = {
-  makeBackend: (args: MakeBackendArgs) => Effect.Effect<SyncBackend<any>, UnexpectedError, Scope.Scope>
-  /** @default { _tag: 'Skip' } */
-  initialSyncOptions?: InitialSyncOptions
+export interface SyncBackendOptionsBase {
+  type: string
+  [key: string]: Schema.JsonValue
 }
 
 export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
@@ -29,7 +18,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
   ) => Stream.Stream<
     {
       batch: ReadonlyArray<{
-        mutationEventEncoded: MutationEvent.AnyEncodedGlobal
+        mutationEventEncoded: MutationEvent.AnyEncoded
         metadata: Option.Option<TSyncMetadata>
       }>
       remaining: number
@@ -44,7 +33,7 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
      * - Number of events: 1-100
      * - event ids must be in ascending order
      * */
-    batch: ReadonlyArray<MutationEvent.AnyEncodedGlobal>,
+    batch: ReadonlyArray<MutationEvent.AnyEncoded>,
   ) => Effect.Effect<
     {
       /** Indexes are relative to `batch` */
@@ -57,7 +46,6 @@ export type SyncBackend<TSyncMetadata = Schema.JsonValue> = {
 }
 
 export class IsOfflineError extends Schema.TaggedError<IsOfflineError>()('IsOfflineError', {}) {}
-
 export class InvalidPushError extends Schema.TaggedError<InvalidPushError>()('InvalidPushError', {
   reason: Schema.Union(
     Schema.TaggedStruct('Unexpected', {
@@ -73,7 +61,6 @@ export class InvalidPushError extends Schema.TaggedError<InvalidPushError>()('In
     }),
   ),
 }) {}
-
 export class InvalidPullError extends Schema.TaggedError<InvalidPullError>()('InvalidPullError', {
   message: Schema.String,
 }) {}