@livestore/sync-cf 0.4.0-dev.9 → 0.5.0-dev.0

package/dist/cf-worker/do/push.js

@@ -1,50 +1,57 @@
-import { BackendIdMismatchError, InvalidPushError, ServerAheadError, SyncBackend, UnexpectedError, } from '@livestore/common';
+import { BackendIdMismatchError, ServerAheadError, SyncBackend, UnknownError } from '@livestore/common';
 import { emitStreamResponse } from '@livestore/common-cf';
-import { Chunk, Effect, Option, Schema } from '@livestore/utils/effect';
+import { splitArrayBySize } from '@livestore/common/sync';
+import { Effect, Option, ReadonlyArray as EffectArray, Schema } from '@livestore/utils/effect';
+import { MAX_PUSH_EVENTS_PER_REQUEST, MAX_WS_MESSAGE_BYTES } from "../../common/constants.js";
 import { SyncMessage } from "../../common/mod.js";
-import { MAX_PULL_EVENTS_PER_MESSAGE, MAX_WS_MESSAGE_BYTES, WebSocketAttachmentSchema, } from "../shared.js";
-import { DoCtx } from "./layer.js";
-import { splitChunkBySize } from "./ws-chunking.js";
-const encodePullResponse = Schema.encodeSync(SyncMessage.PullResponse);
-export const makePush = ({ payload, options, storeId, ctx, env, }) => (pushRequest) => Effect.gen(function* () {
+import { rpcSubscriptionKeyPrefix, WebSocketAttachmentSchema, } from "../shared.js";
+import * as DoCtx from "./layer.js";
+const pullResponseJsonSchema = Schema.toCodecJson(SyncMessage.PullResponse);
+const encodePullResponse = Schema.encodeSync(pullResponseJsonSchema);
+const jsonStringify = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
+export const makePush = ({ payload, headers, options, storeId, ctx, env, }) => (pushRequest) => Effect.gen(function* () {
     // yield* Effect.log(`Pushing ${decodedMessage.batch.length} events`, decodedMessage.batch)
-    const { backendId, storage, currentHeadRef, updateCurrentHead, rpcSubscriptions } = yield* DoCtx;
+    const { backendId, storage, currentHeadRef, updateCurrentHead, pushSemaphore } = yield* DoCtx.DoCtx;
     if (pushRequest.batch.length === 0) {
         return SyncMessage.PushAck.make({});
     }
-    if (options?.onPush) {
-        yield* Effect.tryAll(() => options.onPush(pushRequest, { storeId, payload })).pipe(UnexpectedError.mapToUnexpectedError);
+    if (options?.onPush !== undefined) {
+        yield* Effect.trySyncOrPromiseOrEffect(() => options.onPush(pushRequest, {
+            storeId,
+            ...(payload !== undefined ? { payload } : {}),
+            ...(headers !== undefined ? { headers } : {}),
+        })).pipe(UnknownError.mapToUnknownError);
     }
     if (pushRequest.backendId._tag === 'Some' && pushRequest.backendId.value !== backendId) {
         return yield* new BackendIdMismatchError({ expected: backendId, received: pushRequest.backendId.value });
     }
-    // This part of the code needs to run sequentially to avoid race conditions
-    const { createdAt } = yield* Effect.gen(function* () {
-        const currentHead = currentHeadRef.current;
-        // TODO handle clientId unique conflict
-        // Validate the batch
-        const firstEventParent = pushRequest.batch[0].parentSeqNum;
-        if (firstEventParent !== currentHead) {
-            // yield* Effect.logDebug('ServerAheadError: backend head mismatch', {
-            //   expectedHead: currentHead,
-            //   providedHead: firstEventParent,
-            //   batchSize: pushRequest.batch.length,
-            //   backendId,
-            // })
-            return yield* new ServerAheadError({ minimumExpectedNum: currentHead, providedNum: firstEventParent });
-        }
-        const createdAt = new Date().toISOString();
-        // TODO possibly model this as a queue in order to speed up subsequent pushes
-        yield* storage.appendEvents(pushRequest.batch, createdAt);
-        updateCurrentHead(pushRequest.batch.at(-1).seqNum);
-        return { createdAt };
-    }).pipe(blockConcurrencyWhile(ctx));
-    // Run in background but already return the push ack to the client
-    yield* Effect.gen(function* () {
+    // A push is one ordered admit → persist → publish operation. `blockConcurrencyWhile` below protects
+    // the Durable Object state transition, while this semaphore keeps later pushes from overtaking this
+    // push during broadcasting without holding Cloudflare's concurrency gate across network I/O.
+    yield* runSerializedPushAdmission(pushSemaphore, Effect.gen(function* () {
+        // Keep the head check, durable append, and in-memory head update atomic with respect to other
+        // Durable Object requests. Broadcasting intentionally happens after this gate is released.
+        const { createdAt } = yield* Effect.gen(function* () {
+            const currentHead = currentHeadRef.current;
+            // TODO handle clientId unique conflict
+            // Validate the batch
+            const firstEventParent = pushRequest.batch[0].parentSeqNum;
+            if (firstEventParent !== currentHead) {
+                return yield* new ServerAheadError({ minimumExpectedNum: currentHead, providedNum: firstEventParent });
+            }
+            const createdAt = new Date().toISOString();
+            // TODO possibly model this as a queue in order to speed up subsequent pushes
+            yield* storage.appendEvents(pushRequest.batch, createdAt);
+            updateCurrentHead(pushRequest.batch.at(-1).seqNum);
+            return { createdAt };
+        }).pipe(blockConcurrencyWhile(ctx));
         const connectedClients = ctx.getWebSockets();
         // Preparing chunks of responses to make sure we don't exceed the WS message size limit.
-        const responses = Chunk.fromIterable(pushRequest.batch).pipe(splitChunkBySize({
-            maxItems: MAX_PULL_EVENTS_PER_MESSAGE,
+        if (EffectArray.isReadonlyArrayNonEmpty(pushRequest.batch) === false) {
+            return;
+        }
+        const responses = yield* splitArrayBySize({
+            maxItems: MAX_PUSH_EVENTS_PER_REQUEST,
             maxBytes: MAX_WS_MESSAGE_BYTES,
             encode: (items) => encodePullResponse(SyncMessage.PullResponse.make({
                 batch: items.map((eventEncoded) => ({
@@ -54,8 +61,8 @@ export const makePush = ({ payload, options, storeId, ctx, env, }) => (pushReque
                 pageInfo: SyncBackend.pageInfoNoMore,
                 backendId,
             })),
-        }), Chunk.map((eventsChunk) => {
-            const batchWithMetadata = Chunk.toReadonlyArray(eventsChunk).map((eventEncoded) => ({
+        })(pushRequest.batch).pipe(Effect.map((eventBatch) => eventBatch.map((events) => {
+            const batchWithMetadata = events.map((eventEncoded) => ({
                 eventEncoded,
                 metadata: Option.some(SyncMessage.SyncMetadata.make({ createdAt })),
             }));
@@ -66,20 +73,20 @@ export const makePush = ({ payload, options, storeId, ctx, env, }) => (pushReque
             });
             return {
                 response,
-                encoded: Schema.encodeSync(SyncMessage.PullResponse)(response),
+                encoded: encodePullResponse(response),
             };
-        }));
+        })));
         // Dual broadcasting: WebSocket + RPC clients
         // Broadcast to WebSocket clients
         if (connectedClients.length > 0) {
             for (const { response, encoded } of responses) {
                 // Only calling once for now.
-                if (options?.onPullRes) {
-                    yield* Effect.tryAll(() => options.onPullRes(response)).pipe(UnexpectedError.mapToUnexpectedError);
+                if (options?.onPullRes !== undefined) {
+                    yield* Effect.trySyncOrPromiseOrEffect(() => options.onPullRes(response)).pipe(UnknownError.mapToUnknownError);
                 }
                 // NOTE we're also sending the pullRes chunk to the pushing ws client as confirmation
                 for (const conn of connectedClients) {
-                    const attachment = Schema.decodeSync(WebSocketAttachmentSchema)(conn.deserializeAttachment());
+                    const attachment = yield* Schema.decodeEffect(WebSocketAttachmentSchema)(conn.deserializeAttachment());
                     // We're doing something a bit "advanced" here as we're directly emitting Effect RPC-compatible
                     // response messsages on the Effect RPC-managed websocket connection to the WS client.
                     // For this we need to get the RPC `requestId` from the WebSocket attachment.
@@ -89,42 +96,63 @@ export const makePush = ({ payload, options, storeId, ctx, env, }) => (pushReque
                             requestId,
                             values: [encoded],
                         };
-                        conn.send(JSON.stringify(res));
+                        conn.send(jsonStringify(res));
                     }
                 }
             }
             yield* Effect.logDebug(`Broadcasted to ${connectedClients.length} WebSocket clients`);
         }
-        // RPC broadcasting would require reconstructing client stubs from clientIds
-        if (rpcSubscriptions.size > 0) {
-            for (const subscription of rpcSubscriptions.values()) {
+        // Subscribers live in the DO's KV storage (single source of truth), so fan-out survives reconstruction.
+        // emitStreamResponse reconstructs each client stub from its callerContext.
+        const rpcSubscriptions = Array.from(ctx.storage.kv.list({ prefix: rpcSubscriptionKeyPrefix }));
+        if (rpcSubscriptions.length > 0) {
+            for (const [, subscription] of rpcSubscriptions) {
                 for (const { encoded } of responses) {
                     yield* emitStreamResponse({
                         callerContext: subscription.callerContext,
                         env,
                         requestId: subscription.requestId,
+                        storeId: subscription.storeId,
                         values: [encoded],
                     }).pipe(Effect.tapCauseLogPretty, Effect.exit);
                 }
             }
-            yield* Effect.logDebug(`Broadcasted to ${rpcSubscriptions.size} RPC clients`);
+            yield* Effect.logDebug(`Broadcasted to ${rpcSubscriptions.length} RPC clients`);
         }
-    }).pipe(Effect.tapCauseLogPretty, Effect.withSpan('push-rpc-broadcast'), Effect.uninterruptible, // We need to make sure Effect RPC doesn't interrupt this fiber
-    Effect.fork);
-    // We need to yield here to make sure the fork above is kicked off before we let Effect RPC finish the request
-    yield* Effect.yieldNow();
+    }).pipe(Effect.tapCauseLogPretty, Effect.withSpan('push-rpc-broadcast')));
+    // Acknowledge only after the committed batch has been published, so a client cannot observe an
+    // advanced server head while the corresponding pull response is still waiting in a detached fiber.
     return SyncMessage.PushAck.make({});
 }).pipe(Effect.tap(Effect.fn(function* (message) {
-    if (options?.onPushRes) {
-        yield* Effect.tryAll(() => options.onPushRes(message)).pipe(UnexpectedError.mapToUnexpectedError);
+    if (options?.onPushRes !== undefined) {
+        yield* Effect.trySyncOrPromiseOrEffect(() => options.onPushRes(message)).pipe(UnknownError.mapToUnknownError);
     }
-})), Effect.mapError((cause) => InvalidPushError.make({ cause })), Effect.withSpan('sync-cf:do:push', { attributes: { storeId, batchSize: pushRequest.batch.length } }));
+})), Effect.mapError((cause) => cause._tag === 'BackendIdMismatchError' || cause._tag === 'ServerAheadError' || cause._tag === 'UnknownError'
+    ? cause
+    : new UnknownError({ cause })), Effect.withSpan('sync-cf:do:push', { attributes: { storeId, batchSize: pushRequest.batch.length } }));
+/**
+ * Serializes the complete push admission lifecycle, including publication to pull subscribers.
+ *
+ * This complements `blockConcurrencyWhile`: that Cloudflare primitive makes the durable state transition
+ * atomic with respect to other Durable Object requests, whereas this semaphore preserves push order after
+ * the storage gate is released and broadcasting begins. Keeping broadcast outside `blockConcurrencyWhile`
+ * avoids holding Cloudflare's concurrency gate across network I/O.
+ *
+ * Once admitted, the effect is uninterruptible so cancellation cannot leave a committed head without its
+ * matching pull response. Such a gap would make later pushers receive `ServerAhead` while waiting for a
+ * response that was never published.
+ */
+export const runSerializedPushAdmission = (semaphore, admission) => semaphore.withPermits(1)(admission.pipe(Effect.uninterruptible));
 /**
+ * Runs the storage-backed state transition behind Cloudflare's Durable Object concurrency gate.
+ * This scope should remain limited to local persistence and head mutation; ordered publication is handled
+ * separately by `runSerializedPushAdmission` so outbound work does not block unrelated Durable Object events.
+ *
  * @see https://developers.cloudflare.com/durable-objects/api/state/#blockconcurrencywhile
  */
 const blockConcurrencyWhile = (ctx) => (eff) => Effect.gen(function* () {
-    const runtime = yield* Effect.runtime();
-    const exit = yield* Effect.promise(() => ctx.blockConcurrencyWhile(() => eff.pipe(Effect.provide(runtime), Effect.runPromiseExit)));
+    const services = yield* Effect.context();
+    const exit = yield* Effect.promise(() => ctx.blockConcurrencyWhile(() => eff.pipe(Effect.runPromiseExitWith(services))));
     return yield* exit;
 });
 //# sourceMappingURL=push.js.map

package/dist/cf-worker/do/push.js.map

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

package/dist/cf-worker/do/push.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=push.test.d.ts.map

package/dist/cf-worker/do/push.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.test.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/push.test.ts"],"names":[],"mappings":""}

package/dist/cf-worker/do/push.test.js

@@ -0,0 +1,30 @@
+import { Vitest } from '@livestore/utils-dev/node-vitest';
+import { Deferred, Duration, Effect, Fiber, Semaphore } from '@livestore/utils/effect';
+import { runSerializedPushAdmission } from "./push.js";
+Vitest.describe('sync-cf push admission', () => {
+    Vitest.live('publishes an admitted push before honoring interruption', () => Effect.gen(function* () {
+        const semaphore = yield* Semaphore.make(1);
+        const persisted = yield* Deferred.make();
+        const allowBroadcast = yield* Deferred.make();
+        const broadcasted = yield* Deferred.make();
+        const admissionFiber = yield* runSerializedPushAdmission(semaphore, Effect.gen(function* () {
+            yield* Deferred.succeed(persisted, undefined);
+            yield* Deferred.await(allowBroadcast);
+            yield* Deferred.succeed(broadcasted, undefined);
+        })).pipe(Effect.forkChild);
+        // Reproduce cancellation after persistence but before the pull broadcast handoff.
+        yield* Deferred.await(persisted);
+        const interruptStarted = yield* Deferred.make();
+        const interruptFiber = yield* Effect.gen(function* () {
+            yield* Deferred.succeed(interruptStarted, undefined);
+            yield* Fiber.interrupt(admissionFiber);
+        }).pipe(Effect.forkChild);
+        yield* Deferred.await(interruptStarted);
+        yield* Effect.yieldNow;
+        yield* Deferred.succeed(allowBroadcast, undefined);
+        yield* Deferred.await(broadcasted).pipe(Effect.timeout(Duration.seconds(1)));
+        yield* Fiber.join(interruptFiber);
+        Vitest.expect(yield* Deferred.isDone(broadcasted)).toBe(true);
+    }));
+});
+//# sourceMappingURL=push.test.js.map

package/dist/cf-worker/do/push.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.test.js","sourceRoot":"","sources":["../../../src/cf-worker/do/push.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAEtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAA;AAEtD,MAAM,CAAC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAC7C,MAAM,CAAC,IAAI,CAAC,yDAAyD,EAAE,GAAG,EAAE,CAC1E,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC1C,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;QAC9C,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;QAEhD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,0BAA0B,CACtD,SAAS,EACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;YAC7C,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;YACrC,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;QACjD,CAAC,CAAC,CACH,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAExB,kFAAkF;QAClF,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAChC,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAQ,CAAA;QACrD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAChD,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAA;YACpD,KAAK,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACxC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACzB,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QACvC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAA;QAEtB,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC,CAAA;QAClD,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5E,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC/D,CAAC,CAAC,CACH,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/cf-worker/do/sqlite.d.ts

@@ -1,9 +1,14 @@
 import { State } from '@livestore/common/schema';
 import { Schema } from '@livestore/utils/effect';
+/**
+ * Main event log table storing all LiveStore events.
+ *
+ * ⚠️  IMPORTANT: Any changes to this schema require bumping PERSISTENCE_FORMAT_VERSION in shared.ts
+ */
 export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTableDefForInput<"eventlog_7_$storeId", {
     readonly seqNum: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
@@ -11,7 +16,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly parentSeqNum: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -19,7 +24,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly name: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -27,7 +32,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly args: {
         columnType: "text";
-        schema: Schema.Schema<any, string | null, never>;
+        schema: Schema.Codec<any, string | null, never, never>;
         default: import("effect/Option").None<never>;
         nullable: true;
         primaryKey: false;
@@ -36,7 +41,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     /** ISO date format. Currently only used for debugging purposes. */
     readonly createdAt: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -44,7 +49,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly clientId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -52,7 +57,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly sessionId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -61,7 +66,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
 }>, State.SQLite.WithDefaults<{
     readonly seqNum: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
@@ -69,7 +74,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly parentSeqNum: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -77,7 +82,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly name: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -85,7 +90,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly args: {
         columnType: "text";
-        schema: Schema.Schema<any, string | null, never>;
+        schema: Schema.Codec<any, string | null, never, never>;
         default: import("effect/Option").None<never>;
         nullable: true;
         primaryKey: false;
@@ -94,7 +99,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     /** ISO date format. Currently only used for debugging purposes. */
     readonly createdAt: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -102,7 +107,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly clientId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -110,34 +115,30 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     };
     readonly sessionId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
-        default: import("effect/Option").None<never>;
-        nullable: false;
-        primaryKey: false;
-        autoIncrement: false;
-    };
-}>, Schema.Schema<{
-    readonly seqNum: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-    readonly parentSeqNum: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-    readonly name: string;
-    readonly args: any;
-    readonly createdAt: string;
-    readonly clientId: string;
-    readonly sessionId: string;
-}, {
-    readonly seqNum: number;
-    readonly parentSeqNum: number;
-    readonly name: string;
-    readonly args: string | null;
-    readonly createdAt: string;
-    readonly clientId: string;
-    readonly sessionId: string;
-}, never>>;
-/** Will only ever have one row per durable object. */
+        schema: Schema.Codec<string, string, never, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: false;
+        autoIncrement: false;
+    };
+}>, Schema.Struct<{
+    readonly seqNum: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
+    readonly parentSeqNum: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
+    readonly name: Schema.Codec<string, string, never, never>;
+    readonly args: Schema.Codec<any, string | null, never, never>;
+    readonly createdAt: Schema.Codec<string, string, never, never>;
+    readonly clientId: Schema.Codec<string, string, never, never>;
+    readonly sessionId: Schema.Codec<string, string, never, never>;
+}>>;
+/**
+ * Context metadata table - one row per Durable Object.
+ *
+ * ⚠️  IMPORTANT: Any changes to this schema require bumping PERSISTENCE_FORMAT_VERSION in shared.ts
+ */
 export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTableDefForInput<"context_7", {
     readonly storeId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
@@ -145,7 +146,7 @@ export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTabl
     };
     readonly currentHead: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -153,7 +154,7 @@ export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTabl
     };
     readonly backendId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -162,7 +163,7 @@ export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTabl
 }>, State.SQLite.WithDefaults<{
     readonly storeId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
@@ -170,7 +171,7 @@ export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTabl
     };
     readonly currentHead: {
         columnType: "integer";
-        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        schema: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
@@ -178,19 +179,15 @@ export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTabl
     };
     readonly backendId: {
         columnType: "text";
-        schema: Schema.Schema<string, string, never>;
+        schema: Schema.Codec<string, string, never, never>;
         default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
     };
-}>, Schema.Schema<{
-    readonly storeId: string;
-    readonly currentHead: number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">;
-    readonly backendId: string;
-}, {
-    readonly storeId: string;
-    readonly currentHead: number;
-    readonly backendId: string;
-}, never>>;
+}>, Schema.Struct<{
+    readonly storeId: Schema.Codec<string, string, never, never>;
+    readonly currentHead: Schema.Codec<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never, never>;
+    readonly backendId: Schema.Codec<string, string, never, never>;
+}>>;
 //# sourceMappingURL=sqlite.d.ts.map

package/dist/cf-worker/do/sqlite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAGhD,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQtB,mEAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAnE,mEAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAKrE,CAAA;AAEF,sDAAsD;AACtD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAOvB,CAAA"}
+{"version":3,"file":"sqlite.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,KAAK,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIhD;;;;GAIG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQtB,mEAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAAnE,mEAAmE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAKrE,CAAA;AAEF;;;;GAIG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOvB,CAAA"}

package/dist/cf-worker/do/sqlite.js

@@ -1,26 +1,35 @@
 import { EventSequenceNumber, State } from '@livestore/common/schema';
 import { Schema } from '@livestore/utils/effect';
 import { PERSISTENCE_FORMAT_VERSION } from "../shared.js";
+/**
+ * Main event log table storing all LiveStore events.
+ *
+ * ⚠️  IMPORTANT: Any changes to this schema require bumping PERSISTENCE_FORMAT_VERSION in shared.ts
+ */
 export const eventlogTable = State.SQLite.table({
     // NOTE actual table name is determined at runtime to use proper storeId
     name: `eventlog_${PERSISTENCE_FORMAT_VERSION}_$storeId`,
     columns: {
-        seqNum: State.SQLite.integer({ primaryKey: true, schema: EventSequenceNumber.GlobalEventSequenceNumber }),
-        parentSeqNum: State.SQLite.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
+        seqNum: State.SQLite.integer({ primaryKey: true, schema: EventSequenceNumber.Global.Schema }),
+        parentSeqNum: State.SQLite.integer({ schema: EventSequenceNumber.Global.Schema }),
         name: State.SQLite.text({}),
-        args: State.SQLite.text({ schema: Schema.parseJson(Schema.Any), nullable: true }),
+        args: State.SQLite.text({ schema: Schema.fromJsonString(Schema.Any), nullable: true }),
         /** ISO date format. Currently only used for debugging purposes. */
         createdAt: State.SQLite.text({}),
         clientId: State.SQLite.text({}),
         sessionId: State.SQLite.text({}),
     },
 });
-/** Will only ever have one row per durable object. */
+/**
+ * Context metadata table - one row per Durable Object.
+ *
+ * ⚠️  IMPORTANT: Any changes to this schema require bumping PERSISTENCE_FORMAT_VERSION in shared.ts
+ */
 export const contextTable = State.SQLite.table({
     name: `context_${PERSISTENCE_FORMAT_VERSION}`,
     columns: {
         storeId: State.SQLite.text({ primaryKey: true }),
-        currentHead: State.SQLite.integer({ schema: EventSequenceNumber.GlobalEventSequenceNumber }),
+        currentHead: State.SQLite.integer({ schema: EventSequenceNumber.Global.Schema }),
         backendId: State.SQLite.text({}),
     },
 });

package/dist/cf-worker/do/sqlite.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../../src/cf-worker/do/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAA;AAEzD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;IAC9C,wEAAwE;IACxE,IAAI,EAAE,YAAY,0BAA0B,WAAW;IACvD,OAAO,EAAE;QACP,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;QACzG,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;QAC7F,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACjF,mEAAmE;QACnE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;KACjC;CACF,CAAC,CAAA;AAEF,sDAAsD;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;IAC7C,IAAI,EAAE,WAAW,0BAA0B,EAAE;IAC7C,OAAO,EAAE;QACP,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAChD,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,yBAAyB,EAAE,CAAC;QAC5F,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;KACjC;CACF,CAAC,CAAA"}
+{"version":3,"file":"sqlite.js","sourceRoot":"","sources":["../../../src/cf-worker/do/sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAA;AAEzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;IAC9C,wEAAwE;IACxE,IAAI,EAAE,YAAY,0BAA0B,WAAW;IACvD,OAAO,EAAE;QACP,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC7F,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACjF,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QACtF,mEAAmE;QACnE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;KACjC;CACF,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;IAC7C,IAAI,EAAE,WAAW,0BAA0B,EAAE;IAC7C,OAAO,EAAE;QACP,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAChD,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAChF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;KACjC;CACF,CAAC,CAAA"}

package/dist/cf-worker/do/sync-storage.d.ts

@@ -1,20 +1,26 @@
-import { UnexpectedError } from '@livestore/common';
-import type { LiveStoreEvent } from '@livestore/common/schema';
+import { UnknownError } from '@livestore/common';
 import type { CfTypes } from '@livestore/common-cf';
+import type { LiveStoreEvent } from '@livestore/common/schema';
 import { Effect, Option, Stream } from '@livestore/utils/effect';
 import { SyncMetadata } from '../../common/sync-message-types.ts';
-import { type Env, type StoreId } from '../shared.ts';
+import { type StoreId } from '../shared.ts';
+export type StorageEngine = {
+    _tag: 'd1';
+    db: CfTypes.D1Database;
+} | {
+    _tag: 'do-sqlite';
+};
 export type SyncStorage = {
     dbName: string;
     getEvents: (cursor: number | undefined) => Effect.Effect<{
         total: number;
         stream: Stream.Stream<{
-            eventEncoded: LiveStoreEvent.AnyEncodedGlobal;
+            eventEncoded: LiveStoreEvent.Global.Encoded;
             metadata: Option.Option<SyncMetadata>;
-        }, UnexpectedError>;
-    }, UnexpectedError>;
-    appendEvents: (batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>, createdAt: string) => Effect.Effect<void, UnexpectedError>;
-    resetStore: Effect.Effect<void, UnexpectedError>;
+        }, UnknownError>;
+    }, UnknownError>;
+    appendEvents: (batch: ReadonlyArray<LiveStoreEvent.Global.Encoded>, createdAt: string) => Effect.Effect<void, UnknownError>;
+    resetStore: Effect.Effect<void, UnknownError>;
 };
-export declare const makeStorage: (ctx: CfTypes.DurableObjectState, env: Env, storeId: StoreId) => SyncStorage;
+export declare const makeStorage: (ctx: CfTypes.DurableObjectState, storeId: StoreId, engine: StorageEngine) => SyncStorage;
 //# sourceMappingURL=sync-storage.d.ts.map