@livestore/common 0.4.0 → 0.5.0-dev.0

package/dist/sync/ClientSessionSyncProcessor.d.ts

@@ -1,8 +1,9 @@
-import { Effect, Option, Schema, type Scope, Subscribable } from '@livestore/utils/effect';
+import { Effect, Exit, Option, type Scope, Subscribable } from '@livestore/utils/effect';
 import type { ClientSession } from '../adapter-types.ts';
-import type { MaterializeError } from '../errors.ts';
+import { MaterializeError } from '../errors.ts';
 import * as LiveStoreEvent from '../schema/LiveStoreEvent/mod.ts';
 import type { LiveStoreSchema } from '../schema/mod.ts';
+import * as StateHead from '../StateHead.ts';
 import * as SyncState from './syncstate.ts';
 /**
  * Rebase behaviour:
@@ -23,7 +24,6 @@ export declare const makeClientSessionSyncProcessor: (args_0: {
     schema: LiveStoreSchema;
     clientSession: ClientSession;
     materializeEvent: (eventEncoded: LiveStoreEvent.Client.EncodedWithMeta, options: {
-        withChangeset: boolean;
         materializerHashLeader: Option.Option<number>;
     }) => Effect.Effect<{
         writeTables: Set<string>;
@@ -42,16 +42,42 @@ export declare const makeClientSessionSyncProcessor: (args_0: {
     refreshTables: (tables: Set<string>) => void;
     params: {
         leaderPushBatchSize: number;
-        simulation?: ClientSessionSyncProcessorSimulationParams;
+        /**
+         * Test-only deterministic barriers, awaited at fixed points of the rebase critical section.
+         * A test can park the pull fiber at a chosen point, inject a concurrent operation
+         * (a synchronous `push` or a `shutdown`), then release the barrier — without relying on
+         * virtual-time scheduling. Unset in production, where each lookup resolves to `Effect.void`.
+         */
+        rebaseBarriers?: Partial<Record<RebaseBarrierPoint, Effect.Effect<void>>>;
     };
     /**
      * Currently only used in the web adapter:
      * If true, registers a beforeunload event listener to confirm unsaved changes.
      */
     confirmUnsavedChanges: boolean;
