@livestore/sync-cf 0.4.0-dev.0 → 0.4.0-dev.10

package/dist/cf-worker/{durable-object.d.ts → do/sqlite.d.ts}

@@ -1,16 +1,10 @@
 import { State } from '@livestore/common/schema';
-import { Effect, Option, Schema } from '@livestore/utils/effect';
-import { WSMessage } from '../common/mod.ts';
-import type * as CfWorker from './cf-types.ts';
-export interface Env {
-    DB: CfWorker.D1Database;
-    ADMIN_SECRET: string;
-}
-export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTableDefForInput<"eventlog_$PERSISTENCE_FORMAT_VERSION_$storeId", {
+import { Schema } from '@livestore/utils/effect';
+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>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
         autoIncrement: false;
@@ -18,7 +12,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>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -26,7 +20,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly name: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -34,7 +28,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly args: {
         columnType: "text";
         schema: Schema.Schema<any, string | null, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: true;
         primaryKey: false;
         autoIncrement: false;
@@ -43,7 +37,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly createdAt: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -51,7 +45,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly clientId: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -59,7 +53,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly sessionId: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -68,7 +62,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly seqNum: {
         columnType: "integer";
         schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: true;
         autoIncrement: false;
@@ -76,7 +70,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>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -84,7 +78,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly name: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -92,7 +86,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly args: {
         columnType: "text";
         schema: Schema.Schema<any, string | null, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: true;
         primaryKey: false;
         autoIncrement: false;
@@ -101,7 +95,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly createdAt: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -109,7 +103,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly clientId: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -117,7 +111,7 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly sessionId: {
         columnType: "text";
         schema: Schema.Schema<string, string, never>;
-        default: Option.None<never>;
+        default: import("effect/Option").None<never>;
         nullable: false;
         primaryKey: false;
         autoIncrement: false;
@@ -139,51 +133,64 @@ export declare const eventlogTable: State.SQLite.TableDef<State.SQLite.SqliteTab
     readonly clientId: string;
     readonly sessionId: string;
 }, never>>;
-export declare const PULL_CHUNK_SIZE = 100;
-/**
- * Needs to be bumped when the storage format changes (e.g. eventlogTable schema changes)
- *
- * Changing this version number will lead to a "soft reset".
- */
-export declare const PERSISTENCE_FORMAT_VERSION = 7;
-export type MakeDurableObjectClassOptions = {
-    onPush?: (message: WSMessage.PushReq, context: {
-        storeId: string;
-        payload?: Schema.JsonValue;
-    }) => Effect.Effect<void> | Promise<void>;
-    onPushRes?: (message: WSMessage.PushAck | WSMessage.Error) => Effect.Effect<void> | Promise<void>;
-    onPull?: (message: WSMessage.PullReq, context: {
-        storeId: string;
-        payload?: Schema.JsonValue;
-    }) => Effect.Effect<void> | Promise<void>;
-    onPullRes?: (message: WSMessage.PullRes | WSMessage.Error) => Effect.Effect<void> | Promise<void>;
-};
-export type MakeDurableObjectClass = (options?: MakeDurableObjectClassOptions) => {
-    new (ctx: CfWorker.DurableObjectState, env: Env): CfWorker.DurableObject;
-};
-/**
- * Creates a Durable Object class for handling WebSocket-based sync.
- *
- * Example:
- * ```ts
- * // In your Cloudflare Worker file
- * import { makeDurableObject } from '@livestore/sync-cf/cf-worker'
- *
- * export class WebSocketServer extends makeDurableObject({
- *   onPush: async (message) => {
- *     console.log('onPush', message.batch)
- *   },
- *   onPull: async (message) => {
- *     console.log('onPull', message)
- *   },
- * }) {}
- * ```
- *
- * ```toml
- * # wrangler.toml
- * [new_classes]
- * WebSocketServer = "src/websocket-server.ts"
- * ```
- */
-export declare const makeDurableObject: MakeDurableObjectClass;
-//# sourceMappingURL=durable-object.d.ts.map
+/** Will only ever have one row per durable object. */
+export declare const contextTable: State.SQLite.TableDef<State.SQLite.SqliteTableDefForInput<"context_7", {
+    readonly storeId: {
+        columnType: "text";
+        schema: Schema.Schema<string, string, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: true;
+        autoIncrement: false;
+    };
+    readonly currentHead: {
+        columnType: "integer";
+        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: false;
+        autoIncrement: false;
+    };
+    readonly backendId: {
+        columnType: "text";
+        schema: Schema.Schema<string, string, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: false;
+        autoIncrement: false;
+    };
+}>, State.SQLite.WithDefaults<{
+    readonly storeId: {
+        columnType: "text";
+        schema: Schema.Schema<string, string, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: true;
+        autoIncrement: false;
+    };
+    readonly currentHead: {
+        columnType: "integer";
+        schema: Schema.Schema<number & import("effect/Brand").Brand<"GlobalEventSequenceNumber">, number, never>;
+        default: import("effect/Option").None<never>;
+        nullable: false;
+        primaryKey: false;
+        autoIncrement: false;
+    };
+    readonly backendId: {
+        columnType: "text";
+        schema: Schema.Schema<string, string, 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>>;
+//# sourceMappingURL=sqlite.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,27 @@
+import { EventSequenceNumber, State } from '@livestore/common/schema';
+import { Schema } from '@livestore/utils/effect';
+import { PERSISTENCE_FORMAT_VERSION } from "../shared.js";
+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 }),
+        name: State.SQLite.text({}),
+        args: State.SQLite.text({ schema: Schema.parseJson(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. */
+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 }),
+        backendId: State.SQLite.text({}),
+    },
+});
+//# sourceMappingURL=sqlite.js.map

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

@@ -0,0 +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"}

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

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

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

@@ -0,0 +1 @@
+{"version":3,"file":"sync-storage.d.ts","sourceRoot":"","sources":["../../../src/cf-worker/do/sync-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAS,MAAM,EAAE,MAAM,EAAU,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAA8B,KAAK,OAAO,EAAE,MAAM,cAAc,CAAA;AAGvE,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,MAAM,CACtD;QACE,KAAK,EAAE,MAAM,CAAA;QACb,MAAM,EAAE,MAAM,CAAC,MAAM,CACnB;YAAE,YAAY,EAAE,cAAc,CAAC,gBAAgB,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SAAE,EACxF,eAAe,CAChB,CAAA;KACF,EACD,eAAe,CAChB,CAAA;IACD,YAAY,EAAE,CACZ,KAAK,EAAE,aAAa,CAAC,cAAc,CAAC,gBAAgB,CAAC,EACrD,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;IACzC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;CACjD,CAAA;AAED,eAAO,MAAM,WAAW,GACtB,KAAK,OAAO,CAAC,kBAAkB,EAC/B,SAAS,OAAO,EAChB,QAAQ;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,UAAU,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,KACrE,WA+RF,CAAA"}

package/dist/cf-worker/do/sync-storage.js

@@ -0,0 +1,190 @@
+import { UnexpectedError } from '@livestore/common';
+import { Chunk, Effect, Option, Schema, Stream } from '@livestore/utils/effect';
+import { SyncMetadata } from "../../common/sync-message-types.js";
+import { PERSISTENCE_FORMAT_VERSION } from "../shared.js";
+import { eventlogTable } from "./sqlite.js";
+export const makeStorage = (ctx, storeId, engine) => {
+    const dbName = `eventlog_${PERSISTENCE_FORMAT_VERSION}_${toValidTableName(storeId)}`;
+    const execDb = (cb) => Effect.tryPromise({
+        try: () => cb(engine._tag === 'd1' ? engine.db : undefined),
+        catch: (error) => new UnexpectedError({ cause: error, payload: { dbName } }),
+    }).pipe(Effect.map((_) => _.results), Effect.withSpan('@livestore/sync-cf:durable-object:execDb'));
+    // Cloudflare's D1 HTTP endpoint rejects JSON responses once they exceed ~1MB.
+    // Keep individual SELECT batches comfortably below that threshold so we can
+    // serve large histories without tripping the limit.
+    const D1_MAX_JSON_RESPONSE_BYTES = 1_000_000;
+    const D1_RESPONSE_SAFETY_MARGIN_BYTES = 64 * 1024;
+    const D1_TARGET_RESPONSE_BYTES = D1_MAX_JSON_RESPONSE_BYTES - D1_RESPONSE_SAFETY_MARGIN_BYTES;
+    const D1_INITIAL_PAGE_SIZE = 256;
+    const D1_MIN_PAGE_SIZE = 1;
+    const decodeEventlogRows = Schema.decodeUnknownSync(Schema.Array(eventlogTable.rowSchema));
+    const textEncoder = new TextEncoder();
+    const decreaseLimit = (limit) => Math.max(D1_MIN_PAGE_SIZE, Math.floor(limit / 2));
+    const increaseLimit = (limit) => Math.min(D1_INITIAL_PAGE_SIZE, limit * 2);
+    const computeNextLimit = (limit, encodedSize) => {
+        if (encodedSize > D1_TARGET_RESPONSE_BYTES && limit > D1_MIN_PAGE_SIZE) {
+            const next = decreaseLimit(limit);
+            return next === limit ? limit : next;
+        }
+        if (encodedSize < D1_TARGET_RESPONSE_BYTES / 2 && limit < D1_INITIAL_PAGE_SIZE) {
+            const next = increaseLimit(limit);
+            return next === limit ? limit : next;
+        }
+        return limit;
+    };
+    const getEventsD1 = (cursor) => Effect.gen(function* () {
+        const countStatement = cursor === undefined
+            ? `SELECT COUNT(*) as total FROM ${dbName}`
+            : `SELECT COUNT(*) as total FROM ${dbName} WHERE seqNum > ?`;
+        const countRows = yield* execDb((db) => {
+            const prepared = db.prepare(countStatement);
+            return cursor === undefined ? prepared.all() : prepared.bind(cursor).all();
+        });
+        const total = Number(countRows[0]?.total ?? 0);
+        const initialState = { cursor, limit: D1_INITIAL_PAGE_SIZE };
+        const fetchPage = (state) => Effect.gen(function* () {
+            const statement = state.cursor === undefined
+                ? `SELECT * FROM ${dbName} ORDER BY seqNum ASC LIMIT ?`
+                : `SELECT * FROM ${dbName} WHERE seqNum > ? ORDER BY seqNum ASC LIMIT ?`;
+            const rawEvents = yield* execDb((db) => {
+                const prepared = db.prepare(statement);
+                return state.cursor === undefined
+                    ? prepared.bind(state.limit).all()
+                    : prepared.bind(state.cursor, state.limit).all();
+            });
+            if (rawEvents.length === 0) {
+                return Option.none();
+            }
+            const encodedSize = textEncoder.encode(JSON.stringify(rawEvents)).byteLength;
+            if (encodedSize > D1_TARGET_RESPONSE_BYTES && state.limit > D1_MIN_PAGE_SIZE) {
+                const nextLimit = decreaseLimit(state.limit);
+                if (nextLimit !== state.limit) {
+                    return yield* fetchPage({ cursor: state.cursor, limit: nextLimit });
+                }
+            }
+            const decodedRows = Chunk.fromIterable(decodeEventlogRows(rawEvents));
+            const eventsChunk = Chunk.map(decodedRows, ({ createdAt, ...eventEncoded }) => ({
+                eventEncoded,
+                metadata: Option.some(SyncMetadata.make({ createdAt })),
+            }));
+            const lastSeqNum = Chunk.unsafeLast(decodedRows).seqNum;
+            const nextState = { cursor: lastSeqNum, limit: computeNextLimit(state.limit, encodedSize) };
+            return Option.some([eventsChunk, nextState]);
+        });
+        const stream = Stream.unfoldChunkEffect(initialState, fetchPage);
+        return { total, stream };
+    }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/sync-cf:durable-object:getEvents', {
+        attributes: { dbName, cursor, engine: engine._tag },
+    }));
+    const appendEventsD1 = (batch, createdAt) => Effect.gen(function* () {
+        // If there are no events, do nothing.
+        if (batch.length === 0)
+            return;
+        // CF D1 limits:
+        // Maximum bound parameters per query	100, Maximum arguments per SQL function	32
+        // Thus we need to split the batch into chunks of max (100/7=)14 events each.
+        const CHUNK_SIZE = 14;
+        for (let i = 0; i < batch.length; i += CHUNK_SIZE) {
+            const chunk = batch.slice(i, i + CHUNK_SIZE);
+            // Create a list of placeholders ("(?, ?, ?, ?, ?, ?, ?)"), corresponding to each event.
+            const valuesPlaceholders = chunk.map(() => '(?, ?, ?, ?, ?, ?, ?)').join(', ');
+            const sql = `INSERT INTO ${dbName} (seqNum, parentSeqNum, args, name, createdAt, clientId, sessionId) VALUES ${valuesPlaceholders}`;
+            // Flatten the event properties into a parameters array.
+            const params = chunk.flatMap((event) => [
+                event.seqNum,
+                event.parentSeqNum,
+                event.args === undefined ? null : JSON.stringify(event.args),
+                event.name,
+                createdAt,
+                event.clientId,
+                event.sessionId,
+            ]);
+            yield* execDb((db) => db
+                .prepare(sql)
+                .bind(...params)
+                .run());
+        }
+    }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/sync-cf:durable-object:appendEvents', {
+        attributes: { dbName, batchLength: batch.length, engine: engine._tag },
+    }));
+    const resetStore = Effect.promise(() => ctx.storage.deleteAll()).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/sync-cf:durable-object:resetStore'));
+    // DO SQLite engine implementation
+    const getEventsDoSqlite = (cursor) => Effect.gen(function* () {
+        const selectCountSql = cursor === undefined
+            ? `SELECT COUNT(*) as total FROM "${dbName}"`
+            : `SELECT COUNT(*) as total FROM "${dbName}" WHERE seqNum > ?`;
+        let total = 0;
+        try {
+            const cursorIter = cursor === undefined ? ctx.storage.sql.exec(selectCountSql) : ctx.storage.sql.exec(selectCountSql, cursor);
+            for (const row of cursorIter) {
+                total = Number(row.total ?? 0);
+            }
+        }
+        catch (error) {
+            return yield* Effect.fail(new UnexpectedError({ cause: error, payload: { dbName, stage: 'count' } }));
+        }
+        const DO_PAGE_SIZE = 256;
+        const initialState = { cursor };
+        const fetchPage = (state) => Effect.try({
+            try: () => {
+                const sql = state.cursor === undefined
+                    ? `SELECT * FROM "${dbName}" ORDER BY seqNum ASC LIMIT ?`
+                    : `SELECT * FROM "${dbName}" WHERE seqNum > ? ORDER BY seqNum ASC LIMIT ?`;
+                const iter = state.cursor === undefined
+                    ? ctx.storage.sql.exec(sql, DO_PAGE_SIZE)
+                    : ctx.storage.sql.exec(sql, state.cursor, DO_PAGE_SIZE);
+                const rows = [];
+                for (const row of iter)
+                    rows.push(row);
+                if (rows.length === 0) {
+                    return Option.none();
+                }
+                const decodedRows = Chunk.fromIterable(decodeEventlogRows(rows));
+                const eventsChunk = Chunk.map(decodedRows, ({ createdAt, ...eventEncoded }) => ({
+                    eventEncoded,
+                    metadata: Option.some(SyncMetadata.make({ createdAt })),
+                }));
+                const lastSeqNum = Chunk.unsafeLast(decodedRows).seqNum;
+                const nextState = { cursor: lastSeqNum };
+                return Option.some([eventsChunk, nextState]);
+            },
+            catch: (error) => new UnexpectedError({ cause: error, payload: { dbName, stage: 'select' } }),
+        });
+        const stream = Stream.unfoldChunkEffect(initialState, fetchPage);
+        return { total, stream };
+    }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/sync-cf:durable-object:getEvents', {
+        attributes: { dbName, cursor, engine: engine._tag },
+    }));
+    const appendEventsDoSqlite = (batch, createdAt) => Effect.try({
+        try: () => {
+            if (batch.length === 0)
+                return;
+            // Keep params per statement within conservative limits (align with D1 bound params ~100)
+            const CHUNK_SIZE = 14;
+            for (let i = 0; i < batch.length; i += CHUNK_SIZE) {
+                const chunk = batch.slice(i, i + CHUNK_SIZE);
+                const placeholders = chunk.map(() => '(?, ?, ?, ?, ?, ?, ?)').join(', ');
+                const sql = `INSERT INTO "${dbName}" (seqNum, parentSeqNum, args, name, createdAt, clientId, sessionId) VALUES ${placeholders}`;
+                const params = chunk.flatMap((event) => [
+                    event.seqNum,
+                    event.parentSeqNum,
+                    event.args === undefined ? null : JSON.stringify(event.args),
+                    event.name,
+                    createdAt,
+                    event.clientId,
+                    event.sessionId,
+                ]);
+                ctx.storage.sql.exec(sql, ...params);
+            }
+        },
+        catch: (error) => new UnexpectedError({ cause: error, payload: { dbName, stage: 'insert' } }),
+    }).pipe(Effect.withSpan('@livestore/sync-cf:durable-object:appendEvents', {
+        attributes: { dbName, batchLength: batch.length, engine: engine._tag },
+    }), UnexpectedError.mapToUnexpectedError);
+    if (engine._tag === 'd1') {
+        return { dbName, getEvents: getEventsD1, appendEvents: appendEventsD1, resetStore };
+    }
+    return { dbName, getEvents: getEventsDoSqlite, appendEvents: appendEventsDoSqlite, resetStore };
+};
+const toValidTableName = (str) => str.replaceAll(/[^a-zA-Z0-9]/g, '_');
+//# sourceMappingURL=sync-storage.js.map

