effect-cf 0.40.2 → 0.40.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # effect-cf
 
+## 0.40.3
+
+### Patch Changes
+
+- [#157](https://github.com/danieljvdm/effect-cf/pull/157) [`279eecd`](https://github.com/danieljvdm/effect-cf/commit/279eecd1a5ea9112e727497e0aac666142e7a7f8) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Prevent Durable Object SQLite transactions from stalling when a blocked owner timer precedes an Effect scheduler yield. Keep transaction isolation, rollback, and the caller's scheduler after the transaction completes.
+
 ## 0.40.2
 
 ### Patch Changes

package/dist/D1.d.mts

@@ -2,8 +2,8 @@ import { WorkerEnvironment } from "./Environment.mjs";
 import { BindingNotFoundError, BindingService, BindingValidationError } from "./Binding.mjs";
 import * as Layer$1 from "effect/Layer";
 import { D1Client } from "@effect/sql-d1";
-import { Config } from "effect";
 import { SqlClient } from "effect/unstable/sql";
+import { Config } from "effect";
 declare namespace D1_d_exports {
   export { D1Definition, D1Service, D1SqlLayerOptions, Service, TypeId, make };
 }

package/dist/DurableObjectSqlite.mjs

@@ -1,16 +1,25 @@
 import { __exportAll } from "./_virtual/_rolldown/runtime.mjs";
 import { DurableObjectState } from "./DurableObjectState.mjs";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { SqliteClient } from "@effect/sql-sqlite-do";
+import * as Scheduler from "effect/Scheduler";
+import * as Reactivity from "effect/unstable/reactivity/Reactivity";
+import { SqlClient } from "effect/unstable/sql";
 //#region src/DurableObjectSqlite.ts
 var DurableObjectSqlite_exports = /* @__PURE__ */ __exportAll({ layer: () => layer });
-const layer = (options) => Layer.unwrap(Effect.gen(function* () {
+const layer = (options) => Layer.effectContext(Effect.gen(function* () {
 	const state = yield* DurableObjectState;
-	return SqliteClient.layer({
+	const client = yield* SqliteClient.make({
 		...options,
 		storage: state.raw.storage
 	});
-}));
+	const original = client.withTransaction;
+	const scheduler = new Scheduler.MixedScheduler("sync");
+	const withTransaction = (body) => original(body).pipe(Effect.provideService(Scheduler.Scheduler, scheduler));
+	Object.assign(client, { withTransaction });
+	return Context.make(SqliteClient.SqliteClient, client).pipe(Context.add(SqlClient.SqlClient, client));
+})).pipe(Layer.provide(Reactivity.layer));
 //#endregion
 export { DurableObjectSqlite_exports, layer };

package/dist/HyperdrivePg.d.mts

@@ -2,8 +2,8 @@ import { WorkerEnvironment } from "./Environment.mjs";
 import { BindingNotFoundError, BindingValidationError } from "./Binding.mjs";
 import { LayerOptions, TagClass } from "./Hyperdrive.mjs";
 import * as Layer from "effect/Layer";
-import { PgClient } from "@effect/sql-pg";
 import { SqlClient, SqlError } from "effect/unstable/sql";
+import { PgClient } from "@effect/sql-pg";
 //#region src/HyperdrivePg.d.ts
 type PgLayerOptions = Omit<Parameters<typeof PgClient.makeClient>[0], "url" | "host" | "port" | "path" | "ssl" | "database" | "username" | "password" | "stream">;
 declare const layer: <Self, Id extends string>(tag: TagClass<Self, Id>, binding: LayerOptions, options?: PgLayerOptions) => Layer.Layer<PgClient.PgClient | SqlClient.SqlClient, BindingNotFoundError | BindingValidationError | SqlError.SqlError, WorkerEnvironment>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-cf",
-  "version": "0.40.2",
+  "version": "0.40.3",
   "description": "Effect-native primitives for Cloudflare Workers and bindings.",
   "license": "MIT",
   "repository": {

package/src/DurableObjectSqlite.ts

@@ -1,7 +1,10 @@
 import { SqliteClient } from "@effect/sql-sqlite-do";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import type { SqlClient } from "effect/unstable/sql";
+import * as Scheduler from "effect/Scheduler";
+import * as Reactivity from "effect/unstable/reactivity/Reactivity";
+import { SqlClient } from "effect/unstable/sql";
 
 import { DurableObjectState } from "./DurableObjectState";
 
@@ -10,10 +13,22 @@ export type SqliteLayerOptions = Omit<SqliteClient.SqliteClientConfig, "db" | "s
 export const layer = (
   options?: SqliteLayerOptions,
 ): Layer.Layer<SqliteClient.SqliteClient | SqlClient.SqlClient, never, DurableObjectState> =>
-  Layer.unwrap(
+  Layer.effectContext(
     Effect.gen(function* () {
       const state = yield* DurableObjectState;
+      const client = yield* SqliteClient.make({ ...options, storage: state.raw.storage });
+      const original = client.withTransaction;
+      const scheduler = new Scheduler.MixedScheduler("sync");
+      const withTransaction: SqliteClient.SqliteClient["withTransaction"] = (body) =>
+        original(body).pipe(Effect.provideService(Scheduler.Scheduler, scheduler));
 
-      return SqliteClient.layer({ ...options, storage: state.raw.storage });
+      // Native timers retain their input gate. A blocked parent timer can prevent
+      // a transaction's later timer from running, so yield through microtasks until
+      // the native transaction settles. Keep the original client and SQL permit.
+      Object.assign(client, { withTransaction });
+
+      return Context.make(SqliteClient.SqliteClient, client).pipe(
+        Context.add(SqlClient.SqlClient, client),
+      );
     }),
-  );
+  ).pipe(Layer.provide(Reactivity.layer));