-}) => Effect.Effect<ClientSessionSyncProcessor, never, never>;
+}) => Effect.Effect<{
+    boot: Effect.Effect<void, never, Scope.Scope>;
+    shutdown: (exit: Exit.Exit<unknown, unknown>) => Effect.Effect<void>;
+    encodeEvents: (events: ReadonlyArray<LiveStoreEvent.Input.Decoded>) => Effect.Effect<ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>>;
+    materializeEvents: (events: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>) => Effect.Effect<{
+        writeTables: Set<string>;
+    }, MaterializeError>;
+    push: (events: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>) => Effect.Effect<void>;
+    syncState: Subscribable.Subscribable<SyncState.SyncState, never, never>;
+    debug: {
+        awaitDrainStarted: Effect.Effect<void, never, never>;
+        awaitRejection: Effect.Effect<void, never, never>;
+        print: () => void;
+        debugInfo: () => {
+            rebaseCount: number;
+            advanceCount: number;
+            rejectCount: number;
+        };
+    };
+}, never, StateHead.StateHead>;
 export interface ClientSessionSyncProcessor {
     boot: Effect.Effect<void, never, Scope.Scope>;
+    shutdown: (exit: Exit.Exit<unknown, unknown>) => Effect.Effect<void>;
     encodeEvents: (events: ReadonlyArray<LiveStoreEvent.Input.Decoded>) => Effect.Effect<ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>>;
     push: (events: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>) => Effect.Effect<void>;
     materializeEvents: (events: ReadonlyArray<LiveStoreEvent.Client.EncodedWithMeta>) => Effect.Effect<{
@@ -62,6 +88,8 @@ export interface ClientSessionSyncProcessor {
      */
     syncState: Subscribable.Subscribable<SyncState.SyncState>;
     debug: {
+        awaitDrainStarted: Effect.Effect<void>;
+        awaitRejection: Effect.Effect<void>;
         print: () => void;
         debugInfo: () => {
             rebaseCount: number;
@@ -69,15 +97,9 @@ export interface ClientSessionSyncProcessor {
         };
     };
 }
-export declare const ClientSessionSyncProcessorSimulationParams: Schema.Struct<{
-    pull: Schema.Struct<{
-        '1_before_leader_push_fiber_interrupt': Schema.filter<typeof Schema.Int>;
-        '2_before_leader_push_queue_clear': Schema.filter<typeof Schema.Int>;
-        '3_before_rebase_rollback': Schema.filter<typeof Schema.Int>;
-        '4_before_leader_push_queue_offer': Schema.filter<typeof Schema.Int>;
-        '5_before_leader_push_fiber_run': Schema.filter<typeof Schema.Int>;
-    }>;
-}>;
-type ClientSessionSyncProcessorSimulationParams = typeof ClientSessionSyncProcessorSimulationParams.Type;
-export {};
+/**
+ * Injection points inside the rebase critical section where a test-only barrier may be awaited.
+ * Named for the step they precede so the deterministic no-loss tests can target the exact window.
+ */
+export type RebaseBarrierPoint = 'before_leader_push_fiber_interrupt' | 'before_queue_reconcile' | 'before_leader_push_fiber_run';
 //# 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":"AAEA,OAAO,EAEL,MAAM,EAGN,MAAM,EAEN,MAAM,EACN,KAAK,KAAK,EAEV,YAAY,EACb,MAAM,yBAAyB,CAAA;AAEhC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAGpD,OAAO,KAAK,cAAc,MAAM,iCAAiC,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACvD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAK3C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,8BAA8B;YASjC,eAAe;mBACR,aAAa;sBACV,CAChB,YAAY,EAAE,cAAc,CAAC,MAAM,CAAC,eAAe,EACnD,OAAO,EAAE;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,sBAAsB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;KAAE,KAC/E,MAAM,CAAC,MAAM,CAChB;QACE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QACxB,gBAAgB,EACZ;YAAE,IAAI,EAAE,kBAAkB,CAAC;YAAC,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;YAAC,KAAK,EAAE,GAAG,CAAA;SAAE,GACvE;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,GACjB;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,CAAA;QACrB,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;KACxC,EACD,gBAAgB,CACjB;cACS,CAAC,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI;mBACvC,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,KAAK,IAAI;YACpC;QACN,mBAAmB,EAAE,MAAM,CAAA;QAC3B,UAAU,CAAC,EAAE,0CAA0C,CAAA;KACxD;IACD;;;OAGG;2BACoB,OAAO;6DA0S9B,CAAA;AAEF,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;IAC7C,YAAY,EAAE,CACZ,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAA;IACxE,IAAI,EAAE,CACJ,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,KACzD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,iBAAiB,EAAE,CACjB,MAAM,EAAE,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,KACzD,MAAM,CAAC,MAAM,CAAC;QAAE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;KAAE,EAAE,gBAAgB,CAAC,CAAA;IAClE;;OAEG;IACH,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;AAMD,eAAO,MAAM,0CAA0C;;;;;;;;EAQrD,CAAA;AACF,KAAK,0CAA0C,GAAG,OAAO,0CAA0C,CAAC,IAAI,CAAA"}
+{"version":3,"file":"ClientSessionSyncProcessor.d.ts","sourceRoot":"","sources":["../../src/sync/ClientSessionSyncProcessor.ts"],"names":[],"mappings":"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"}

package/dist/sync/ClientSessionSyncProcessor.js

@@ -1,12 +1,15 @@
 /// <reference lib="dom" />
 import { LS_DEV, TRACE_VERBOSE } from '@livestore/utils';
-import { BucketQueue, Effect, Exit, FiberHandle, Option, Queue, Schema, Stream, Subscribable, } from '@livestore/utils/effect';
+import { Cause, Deferred, Effect, Exit, Filter, FiberHandle, Option, Queue, Schema, Semaphore, Stream, Subscribable, TxQueue, } from '@livestore/utils/effect';
+import { MaterializeError } from "../errors.js";
 import { isRejectedPushError } from "../leader-thread/RejectedPushError.js";
 import * as EventSequenceNumber from "../schema/EventSequenceNumber/mod.js";
 import * as LiveStoreEvent from "../schema/LiveStoreEvent/mod.js";
+import { resolveSessionIdSymbolInEventArgs } from "../session-id-symbol.js";
+import * as StateHead from "../StateHead.js";
 import * as SyncState from "./syncstate.js";
 /** Serialize value to JSON string for trace attributes */
-const jsonStringify = Schema.encodeSync(Schema.parseJson());
+const jsonStringify = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 /**
  * Rebase behaviour:
  * - We continously pull events from the leader and apply them to the local store.
@@ -23,8 +26,9 @@ const jsonStringify = Schema.encodeSync(Schema.parseJson());
  * - The session sync processor has no downstream nodes.
  */
 export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncProcessor')(function* ({ schema, clientSession, materializeEvent, rollback, refreshTables, params, confirmUnsavedChanges, }) {
+    const stateHead = yield* StateHead.StateHead;
     const eventSchema = LiveStoreEvent.Client.makeSchemaMemo(schema);
-    const simSleep = (key, key2) => Effect.sleep((params.simulation?.[key]?.[key2] ?? 0));
+    const rebaseBarrier = (point) => params.rebaseBarriers?.[point] ?? Effect.void;
     const syncStateRef = {
         // The initial state is identical to the leader's initial state
         current: new SyncState.SyncState({
@@ -36,10 +40,33 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
     };
     /** Only used for debugging / observability / testing, it's not relied upon for correctness of the sync processor. */
     const syncStateUpdateQueue = yield* Queue.unbounded();
-    const isClientEvent = (eventEncoded) => schema.eventsDefsMap.get(eventEncoded.name)?.options.clientOnly ?? false;
+    const isClientOnlyEvent = (eventEncoded) => schema.eventsDefsMap.get(eventEncoded.name)?.options.clientOnly ?? false;
     /** We're queuing push requests to reduce the number of messages sent to the leader by batching them */
-    const leaderPushQueue = yield* BucketQueue.make();
-    const boot = Effect.fn('client-session-sync-processor:boot')(function* () {
+    const leaderPushQueue = yield* TxQueue.unbounded();
+    /**
+     * Prevents pull reconciliation, push-rejection handling, and shutdown from running concurrently.
+     * These transitions inspect or update the pending events, leader push queue, and rejection state,
+     * so each must observe the others either fully before or fully after—not midway through bookkeeping.
+     *
+     * Regular local commits do not acquire this mutex; they remain synchronous and are incorporated
+     * when `reconcileLeaderPushQueue` reads the current pending events transactionally.
+     */
+    const pullReconciliationMutex = yield* Semaphore.make(1);
+    const shutdownDone = yield* Deferred.make();
+    const drainStartedSignal = yield* Deferred.make();
+    const rejectionObserved = yield* Deferred.make();
+    let shutdownStarted = false;
+    let terminalPushCause;
+    let unresolvedRejection;
+    let leaderPushingFiberHandle;
+    let pullingFiberHandle;
+    /** Rebuild the leader push queue from the current pending events without racing synchronous commits. */
+    const reconcileLeaderPushQueue = Effect.tx(Effect.gen(function* () {
+        const livePending = syncStateRef.current.pending;
+        yield* TxQueue.clear(leaderPushQueue);
+        yield* TxQueue.offerAll(leaderPushQueue, livePending);
+    }));
+    const boot = Effect.gen(function* () {
         if (confirmUnsavedChanges === true &&
             typeof window !== 'undefined' &&
             typeof window.addEventListener === 'function') {
@@ -51,28 +78,65 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
             };
             yield* Effect.acquireRelease(Effect.sync(() => window.addEventListener('beforeunload', onBeforeUnload)), () => Effect.sync(() => window.removeEventListener('beforeunload', onBeforeUnload)));
         }
-        const leaderPushingFiberHandle = yield* FiberHandle.make();
+        const leaderPushingHandle = yield* FiberHandle.make();
+        const pullingHandle = yield* FiberHandle.make();
+        leaderPushingFiberHandle = leaderPushingHandle;
+        pullingFiberHandle = pullingHandle;
         const backgroundLeaderPushing = Effect.gen(function* () {
-            const batch = yield* BucketQueue.takeBetween(leaderPushQueue, 1, params.leaderPushBatchSize);
-            yield* clientSession.leaderThread.events.push(batch).pipe(Effect.catchIf(isRejectedPushError, () => {
-                debugInfo.rejectCount++;
-                return BucketQueue.clear(leaderPushQueue);
-            }));
-        }).pipe(Effect.forever, Effect.interruptible, Effect.tapCauseLogPretty, Effect.catchAllCause((cause) => clientSession.shutdown(Exit.failCause(cause))));
-        yield* FiberHandle.run(leaderPushingFiberHandle, backgroundLeaderPushing);
+            while (true) {
+                const batch = yield* TxQueue.takeBetween(leaderPushQueue, 1, params.leaderPushBatchSize).pipe(Effect.catchIf(Cause.isDone, () => Effect.void));
+                if (batch === undefined)
+                    return;
+                yield* clientSession.leaderThread.events.push(batch).pipe(Effect.catchIf(isRejectedPushError, (error) => 
+                // A pull carrying the leader's corrective history can complete before or after this
+                // rejection response. Use the same mutex as pull reconciliation so this decision uses
+                // one stable view of pending events and cannot install a stale rejection fence after recovery.
+                pullReconciliationMutex
+                    .withPermits(1)(Effect.gen(function* () {
+                    debugInfo.rejectCount++;
+                    if (shutdownStarted === true)
+                        return yield* Effect.die(error);
+                    // A concurrent pull may have already confirmed or rebased this batch while the
+                    // push response was in flight. In that case, rebuild the queue from the reconciled
+                    // pending events instead of creating a fence that no future pull could release.
+                    if (isRejectedBatchRecovered(batch, syncStateRef.current.pending) === true) {
+                        yield* reconcileLeaderPushQueue;
+                        yield* Deferred.succeed(rejectionObserved, undefined);
+                        return false;
+                    }
+                    unresolvedRejection = { error, events: batch };
+                    yield* TxQueue.clear(leaderPushQueue);
+                    yield* Deferred.succeed(rejectionObserved, undefined);
+                    return true;
+                }))
+                    .pipe(Effect.flatMap((shouldFence) => 
+                // Local commits remain synchronous and continue accumulating in pending/the FIFO,
+                // but this sole drain worker stays parked until pull reconciliation reseeds it.
+                shouldFence === true ? Effect.never : Effect.void))));
+            }
+        }).pipe(Effect.interruptible, Effect.tapCauseLogPretty, Effect.catchCause((cause) => {
+            if (Cause.hasInterruptsOnly(cause) === true)
+                return Effect.void;
+            terminalPushCause ??= cause;
+            return shutdownStarted === true
+                ? Effect.void
+                : clientSession.shutdown(Exit.failCause(cause)).pipe(Effect.forkDetach, Effect.asVoid);
+        }));
+        yield* FiberHandle.run(leaderPushingHandle, backgroundLeaderPushing);
         // NOTE We need to lazily call `.pull` as we want the cursor to be updated
-        yield* Stream.suspend(() => clientSession.leaderThread.events.pull({ cursor: syncStateRef.current.upstreamHead })).pipe(Stream.tap(({ payload }) => Effect.gen(function* () {
+        const backgroundPulling = Stream.suspend(() => clientSession.leaderThread.events.pull({ cursor: syncStateRef.current.upstreamHead })).pipe(Stream.tap(() => clientSession.devtools.enabled === true ? clientSession.devtools.pullLatch.await : Effect.void), Stream.tap(({ payload }) => Effect.gen(function* () {
             // yield* Effect.logDebug('ClientSessionSyncProcessor:pull', payload)
-            if (clientSession.devtools.enabled === true) {
-                yield* clientSession.devtools.pullLatch.await;
-            }
+            const rejectionAtPullStart = unresolvedRejection;
             const mergeResult = yield* SyncState.merge({
                 syncState: syncStateRef.current,
                 payload,
-                isClientEvent,
+                isClientOnlyEvent,
                 isEqualEvent: LiveStoreEvent.Client.isEqualEncoded,
-            }).pipe(Effect.filterOrDieMessage((r) => r._tag !== 'reject', 'Unexpected reject in client-session-sync-processor'));
+            }).pipe(Effect.filterOrElse((r) => r._tag !== 'reject', () => Effect.die(new Error('Unexpected reject in client-session-sync-processor'))));
             syncStateRef.current = mergeResult.newSyncState;
+            const recoveredRejection = rejectionAtPullStart !== undefined &&
+                unresolvedRejection === rejectionAtPullStart &&
+                isRejectedBatchRecovered(rejectionAtPullStart.events, mergeResult.newSyncState.pending) === true;
             if (mergeResult._tag === 'rebase') {
                 yield* Effect.spanEvent('merge:pull:rebase', {
                     payloadTag: payload._tag,
@@ -82,18 +146,14 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
                     ...(TRACE_VERBOSE === true ? { res: jsonStringify(mergeResult) } : {}),
                 });
                 debugInfo.rebaseCount++;
-                if (SIMULATION_ENABLED === true)
-                    yield* simSleep('pull', '1_before_leader_push_fiber_interrupt');
-                yield* FiberHandle.clear(leaderPushingFiberHandle);
-                if (SIMULATION_ENABLED === true)
-                    yield* simSleep('pull', '2_before_leader_push_queue_clear');
-                // Reset the leader push queue since we're rebasing and will push again
-                yield* BucketQueue.clear(leaderPushQueue);
-                if (SIMULATION_ENABLED === true)
-                    yield* simSleep('pull', '3_before_rebase_rollback');
+                // Barrier: before we interrupt the in-flight leader-push worker.
+                yield* rebaseBarrier('before_leader_push_fiber_interrupt');
+                yield* FiberHandle.clear(leaderPushingHandle);
                 if (LS_DEV === true) {
                     yield* Effect.logDebug('merge:pull:rebase: rollback', mergeResult.rollbackEvents.length, ...mergeResult.rollbackEvents.slice(0, 10).map((_) => _.toJSON()));
                 }
+                // Roll back the optimistic session changesets for the events this rebase discards.
+                // (Independent of the push queue below; order relative to the queue reconcile is irrelevant.)
                 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') {
@@ -101,12 +161,34 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
                         event.meta.sessionChangeset = { _tag: 'unset' };
                     }
                 }
-                if (SIMULATION_ENABLED === true)
-                    yield* simSleep('pull', '4_before_leader_push_queue_offer');
-                yield* BucketQueue.offerAll(leaderPushQueue, mergeResult.newSyncState.pending);
-                if (SIMULATION_ENABLED === true)
-                    yield* simSleep('pull', '5_before_leader_push_fiber_run');
-                yield* FiberHandle.run(leaderPushingFiberHandle, backgroundLeaderPushing);
+                if (mergeResult.rollbackEvents.length > 0) {
+                    yield* stateHead
+                        .set(mergeResult.rollbackEvents[0].parentSeqNum)
+                        .pipe(Effect.mapError((cause) => MaterializeError.make({ cause })));
+                }
+                // Barrier: before the atomic queue reconciliation (the "discard + re-offer" step).
+                // A `push` admitted here appends its event to `syncStateRef.current.pending` AND to
+                // `leaderPushQueue`; the reconciliation below re-reads the current pending events, so
+                // that event is preserved rather than removed by the queue clear.
+                yield* rebaseBarrier('before_queue_reconcile');
+                // Atomic queue reconciliation. `push` runs via `Effect.runSyncWith` (a synchronous run,
+                // per the store's fully-synchronous commit contract), so it executes as an indivisible
+                // unit that can only interleave in THIS fiber's async gaps — never inside a synchronous
+                // stretch. By reading the current pending events, clearing, and re-offering with no async
+                // park between them, this block is atomic w.r.t. `push`. This replaces the blocking
+                // `pullReconciliationMutex` permit that previously forced `push` to wait: queue rebuilding
+                // and synchronous commits cannot interleave, without suspending the commit path.
+                //
+                // We re-read the current `syncStateRef.current.pending` instead of the stale
+                // `mergeResult.newSyncState.pending` snapshot captured at merge time, so any event a
+                // concurrent push appended during the async steps above (fiber interrupt / rollback /
+                // barriers) is included. `Effect.tx` commits the clear+offer as one transaction.
+                yield* reconcileLeaderPushQueue;
+                // Barrier: before restarting the leader-push worker.
+                yield* rebaseBarrier('before_leader_push_fiber_run');
+                if (recoveredRejection === true)
+                    unresolvedRejection = undefined;
+                yield* FiberHandle.run(leaderPushingHandle, backgroundLeaderPushing);
             }
             else {
                 yield* Effect.spanEvent('merge:pull:advance', {
@@ -116,16 +198,21 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
                     ...(TRACE_VERBOSE === true ? { res: jsonStringify(mergeResult) } : {}),
                 });
                 debugInfo.advanceCount++;
+                if (recoveredRejection === true) {
+                    yield* FiberHandle.clear(leaderPushingHandle);
+                    yield* reconcileLeaderPushQueue;
+                    unresolvedRejection = undefined;
+                    yield* FiberHandle.run(leaderPushingHandle, backgroundLeaderPushing);
+                }
             }
             if (mergeResult.newEvents.length === 0) {
                 // If there are no new events, we need to update the sync state as well
-                yield* syncStateUpdateQueue.offer(mergeResult.newSyncState);
+                yield* Queue.offer(syncStateUpdateQueue, mergeResult.newSyncState);
                 return;
             }
             const writeTables = new Set();
             for (const event of mergeResult.newEvents) {
                 const { writeTables: newWriteTables, sessionChangeset, materializerHash, } = yield* materializeEvent(event, {
-                    withChangeset: true,
                     materializerHashLeader: event.meta.materializerHashLeader,
                 });
                 for (const table of newWriteTables) {
@@ -136,34 +223,73 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
             }
             refreshTables(writeTables);
             // We're only triggering the sync state update after all events have been materialized
-            yield* syncStateUpdateQueue.offer(mergeResult.newSyncState);
-        }).pipe(Effect.tapCauseLogPretty, Effect.catchAllCause((cause) => clientSession.shutdown(Exit.failCause(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);
-    })();
+            yield* Queue.offer(syncStateUpdateQueue, mergeResult.newSyncState);
+        }).pipe(pullReconciliationMutex.withPermits(1), Effect.tapCauseLogPretty, Effect.catchCause((cause) => clientSession.shutdown(Exit.failCause(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);
+        yield* FiberHandle.run(pullingHandle, backgroundPulling);
+    }).pipe(Effect.withSpan('client-session-sync-processor:boot'));
+    const runShutdown = Effect.fn('client-session-sync-processor:shutdown')(function* (exit) {
+        if (Exit.isFailure(exit) === true) {
+            if (pullingFiberHandle !== undefined)
+                yield* FiberHandle.clear(pullingFiberHandle);
+            yield* pullReconciliationMutex.withPermits(1)(TxQueue.end(leaderPushQueue));
+            if (leaderPushingFiberHandle !== undefined)
+                yield* FiberHandle.clear(leaderPushingFiberHandle);
+            return;
+        }
+        yield* pullReconciliationMutex.withPermits(1)(Effect.gen(function* () {
+            if (pullingFiberHandle !== undefined)
+                yield* FiberHandle.clear(pullingFiberHandle);
+            yield* TxQueue.end(leaderPushQueue);
+            yield* Deferred.succeed(drainStartedSignal, undefined);
+        }));
+        if (leaderPushingFiberHandle !== undefined) {
+            if (unresolvedRejection === undefined) {
+                yield* FiberHandle.awaitEmpty(leaderPushingFiberHandle);
+            }
+            else {
+                yield* FiberHandle.clear(leaderPushingFiberHandle);
+            }
+        }
+        if (terminalPushCause !== undefined)
+            return yield* Effect.failCause(terminalPushCause);
+        if (unresolvedRejection !== undefined)
+            return yield* Effect.die(unresolvedRejection.error);
+    });
+    const shutdown = (exit) => Effect.suspend(() => {
+        if (shutdownStarted === true)
+            return Deferred.await(shutdownDone);
+        shutdownStarted = true;
+        return runShutdown(exit).pipe(Effect.exit, Effect.tap((shutdownExit) => Deferred.done(shutdownDone, shutdownExit)), Effect.forkDetach, Effect.andThen(Deferred.await(shutdownDone)));
+    });
     const encodeEvents = Effect.fn('client-session-sync-processor:encode-events')(function* (events) {
         let baseEventSequenceNumber = syncStateRef.current.localHead;
         return yield* Effect.forEach(events, ({ name, args }) => Effect.gen(function* () {
-            const eventDef = yield* Effect.fromNullable(schema.eventsDefsMap.get(name)).pipe(Effect.orDieDebugger);
+            const eventDef = yield* Effect.fromNullishOr(schema.eventsDefsMap.get(name)).pipe(Effect.orDieDebugger);
             const nextNumPair = EventSequenceNumber.Client.nextPair({
                 seqNum: baseEventSequenceNumber,
-                isClient: eventDef.options.clientOnly,
+                isClientOnly: eventDef.options.clientOnly,
                 rebaseGeneration: baseEventSequenceNumber.rebaseGeneration,
             });
             baseEventSequenceNumber = nextNumPair.seqNum;
-            return new LiveStoreEvent.Client.EncodedWithMeta(Schema.encodeUnknownSync(eventSchema)({
+            // Encoding known-valid domain data: an encode failure is an invariant violation (a defect),
+            // so `Effect.orDie` is the correct modeling — it keeps the typed error channel narrow.
+            const encoded = yield* Schema.encodeUnknownEffect(eventSchema)({
                 name,
-                args,
+                // Client-document events expose SessionIdSymbol as an input placeholder, but encoded events are persisted
+                // and replayed by concrete id. Resolve during schema encoding so commit never mutates the caller's event.
+                args: resolveSessionIdSymbolInEventArgs(args, clientSession.sessionId),
                 ...nextNumPair,
                 clientId: clientSession.clientId,
                 sessionId: clientSession.sessionId,
-            }));
+            }).pipe(Effect.orDie);
+            return new LiveStoreEvent.Client.EncodedWithMeta(encoded);
         }));
     });
     const materializeEvents = Effect.fn('client-session-sync-processor:materialize-events')(function* (events) {
         const writeTables = new Set();
         for (const event of events) {
             const { writeTables: newWriteTables, sessionChangeset, materializerHash, } = yield* materializeEvent(event, {
-                withChangeset: true,
                 materializerHashLeader: Option.none(),
             });
             for (const table of newWriteTables) {
@@ -175,12 +301,15 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
         return { writeTables };
     });
     const push = Effect.fn('client-session-sync-processor:push')(function* (encodedEvents) {
+        if (shutdownStarted === true) {
+            return yield* Effect.die(new Error('Cannot push events after the client session sync processor starts shutting down'));
+        }
         const mergeResult = yield* SyncState.merge({
             syncState: syncStateRef.current,
             payload: { _tag: 'local-push', newEvents: encodedEvents },
-            isClientEvent,
+            isClientOnlyEvent,
             isEqualEvent: LiveStoreEvent.Client.isEqualEncoded,
-        }).pipe(Effect.filterOrDieMessage((r) => r._tag === 'advance', 'Expected advance from local-push merge'));
+        }).pipe(Effect.filterMapOrElse(Filter.tagged()('advance'), () => Effect.die(new Error('Expected advance from local-push merge'))));
         yield* Effect.annotateCurrentSpan({
             batchSize: encodedEvents.length,
             mergeResultTag: mergeResult._tag,
@@ -191,8 +320,11 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
             ...(TRACE_VERBOSE === true ? { mergeResult: jsonStringify(mergeResult) } : {}),
         });
         syncStateRef.current = mergeResult.newSyncState;
-        yield* syncStateUpdateQueue.offer(mergeResult.newSyncState);
-        yield* BucketQueue.offerAll(leaderPushQueue, mergeResult.newEvents);
+        yield* Queue.offer(syncStateUpdateQueue, mergeResult.newSyncState);
+        const rejectedEvents = yield* TxQueue.offerAll(leaderPushQueue, mergeResult.newEvents);
+        if (rejectedEvents.length > 0) {
+            return yield* Effect.die(new Error('Leader push queue closed while accepting events'));
+        }
     });
     const debugInfo = {
         rebaseCount: 0,
@@ -201,6 +333,7 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
     };
     return {
         boot,
+        shutdown,
         encodeEvents,
         materializeEvents,
         push,
@@ -209,28 +342,25 @@ export const makeClientSessionSyncProcessor = Effect.fn('makeClientSessionSyncPr
             changes: Stream.fromQueue(syncStateUpdateQueue),
         }),
         debug: {
+            awaitDrainStarted: Deferred.await(drainStartedSignal),
+            awaitRejection: Deferred.await(rejectionObserved),
             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);
+                const pushQueueItems = yield* snapshotTxQueue(leaderPushQueue);
+                console.log('pushQueueSize', pushQueueItems.length);
                 console.log('pushQueueItems', pushQueueItems.map((_) => _.toJSON()));
             }).pipe(Effect.runSync),
             debugInfo: () => debugInfo,
         },
     };
 });
-// TODO turn this into a build-time "macro" so all simulation snippets are removed for production builds
-const SIMULATION_ENABLED = true;
-// Warning: High values for the simulation params can lead to very long test runs since those get multiplied with the number of events
-export const ClientSessionSyncProcessorSimulationParams = Schema.Struct({
-    pull: Schema.Struct({
-        '1_before_leader_push_fiber_interrupt': Schema.Int.pipe(Schema.between(0, 15)),
-        '2_before_leader_push_queue_clear': Schema.Int.pipe(Schema.between(0, 15)),
-        '3_before_rebase_rollback': Schema.Int.pipe(Schema.between(0, 15)),
-        '4_before_leader_push_queue_offer': Schema.Int.pipe(Schema.between(0, 15)),
-        '5_before_leader_push_fiber_run': Schema.Int.pipe(Schema.between(0, 15)),
-    }),
-});
+const snapshotTxQueue = (queue) => Effect.tx(Effect.gen(function* () {
+    if ((yield* TxQueue.isOpen(queue)) === false)
+        return [];
+    const items = yield* TxQueue.clear(queue);
+    yield* TxQueue.offerAll(queue, items);
+    return items;
+}));
+const isRejectedBatchRecovered = (rejectedEvents, pendingEvents) => rejectedEvents.every((rejectedEvent) => pendingEvents.some((pendingEvent) => LiveStoreEvent.Client.isEqualEncoded(pendingEvent, rejectedEvent)) === false);
 //# 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/errors.d.ts

@@ -1,27 +1,21 @@
 import { Schema } from '@livestore/utils/effect';
-declare const IsOfflineError_base: Schema.TaggedErrorClass<IsOfflineError, "IsOfflineError", {
-    readonly _tag: Schema.tag<"IsOfflineError">;
-} & {
-    cause: typeof Schema.Defect;
-}>;
+declare const IsOfflineError_base: Schema.Class<IsOfflineError, Schema.TaggedStruct<"IsOfflineError", {
+    readonly cause: Schema.Defect;
+}>, import("effect/Cause").YieldableError>;
 export declare class IsOfflineError extends IsOfflineError_base {
 }
 /** Unique ID generated by the backend when its created. Used to check whether the backend identity has changed. */
-export declare const BackendId: Schema.SchemaClass<string, string, never>;
-declare const BackendIdMismatchError_base: Schema.TaggedErrorClass<BackendIdMismatchError, "BackendIdMismatchError", {
-    readonly _tag: Schema.tag<"BackendIdMismatchError">;
-} & {
-    expected: Schema.SchemaClass<string, string, never>;
-    received: Schema.SchemaClass<string, string, never>;
-}>;
+export declare const BackendId: Schema.String;
+declare const BackendIdMismatchError_base: Schema.Class<BackendIdMismatchError, Schema.TaggedStruct<"BackendIdMismatchError", {
+    readonly expected: Schema.String;
+    readonly received: Schema.String;
+}>, import("effect/Cause").YieldableError>;
 export declare class BackendIdMismatchError extends BackendIdMismatchError_base {
 }
-declare const ServerAheadError_base: Schema.TaggedErrorClass<ServerAheadError, "ServerAheadError", {
-    readonly _tag: Schema.tag<"ServerAheadError">;
-} & {
-    minimumExpectedNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-    providedNum: Schema.BrandSchema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-}>;
+declare const ServerAheadError_base: Schema.Class<ServerAheadError, Schema.TaggedStruct<"ServerAheadError", {
+    readonly minimumExpectedNum: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+    readonly providedNum: Schema.brand<Schema.Int, "GlobalEventSequenceNumber">;
+}>, import("effect/Cause").YieldableError>;
 export declare class ServerAheadError extends ServerAheadError_base {
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/sync/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;;;;;;AAIhD,qBAAa,cAAe,SAAQ,mBAIlC;CAAG;AAEL,mHAAmH;AACnH,eAAO,MAAM,SAAS,2CAAuE,CAAA;;;;;;;AAE7F,qBAAa,sBAAuB,SAAQ,2BAK1C;CAAG;;;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/sync/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;;;;AAIhD,qBAAa,cAAe,SAAQ,mBAKnC;CAAG;AAEJ,mHAAmH;AACnH,eAAO,MAAM,SAAS,eAAoE,CAAA;;;;;AAE1F,qBAAa,sBAAuB,SAAQ,2BAK1C;CAAG;;;;;AAEL,qBAAa,gBAAiB,SAAQ,qBAMrC;CAAG"}