package/dist/cf-worker/do/sync-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-storage.js","sourceRoot":"","sources":["../../../src/cf-worker/do/sync-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGnD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAA;AACjE,OAAO,EAAE,0BAA0B,EAAgB,MAAM,cAAc,CAAA;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAqB3C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAA+B,EAC/B,OAAgB,EAChB,MAAsE,EACzD,EAAE;IACf,MAAM,MAAM,GAAG,YAAY,0BAA0B,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAA;IAEpF,MAAM,MAAM,GAAG,CAAI,EAA4D,EAAE,EAAE,CACjF,MAAM,CAAC,UAAU,CAAC;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAE,SAAmB,CAAC;QACtE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;KAC7E,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAC5B,MAAM,CAAC,QAAQ,CAAC,0CAA0C,CAAC,CAC5D,CAAA;IAEH,8EAA8E;IAC9E,4EAA4E;IAC5E,oDAAoD;IACpD,MAAM,0BAA0B,GAAG,SAAS,CAAA;IAC5C,MAAM,+BAA+B,GAAG,EAAE,GAAG,IAAI,CAAA;IACjD,MAAM,wBAAwB,GAAG,0BAA0B,GAAG,+BAA+B,CAAA;IAC7F,MAAM,oBAAoB,GAAG,GAAG,CAAA;IAChC,MAAM,gBAAgB,GAAG,CAAC,CAAA;IAE1B,MAAM,kBAAkB,GAAG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAA;IAC1F,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAA;IAErC,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;IAC1F,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,GAAG,CAAC,CAAC,CAAA;IAElF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,WAAmB,EAAE,EAAE;QAC9D,IAAI,WAAW,GAAG,wBAAwB,IAAI,KAAK,GAAG,gBAAgB,EAAE,CAAC;YACvE,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;YACjC,OAAO,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACtC,CAAC;QAED,IAAI,WAAW,GAAG,wBAAwB,GAAG,CAAC,IAAI,KAAK,GAAG,oBAAoB,EAAE,CAAC;YAC/E,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;YACjC,OAAO,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACtC,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,CAClB,MAA0B,EAU1B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,cAAc,GAClB,MAAM,KAAK,SAAS;YAClB,CAAC,CAAC,iCAAiC,MAAM,EAAE;YAC3C,CAAC,CAAC,iCAAiC,MAAM,mBAAmB,CAAA;QAEhE,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAoB,CAAC,EAAE,EAAE,EAAE;YACxD,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;YAC3C,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAA;QAC5E,CAAC,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;QAK9C,MAAM,YAAY,GAAU,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAA;QAEnE,MAAM,SAAS,GAAG,CAChB,KAAY,EACgF,EAAE,CAC9F,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,SAAS,GACb,KAAK,CAAC,MAAM,KAAK,SAAS;gBACxB,CAAC,CAAC,iBAAiB,MAAM,8BAA8B;gBACvD,CAAC,CAAC,iBAAiB,MAAM,+CAA+C,CAAA;YAE5E,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;gBACrC,MAAM,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBACtC,OAAO,KAAK,CAAC,MAAM,KAAK,SAAS;oBAC/B,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE;oBAClC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAA;YACpD,CAAC,CAAC,CAAA;YAEF,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;YACtB,CAAC;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;YAE5E,IAAI,WAAW,GAAG,wBAAwB,IAAI,KAAK,CAAC,KAAK,GAAG,gBAAgB,EAAE,CAAC;gBAC7E,MAAM,SAAS,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBAE5C,IAAI,SAAS,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAA;gBACrE,CAAC;YACH,CAAC;YAED,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAA;YAErE,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9E,YAAY;gBACZ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;aACxD,CAAC,CAAC,CAAA;YAEH,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,CAAA;YACvD,MAAM,SAAS,GAAU,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,CAAA;YAElG,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,SAAS,CAAU,CAAC,CAAA;QACvD,CAAC,CAAC,CAAA;QAEJ,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAEhE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAC,IAAI,CACL,eAAe,CAAC,oBAAoB,EACpC,MAAM,CAAC,QAAQ,CAAC,6CAA6C,EAAE;QAC7D,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;KACpD,CAAC,CACH,CAAA;IAEH,MAAM,cAAc,GAAgC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CACvE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,sCAAsC;QACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAM;QAE9B,gBAAgB;QAChB,gFAAgF;QAChF,6EAA6E;QAC7E,MAAM,UAAU,GAAG,EAAE,CAAA;QAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAA;YAE5C,wFAAwF;YACxF,MAAM,kBAAkB,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC9E,MAAM,GAAG,GAAG,eAAe,MAAM,8EAA8E,kBAAkB,EAAE,CAAA;YACnI,wDAAwD;YACxD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;gBACtC,KAAK,CAAC,MAAM;gBACZ,KAAK,CAAC,YAAY;gBAClB,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC5D,KAAK,CAAC,IAAI;gBACV,SAAS;gBACT,KAAK,CAAC,QAAQ;gBACd,KAAK,CAAC,SAAS;aAChB,CAAC,CAAA;YAEF,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CACnB,EAAE;iBACC,OAAO,CAAC,GAAG,CAAC;iBACZ,IAAI,CAAC,GAAG,MAAM,CAAC;iBACf,GAAG,EAAE,CACT,CAAA;QACH,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CACL,eAAe,CAAC,oBAAoB,EACpC,MAAM,CAAC,QAAQ,CAAC,gDAAgD,EAAE;QAChE,UAAU,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;KACvE,CAAC,CACH,CAAA;IAEH,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CACnE,eAAe,CAAC,oBAAoB,EACpC,MAAM,CAAC,QAAQ,CAAC,8CAA8C,CAAC,CAChE,CAAA;IAED,kCAAkC;IAClC,MAAM,iBAAiB,GAAG,CACxB,MAA0B,EAU1B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,cAAc,GAClB,MAAM,KAAK,SAAS;YAClB,CAAC,CAAC,kCAAkC,MAAM,GAAG;YAC7C,CAAC,CAAC,kCAAkC,MAAM,oBAAoB,CAAA;QAElE,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,IAAI,CAAC;YACH,MAAM,UAAU,GACd,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;YAC5G,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAC7B,KAAK,GAAG,MAAM,CAAE,GAAW,CAAC,KAAK,IAAI,CAAC,CAAC,CAAA;YACzC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;QACvG,CAAC;QAKD,MAAM,YAAY,GAAG,GAAG,CAAA;QACxB,MAAM,YAAY,GAAU,EAAE,MAAM,EAAE,CAAA;QAEtC,MAAM,SAAS,GAAG,CAChB,KAAY,EACgF,EAAE,CAC9F,MAAM,CAAC,GAAG,CAAC;YACT,GAAG,EAAE,GAAG,EAAE;gBACR,MAAM,GAAG,GACP,KAAK,CAAC,MAAM,KAAK,SAAS;oBACxB,CAAC,CAAC,kBAAkB,MAAM,+BAA+B;oBACzD,CAAC,CAAC,kBAAkB,MAAM,gDAAgD,CAAA;gBAE9E,MAAM,IAAI,GACR,KAAK,CAAC,MAAM,KAAK,SAAS;oBACxB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC;oBACzC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;gBAE3D,MAAM,IAAI,GAAU,EAAE,CAAA;gBACtB,KAAK,MAAM,GAAG,IAAI,IAAI;oBAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBAEtC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;gBACtB,CAAC;gBAED,MAAM,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAA;gBAChE,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,GAAG,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9E,YAAY;oBACZ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;iBACxD,CAAC,CAAC,CAAA;gBAEH,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,MAAM,CAAA;gBACvD,MAAM,SAAS,GAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAA;gBAE/C,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,SAAS,CAAU,CAAC,CAAA;YACvD,CAAC;YACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;SAC9F,CAAC,CAAA;QAEJ,MAAM,MAAM,GAAG,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAEhE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;IAC1B,CAAC,CAAC,CAAC,IAAI,CACL,eAAe,CAAC,oBAAoB,EACpC,MAAM,CAAC,QAAQ,CAAC,6CAA6C,EAAE;QAC7D,UAAU,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;KACpD,CAAC,CACH,CAAA;IAEH,MAAM,oBAAoB,GAAgC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAC7E,MAAM,CAAC,GAAG,CAAC;QACT,GAAG,EAAE,GAAG,EAAE;YACR,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAM;YAC9B,yFAAyF;YACzF,MAAM,UAAU,GAAG,EAAE,CAAA;YACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;gBAClD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAA;gBAC5C,MAAM,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACxE,MAAM,GAAG,GAAG,gBAAgB,MAAM,+EAA+E,YAAY,EAAE,CAAA;gBAC/H,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;oBACtC,KAAK,CAAC,MAAM;oBACZ,KAAK,CAAC,YAAY;oBAClB,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC5D,KAAK,CAAC,IAAI;oBACV,SAAS;oBACT,KAAK,CAAC,QAAQ;oBACd,KAAK,CAAC,SAAS;iBAChB,CAAC,CAAA;gBACF,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;QACD,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC;KAC9F,CAAC,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CAAC,gDAAgD,EAAE;QAChE,UAAU,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;KACvE,CAAC,EACF,eAAe,CAAC,oBAAoB,CACrC,CAAA;IAEH,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACzB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,CAAA;IACrF,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,CAAA;AACjG,CAAC,CAAA;AAED,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,EAAE,GAAG,CAAC,CAAA"}

