@livestore/common 0.3.0-dev.9 → 0.3.0

package/dist/sync/ClientSessionSyncProcessor.d.ts

@@ -1,45 +1,66 @@
-import type { Scope } from '@livestore/utils/effect';
-import { Effect } from '@livestore/utils/effect';
+import type { Runtime, Scope } from '@livestore/utils/effect';
+import { Effect, Subscribable } from '@livestore/utils/effect';
 import * as otel from '@opentelemetry/api';
-import type { ClientSessionLeaderThreadProxy, UnexpectedError } from '../adapter-types.js';
-import * as EventId from '../schema/EventId.js';
+import type { ClientSession, UnexpectedError } from '../adapter-types.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
 import { type LiveStoreSchema } from '../schema/mod.js';
-import * as MutationEvent from '../schema/MutationEvent.js';
-import { SyncState } from './syncstate.js';
+import * as SyncState from './syncstate.js';
 /**
  * Rebase behaviour:
- * - We continously pull mutations from the leader and apply them to the local store.
+ * - We continously pull events from the leader and apply them to the local store.
  * - If there was a race condition (i.e. the leader and client session have both advacned),
- *   we'll need to rebase the local pending mutations on top of the leader's head.
- * - The goal is to never block the UI, so we'll interrupt rebasing if a new mutations is pushed by the client session.
- * - We also want to avoid "backwards-jumping" in the UI, so we'll transactionally apply a read model changes during a rebase.
+ *   we'll need to rebase the local pending events on top of the leader's head.
+ * - The goal is to never block the UI, so we'll interrupt rebasing if a new events is pushed by the client session.
+ * - We also want to avoid "backwards-jumping" in the UI, so we'll transactionally apply state changes during a rebase.
  * - We might need to make the rebase behaviour configurable e.g. to let users manually trigger a rebase
+ *
+ * Longer term we should evalutate whether we can unify the ClientSessionSyncProcessor with the LeaderSyncProcessor.
  */
