@livestore/adapter-cloudflare 0.4.0-dev.8 → 0.4.0

package/src/make-adapter.ts

@@ -5,14 +5,21 @@ import {
   liveStoreStorageFormatVersion,
   makeClientSession,
   type SyncOptions,
-  UnexpectedError,
+  UnknownError,
 } from '@livestore/common'
-import { type DevtoolsOptions, Eventlog, LeaderThreadCtx, makeLeaderThreadLayer } from '@livestore/common/leader-thread'
+import type { CfTypes } from '@livestore/common-cf'
+import {
+  type DevtoolsOptions,
+  Eventlog,
+  LeaderThreadCtx,
+  makeLeaderThreadLayer,
+  streamEventsWithSyncState,
+} from '@livestore/common/leader-thread'
 import { LiveStoreEvent } from '@livestore/livestore'
-import { sqliteDbFactory } from '@livestore/sqlite-wasm/cf'
+import { CF_SQL_VFS_REQUIRED_PRAGMAS, sqliteDbFactory } from '@livestore/sqlite-wasm/cf'
+import { makeSqliteDb as makeDoSqliteDb } from './make-sqlite-db.ts'
 import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { Effect, FetchHttpClient, Layer, Schedule, SubscriptionRef, WebChannel } from '@livestore/utils/effect'
-import type * as CfWorker from './cf-types.ts'
 
 export const makeAdapter =
   ({
@@ -22,7 +29,7 @@ export const makeAdapter =
     sessionId,
     resetPersistence = false,
   }: {
-    storage: CfWorker.DurableObjectStorage
+    storage: CfTypes.DurableObjectStorage
     clientId: string
     syncOptions: SyncOptions
     sessionId: string
@@ -30,7 +37,13 @@ export const makeAdapter =
   }): Adapter =>
   (adapterArgs) =>
     Effect.gen(function* () {
-      const { storeId, /* devtoolsEnabled, shutdown, bootStatusQueue,  */ syncPayload, schema } = adapterArgs
+      const {
+        storeId,
+        /* devtoolsEnabled, shutdown, bootStatusQueue,  */
+        syncPayloadEncoded,
+        syncPayloadSchema,
+        schema,
+      } = adapterArgs
 
       const devtoolsOptions = { enabled: false } as DevtoolsOptions
 
@@ -39,41 +52,39 @@ export const makeAdapter =
       const makeSqliteDb = sqliteDbFactory({ sqlite3 })
 
       const syncInMemoryDb = yield* makeSqliteDb({ _tag: 'in-memory', storage, configureDb: () => {} }).pipe(
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
       )
 
       const schemaHashSuffix =
         schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
 
-      const stateDbFileName = getStateDbFileName(schemaHashSuffix)
-      const eventlogDbFileName = getEventlogDbFileName()
-
       if (resetPersistence === true) {
-        yield* resetDurableObjectPersistence({
-          storage,
-          storeId,
-          dbFileNames: [stateDbFileName, eventlogDbFileName],
-        })
+        yield* resetDurableObjectPersistence({ storage, storeId })
       }
 
+      const stateDbFileName = getStateDbFileName(schemaHashSuffix)
+
       const dbState = yield* makeSqliteDb({
         _tag: 'storage',
         storage,
         fileName: stateDbFileName,
+        configureDb: (db) =>
+          db.execute(
+            [...CF_SQL_VFS_REQUIRED_PRAGMAS, 'cache_size=-8000'].map((p) => `PRAGMA ${p}`).join(';\n'),
+          ),
+      }).pipe(UnknownError.mapToUnknownError)
+
+      // dbEventlog runs on DO SQLite directly (not through the VFS). SQL-level transaction
+      // control (BEGIN/COMMIT/ROLLBACK) is silently dropped — see isTransactionControlStatement
+      // in make-sqlite-db.ts for details on why this is safe.
+      const dbEventlog = yield* makeDoSqliteDb({
+        _tag: 'file',
+        db: storage.sql,
         configureDb: () => {},
-      }).pipe(UnexpectedError.mapToUnexpectedError)
-
-      const dbEventlog = yield* makeSqliteDb({
-        _tag: 'storage',
-        storage,
-        fileName: eventlogDbFileName,
-        configureDb: () => {},
-      }).pipe(UnexpectedError.mapToUnexpectedError)
+      }).pipe(UnknownError.mapToUnknownError)
 
       const shutdownChannel = yield* WebChannel.noopChannel<any, any>()
 