package/dist/cf-worker/do/transport/do-rpc-server.d.ts

@@ -0,0 +1,9 @@
+import { type CfTypes } from '@livestore/common-cf';
+import { Effect } from '@livestore/utils/effect';
+import { type DoCtxInput } from '../layer.ts';
+export interface DoRpcHandlerOptions {
+    payload: Uint8Array<ArrayBuffer>;
+    input: Omit<DoCtxInput, 'from'>;
+}
+export declare const createDoRpcHandler: (options: DoRpcHandlerOptions) => Effect.Effect<Uint8Array<ArrayBuffer> | CfTypes.ReadableStream>;
+//# sourceMappingURL=do-rpc-server.d.ts.map

package/dist/cf-worker/do/transport/do-rpc-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"do-rpc-server.d.ts","sourceRoot":"","sources":["../../../../src/cf-worker/do/transport/do-rpc-server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,OAAO,EAA0B,MAAM,sBAAsB,CAAA;AAC3E,OAAO,EACL,MAAM,EASP,MAAM,yBAAyB,CAAA;AAGhC,OAAO,EAAS,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AAIpD,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,CAAA;IAChC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;CAChC;AAED,eAAO,MAAM,kBAAkB,GAC7B,SAAS,mBAAmB,KAC3B,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,cAAc,CAyDjB,CAAA"}

