effect-cf 0.54.0 → 0.55.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # effect-cf
 
+## 0.55.0
+
+### Minor Changes
+
+- [#211](https://github.com/danieljvdm/effect-cf/pull/211) [`2764143`](https://github.com/danieljvdm/effect-cf/commit/276414374c3fe71f619c26ef1c447ab0f52f9ab4) Thanks [@danieljvdm](https://github.com/danieljvdm)! - Keep in-flight Durable Object work recoverable through a configurable short alarm deadline while preserving hourly parked recovery. Coalesce native deliveries with active processing without starting another pass.
+
 ## 0.54.0
 
 ### Minor Changes

package/dist/DurableObjectAlarm.d.mts

@@ -21,6 +21,8 @@ declare const DEFAULT_MIN_REPEAT_INTERVAL_MS = 60000;
 interface ScheduleConfiguration {
   /** Check for due alarms after RPC/fetch responses unwind. Native alarms remain recovery authority. */
   readonly dispatchAfterEvent?: boolean;
+  /** Positive recovery deadline while dispatch or deferWakes is active. Defaults to one second. */
+  readonly inFlightRecovery?: Duration.Input;
   /** Retry floor, at least one second. Defaults to one second. */
   readonly minimumRetryDelay?: Duration.Input;
   /** Positive safe integer. Defaults to eight unchanged attempts. */
@@ -184,7 +186,7 @@ type AlarmScheduler = {
    * object's concurrent and nested scopes. Source/checkpoint transactions still commit;
    * the last scope reconciles their current deadlines on success, failure or interruption.
    * Run outside transactions, around bounded maintenance or inline work. The first scope's
-   * parkedRetryDelay bounds the shared guard; renew it if it expires and is consumed while
+   * inFlightRecovery bounds the shared guard; renew it if it expires and is consumed while
    * scopes remain active. A process loss before exit recovers at that retained alarm.
    */
   readonly deferWakes: <A, E, R>(body: Effect.Effect<A, E, R>) => Effect.Effect<A, E | InvalidScheduleConfigurationError | StorageOperationError, R>;

package/dist/DurableObjectAlarm.mjs

@@ -68,6 +68,7 @@ const DEFAULT_PROCESS_DUE_ALARMS_LIMIT = 100;
 const MIN_RETRY_DELAY_MS = 1e3;
 /** Minimum and default parked recovery interval. */
 const PARKED_RETRY_DELAY_MS = 36e5;
+const DEFAULT_IN_FLIGHT_RECOVERY_MS = 1e3;
 /** Absolute product repeat floor. */
 const MIN_REPEAT_INTERVAL_MS = 1e3;
 /** Default product schedule floor. Never use repeats to poll state. */
@@ -78,6 +79,7 @@ const safeIntegerAtLeast = (minimum) => S.Int.check(S.isGreaterThanOrEqualTo(min
 const AlarmLifecycleSchema = S.Literals(["automatic", "manual"]);
 const ScheduleConfigurationSchema = S.Struct({
 	dispatchAfterEvent: S.Boolean,
+	inFlightRecovery: safeIntegerAtLeast(1),
 	minimumRetryDelay: safeIntegerAtLeast(MIN_RETRY_DELAY_MS),
 	unchangedAttemptBudget: safeIntegerAtLeast(1),
 	parkedRetryDelay: safeIntegerAtLeast(PARKED_RETRY_DELAY_MS),
@@ -142,6 +144,7 @@ const getScheduleConfiguration = Effect.fnUntraced(function* (defaults) {
 	return yield* Effect.try({
 		try: () => S.decodeUnknownSync(ScheduleConfigurationSchema)({
 			dispatchAfterEvent: input.dispatchAfterEvent ?? false,
+			inFlightRecovery: Math.ceil(Duration.toMillis(input.inFlightRecovery ?? DEFAULT_IN_FLIGHT_RECOVERY_MS)),
 			minimumRetryDelay: Math.ceil(Duration.toMillis(input.minimumRetryDelay ?? 1e3)),
 			unchangedAttemptBudget: input.unchangedAttemptBudget ?? 8,
 			parkedRetryDelay: Math.ceil(Duration.toMillis(input.parkedRetryDelay ?? 36e5)),
@@ -533,7 +536,7 @@ var DurableObjectAlarm = class DurableObjectAlarm extends Context.Service()("eff
 			const configuration = yield* getScheduleConfiguration(configurationDefaults);
 			const now = yield* Clock.currentTimeMillis;
 			if (wakeDeferrals === 0) {
-				deferredRecoveryDelay = configuration.parkedRetryDelay;
+				deferredRecoveryDelay = configuration.inFlightRecovery;
 				deferredRecoveryAt = now + deferredRecoveryDelay;
 				wakesReady ??= Deferred.makeUnsafe();
 			}
@@ -566,6 +569,16 @@ var DurableObjectAlarm = class DurableObjectAlarm extends Context.Service()("eff
 			})).pipe(Effect.onExit((exit) => Effect.gen(function* () {
 				const reconcile = dispatchNeedsReconcile || dispatchStarted || Exit.isFailure(exit);
 				dispatchActive = Exit.isFailure(exit) && !dispatchStarted;
+				if (dispatchActive) {
+					const recoveryDelay = yield* getScheduleConfiguration(configurationDefaults).pipe(Effect.match({
+						onFailure: () => PARKED_RETRY_DELAY_MS,
+						onSuccess: (configuration) => configuration.parkedRetryDelay
+					}));
+					if (wakeDeferrals === 0) {
+						deferredRecoveryDelay = recoveryDelay;
+						deferredRecoveryAt = 0;
+					}
+				}
 				const reconciled = yield* (reconcile ? transaction(() => Effect.void) : Effect.void).pipe(Effect.exit);
 				dispatchActive = false;
 				pendingAlarm = void 0;
@@ -607,7 +620,10 @@ var DurableObjectAlarm = class DurableObjectAlarm extends Context.Service()("eff
 			const dueRows = yield* select("automatic", limit);
 			const manualRows = yield* select("manual", DEFAULT_PROCESS_DUE_ALARMS_LIMIT);
 			if (manualRows.length > 0) yield* transaction(() => Effect.gen(function* () {
-				for (const row of manualRows) yield* state.storage.sql.exec(`UPDATE effect_cf_scheduled_alarms SET run_at = ?, wake_at = ? WHERE ${sameRevisionSql}`, now + configuration.parkedRetryDelay, now + configuration.parkedRetryDelay, row.storage_id, row.storage_id, row.revision);
+				for (const row of manualRows) {
+					const recoveryAt = now + (options?.[ManualTags]?.has(row.tag) ? configuration.inFlightRecovery : configuration.parkedRetryDelay);
+					yield* state.storage.sql.exec(`UPDATE effect_cf_scheduled_alarms SET run_at = ?, wake_at = ? WHERE ${sameRevisionSql}`, recoveryAt, recoveryAt, row.storage_id, row.storage_id, row.revision);
+				}
 			}));
 			const handled = [];
 			const failed = [];
@@ -665,7 +681,10 @@ var DurableObjectAlarm = class DurableObjectAlarm extends Context.Service()("eff
 			const permits = dispatch?.permits ?? (yield* Semaphore.make(4));
 			const automatic = Effect.forEach(dueRows, handleRow, { discard: true }).pipe(Effect.exit);
 			const exits = yield* manualRows.length === 0 ? automatic.pipe(Effect.map((exit) => [exit])) : Effect.all([automatic, Effect.forEach(manualRows, (row) => permits.withPermits(1)(handleRow(row)).pipe(Effect.exit), { concurrency: 4 }).pipe(Effect.flatMap(Exit.asVoidAll), Effect.exit)], { concurrency: 2 });
-			yield* transaction(() => Effect.void);
+			yield* transaction(() => Effect.gen(function* () {
+				const recoveryAt = (yield* Clock.currentTimeMillis) + configuration.parkedRetryDelay;
+				for (const row of manualRows) yield* state.storage.sql.exec(`UPDATE effect_cf_scheduled_alarms SET run_at = ?, wake_at = ? WHERE ${sameRevisionSql}`, recoveryAt, recoveryAt, row.storage_id, row.storage_id, row.revision);
+			}));
 			yield* Exit.asVoidAll(exits);
 			return {
 				failed,

package/package.json

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

package/src/DurableObjectAlarm.ts

@@ -46,6 +46,7 @@ export const MIN_RETRY_DELAY_MS = 1_000;
 export const UNCHANGED_ATTEMPT_BUDGET = 8;
 /** Minimum and default parked recovery interval. */
 export const PARKED_RETRY_DELAY_MS = 3_600_000;
+const DEFAULT_IN_FLIGHT_RECOVERY_MS = 1_000;
 
 /** Absolute product repeat floor. */
 export const MIN_REPEAT_INTERVAL_MS = 1_000;
@@ -55,6 +56,8 @@ export const DEFAULT_MIN_REPEAT_INTERVAL_MS = 60_000;
 export interface ScheduleConfiguration {
   /** Check for due alarms after RPC/fetch responses unwind. Native alarms remain recovery authority. */
   readonly dispatchAfterEvent?: boolean;
+  /** Positive recovery deadline while dispatch or deferWakes is active. Defaults to one second. */
+  readonly inFlightRecovery?: Duration.Input;
   /** Retry floor, at least one second. Defaults to one second. */
   readonly minimumRetryDelay?: Duration.Input;
   /** Positive safe integer. Defaults to eight unchanged attempts. */
@@ -81,6 +84,7 @@ const AlarmLifecycleSchema = S.Literals(["automatic", "manual"]);
 
 const ScheduleConfigurationSchema = S.Struct({
   dispatchAfterEvent: S.Boolean,
+  inFlightRecovery: safeIntegerAtLeast(1),
   minimumRetryDelay: safeIntegerAtLeast(MIN_RETRY_DELAY_MS),
   unchangedAttemptBudget: safeIntegerAtLeast(1),
   parkedRetryDelay: safeIntegerAtLeast(PARKED_RETRY_DELAY_MS),
@@ -230,6 +234,9 @@ const getScheduleConfiguration = Effect.fnUntraced(function* (defaults: Schedule
     try: () =>
       S.decodeUnknownSync(ScheduleConfigurationSchema)({
         dispatchAfterEvent: input.dispatchAfterEvent ?? false,
+        inFlightRecovery: Math.ceil(
+          Duration.toMillis(input.inFlightRecovery ?? DEFAULT_IN_FLIGHT_RECOVERY_MS),
+        ),
         minimumRetryDelay: Math.ceil(
           Duration.toMillis(input.minimumRetryDelay ?? MIN_RETRY_DELAY_MS),
         ),
@@ -385,7 +392,7 @@ export type AlarmScheduler = {
    * object's concurrent and nested scopes. Source/checkpoint transactions still commit;
    * the last scope reconciles their current deadlines on success, failure or interruption.
    * Run outside transactions, around bounded maintenance or inline work. The first scope's
-   * parkedRetryDelay bounds the shared guard; renew it if it expires and is consumed while
+   * inFlightRecovery bounds the shared guard; renew it if it expires and is consumed while
    * scopes remain active. A process loss before exit recovers at that retained alarm.
    */
   readonly deferWakes: <A, E, R>(
@@ -1369,7 +1376,7 @@ export class DurableObjectAlarm extends Context.Service<DurableObjectAlarm, Alar
             const now = yield* Clock.currentTimeMillis;
 
             if (wakeDeferrals === 0) {
-              deferredRecoveryDelay = configuration.parkedRetryDelay;
+              deferredRecoveryDelay = configuration.inFlightRecovery;
               deferredRecoveryAt = now + deferredRecoveryDelay;
               wakesReady ??= Deferred.makeUnsafe<void>();
             }
@@ -1448,6 +1455,22 @@ export class DurableObjectAlarm extends Context.Service<DurableObjectAlarm, Alar
                           dispatchNeedsReconcile || dispatchStarted || Exit.isFailure(exit);
 
                         dispatchActive = Exit.isFailure(exit) && !dispatchStarted;
+                        if (dispatchActive) {
+                          const recoveryDelay = yield* getScheduleConfiguration(
+                            configurationDefaults,
+                          ).pipe(
+                            Effect.match({
+                              onFailure: () => PARKED_RETRY_DELAY_MS,
+                              onSuccess: (configuration) => configuration.parkedRetryDelay,
+                            }),
+                          );
+
+                          // A concurrent deferred scope retains ownership of its short guard.
+                          if (wakeDeferrals === 0) {
+                            deferredRecoveryDelay = recoveryDelay;
+                            deferredRecoveryAt = 0;
+                          }
+                        }
                         const reconciled = yield* (
                           reconcile ? transaction(() => Effect.void) : Effect.void
                         ).pipe(Effect.exit);
@@ -1570,11 +1593,17 @@ export class DurableObjectAlarm extends Context.Service<DurableObjectAlarm, Alar
           yield* transaction(() =>
             Effect.gen(function* () {
               for (const row of manualRows) {
-                // Keep the selected revision: a racing replacement must survive this guard.
+                // Keep work eligible after eviction; unknown registrations stay parked.
+                const recoveryAt =
+                  now +
+                  (options?.[ManualTags]?.has(row.tag)
+                    ? configuration.inFlightRecovery
+                    : configuration.parkedRetryDelay);
+
                 yield* state.storage.sql.exec(
                   `UPDATE effect_cf_scheduled_alarms SET run_at = ?, wake_at = ? WHERE ${sameRevisionSql}`,
-                  now + configuration.parkedRetryDelay,
-                  now + configuration.parkedRetryDelay,
+                  recoveryAt,
+                  recoveryAt,
                   row.storage_id,
                   row.storage_id,
                   row.revision,
@@ -1686,7 +1715,23 @@ export class DurableObjectAlarm extends Context.Service<DurableObjectAlarm, Alar
               { concurrency: 2 },
             );
 
-        yield* transaction(() => Effect.void);
+        yield* transaction(() =>
+          Effect.gen(function* () {
+            const recoveryAt = (yield* Clock.currentTimeMillis) + configuration.parkedRetryDelay;
+
+            for (const row of manualRows) {
+              // Only a returned handler with no newer checkpoint falls back to parked recovery.
+              yield* state.storage.sql.exec(
+                `UPDATE effect_cf_scheduled_alarms SET run_at = ?, wake_at = ? WHERE ${sameRevisionSql}`,
+                recoveryAt,
+                recoveryAt,
+                row.storage_id,
+                row.storage_id,
+                row.revision,
+              );
+            }
+          }),
+        );
         yield* Exit.asVoidAll(exits);
 
         return { failed, handled, parked };