-export declare const makeClientSessionSyncProcessor: ({ schema, initialLeaderHead, pushToLeader, pullFromLeader, applyMutation, rollback, refreshTables, span, }: {
+export declare const makeClientSessionSyncProcessor: ({ schema, clientSession, runtime, materializeEvent, rollback, refreshTables, span, params, confirmUnsavedChanges, }: {
     schema: LiveStoreSchema;
-    initialLeaderHead: EventId.EventId;
-    pushToLeader: (batch: ReadonlyArray<MutationEvent.AnyEncoded>) => void;
-    pullFromLeader: ClientSessionLeaderThreadProxy["mutations"]["pull"];
-    applyMutation: (mutationEventDecoded: MutationEvent.PartialAnyDecoded, options: {
+    clientSession: ClientSession;
+    runtime: Runtime.Runtime<Scope.Scope>;
+    materializeEvent: (eventDecoded: LiveStoreEvent.PartialAnyDecoded, options: {
         otelContext: otel.Context;
         withChangeset: boolean;
     }) => {
         writeTables: Set<string>;
-        sessionChangeset: Uint8Array | undefined;
+        sessionChangeset: {
+            _tag: "sessionChangeset";
+            data: Uint8Array;
+            debug: any;
+        } | {
+            _tag: "no-op";
+        } | {
+            _tag: "unset";
+        };
     };
     rollback: (changeset: Uint8Array) => void;
     refreshTables: (tables: Set<string>) => void;
     span: otel.Span;
+    params: {
+        leaderPushBatchSize: number;
+    };
+    /**
+     * Currently only used in the web adapter:
+     * If true, registers a beforeunload event listener to confirm unsaved changes.
+     */
+    confirmUnsavedChanges: boolean;
 }) => ClientSessionSyncProcessor;
 export interface ClientSessionSyncProcessor {
-    push: (batch: ReadonlyArray<MutationEvent.PartialAnyDecoded>, options: {
+    push: (batch: ReadonlyArray<LiveStoreEvent.PartialAnyDecoded>, options: {
         otelContext: otel.Context;
     }) => {
         writeTables: Set<string>;
     };
     boot: Effect.Effect<void, UnexpectedError, Scope.Scope>;
-    syncStateRef: {
-        current: SyncState;
+    syncState: Subscribable.Subscribable<SyncState.SyncState>;
+    debug: {
+        print: () => void;
+        debugInfo: () => {
+            rebaseCount: number;
+            advanceCount: number;
+        };
     };
 }
 //# sourceMappingURL=ClientSessionSyncProcessor.d.ts.map

package/dist/sync/ClientSessionSyncProcessor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientSessionSyncProcessor.d.ts","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,MAAM,EAAkB,MAAM,yBAAyB,CAAA;AAChE,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,KAAK,EAAE,8BAA8B,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1F,OAAO,KAAK,OAAO,MAAM,sBAAsB,CAAA;AAC/C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAE,SAAS,EAAmB,MAAM,gBAAgB,CAAA;AAE3D;;;;;;;;GAQG;AACH,eAAO,MAAM,8BAA8B,+GASxC;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,iBAAiB,EAAE,OAAO,CAAC,OAAO,CAAA;IAClC,YAAY,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,IAAI,CAAA;IACtE,cAAc,EAAE,8BAA8B,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAA;IACnE,aAAa,EAAE,CACb,oBAAoB,EAAE,aAAa,CAAC,iBAAiB,EACrD,OAAO,EAAE;QAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,KAC3D;QACH,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QACxB,gBAAgB,EAAE,UAAU,GAAG,SAAS,CAAA;KACzC,CAAA;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,UAAU,KAAK,IAAI,CAAA;IACzC,aAAa,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;IAC5C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAA;CAChB,KAAG,0BAuJH,CAAA;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,CACJ,KAAK,EAAE,aAAa,CAAC,aAAa,CAAC,iBAAiB,CAAC,EACrD,OAAO,EAAE;QAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAAE,KACnC;QACH,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KACzB,CAAA;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAEvD,YAAY,EAAE;QAAE,OAAO,EAAE,SAAS,CAAA;KAAE,CAAA;CACrC"}
+{"version":3,"file":"ClientSessionSyncProcessor.d.ts","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAe,MAAM,EAAsC,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE1C,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAEzE,OAAO,KAAK,cAAc,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAe,KAAK,eAAe,EAAgB,MAAM,kBAAkB,CAAA;AAElF,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAE3C;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,GAAI,qHAU5C;IACD,MAAM,EAAE,eAAe,CAAA;IACvB,aAAa,EAAE,aAAa,CAAA;IAC5B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACrC,gBAAgB,EAAE,CAChB,YAAY,EAAE,cAAc,CAAC,iBAAiB,EAC9C,OAAO,EAAE;QAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,KAC3D;QACH,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QACxB,gBAAgB,EAAE;YAAE,IAAI,EAAE,kBAAkB,CAAC;YAAC,IAAI,EAAE,UAAU,CAAC;YAAC,KAAK,EAAE,GAAG,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,CAAA;KACrH,CAAA;IACD,QAAQ,EAAE,CAAC,SAAS,EAAE,UAAU,KAAK,IAAI,CAAA;IACzC,aAAa,EAAE,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;IAC5C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAA;IACf,MAAM,EAAE;QACN,mBAAmB,EAAE,MAAM,CAAA;KAC5B,CAAA;IACD;;;OAGG;IACH,qBAAqB,EAAE,OAAO,CAAA;CAC/B,KAAG,0BAiQH,CAAA;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,CACJ,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,EACtD,OAAO,EAAE;QAAE,WAAW,EAAE,IAAI,CAAC,OAAO,CAAA;KAAE,KACnC;QACH,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KACzB,CAAA;IACD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IACvD,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACzD,KAAK,EAAE;QACL,KAAK,EAAE,MAAM,IAAI,CAAA;QACjB,SAAS,EAAE,MAAM;YACf,WAAW,EAAE,MAAM,CAAA;YACnB,YAAY,EAAE,MAAM,CAAA;SACrB,CAAA;KACF,CAAA;CACF"}

package/dist/sync/ClientSessionSyncProcessor.js

@@ -1,133 +1,209 @@
+/// <reference lib="dom" />
 import { LS_DEV, shouldNeverHappen, TRACE_VERBOSE } from '@livestore/utils';
-import { Effect, Schema, Stream } from '@livestore/utils/effect';
+import { BucketQueue, Effect, FiberHandle, Queue, Schema, Stream, Subscribable } from '@livestore/utils/effect';
 import * as otel from '@opentelemetry/api';
-import * as EventId from '../schema/EventId.js';
-import * as MutationEvent from '../schema/MutationEvent.js';
-import { SyncState, updateSyncState } from './syncstate.js';
+import * as EventSequenceNumber from '../schema/EventSequenceNumber.js';
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js';
+import { getEventDef, SystemTables } from '../schema/mod.js';
+import { sql } from '../util.js';
+import * as SyncState from './syncstate.js';
 /**
  * Rebase behaviour:
- * - We continously pull mutations from the leader and apply them to the local store.
+ * - We continously pull events from the leader and apply them to the local store.
  * - If there was a race condition (i.e. the leader and client session have both advacned),
- *   we'll need to rebase the local pending mutations on top of the leader's head.
- * - The goal is to never block the UI, so we'll interrupt rebasing if a new mutations is pushed by the client session.
- * - We also want to avoid "backwards-jumping" in the UI, so we'll transactionally apply a read model changes during a rebase.
+ *   we'll need to rebase the local pending events on top of the leader's head.
+ * - The goal is to never block the UI, so we'll interrupt rebasing if a new events is pushed by the client session.
+ * - We also want to avoid "backwards-jumping" in the UI, so we'll transactionally apply state changes during a rebase.
  * - We might need to make the rebase behaviour configurable e.g. to let users manually trigger a rebase
+ *
+ * Longer term we should evalutate whether we can unify the ClientSessionSyncProcessor with the LeaderSyncProcessor.
  */
-export const makeClientSessionSyncProcessor = ({ schema, initialLeaderHead, pushToLeader, pullFromLeader, applyMutation, rollback, refreshTables, span, }) => {
-    const mutationEventSchema = MutationEvent.makeMutationEventSchemaMemo(schema);
+export const makeClientSessionSyncProcessor = ({ schema, clientSession, runtime, materializeEvent, rollback, refreshTables, span, params, confirmUnsavedChanges, }) => {
+    const eventSchema = LiveStoreEvent.makeEventDefSchemaMemo(schema);
     const syncStateRef = {
-        current: new SyncState({
-            localHead: initialLeaderHead,
-            upstreamHead: initialLeaderHead,
+        // The initial state is identical to the leader's initial state
+        current: new SyncState.SyncState({
+            localHead: clientSession.leaderThread.initialState.leaderHead,
+            upstreamHead: clientSession.leaderThread.initialState.leaderHead,
+            // Given we're starting with the leader's snapshot, we don't have any pending events intially
             pending: [],
-            // TODO init rollbackTail from leader to be ready for backend rebasing
-            rollbackTail: [],
         }),
     };
-    const isLocalEvent = (mutationEventEncoded) => {
-        const mutationDef = schema.mutations.get(mutationEventEncoded.mutation);
-        return mutationDef.options.localOnly;
-    };
+    const syncStateUpdateQueue = Queue.unbounded().pipe(Effect.runSync);
+    const isClientEvent = (eventEncoded) => getEventDef(schema, eventEncoded.name).eventDef.options.clientOnly;
+    /** We're queuing push requests to reduce the number of messages sent to the leader by batching them */
+    const leaderPushQueue = BucketQueue.make().pipe(Effect.runSync);
     const push = (batch, { otelContext }) => {
         // TODO validate batch
-        let baseEventId = syncStateRef.current.localHead;
-        const encodedMutationEvents = batch.map((mutationEvent) => {
-            const mutationDef = schema.mutations.get(mutationEvent.mutation);
-            const nextIdPair = EventId.nextPair(baseEventId, mutationDef.options.localOnly);
-            baseEventId = nextIdPair.id;
-            return new MutationEvent.EncodedWithMeta(Schema.encodeUnknownSync(mutationEventSchema)({ ...mutationEvent, ...nextIdPair }));
+        let baseEventSequenceNumber = syncStateRef.current.localHead;
+        const encodedEventDefs = batch.map(({ name, args }) => {
+            const eventDef = getEventDef(schema, name);
+            const nextNumPair = EventSequenceNumber.nextPair(baseEventSequenceNumber, eventDef.eventDef.options.clientOnly);
+            baseEventSequenceNumber = nextNumPair.seqNum;
+            return new LiveStoreEvent.EncodedWithMeta(Schema.encodeUnknownSync(eventSchema)({
+                name,
+                args,
+                ...nextNumPair,
+                clientId: clientSession.clientId,
+                sessionId: clientSession.sessionId,
+            }));
         });
-        const updateResult = updateSyncState({
+        const mergeResult = SyncState.merge({
             syncState: syncStateRef.current,
-            payload: { _tag: 'local-push', newEvents: encodedMutationEvents },
-            isLocalEvent,
-            isEqualEvent: MutationEvent.isEqualEncoded,
+            payload: { _tag: 'local-push', newEvents: encodedEventDefs },
+            isClientEvent,
+            isEqualEvent: LiveStoreEvent.isEqualEncoded,
         });
+        if (mergeResult._tag === 'unexpected-error') {
+            return shouldNeverHappen('Unexpected error in client-session-sync-processor', mergeResult.cause);
+        }
         span.addEvent('local-push', {
-            batchSize: encodedMutationEvents.length,
-            updateResult: TRACE_VERBOSE ? JSON.stringify(updateResult) : undefined,
+            batchSize: encodedEventDefs.length,
+            mergeResult: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
         });
-        if (updateResult._tag !== 'advance') {
-            return shouldNeverHappen(`Expected advance, got ${updateResult._tag}`);
+        if (mergeResult._tag !== 'advance') {
+            return shouldNeverHappen(`Expected advance, got ${mergeResult._tag}`);
         }
-        syncStateRef.current = updateResult.newSyncState;
+        syncStateRef.current = mergeResult.newSyncState;
+        syncStateUpdateQueue.offer(mergeResult.newSyncState).pipe(Effect.runSync);
         const writeTables = new Set();
-        for (const mutationEvent of updateResult.newEvents) {
+        for (const event of mergeResult.newEvents) {
             // TODO avoid encoding and decoding here again
-            const decodedMutationEvent = Schema.decodeSync(mutationEventSchema)(mutationEvent);
-            const res = applyMutation(decodedMutationEvent, { otelContext, withChangeset: true });
+            const decodedEventDef = Schema.decodeSync(eventSchema)(event);
+            const res = materializeEvent(decodedEventDef, { otelContext, withChangeset: true });
             for (const table of res.writeTables) {
                 writeTables.add(table);
             }
-            mutationEvent.meta.sessionChangeset = res.sessionChangeset;
+            event.meta.sessionChangeset = res.sessionChangeset;
         }
-        // console.debug('pushToLeader', encodedMutationEvents.length, ...encodedMutationEvents.map((_) => _.toJSON()))
-        pushToLeader(encodedMutationEvents);
+        // console.debug('pushToLeader', encodedEventDefs.length, ...encodedEventDefs.map((_) => _.toJSON()))
+        BucketQueue.offerAll(leaderPushQueue, encodedEventDefs).pipe(Effect.runSync);
         return { writeTables };
     };
+    const debugInfo = {
+        rebaseCount: 0,
+        advanceCount: 0,
+        rejectCount: 0,
+    };
     const otelContext = otel.trace.setSpan(otel.context.active(), span);
     const boot = Effect.gen(function* () {
-        yield* pullFromLeader.pipe(Stream.tap(({ payload, remaining }) => Effect.gen(function* () {
-            // console.log('pulled payload from leader', { payload, remaining })
-            const updateResult = updateSyncState({
+        // eslint-disable-next-line unicorn/prefer-global-this
+        if (confirmUnsavedChanges && typeof window !== 'undefined' && typeof window.addEventListener === 'function') {
+            const onBeforeUnload = (event) => {
+                if (syncStateRef.current.pending.length > 0) {
+                    // Trigger the default browser dialog
+                    event.preventDefault();
+                }
+            };
+            yield* Effect.acquireRelease(Effect.sync(() => window.addEventListener('beforeunload', onBeforeUnload)), () => Effect.sync(() => window.removeEventListener('beforeunload', onBeforeUnload)));
+        }
+        const leaderPushingFiberHandle = yield* FiberHandle.make();
+        const backgroundLeaderPushing = Effect.gen(function* () {
+            const batch = yield* BucketQueue.takeBetween(leaderPushQueue, 1, params.leaderPushBatchSize);
+            yield* clientSession.leaderThread.events.push(batch).pipe(Effect.catchTag('LeaderAheadError', () => {
+                debugInfo.rejectCount++;
+                return BucketQueue.clear(leaderPushQueue);
+            }));
+        }).pipe(Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty);
+        yield* FiberHandle.run(leaderPushingFiberHandle, backgroundLeaderPushing);
+        const getMergeCounter = () => clientSession.sqliteDb.select(sql `SELECT mergeCounter FROM ${SystemTables.LEADER_MERGE_COUNTER_TABLE} WHERE id = 0`)[0]?.mergeCounter ?? 0;
+        // NOTE We need to lazily call `.pull` as we want the cursor to be updated
+        yield* Stream.suspend(() => clientSession.leaderThread.events.pull({
+            cursor: { mergeCounter: getMergeCounter(), eventNum: syncStateRef.current.localHead },
+        })).pipe(Stream.tap(({ payload, mergeCounter: leaderMergeCounter }) => Effect.gen(function* () {
+            // yield* Effect.logDebug('ClientSessionSyncProcessor:pull', payload)
+            if (clientSession.devtools.enabled) {
+                yield* clientSession.devtools.pullLatch.await;
+            }
+            const mergeResult = SyncState.merge({
                 syncState: syncStateRef.current,
                 payload,
-                isLocalEvent,
-                isEqualEvent: MutationEvent.isEqualEncoded,
+                isClientEvent,
+                isEqualEvent: LiveStoreEvent.isEqualEncoded,
             });
-            if (updateResult._tag === 'reject') {
-                debugger;
-                throw new Error('TODO: implement reject in client-session-sync-queue for pull');
+            if (mergeResult._tag === 'unexpected-error') {
+                return yield* Effect.fail(mergeResult.cause);
             }
-            syncStateRef.current = updateResult.newSyncState;
-            if (updateResult._tag === 'rebase') {
-                span.addEvent('pull:rebase', {
+            else if (mergeResult._tag === 'reject') {
+                return shouldNeverHappen('Unexpected reject in client-session-sync-processor', mergeResult);
+            }
+            syncStateRef.current = mergeResult.newSyncState;
+            syncStateUpdateQueue.offer(mergeResult.newSyncState).pipe(Effect.runSync);
+            if (mergeResult._tag === 'rebase') {
+                span.addEvent('merge:pull:rebase', {
                     payloadTag: payload._tag,
                     payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
-                    newEventsCount: updateResult.newEvents.length,
-                    rollbackCount: updateResult.eventsToRollback.length,
-                    res: TRACE_VERBOSE ? JSON.stringify(updateResult) : undefined,
-                    remaining,
+                    newEventsCount: mergeResult.newEvents.length,
+                    rollbackCount: mergeResult.rollbackEvents.length,
+                    res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
+                    leaderMergeCounter,
                 });
+                debugInfo.rebaseCount++;
+                yield* FiberHandle.clear(leaderPushingFiberHandle);
+                // Reset the leader push queue since we're rebasing and will push again
+                yield* BucketQueue.clear(leaderPushQueue);
+                yield* FiberHandle.run(leaderPushingFiberHandle, backgroundLeaderPushing);
                 if (LS_DEV) {
-                    console.debug('pull:rebase: rollback', updateResult.eventsToRollback.length, ...updateResult.eventsToRollback.map((_) => _.toJSON()));
+                    Effect.logDebug('merge:pull:rebase: rollback', mergeResult.rollbackEvents.length, ...mergeResult.rollbackEvents.slice(0, 10).map((_) => _.toJSON()), { leaderMergeCounter }).pipe(Effect.provide(runtime), Effect.runSync);
                 }
-                for (let i = updateResult.eventsToRollback.length - 1; i >= 0; i--) {
-                    const event = updateResult.eventsToRollback[i];
-                    if (event.meta.sessionChangeset) {
-                        rollback(event.meta.sessionChangeset);
-                        event.meta.sessionChangeset = undefined;
+                for (let i = mergeResult.rollbackEvents.length - 1; i >= 0; i--) {
+                    const event = mergeResult.rollbackEvents[i];
+                    if (event.meta.sessionChangeset._tag !== 'no-op' && event.meta.sessionChangeset._tag !== 'unset') {
+                        rollback(event.meta.sessionChangeset.data);
+                        event.meta.sessionChangeset = { _tag: 'unset' };
                     }
                 }
-                pushToLeader(updateResult.newSyncState.pending);
+                yield* BucketQueue.offerAll(leaderPushQueue, mergeResult.newSyncState.pending);
             }
             else {
-                span.addEvent('pull:advance', {
+                span.addEvent('merge:pull:advance', {
                     payloadTag: payload._tag,
                     payload: TRACE_VERBOSE ? JSON.stringify(payload) : undefined,
-                    newEventsCount: updateResult.newEvents.length,
-                    res: TRACE_VERBOSE ? JSON.stringify(updateResult) : undefined,
-                    remaining,
+                    newEventsCount: mergeResult.newEvents.length,
+                    res: TRACE_VERBOSE ? JSON.stringify(mergeResult) : undefined,
+                    leaderMergeCounter,
                 });
+                debugInfo.advanceCount++;
             }
-            if (updateResult.newEvents.length === 0)
+            if (mergeResult.newEvents.length === 0)
                 return;
             const writeTables = new Set();
-            for (const mutationEvent of updateResult.newEvents) {
-                const decodedMutationEvent = Schema.decodeSync(mutationEventSchema)(mutationEvent);
-                const res = applyMutation(decodedMutationEvent, { otelContext, withChangeset: true });
+            for (const event of mergeResult.newEvents) {
+                // TODO apply changeset if available (will require tracking of write tables as well)
+                const decodedEventDef = Schema.decodeSync(eventSchema)(event);
+                const res = materializeEvent(decodedEventDef, { otelContext, withChangeset: true });
                 for (const table of res.writeTables) {
                     writeTables.add(table);
                 }
-                mutationEvent.meta.sessionChangeset = res.sessionChangeset;
+                event.meta.sessionChangeset = res.sessionChangeset;
             }
             refreshTables(writeTables);
-        })), Stream.runDrain, Effect.tapCauseLogPretty, Effect.forkScoped);
+        }).pipe(Effect.tapCauseLogPretty, Effect.catchAllCause((cause) => clientSession.shutdown(cause)))), Stream.runDrain, Effect.forever, // NOTE Whenever the leader changes, we need to re-start the stream
+        Effect.interruptible, Effect.withSpan('client-session-sync-processor:pull'), Effect.tapCauseLogPretty, Effect.forkScoped);
     });
     return {
         push,
         boot,
-        syncStateRef,
+        syncState: Subscribable.make({
+            get: Effect.gen(function* () {
+                const syncState = syncStateRef.current;
+                if (syncStateRef === undefined)
+                    return shouldNeverHappen('Not initialized');
+                return syncState;
+            }),
+            changes: Stream.fromQueue(syncStateUpdateQueue),
+        }),
+        debug: {
+            print: () => Effect.gen(function* () {
+                console.log('debugInfo', debugInfo);
+                console.log('syncState', syncStateRef.current);
+                const pushQueueSize = yield* BucketQueue.size(leaderPushQueue);
+                console.log('pushQueueSize', pushQueueSize);
+                const pushQueueItems = yield* BucketQueue.peekAll(leaderPushQueue);
+                console.log('pushQueueItems', pushQueueItems.map((_) => _.toJSON()));
+            }).pipe(Effect.provide(runtime), Effect.runSync),
+            debugInfo: () => debugInfo,
+        },
     };
 };
 //# sourceMappingURL=ClientSessionSyncProcessor.js.map

package/dist/sync/ClientSessionSyncProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClientSessionSyncProcessor.js","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ClientSessionSyncProcessor.js","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"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"}

package/dist/sync/next/compact-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compact-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAGzD;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,aAAc,UAAU,KAAG;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAkDlG,CAAA"}
+{"version":3,"file":"compact-events.d.ts","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAGzD;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,GAAI,UAAU,UAAU,KAAG;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAkDlG,CAAA"}

package/dist/sync/next/compact-events.js

@@ -1,6 +1,6 @@
+import { EventSequenceNumber } from '../../schema/mod.js';
 import { replacesFacts } from './facts.js';
 import { graphologyDag } from './graphology_.js';
-import { eventIdToString } from './history-dag.js';
 import { emptyHistoryDag } from './history-dag-common.js';
 /**
  * Idea:
@@ -14,21 +14,21 @@ import { emptyHistoryDag } from './history-dag-common.js';
 export const compactEvents = (inputDag) => {
     const dag = inputDag.copy();
     const compactedEventCount = 0;
-    const orderedEventIdStrs = graphologyDag.topologicalSort(dag).reverse();
+    const orderedEventSequenceNumberStrs = graphologyDag.topologicalSort(dag).reverse();
     // drop root
-    orderedEventIdStrs.pop();
-    for (const eventIdStr of orderedEventIdStrs) {
-        if (dag.hasNode(eventIdStr) === false) {
+    orderedEventSequenceNumberStrs.pop();
+    for (const eventNumStr of orderedEventSequenceNumberStrs) {
+        if (dag.hasNode(eventNumStr) === false) {
             continue;
         }
-        const subDagsForEvent = Array.from(makeSubDagsForEvent(dag, eventIdStr));
+        const subDagsForEvent = Array.from(makeSubDagsForEvent(dag, eventNumStr));
         for (const subDag of subDagsForEvent) {
             let shouldRetry = true;
             while (shouldRetry) {
-                const subDagsInHistory = findSubDagsInHistory(dag, subDag, eventIdStr);
+                const subDagsInHistory = findSubDagsInHistory(dag, subDag, eventNumStr);
                 // console.debug(
                 //   'subDagsInHistory',
-                //   eventIdStr,
+                //   eventNumStr,
                 //   'target',
                 //   subDag.nodes(),
                 //   'found',
@@ -50,27 +50,30 @@ export const compactEvents = (inputDag) => {
     }
     return { dag, compactedEventCount };
 };
-function* makeSubDagsForEvent(inputDag, eventIdStr) {
-    /** Map from eventIdStr to array of eventIdStrs that are dependencies */
-    let nextIterationEls = new Map([[eventIdStr, []]]);
+function* makeSubDagsForEvent(inputDag, eventNumStr) {
+    /** Map from eventNumStr to array of eventNumStrs that are dependencies */
+    let nextIterationEls = new Map([[eventNumStr, []]]);
     let previousDag;
     while (nextIterationEls.size > 0) {
         // start with a copy of the last sub dag to build on top of
         const subDag = previousDag?.copy() ?? emptyHistoryDag();
         const currentIterationEls = new Map(nextIterationEls);
         nextIterationEls = new Map();
-        for (const [currentEventIdStr, edgeTargetIdStrs] of currentIterationEls) {
-            const node = inputDag.getNodeAttributes(currentEventIdStr);
-            if (subDag.hasNode(currentEventIdStr) === false) {
-                subDag.addNode(currentEventIdStr, { ...node });
+        for (const [currentEventSequenceNumberStr, edgeTargetIdStrs] of currentIterationEls) {
+            const node = inputDag.getNodeAttributes(currentEventSequenceNumberStr);
+            if (subDag.hasNode(currentEventSequenceNumberStr) === false) {
+                subDag.addNode(currentEventSequenceNumberStr, { ...node });
             }
             for (const edgeTargetIdStr of edgeTargetIdStrs) {
-                subDag.addEdge(currentEventIdStr, edgeTargetIdStr, { type: 'facts' });
+                subDag.addEdge(currentEventSequenceNumberStr, edgeTargetIdStr, { type: 'facts' });
             }
-            for (const depEdge of inputDag.outboundEdgeEntries(currentEventIdStr)) {
+            for (const depEdge of inputDag.outboundEdgeEntries(currentEventSequenceNumberStr)) {
                 if (depEdge.attributes.type === 'facts') {
-                    const depEventIdStr = depEdge.target;
-                    nextIterationEls.set(depEventIdStr, [...(nextIterationEls.get(depEventIdStr) ?? []), currentEventIdStr]);
+                    const depEventSequenceNumberStr = depEdge.target;
+                    nextIterationEls.set(depEventSequenceNumberStr, [
+                        ...(nextIterationEls.get(depEventSequenceNumberStr) ?? []),
+                        currentEventSequenceNumberStr,
+                    ]);
                 }
             }
         }
@@ -80,17 +83,17 @@ function* makeSubDagsForEvent(inputDag, eventIdStr) {
     }
 }
 /**
- * Iterates over all events from root to `upToExclEventIdStr`
+ * Iterates over all events from root to `upToExclEventSequenceNumberStr`
  * and collects all valid sub dags that are replaced by `targetSubDag`.
  */
-const findSubDagsInHistory = (inputDag, targetSubDag, upToExclEventIdStr) => {
+const findSubDagsInHistory = (inputDag, targetSubDag, upToExclEventSequenceNumberStr) => {
     const subDags = [];
     const allOutsideDependencies = [];
-    for (const eventIdStr of graphologyDag.topologicalSort(inputDag)) {
-        if (eventIdStr === upToExclEventIdStr) {
+    for (const eventNumStr of graphologyDag.topologicalSort(inputDag)) {
+        if (eventNumStr === upToExclEventSequenceNumberStr) {
             break;
         }
-        for (const subDag of makeSubDagsForEvent(inputDag, eventIdStr)) {
+        for (const subDag of makeSubDagsForEvent(inputDag, eventNumStr)) {
             // console.debug('findSubDagsInHistory', 'target', targetSubDag.nodes(), 'subDag', subDag.nodes())
             if (subDag.size < targetSubDag.size) {
                 continue;
@@ -120,9 +123,9 @@ const outsideDependenciesForDag = (subDag, inputDag) => {
     for (const nodeIdStr of subDag.nodes()) {
         for (const edgeEntry of inputDag.outboundEdgeEntries(nodeIdStr)) {
             if (edgeEntry.attributes.type === 'facts') {
-                const depEventIdStr = edgeEntry.target;
-                if (subDag.hasNode(depEventIdStr) === false) {
-                    outsideDependencies.push(depEventIdStr);
+                const depEventSequenceNumberStr = edgeEntry.target;
+                if (subDag.hasNode(depEventSequenceNumberStr) === false) {
+                    outsideDependencies.push(depEventSequenceNumberStr);
                 }
             }
         }
@@ -160,18 +163,18 @@ const dagReplacesDag = (dagA, dagB) => {
     }
     return true;
 };
-const removeEvent = (dag, eventIdStr) => {
-    // console.debug('removing event', eventIdStr)
-    const event = dag.getNodeAttributes(eventIdStr);
-    const parentIdStr = eventIdToString(event.parentId);
-    const childEdges = dag.outboundEdgeEntries(eventIdStr);
+const removeEvent = (dag, eventNumStr) => {
+    // console.debug('removing event', eventNumStr)
+    const event = dag.getNodeAttributes(eventNumStr);
+    const parentSeqNumStr = EventSequenceNumber.toString(event.parentSeqNum);
+    const childEdges = dag.outboundEdgeEntries(eventNumStr);
     for (const childEdge of childEdges) {
         if (childEdge.attributes.type === 'parent') {
             const childEvent = dag.getNodeAttributes(childEdge.target);
-            childEvent.parentId = { ...event.parentId };
-            dag.addEdge(parentIdStr, eventIdToString(childEvent.id), { type: 'parent' });
+            childEvent.parentSeqNum = { ...event.parentSeqNum };
+            dag.addEdge(parentSeqNumStr, EventSequenceNumber.toString(childEvent.seqNum), { type: 'parent' });
         }
     }
-    dag.dropNode(eventIdStr);
+    dag.dropNode(eventNumStr);
 };
 //# sourceMappingURL=compact-events.js.map

package/dist/sync/next/compact-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"compact-events.js","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compact-events.js","sourceRoot":"","sources":["../../../src/sync/next/compact-events.ts"],"names":[],"mappings":"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"}