package/dist/cf-worker/do/transport/do-rpc-server.js

@@ -0,0 +1,45 @@
+import { InvalidPullError, InvalidPushError } from '@livestore/common';
+import { toDurableObjectHandler } from '@livestore/common-cf';
+import { Effect, Headers, HttpServer, Layer, Logger, LogLevel, Option, RpcSerialization, Stream, } from '@livestore/utils/effect';
+import { SyncDoRpc } from "../../../common/do-rpc-schema.js";
+import { SyncMessage } from "../../../common/mod.js";
+import { DoCtx } from "../layer.js";
+import { makeEndingPullStream } from "../pull.js";
+import { makePush } from "../push.js";
+export const createDoRpcHandler = (options) => Effect.gen(this, function* () {
+    const { payload, input } = options;
+    // const { rpcSubscriptions, backendId, doOptions, ctx, env } = yield* DoCtx
+    // TODO add admin RPCs
+    const RpcLive = SyncDoRpc.toLayer({
+        'SyncDoRpc.Ping': (_req) => {
+            return Effect.succeed(SyncMessage.Pong.make({}));
+        },
+        'SyncDoRpc.Pull': (req, { headers }) => Effect.gen(this, function* () {
+            const { rpcSubscriptions } = yield* DoCtx;
+            // TODO rename `req.rpcContext` to something more appropriate
+            if (req.rpcContext) {
+                rpcSubscriptions.set(req.storeId, {
+                    storeId: req.storeId,
+                    payload: req.payload,
+                    subscribedAt: Date.now(),
+                    requestId: Headers.get(headers, 'x-rpc-request-id').pipe(Option.getOrThrow),
+                    callerContext: req.rpcContext.callerContext,
+                });
+            }
+            return makeEndingPullStream(req, req.payload);
+        }).pipe(Stream.unwrap, Stream.map((res) => ({
+            ...res,
+            rpcRequestId: Headers.get(headers, 'x-rpc-request-id').pipe(Option.getOrThrow),
+        })), Stream.provideLayer(DoCtx.Default({ ...input, from: { storeId: req.storeId } })), Stream.mapError((cause) => (cause._tag === 'InvalidPullError' ? cause : InvalidPullError.make({ cause }))), Stream.tapErrorCause(Effect.log)),
+        'SyncDoRpc.Push': (req) => Effect.gen(this, function* () {
+            const { doOptions, ctx, env, storeId } = yield* DoCtx;
+            const push = makePush({ storeId, payload: req.payload, options: doOptions, ctx, env });
+            return yield* push(req);
+        }).pipe(Effect.provide(DoCtx.Default({ ...input, from: { storeId: req.storeId } })), Effect.mapError((cause) => (cause._tag === 'InvalidPushError' ? cause : InvalidPushError.make({ cause }))), Effect.tapCauseLogPretty),
+    });
+    const handler = toDurableObjectHandler(SyncDoRpc, {
+        layer: Layer.mergeAll(RpcLive, RpcSerialization.layerJson, HttpServer.layerContext).pipe(Layer.provide(Logger.consoleWithThread('SyncDo')), Layer.provide(Logger.minimumLogLevel(LogLevel.Debug))),
+    });
+    return yield* handler(payload);
+}).pipe(Effect.withSpan('createDoRpcHandler'));
+//# sourceMappingURL=do-rpc-server.js.map

