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

package/dist/make-sqlite-db.js

@@ -11,13 +11,15 @@ class CloudflarePreparedStatement {
     }
     execute = (bindValues, options) => {
         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;
             for (const _row of cursor) {
                 changedCount++;
             }
-            if (options?.onRowsChanged) {
+            if (options?.onRowsChanged !== undefined) {
                 options.onRowsChanged(changedCount);
             }
         }
@@ -31,7 +33,7 @@ class CloudflarePreparedStatement {
     };
     select = (bindValues) => {
         try {
-            const cursor = this.sqlStorage.exec(this.sql, ...(bindValues ? Object.values(bindValues) : []));
+            const cursor = this.sqlStorage.exec(this.sql, ...(bindValues !== undefined ? Object.values(bindValues) : []));
             const results = [];
             for (const row of cursor) {
                 results.push(row);
@@ -51,14 +53,12 @@ class CloudflarePreparedStatement {
     };
 }
 export const makeSqliteDb = (input) => Effect.gen(function* () {
-    // console.log('makeSqliteDb', input)
     if (input._tag === 'in-memory') {
         return makeSqliteDb_({
             sqlStorage: input.db,
             metadata: {
                 _tag: 'file',
                 dbPointer: 0,
-                // persistenceInfo: { fileName: ':memory:' },
                 persistenceInfo: { fileName: 'cf' },
                 input,
                 configureDb: input.configureDb,
@@ -71,7 +71,6 @@ export const makeSqliteDb = (input) => Effect.gen(function* () {
             metadata: {
                 _tag: 'file',
                 dbPointer: 0,
-                // persistenceInfo: { fileName: `${input.directory}/${input.databaseName}` },
                 persistenceInfo: { fileName: 'cf' },
                 input,
                 configureDb: input.configureDb,
@@ -87,7 +86,7 @@ export const makeSqliteDb_ = ({ sqlStorage, metadata, }) => {
         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 {
@@ -126,17 +125,13 @@ export const makeSqliteDb_ = ({ sqlStorage, metadata, }) => {
         }),
         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;
             }
             for (const stmt of preparedStmts) {
@@ -191,4 +186,38 @@ export const makeSqliteDb_ = ({ sqlStorage, metadata, }) => {
     metadata.configureDb(sqliteDb);
     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) => {
+    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);
+};
 //# sourceMappingURL=make-sqlite-db.js.map

package/dist/make-sqlite-db.js.map

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

package/dist/mod.d.ts

@@ -1,5 +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';
 //# sourceMappingURL=mod.d.ts.map

package/dist/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EACL,KAAK,oBAAoB,EACzB,aAAa,EACb,oBAAoB,EACpB,KAAK,GAAG,EACR,KAAK,sBAAsB,EAC3B,KAAK,6BAA6B,GACnC,MAAM,iCAAiC,CAAA"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,YAAY,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnE,OAAO,EAAE,KAAK,oBAAoB,EAAE,aAAa,EAAE,oBAAoB,EAAE,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAC/G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA"}

package/dist/mod.js

@@ -1,4 +1,4 @@
 import "./polyfill.js";
+export { createStoreDo, createStoreDoPromise } from "./create-store-do.js";
 export { makeAdapter } from "./make-adapter.js";
-export { createStoreDo, createStoreDoPromise, } from "./make-client-durable-object.js";
 //# sourceMappingURL=mod.js.map

package/dist/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAEL,aAAa,EACb,oBAAoB,GAIrB,MAAM,iCAAiC,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAGtB,OAAO,EAA6B,aAAa,EAAE,oBAAoB,EAAY,MAAM,sBAAsB,CAAA;AAC/G,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA"}

package/package.json

@@ -1,6 +1,16 @@
 {
   "name": "@livestore/adapter-cloudflare",
-  "version": "0.4.0-dev.8",
+  "version": "0.4.0",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/livestorejs/livestore.git"
+  },
+  "files": [
+    "dist",
+    "package.json",
+    "src"
+  ],
   "type": "module",
   "sideEffects": [
     "./src/polyfill.ts",
@@ -10,26 +20,59 @@
     ".": "./dist/mod.js",
     "./polyfill": "./dist/polyfill.js"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
-    "@cloudflare/workers-types": "4.20250823.0",
-    "@livestore/common": "0.4.0-dev.8",
-    "@livestore/common-cf": "0.4.0-dev.8",
-    "@livestore/sync-cf": "0.4.0-dev.8",
-    "@livestore/sqlite-wasm": "0.4.0-dev.8",
-    "@livestore/livestore": "0.4.0-dev.8",
-    "@livestore/utils": "0.4.0-dev.8"
+    "@cloudflare/workers-types": "4.20251118.0",
+    "@livestore/common": "^0.4.0",
+    "@livestore/common-cf": "^0.4.0",
+    "@livestore/livestore": "^0.4.0",
+    "@livestore/sqlite-wasm": "^0.4.0",
+    "@livestore/sync-cf": "^0.4.0",
+    "@livestore/utils": "^0.4.0"
   },
   "devDependencies": {
-    "wrangler": "4.32.0"
+    "wrangler": "4.42.2"
   },
-  "files": [
-    "package.json",
-    "src",
-    "dist"
-  ],
-  "license": "Apache-2.0",
-  "publishConfig": {
-    "access": "public"
+  "peerDependencies": {
+    "@effect/ai": "^0.35.0",
+    "@effect/cli": "^0.75.1",
+    "@effect/cluster": "^0.58.2",
+    "@effect/experimental": "^0.60.0",
+    "@effect/opentelemetry": "^0.63.0",
+    "@effect/platform": "^0.96.1",
+    "@effect/platform-browser": "^0.76.0",
+    "@effect/platform-bun": "^0.89.0",
+    "@effect/platform-node": "^0.106.0",
+    "@effect/printer": "^0.49.0",
+    "@effect/printer-ansi": "^0.49.0",
+    "@effect/rpc": "^0.75.1",
+    "@effect/sql": "^0.51.1",
+    "@effect/typeclass": "^0.40.0",
+    "@effect/vitest": "^0.29.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@standard-schema/spec": "^1.1.0",
+    "effect": "^3.21.2"
+  },
+  "$genie": {
+    "source": "package.json.genie.ts",
+    "warning": "DO NOT EDIT - changes will be overwritten",
+    "workspaceClosureDirs": [
+      "packages/@livestore/adapter-cloudflare",
+      "packages/@livestore/adapter-web",
+      "packages/@livestore/common",
+      "packages/@livestore/common-cf",
+      "packages/@livestore/devtools-web-common",
+      "packages/@livestore/livestore",
+      "packages/@livestore/sqlite-wasm",
+      "packages/@livestore/sync-cf",
+      "packages/@livestore/utils",
+      "packages/@livestore/utils-dev",
+      "packages/@livestore/wa-sqlite",
+      "packages/@livestore/webmesh"
+    ]
   },
   "scripts": {
     "test": "echo No tests yet"

package/src/WebSocket.ts

@@ -1,6 +1,6 @@
-import type { Schedule, Scope } from '@livestore/utils/effect'
-import { Effect, Exit, identity, WebSocket } from '@livestore/utils/effect'
-import type * as CfWorker from './cf-types.ts'
+import type { CfTypes } from '@livestore/common-cf'
+import { Effect, Exit, identity, type Schedule, type Scope } from '@livestore/utils/effect'
+import { WebSocket } from '@livestore/utils/effect/browser'
 
 // TODO refactor using Effect socket implementation
 // https://github.com/Effect-TS/effect/blob/main/packages%2Fexperimental%2Fsrc%2FDevTools%2FClient.ts#L113
@@ -18,23 +18,27 @@ export const makeWebSocket = ({
   durableObject,
 }: {
   /** CF Sync Backend DO with `/sync` endpoint */
-  durableObject: CfWorker.DurableObjectStub
+  durableObject: CfTypes.DurableObjectStub
   url: URL
   reconnect?: Schedule.Schedule<unknown> | false
-}): Effect.Effect<CfWorker.WebSocket, WebSocket.WebSocketError, Scope.Scope> =>
+}): Effect.Effect<CfTypes.WebSocket, WebSocket.WebSocketError, Scope.Scope> =>
   Effect.gen(function* () {
     // yield* validateUrl(url)
 
     const socket = yield* Effect.tryPromise({
       try: () =>
-        durableObject.fetch(url, { headers: { Upgrade: 'websocket' } }).then((res: any) => {
-          if (!res.webSocket) {
+        // NOTE: .toString() required due to type mismatch between standard URL and CF's URL types
+        durableObject.fetch(url.toString(), { headers: { Upgrade: 'websocket' } }).then((res: any) => {
+          if (res.webSocket == null) {
             throw new Error('WebSocket upgrade failed')
           }
-          return res.webSocket as CfWorker.WebSocket
+          return res.webSocket as CfTypes.WebSocket
         }),
       catch: (cause) => new WebSocket.WebSocketError({ cause }),
-    }).pipe(reconnect ? Effect.retry(reconnect) : identity, Effect.withSpan('make-websocket-durable-object'))
+    }).pipe(
+      reconnect !== undefined && reconnect !== false ? Effect.retry(reconnect) : identity,
+      Effect.withSpan('make-websocket-durable-object'),
+    )
 
     socket.accept()
 
@@ -53,15 +57,16 @@ export const makeWebSocket = ({
      */
     yield* Effect.addFinalizer(
       Effect.fn(function* (exit) {
-        try {
-          if (Exit.isFailure(exit)) {
-            socket.close(3000)
-          } else {
-            socket.close(1000)
-          }
-        } catch (error) {
-          yield* Effect.die(new WebSocket.WebSocketError({ cause: error }))
-        }
+        yield* Effect.try({
+          try: () => {
+            if (Exit.isFailure(exit) === true) {
+              socket.close(3000)
+            } else {
+              socket.close(1000)
+            }
+          },
+          catch: (error) => new WebSocket.WebSocketError({ cause: error }),
+        }).pipe(Effect.orDie)
       }),
     )
 

package/src/create-store-do.ts

@@ -0,0 +1,173 @@
+import { LogConfig, type SyncOptions } from '@livestore/common'
+import type { CfTypes, HelperTypes } from '@livestore/common-cf'
+import { createStore, type LiveStoreSchema, provideOtel } from '@livestore/livestore'
+import type * as CfSyncBackend from '@livestore/sync-cf/cf-worker'
+import { makeDoRpcSync } from '@livestore/sync-cf/client'
+import { Effect, Logger, Scope } from '@livestore/utils/effect'
+
+import { makeAdapter } from './make-adapter.ts'
+
+export type Env = {
+  SYNC_BACKEND_DO: CfTypes.DurableObjectNamespace<CfSyncBackend.SyncBackendRpcInterface>
+}
+
+export type CreateStoreDoOptions<TSchema extends LiveStoreSchema, TEnv, TState> = {
+  /** 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
+  /** Runtime details about the Durable Object this store runs inside. Needed for sync backend to call back to this instance. */
+  durableObject: {
+    /** Durable Object state handle (e.g. `this.ctx`). */
+    ctx: TState
+    /** Environment bindings associated with the Durable Object. */
+    env: TEnv
+    /** Binding name Cloudflare uses to reach this Durable Object from other workers. */
+    bindingName: HelperTypes.ExtractDurableObjectKeys<NoInfer<TEnv>>
+  }
+  /** RPC stub pointing at the sync backend Durable Object used for replication. */
+  syncBackendStub: CfTypes.DurableObjectStub<CfSyncBackend.SyncBackendRpcInterface>
+  /**
+   * Enables live pull mode to receive sync updates via Durable Object RPC callbacks.
+   *
+   * @default false
+   */
+  livePull?: boolean
+  /**
+   * Clears existing Durable Object persistence before bootstrapping the store.
+   *
+   * Note: Only use this for development purposes.
+   */
+  resetPersistence?: boolean
+  /**
+   * Controls how initial sync behaves when the store boots.
+   *
+   * @default { _tag: 'Blocking', timeout: 500 }
+   */
+  initialSyncOptions?: SyncOptions['initialSyncOptions']
+} & LogConfig.WithLoggerOptions
+
+/**
+ * Creates a LiveStore instance inside a Cloudflare Durable Object.
+ *
+ * This function bootstraps a full LiveStore client within a Durable Object, enabling
+ * persistent state management with automatic sync to a sync backend. Use this when you
+ * need server-side LiveStore instances that can communicate with other clients.
+ *
+ * Returns an Effect that resolves to a Store instance. For a Promise-based API,
+ * use `createStoreDoPromise` instead.
+ *
+ * @example
+ * ```ts
+ * import { createStoreDo } from '@livestore/adapter-cloudflare'
+ * import { schema } from './schema'
+ *
+ * export class MyDurableObject extends DurableObject {
+ *   store: Store | undefined
+ *
+ *   async fetch(request: Request) {
+ *     if (!this.store) {
+ *       this.store = await createStoreDo({
+ *         schema,
+ *         storeId: 'my-store',
+ *         clientId: this.ctx.id.toString(),
+ *         sessionId: 'do-session',
+ *         durableObject: {
+ *           ctx: this.ctx,
+ *           env: this.env,
+ *           bindingName: 'MY_DO',
+ *         },
+ *         syncBackendStub: this.env.SYNC_BACKEND_DO.get(syncBackendId),
+ *       }).pipe(Effect.runPromise)
+ *     }
+ *     // Use this.store...
+ *   }
+ * }
+ * ```
+ *
+ * @see https://livestore.dev/docs/reference/adapters/cloudflare for setup guide
+ */
+// TODO Also support in Cloudflare workers outside of a durable object context.
+export const createStoreDo = <
+  TSchema extends LiveStoreSchema,
+  TEnv,
+  TState extends CfTypes.DurableObjectState = CfTypes.DurableObjectState,
+>({
+  schema,
+  storeId,
+  clientId,
+  sessionId,
+  durableObject,
+  syncBackendStub,
+  livePull = false,
+  resetPersistence = false,
+  initialSyncOptions = { _tag: 'Blocking', timeout: 500 },
+}: CreateStoreDoOptions<TSchema, TEnv, TState>) =>
+  Effect.gen(function* () {
+    const { ctx, bindingName } = durableObject
+    const storage = ctx.storage
+    const durableObjectId = ctx.id.toString()
+    const scope = yield* Scope.make()
+
+    const adapter = makeAdapter({
+      clientId,
+      sessionId,
+      storage,
+      resetPersistence,
+      syncOptions: {
+        backend: makeDoRpcSync({
+          syncBackendStub,
+          durableObjectContext: { bindingName, durableObjectId },
+        }),
+        livePull, // Uses DO RPC callbacks for reactive pull
+        initialSyncOptions,
+      },
+    })
+
+    return yield* createStore({ schema, adapter, storeId }).pipe(Scope.extend(scope), provideOtel({}))
+  })
+
+/**
+ * Promise-based wrapper around `createStoreDo` for simpler async/await usage.
+ *
+ * Equivalent to calling `createStoreDo(options).pipe(Effect.runPromise)` with
+ * logging configured automatically.
+ *
+ * @example
+ * ```ts
+ * import { createStoreDoPromise } from '@livestore/adapter-cloudflare'
+ *
+ * export class MyDurableObject extends DurableObject {
+ *   async fetch(request: Request) {
+ *     const store = await createStoreDoPromise({
+ *       schema,
+ *       storeId: 'my-store',
+ *       clientId: this.ctx.id.toString(),
+ *       sessionId: 'do-session',
+ *       durableObject: { ctx: this.ctx, env: this.env, bindingName: 'MY_DO' },
+ *       syncBackendStub: this.env.SYNC_BACKEND_DO.get(syncBackendId),
+ *     })
+ *     // Use store...
+ *   }
+ * }
+ * ```
+ */
+export const createStoreDoPromise = <
+  TSchema extends LiveStoreSchema,
+  TEnv,
+  TState extends CfTypes.DurableObjectState = CfTypes.DurableObjectState,
+>(
+  options: CreateStoreDoOptions<TSchema, TEnv, TState>,
+) =>
+  createStoreDo(options).pipe(
+    LogConfig.withLoggerConfig(options, {
+      threadName: 'DoClient',
+      defaultLogger: Logger.consoleWithThread('DoClient'),
+    }),
+    Effect.tapCauseLogPretty,
+    Effect.runPromise,
+  )