-      // Use Durable Object sync backend if no backend is specified
-
       const layer = yield* Layer.build(
         makeLeaderThreadLayer({
           schema,
@@ -85,12 +96,14 @@ export const makeAdapter =
           dbEventlog,
           devtoolsOptions,
           shutdownChannel,
-          syncPayload,
+          syncPayloadEncoded,
+          syncPayloadSchema,
         }),
       )
 
       const { leaderThread, initialSnapshot } = yield* Effect.gen(function* () {
-        const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState } = yield* LeaderThreadCtx
+        const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState, networkStatus } =
+          yield* LeaderThreadCtx
 
         const initialLeaderHead = Eventlog.getClientHeadFromDb(dbEventlog)
         // const initialLeaderHead = EventSequenceNumber.ROOT
@@ -101,15 +114,26 @@ export const makeAdapter =
               pull: ({ cursor }) => syncProcessor.pull({ cursor }),
               push: (batch) =>
                 syncProcessor.push(
-                  batch.map((item) => new LiveStoreEvent.EncodedWithMeta(item)),
+                  batch.map((item) => new LiveStoreEvent.Client.EncodedWithMeta(item)),
                   { waitForProcessing: true },
                 ),
+              stream: (options) =>
+                streamEventsWithSyncState({
+                  dbEventlog,
+                  syncState: syncProcessor.syncState,
+                  options,
+                }),
+            },
+            initialState: {
+              leaderHead: initialLeaderHead,
+              migrationsReport: initialState.migrationsReport,
+              storageMode: 'persisted',
             },
-            initialState: { leaderHead: initialLeaderHead, migrationsReport: initialState.migrationsReport },
             export: Effect.sync(() => dbState.export()),
             getEventlogData: Effect.sync(() => dbEventlog.export()),
-            getSyncState: syncProcessor.syncState,
+            syncState: syncProcessor.syncState,
             sendDevtoolsMessage: (message) => extraIncomingMessagesQueue.offer(message),
+            networkStatus,
           },
           {
             // overrides: testing?.overrides?.clientSession?.leaderThreadProxy
@@ -130,14 +154,14 @@ export const makeAdapter =
         sqliteDb: syncInMemoryDb,
         webmeshMode: 'proxy',
         connectWebmeshNode: Effect.fnUntraced(function* ({ webmeshNode }) {
-          console.log('connectWebmeshNode', { webmeshNode })
-          // if (devtoolsOptions.enabled) {
-          //   yield* Webmesh.connectViaWebSocket({
-          //     node: webmeshNode,
-          //     url: `ws://${devtoolsOptions.host}:${devtoolsOptions.port}`,
-          //     openTimeout: 500,
-          //   }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
-          // }
+          if (devtoolsOptions.enabled === true) {
+            console.log('connectWebmeshNode', { webmeshNode })
+            //   yield* Webmesh.connectViaWebSocket({
+            //     node: webmeshNode,
+            //     url: `ws://${devtoolsOptions.host}:${devtoolsOptions.port}`,
+            //     openTimeout: 500,
+            //   }).pipe(Effect.tapCauseLogPretty, Effect.forkScoped)
+          }
         }),
         leaderThread,
         lockStatus,
@@ -146,6 +170,7 @@ export const makeAdapter =
         isLeader: true,
         // Not really applicable for node as there is no "reload the app" concept
         registerBeforeUnload: (_onBeforeUnload) => () => {},
+        origin: undefined,
       })
 
       return clientSession
@@ -156,28 +181,26 @@ export const makeAdapter =
 
 const getStateDbFileName = (suffix: string) => `state${suffix}@${liveStoreStorageFormatVersion}.db`
 