package/dist/cf-worker/do/transport/do-rpc-server.js.map

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

package/dist/cf-worker/do/transport/http-rpc-server.d.ts

@@ -0,0 +1,7 @@
+import type { CfTypes } from '@livestore/common-cf';
+import { Effect } from '@livestore/utils/effect';
+import { DoCtx } from '../layer.ts';
+export declare const createHttpRpcHandler: ({ request }: {
+    request: CfTypes.Request;
+}) => Effect.Effect<CfTypes.Response, import("effect/Cause").TimeoutException, DoCtx | import("effect/Scope").Scope>;
+//# sourceMappingURL=http-rpc-server.d.ts.map

package/dist/cf-worker/do/transport/http-rpc-server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-rpc-server.d.ts","sourceRoot":"","sources":["../../../../src/cf-worker/do/transport/http-rpc-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,MAAM,EAA+C,MAAM,yBAAyB,CAAA;AAG7F,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAInC,eAAO,MAAM,oBAAoB,GAAI,aAAa;IAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAA;CAAE,mHAS5B,CAAA"}

package/dist/cf-worker/do/transport/http-rpc-server.js

@@ -0,0 +1,24 @@
+import { Effect, HttpApp, Layer, RpcSerialization, RpcServer } from '@livestore/utils/effect';
+import { SyncHttpRpc } from "../../../common/http-rpc-schema.js";
+import * as SyncMessage from "../../../common/sync-message-types.js";
+import { DoCtx } from "../layer.js";
+import { makeEndingPullStream } from "../pull.js";
+import { makePush } from "../push.js";
+export const createHttpRpcHandler = ({ request }) => Effect.gen(function* () {
+    const handlerLayer = createHttpRpcLayer;
+    const httpApp = RpcServer.toHttpApp(SyncHttpRpc).pipe(Effect.provide(handlerLayer));
+    const webHandler = yield* httpApp.pipe(Effect.map(HttpApp.toWebHandler));
+    return yield* Effect.promise(() => webHandler(request)).pipe(Effect.timeout(10000));
+}).pipe(Effect.withSpan('createHttpRpcHandler'));
+const createHttpRpcLayer = 
+// TODO implement admin requests
+SyncHttpRpc.toLayer({
+    'SyncHttpRpc.Pull': (req) => makeEndingPullStream(req, req.payload),
+    'SyncHttpRpc.Push': (req) => Effect.gen(function* () {
+        const { ctx, env, doOptions, storeId } = yield* DoCtx;
+        const push = makePush({ payload: undefined, options: doOptions, storeId, ctx, env });
+        return yield* push(req);
+    }),
+    'SyncHttpRpc.Ping': () => Effect.succeed(SyncMessage.Pong.make({})),
+}).pipe(Layer.provideMerge(RpcServer.layerProtocolHttp({ path: '/http-rpc' })), Layer.provideMerge(RpcSerialization.layerJson));
+//# sourceMappingURL=http-rpc-server.js.map