-const getEventlogDbFileName = () => `eventlog@${liveStoreStorageFormatVersion}.db`
-
 const resetDurableObjectPersistence = ({
   storage,
   storeId,
-  dbFileNames,
 }: {
-  storage: CfWorker.DurableObjectStorage
+  storage: CfTypes.DurableObjectStorage
   storeId: string
-  dbFileNames: ReadonlyArray<string>
 }) =>
   Effect.try({
     try: () =>
+      // All three tables live in the DO's single storage.sql database but are
+      // owned by different layers during normal operation:
+      // - vfs_pages: written by the wa-sqlite VFS layer (backs dbState)
+      // - eventlog, __livestore_sync_status: written directly by dbEventlog via storage.sql
       storage.transactionSync(() => {
-        for (const baseName of dbFileNames) {
-          const likePattern = `${baseName}%`
-          safeSqlExec(storage, 'DELETE FROM vfs_blocks WHERE file_path LIKE ?', likePattern)
-          safeSqlExec(storage, 'DELETE FROM vfs_files WHERE file_path LIKE ?', likePattern)
-        }
+        safeSqlExec(storage, 'DELETE FROM vfs_pages')
+        safeSqlExec(storage, 'DELETE FROM eventlog')
+        safeSqlExec(storage, 'DELETE FROM __livestore_sync_status')
       }),
     catch: (cause) =>
-      new UnexpectedError({
+      new UnknownError({
         cause,
         note: `@livestore/adapter-cloudflare: Failed to reset persistence for store ${storeId}`,
       }),
@@ -186,11 +209,11 @@ const resetDurableObjectPersistence = ({
     Effect.withSpan('@livestore/adapter-cloudflare:resetPersistence', { attributes: { storeId } }),
   )
 
-const safeSqlExec = (storage: CfWorker.DurableObjectStorage, query: string, binding: string) => {
+const safeSqlExec = (storage: CfTypes.DurableObjectStorage, query: string, binding?: string) => {
   try {
-    storage.sql.exec(query, binding)
+    binding !== undefined ? storage.sql.exec(query, binding) : storage.sql.exec(query)
   } catch (error) {
-    if (isMissingVfsTableError(error)) {
+    if (isMissingTableError(error) === true) {
       return
     }
 
@@ -198,5 +221,5 @@ const safeSqlExec = (storage: CfWorker.DurableObjectStorage, query: string, bind
   }
 }
 
-const isMissingVfsTableError = (error: unknown): boolean =>
+const isMissingTableError = (error: unknown): boolean =>
   error instanceof Error && error.message.toLowerCase().includes('no such table')

package/src/make-sqlite-db.ts

@@ -8,23 +8,26 @@ import type {
   SqliteDbSession,
 } from '@livestore/common'
 import { SqliteDbHelper, SqliteError } from '@livestore/common'
+import type { CfTypes } from '@livestore/common-cf'
 import { EventSequenceNumber } from '@livestore/common/schema'
 import { Effect } from '@livestore/utils/effect'
-import type * as CfWorker from './cf-types.ts'
 
 // Simplified prepared statement implementation using only public API
 class CloudflarePreparedStatement implements PreparedStatement {
-  private sqlStorage: CfWorker.SqlStorage
+  private sqlStorage: CfTypes.SqlStorage
   public readonly sql: string
 
-  constructor(sqlStorage: CfWorker.SqlStorage, sql: string) {
+  constructor(sqlStorage: CfTypes.SqlStorage, sql: string) {
     this.sqlStorage = sqlStorage
     this.sql = sql
   }
 
   execute = (bindValues?: PreparedBindValues, options?: { onRowsChanged?: (count: number) => void }) => {
     try {
-      const cursor = this.sqlStorage.exec(this.sql, ...(bindValues ? Object.values(bindValues) : []))
+      if (isTransactionControlStatement(this.sql) === true) return
+
+
+      const cursor = this.sqlStorage.exec(this.sql, ...(bindValues !== undefined ? Object.values(bindValues) : []))
 
       // Count affected rows by iterating through cursor
       let changedCount = 0
@@ -32,7 +35,7 @@ class CloudflarePreparedStatement implements PreparedStatement {
         changedCount++
       }
 
-      if (options?.onRowsChanged) {
+      if (options?.onRowsChanged !== undefined) {
         options.onRowsChanged(changedCount)
       }
     } catch (e) {
@@ -46,9 +49,9 @@ class CloudflarePreparedStatement implements PreparedStatement {
 
   select = <T>(bindValues?: PreparedBindValues): readonly T[] => {
     try {
-      const cursor = this.sqlStorage.exec<Record<string, CfWorker.SqlStorageValue>>(
+      const cursor = this.sqlStorage.exec<Record<string, CfTypes.SqlStorageValue>>(
         this.sql,
-        ...(bindValues ? Object.values(bindValues) : []),
+        ...(bindValues !== undefined ? Object.values(bindValues) : []),
       )
       const results: T[] = []
 
@@ -84,12 +87,12 @@ type CloudflareDatabaseInput =
       _tag: 'file'
       // databaseName: string
       // directory: string
-      db: CfWorker.SqlStorage
+      db: CfTypes.SqlStorage
       configureDb: (db: SqliteDb) => void
     }
   | {
       _tag: 'in-memory'
-      db: CfWorker.SqlStorage
+      db: CfTypes.SqlStorage
       configureDb: (db: SqliteDb) => void
     }
 
@@ -97,14 +100,12 @@ export type MakeCloudflareSqliteDb = MakeSqliteDb<Metadata, CloudflareDatabaseIn
 
 export const makeSqliteDb: MakeCloudflareSqliteDb = (input: CloudflareDatabaseInput) =>
   Effect.gen(function* () {
-    // console.log('makeSqliteDb', input)
     if (input._tag === 'in-memory') {
       return makeSqliteDb_<Metadata>({
         sqlStorage: input.db,
         metadata: {
           _tag: 'file' as const,
           dbPointer: 0,
-          // persistenceInfo: { fileName: ':memory:' },
           persistenceInfo: { fileName: 'cf' },
           input,
           configureDb: input.configureDb,
@@ -118,7 +119,6 @@ export const makeSqliteDb: MakeCloudflareSqliteDb = (input: CloudflareDatabaseIn
         metadata: {
           _tag: 'file' as const,
           dbPointer: 0,
-          // persistenceInfo: { fileName: `${input.directory}/${input.databaseName}` },
           persistenceInfo: { fileName: 'cf' },
           input,
           configureDb: input.configureDb,
@@ -130,14 +130,13 @@ export const makeSqliteDb: MakeCloudflareSqliteDb = (input: CloudflareDatabaseIn
 export const makeSqliteDb_ = <
   TMetadata extends {
     persistenceInfo: PersistenceInfo
-    // deleteDb: () => void
     configureDb: (db: SqliteDb<TMetadata>) => void
   },
 >({
   sqlStorage,
   metadata,
 }: {
-  sqlStorage: CfWorker.SqlStorage
+  sqlStorage: CfTypes.SqlStorage
   metadata: TMetadata
 }): SqliteDb<TMetadata> => {
   const preparedStmts: PreparedStatement[] = []
@@ -149,7 +148,7 @@ export const makeSqliteDb_ = <
     metadata,
     debug: {
       // Setting initially to root but will be set to correct value shortly after
-      head: EventSequenceNumber.ROOT,
+      head: EventSequenceNumber.Client.ROOT,
     },
     prepare: (queryStr) => {
       try {
@@ -188,18 +187,13 @@ export const makeSqliteDb_ = <
     destroy: () => {
       sqliteDb.close()
 
-      // metadata.deleteDb()
       throw new SqliteError({
         code: -1,
         cause: 'Database destroy not supported with public SqlStorage API',
       })
-
-      // if (metadata._tag === 'opfs') {
-      //   metadata.vfs.resetAccessHandle(metadata.fileName)
-      // }
     },
     close: () => {
-      if (isClosed) {
+      if (isClosed === true) {
         return
       }
 
@@ -259,3 +253,40 @@ export const makeSqliteDb_ = <
 
   return sqliteDb
 }
+
+/**
+ * CF DO SQLite rejects SQL-level transaction control and requires `storage.transactionSync()` instead.
+ * The current adapter only detects and suppresses those SQL statements. It does not yet translate the
+ * caller's transaction intent into a shared Durable Object storage transaction.
+ *
+ * ## Consistency implications
+ *
+ * `LeaderSyncProcessor.materializeEventsBatch()` wraps both `dbState` and `dbEventlog` in
+ * `BEGIN`/`COMMIT` to keep them consistent. Because this adapter drops those statements,
+ * eventlog INSERTs are auto-committed individually while `dbState` (VFS-backed) still has
+ * real transaction boundaries. If a batch partially fails, earlier eventlog rows survive
+ * while `dbState` rolls back.
+ *
+ * This is safe because:
+ * - The eventlog is append-only and idempotent — replaying already-inserted events is a no-op.
+ * - State is always rebuildable from the eventlog on cold start (`recreateDb`).
+ * - A Durable Object is single-threaded, so no concurrent reader can observe the
+ *   intermediate inconsistency.
+ *
+ * Uses prefix matching to cover all SQLite variants:
+ * - `BEGIN [DEFERRED | IMMEDIATE | EXCLUSIVE] [TRANSACTION]`
+ * - `COMMIT [TRANSACTION]` / `END [TRANSACTION]`
+ * - `ROLLBACK [TRANSACTION] [TO [SAVEPOINT] name]`
+ * - `SAVEPOINT name` / `RELEASE [SAVEPOINT] name`
+ */
+const isTransactionControlStatement = (sql: string): boolean => {
+  const upper = sql.trim().toUpperCase()
+  return (
+    upper.startsWith('BEGIN') === true ||
+    upper.startsWith('COMMIT') === true ||
+    upper.startsWith('END') === true ||
+    upper.startsWith('ROLLBACK') === true ||
+    upper.startsWith('SAVEPOINT') === true ||
+    upper.startsWith('RELEASE') === true
+  )
+}

package/src/mod.ts

@@ -1,12 +1,5 @@
 import './polyfill.ts'
 
 export type { ClientDoWithRpcCallback } from '@livestore/common-cf'
+export { type CreateStoreDoOptions, createStoreDo, createStoreDoPromise, type Env } from './create-store-do.ts'
 export { makeAdapter } from './make-adapter.ts'
-export {
-  type CreateStoreDoOptions,
-  createStoreDo,
-  createStoreDoPromise,
-  type Env,
-  type MakeDurableObjectClass,
-  type MakeDurableObjectClassOptions,
-} from './make-client-durable-object.ts'

package/dist/cf-types.d.ts

@@ -1,2 +0,0 @@
-export { type D1Database, type D1Result, type DurableObject, type DurableObjectNamespace, type DurableObjectState, type DurableObjectStorage, type DurableObjectStub, type MessageEvent, Request, Response, Rpc, type SqlStorage, SqlStorageCursor, SqlStorageStatement, type SqlStorageValue, WebSocket, WebSocketPair, WebSocketRequestResponsePair, } from '@cloudflare/workers-types';
-//# sourceMappingURL=cf-types.d.ts.map

package/dist/cf-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cf-types.d.ts","sourceRoot":"","sources":["../src/cf-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAC3B,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,OAAO,EACP,QAAQ,EACR,GAAG,EACH,KAAK,UAAU,EACf,gBAAgB,EAChB,mBAAmB,EACnB,KAAK,eAAe,EACpB,SAAS,EACT,aAAa,EACb,4BAA4B,GAC7B,MAAM,2BAA2B,CAAA"}

package/dist/cf-types.js

@@ -1,2 +0,0 @@
-export { Request, Response, Rpc, SqlStorageCursor, SqlStorageStatement, WebSocket, WebSocketPair, WebSocketRequestResponsePair, } from '@cloudflare/workers-types';
-//# sourceMappingURL=cf-types.js.map

package/dist/cf-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cf-types.js","sourceRoot":"","sources":["../src/cf-types.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,OAAO,EACP,QAAQ,EACR,GAAG,EAEH,gBAAgB,EAChB,mBAAmB,EAEnB,SAAS,EACT,aAAa,EACb,4BAA4B,GAC7B,MAAM,2BAA2B,CAAA"}

package/dist/make-client-durable-object.d.ts

@@ -1,48 +0,0 @@
-import type { UnexpectedError } from '@livestore/common';
-import { type LiveStoreSchema, type Store, type Unsubscribe } from '@livestore/livestore';
-import type * as CfSyncBackend from '@livestore/sync-cf/cf-worker';
-import { Effect } from '@livestore/utils/effect';
-import type * as CfWorker from './cf-types.ts';
-export type MakeDurableObjectClassOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any> = {
-    schema: TSchema;
-    clientId: string;
-    sessionId: string;
-    onStoreReady?: (store: Store<TSchema>) => Effect.SyncOrPromiseOrEffect<void, UnexpectedError>;
-    registerQueries?: (store: Store<TSchema>) => Effect.SyncOrPromiseOrEffect<ReadonlyArray<Unsubscribe>>;
-    syncBackendUrl?: string;
-    handleCustomRequest?: (request: CfWorker.Request, ensureStore: Effect.Effect<Store<TSchema>, UnexpectedError, never>) => Effect.SyncOrPromiseOrEffect<CfWorker.Response | undefined, UnexpectedError>;
-};
-export type Env = {
-    SYNC_BACKEND_DO: CfWorker.DurableObjectNamespace;
-};
-export type MakeDurableObjectClass = <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>(options: MakeDurableObjectClassOptions<TSchema>) => {
-    new (ctx: CfWorker.DurableObjectState, env: Env): CfWorker.DurableObject & CfWorker.Rpc.DurableObjectBranded;
-};
-/**
- * Options used to initialize the LiveStore Durable Object runtime.
- */
-export type CreateStoreDoOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any> = {
-    /** LiveStore schema that defines state, migrations, and validators. */
-    schema: TSchema;
-    /** Logical identifier for the store instance persisted inside the Durable Object. */
-    storeId: string;
-    /** Unique identifier for the client that owns the Durable Object instance. */
-    clientId: string;
-    /** Identifier for the LiveStore session running inside the Durable Object. */
-    sessionId: string;
-    /** Cloudflare Durable Object storage binding backing the local SQLite files. */
-    storage: CfWorker.DurableObjectStorage;
-    /** RPC stub pointing at the sync backend Durable Object used for replication. */
-    syncBackendDurableObject: CfWorker.DurableObjectStub<CfSyncBackend.SyncBackendRpcInterface>;
-    /** Durable Object identifier for the current instance, forwarded to the sync backend. */
-    durableObjectId: string;
-    /** Binding name Cloudflare uses to reach this Durable Object from other workers. */
-    bindingName: string;
-    /** Enables live pull mode to receive sync updates via Durable Object RPC callbacks. */
-    livePull?: boolean;
-    /** Clears existing Durable Object persistence before bootstrapping the store. */
-    resetPersistence?: boolean;
-};
-export declare const createStoreDo: <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>({ schema, storeId, clientId, sessionId, storage, syncBackendDurableObject, durableObjectId, bindingName, livePull, resetPersistence, }: CreateStoreDoOptions<TSchema>) => Effect.Effect<Store<TSchema, {}>, UnexpectedError, never>;
-export declare const createStoreDoPromise: <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>(options: CreateStoreDoOptions<TSchema>) => Promise<Store<TSchema, {}>>;
-//# sourceMappingURL=make-client-durable-object.d.ts.map

package/dist/make-client-durable-object.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"make-client-durable-object.d.ts","sourceRoot":"","sources":["../src/make-client-durable-object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAe,KAAK,eAAe,EAAe,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACnH,OAAO,KAAK,KAAK,aAAa,MAAM,8BAA8B,CAAA;AAElE,OAAO,EAAE,MAAM,EAA2B,MAAM,yBAAyB,CAAA;AACzE,OAAO,KAAK,KAAK,QAAQ,MAAM,eAAe,CAAA;AAK9C,MAAM,MAAM,6BAA6B,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAC,GAAG,IAAI;IACjG,MAAM,EAAE,OAAO,CAAA;IAEf,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,qBAAqB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;IAG7F,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAA;IACrG,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB,mBAAmB,CAAC,EAAE,CACpB,OAAO,EAAE,QAAQ,CAAC,OAAO,EACzB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAC/D,MAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,QAAQ,GAAG,SAAS,EAAE,eAAe,CAAC,CAAA;CAClF,CAAA;AAED,MAAM,MAAM,GAAG,GAAG;IAChB,eAAe,EAAE,QAAQ,CAAC,sBAAsB,CAAA;CACjD,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAC,GAAG,EACzF,OAAO,EAAE,6BAA6B,CAAC,OAAO,CAAC,KAC5C;IACH,KAAK,GAAG,EAAE,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE,GAAG,GAAG,QAAQ,CAAC,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,oBAAoB,CAAA;CAC7G,CAAA;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,GAAG,eAAe,CAAC,GAAG,IAAI;IACxF,uEAAuE;IACvE,MAAM,EAAE,OAAO,CAAA;IACf,qFAAqF;IACrF,OAAO,EAAE,MAAM,CAAA;IACf,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,CAAA;IAChB,8EAA8E;IAC9E,SAAS,EAAE,MAAM,CAAA;IACjB,gFAAgF;IAChF,OAAO,EAAE,QAAQ,CAAC,oBAAoB,CAAA;IACtC,iFAAiF;IACjF,wBAAwB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAA;IAC3F,yFAAyF;IACzF,eAAe,EAAE,MAAM,CAAA;IACvB,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAA;IACnB,uFAAuF;IACvF,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,OAAO,SAAS,eAAe,GAAG,eAAe,CAAC,GAAG,EAAE,wIAWlF,oBAAoB,CAAC,OAAO,CAAC,8DAsB5B,CAAA;AAEJ,eAAO,MAAM,oBAAoB,GAAI,OAAO,SAAS,eAAe,GAAG,eAAe,CAAC,GAAG,EACxF,SAAS,oBAAoB,CAAC,OAAO,CAAC,gCAOrC,CAAA"}

package/dist/make-client-durable-object.js

@@ -1,26 +0,0 @@
-import { createStore, provideOtel } from '@livestore/livestore';
-import { makeDoRpcSync } from '@livestore/sync-cf/client';
-import { Effect, Logger, LogLevel, Scope } from '@livestore/utils/effect';
-import { makeAdapter } from "./make-adapter.js";
-export const createStoreDo = ({ schema, storeId, clientId, sessionId, storage, syncBackendDurableObject, durableObjectId, bindingName, livePull = false, resetPersistence = false, }) => Effect.gen(function* () {
-    const scope = yield* Scope.make();
-    const adapter = makeAdapter({
-        clientId,
-        sessionId,
-        storage,
-        resetPersistence,
-        syncOptions: {
-            backend: makeDoRpcSync({
-                syncBackendStub: syncBackendDurableObject,
-                durableObjectContext: { bindingName, durableObjectId },
-            }),
-            livePull, // Uses DO RPC callbacks for reactive pull
-            // backend: makeHttpSync({ url: `http://localhost:8787`, livePull: { pollInterval: 500 } }),
-            initialSyncOptions: { _tag: 'Blocking', timeout: 500 },
-            // backend: makeWsSyncProviderClient({ durableObject: syncBackendDurableObject }),
-        },
-    });
-    return yield* createStore({ schema, adapter, storeId }).pipe(Scope.extend(scope), provideOtel({}));
-});
-export const createStoreDoPromise = (options) => createStoreDo(options).pipe(Logger.withMinimumLogLevel(LogLevel.Debug), Effect.provide(Logger.consoleWithThread('DoClient')), Effect.tapCauseLogPretty, Effect.runPromise);
-//# sourceMappingURL=make-client-durable-object.js.map

package/dist/make-client-durable-object.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"make-client-durable-object.js","sourceRoot":"","sources":["../src/make-client-durable-object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwB,WAAW,EAAgC,MAAM,sBAAsB,CAAA;AAEnH,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAEzE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAyD/C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAwD,EACnF,MAAM,EACN,OAAO,EACP,QAAQ,EACR,SAAS,EACT,OAAO,EACP,wBAAwB,EACxB,eAAe,EACf,WAAW,EACX,QAAQ,GAAG,KAAK,EAChB,gBAAgB,GAAG,KAAK,GACM,EAAE,EAAE,CAClC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;IAEjC,MAAM,OAAO,GAAG,WAAW,CAAC;QAC1B,QAAQ;QACR,SAAS;QACT,OAAO;QACP,gBAAgB;QAChB,WAAW,EAAE;YACX,OAAO,EAAE,aAAa,CAAC;gBACrB,eAAe,EAAE,wBAAwB;gBACzC,oBAAoB,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE;aACvD,CAAC;YACF,QAAQ,EAAE,0CAA0C;YACpD,4FAA4F;YAC5F,kBAAkB,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,EAAE;YACtD,kFAAkF;SACnF;KACF,CAAC,CAAA;IAEF,OAAO,KAAK,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,CAAA;AACpG,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAsC,EACtC,EAAE,CACF,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,CACzB,MAAM,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC1C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,EACpD,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,UAAU,CAClB,CAAA"}

package/src/cf-types.ts

@@ -1,20 +0,0 @@
-export {
-  type D1Database,
-  type D1Result,
-  type DurableObject,
-  type DurableObjectNamespace,
-  type DurableObjectState,
-  type DurableObjectStorage,
-  type DurableObjectStub,
-  type MessageEvent,
-  Request,
-  Response,
-  Rpc,
-  type SqlStorage,
-  SqlStorageCursor,
-  SqlStorageStatement,
-  type SqlStorageValue,
-  WebSocket,
-  WebSocketPair,
-  WebSocketRequestResponsePair,
-} from '@cloudflare/workers-types'

package/src/make-client-durable-object.ts

@@ -1,107 +0,0 @@
-import type { UnexpectedError } from '@livestore/common'
-import { createStore, type LiveStoreSchema, provideOtel, type Store, type Unsubscribe } from '@livestore/livestore'
-import type * as CfSyncBackend from '@livestore/sync-cf/cf-worker'
-import { makeDoRpcSync } from '@livestore/sync-cf/client'
-import { Effect, Logger, LogLevel, Scope } from '@livestore/utils/effect'
-import type * as CfWorker from './cf-types.ts'
-import { makeAdapter } from './make-adapter.ts'
-
-declare class Response extends CfWorker.Response {}
-
-export type MakeDurableObjectClassOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any> = {
-  schema: TSchema
-  // storeId: string
-  clientId: string
-  sessionId: string
-  onStoreReady?: (store: Store<TSchema>) => Effect.SyncOrPromiseOrEffect<void, UnexpectedError>
-  // makeStore?: (adapter: Adapter) => Promise<Store<TSchema>>
-  // onLiveStoreEvent?: (event: LiveStoreEvent.ForSchema<TSchema>) => Promise<void>
-  registerQueries?: (store: Store<TSchema>) => Effect.SyncOrPromiseOrEffect<ReadonlyArray<Unsubscribe>>
-  syncBackendUrl?: string
-  // Hook for custom request handling (e.g., testing endpoints)
-  handleCustomRequest?: (
-    request: CfWorker.Request,
-    ensureStore: Effect.Effect<Store<TSchema>, UnexpectedError, never>,
-  ) => Effect.SyncOrPromiseOrEffect<CfWorker.Response | undefined, UnexpectedError>
-}
-
-export type Env = {
-  SYNC_BACKEND_DO: CfWorker.DurableObjectNamespace
-}
-
-export type MakeDurableObjectClass = <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>(
-  options: MakeDurableObjectClassOptions<TSchema>,
-) => {
-  new (ctx: CfWorker.DurableObjectState, env: Env): CfWorker.DurableObject & CfWorker.Rpc.DurableObjectBranded
-}
-
-/**
- * Options used to initialize the LiveStore Durable Object runtime.
- */
-export type CreateStoreDoOptions<TSchema extends LiveStoreSchema = LiveStoreSchema.Any> = {
-  /** LiveStore schema that defines state, migrations, and validators. */
-  schema: TSchema
-  /** Logical identifier for the store instance persisted inside the Durable Object. */
-  storeId: string
-  /** Unique identifier for the client that owns the Durable Object instance. */
-  clientId: string
-  /** Identifier for the LiveStore session running inside the Durable Object. */
-  sessionId: string
-  /** Cloudflare Durable Object storage binding backing the local SQLite files. */
-  storage: CfWorker.DurableObjectStorage
-  /** RPC stub pointing at the sync backend Durable Object used for replication. */
-  syncBackendDurableObject: CfWorker.DurableObjectStub<CfSyncBackend.SyncBackendRpcInterface>
-  /** Durable Object identifier for the current instance, forwarded to the sync backend. */
-  durableObjectId: string
-  /** Binding name Cloudflare uses to reach this Durable Object from other workers. */
-  bindingName: string
-  /** Enables live pull mode to receive sync updates via Durable Object RPC callbacks. */
-  livePull?: boolean
-  /** Clears existing Durable Object persistence before bootstrapping the store. */
-  resetPersistence?: boolean
-}
-
-export const createStoreDo = <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>({
-  schema,
-  storeId,
-  clientId,
-  sessionId,
-  storage,
-  syncBackendDurableObject,
-  durableObjectId,
-  bindingName,
-  livePull = false,
-  resetPersistence = false,
-}: CreateStoreDoOptions<TSchema>) =>
-  Effect.gen(function* () {
-    const scope = yield* Scope.make()
-
-    const adapter = makeAdapter({
-      clientId,
-      sessionId,
-      storage,
-      resetPersistence,
-      syncOptions: {
-        backend: makeDoRpcSync({
-          syncBackendStub: syncBackendDurableObject,
-          durableObjectContext: { bindingName, durableObjectId },
-        }),
-        livePull, // Uses DO RPC callbacks for reactive pull
-        // backend: makeHttpSync({ url: `http://localhost:8787`, livePull: { pollInterval: 500 } }),
-        initialSyncOptions: { _tag: 'Blocking', timeout: 500 },
-        // backend: makeWsSyncProviderClient({ durableObject: syncBackendDurableObject }),
-      },
-    })
-
-    return yield* createStore({ schema, adapter, storeId }).pipe(Scope.extend(scope), provideOtel({}))
-  })
-
-export const createStoreDoPromise = <TSchema extends LiveStoreSchema = LiveStoreSchema.Any>(
-  options: CreateStoreDoOptions<TSchema>,
-) =>
-  createStoreDo(options).pipe(
-    Logger.withMinimumLogLevel(LogLevel.Debug),
-    Effect.provide(Logger.consoleWithThread('DoClient')),
-    Effect.tapCauseLogPretty,
-    Effect.runPromise,
-  )