Adapt to latest ResilientFunctions API changes (#11)

stidsborg · claude · web-flow · commit 1e1d57fac848 · 2026-05-30T12:19:51.000+02:00
* Updated Cleipnir.ResilientFunctions to the latest commit

* Adapt to ResilientFunctions Settings/EffectId API changes

The Settings constructor dropped leaseLength and added
replicaHeartbeatFrequency, and EffectId no longer converts implicitly
from int.

- Options: replace LeaseLength with ReplicaHeartbeatFrequency and pass
  Settings args by name; also stop dropping UtcNow in Merge
- FlowsContainer: rebuild Options by name so no options are dropped
- Tests: construct InitialEffect with EffectId via 0.ToEffectId()
- Samples: use replicaHeartbeatFrequency instead of leaseLength

Co-Authored-By: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;

---------

Co-authored-by: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/Cleipnir.ResilientFunctions b/Cleipnir.ResilientFunctions
@@ -1 +1 @@
-Subproject commit eb6bfc7cced620537ff08295df38341e9b5ec87d
+Subproject commit e5ec420fc1de4059050cf5c9587feae23237f147
diff --git a/Cleipnir.Tests/Flows/FunctionRegistrationTests.cs b/Cleipnir.Tests/Flows/FunctionRegistrationTests.cs
@@ -35,7 +35,7 @@ await flows.Run(
             param: "SomeParam",
             new InitialState(
                 [new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],
-                [new InitialEffect(0, "InitialEffectValue")]
+                [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]
             )
         );
 
diff --git a/Cleipnir.Tests/Flows/ParamlessFlowsTests.cs b/Cleipnir.Tests/Flows/ParamlessFlowsTests.cs
@@ -158,7 +158,7 @@ await flows.Run(
             "SomeInstanceId",
             new InitialState(
                 [new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],
-                [new InitialEffect(0, "InitialEffectValue")]
+                [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]
             )
         );
 
diff --git a/Cleipnir.Tests/Flows/UnitFlowsTests.cs b/Cleipnir.Tests/Flows/UnitFlowsTests.cs
@@ -265,7 +265,7 @@ await flows.Run(
             param: "SomeParam",
             new InitialState(
                 [new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],
-                [new InitialEffect(0, "InitialEffectValue")]
+                [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]
             )
         );
 
diff --git a/Cleipnir/FlowsContainer.cs b/Cleipnir/FlowsContainer.cs
@@ -27,16 +27,17 @@ public FlowsContainer(IFunctionStore flowStore, IServiceProvider serviceProvider
             var logger = serviceProvider.GetRequiredService<ILogger>();
             options = new Options(
                     unhandledExceptionHandler: ex => logger.LogError(ex, "Unhandled exception in Cleipnir"),
-                    options.RetentionPeriod,
-                    options.RetentionCleanUpFrequency,
-                    options.LeaseLength,
-                    options.EnableWatchdogs,
-                    options.WatchdogCheckFrequency,
-                    options.MessagesPullFrequency,
-                    options.MessagesDefaultMaxWaitForCompletion,
-                    options.DelayStartup,
-                    options.MaxParallelRetryInvocations,
-                    options.Serializer
+                    retentionPeriod: options.RetentionPeriod,
+                    retentionCleanUpFrequency: options.RetentionCleanUpFrequency,
+                    enableWatchdogs: options.EnableWatchdogs,
+                    watchdogCheckFrequency: options.WatchdogCheckFrequency,
+                    messagesPullFrequency: options.MessagesPullFrequency,
+                    messagesDefaultMaxWaitForCompletion: options.MessagesDefaultMaxWaitForCompletion,
+                    delayStartup: options.DelayStartup,
+                    maxParallelRetryInvocations: options.MaxParallelRetryInvocations,
+                    serializer: options.Serializer,
+                    utcNow: options.UtcNow,
+                    replicaHeartbeatFrequency: options.ReplicaHeartbeatFrequency
                 );
         }
 
diff --git a/Cleipnir/Options.cs b/Cleipnir/Options.cs
@@ -13,7 +13,6 @@ public class Options
     internal Action<FrameworkException>? UnhandledExceptionHandler { get; }
     internal TimeSpan? RetentionPeriod { get; }
     internal TimeSpan? RetentionCleanUpFrequency { get; }
-    internal TimeSpan? LeaseLength { get; }
     internal bool? EnableWatchdogs { get; }
     internal TimeSpan? WatchdogCheckFrequency { get; }
     internal TimeSpan? DelayStartup { get; }
@@ -22,14 +21,14 @@ public class Options
     internal TimeSpan? MessagesDefaultMaxWaitForCompletion { get; }
     internal ISerializer? Serializer { get; }
     internal UtcNow? UtcNow { get; }
+    internal TimeSpan? ReplicaHeartbeatFrequency { get; }
 
     /// <summary>
     /// Configuration options for Cleipnir
     /// </summary>
     /// <param name="unhandledExceptionHandler">Callback handler for unhandled flow exceptions</param>
     /// <param name="retentionPeriod">Period to keep completed flows before deletion. Default infinite.</param>
     /// <param name="retentionCleanUpFrequency">Retention clean-up check frequency. Default 1 hour when retention period is not infinite.</param>
-    /// <param name="leaseLength">Flow lease-length. Leases are automatically renewed. Default 60 seconds.</param>
     /// <param name="enableWatchdogs">Enable background crashed, interrupted and postponed flow scheduling. Default true.</param>
     /// <param name="watchdogCheckFrequency">Check frequency for eligible crashed, interrupted and postponed flows. Default 1 second.</param>
     /// <param name="messagesPullFrequency">Pull frequency for active/max-waiting messages. Default: 250ms</param>
@@ -38,24 +37,24 @@ public class Options
     /// <param name="maxParallelRetryInvocations">Limit the number of watchdog started invocations. Default: 100.</param>
     /// <param name="serializer">Specify custom serializer. Default built-in json-serializer.</param>
     /// <param name="utcNow">Provide custom delegate for providing current utc datetime. Default: () => DateTime.UtcNow</param>
+    /// <param name="replicaHeartbeatFrequency">Heartbeat frequency for replica liveness detection. Default 1 second.</param>
     public Options(
         Action<FrameworkException>? unhandledExceptionHandler = null,
         TimeSpan? retentionPeriod = null,
         TimeSpan? retentionCleanUpFrequency = null,
-        TimeSpan? leaseLength = null,
         bool? enableWatchdogs = null,
         TimeSpan? watchdogCheckFrequency = null,
         TimeSpan? messagesPullFrequency = null,
         TimeSpan? messagesDefaultMaxWaitForCompletion = null,
         TimeSpan? delayStartup = null,
         int? maxParallelRetryInvocations = null,
         ISerializer? serializer = null,
-        UtcNow? utcNow = null
+        UtcNow? utcNow = null,
+        TimeSpan? replicaHeartbeatFrequency = null
     )
     {
         UnhandledExceptionHandler = unhandledExceptionHandler;
         WatchdogCheckFrequency = watchdogCheckFrequency;
-        LeaseLength = leaseLength;
         RetentionPeriod = retentionPeriod;
         RetentionCleanUpFrequency = retentionCleanUpFrequency;
         EnableWatchdogs = enableWatchdogs;
@@ -65,6 +64,7 @@ public Options(
         MaxParallelRetryInvocations = maxParallelRetryInvocations;
         Serializer = serializer;
         UtcNow = utcNow;
+        ReplicaHeartbeatFrequency = replicaHeartbeatFrequency;
     }
 
     public Options Merge(Options options)
@@ -73,30 +73,31 @@ public Options Merge(Options options)
             UnhandledExceptionHandler ?? options.UnhandledExceptionHandler,
             RetentionPeriod ?? options.RetentionPeriod,
             RetentionCleanUpFrequency ?? options.RetentionCleanUpFrequency,
-            LeaseLength ?? options.LeaseLength,
             EnableWatchdogs ?? options.EnableWatchdogs,
             WatchdogCheckFrequency ?? options.WatchdogCheckFrequency,
             MessagesPullFrequency ?? options.MessagesPullFrequency,
             MessagesDefaultMaxWaitForCompletion ?? options.MessagesDefaultMaxWaitForCompletion,
             DelayStartup ?? options.DelayStartup,
             MaxParallelRetryInvocations ?? options.MaxParallelRetryInvocations,
-            Serializer ?? options.Serializer
+            Serializer ?? options.Serializer,
+            UtcNow ?? options.UtcNow,
+            ReplicaHeartbeatFrequency ?? options.ReplicaHeartbeatFrequency
         );
     }
 
     internal Settings MapToSettings()
         => new(
-            UnhandledExceptionHandler,
-            RetentionPeriod,
-            RetentionCleanUpFrequency,
-            LeaseLength,
-            EnableWatchdogs,
-            WatchdogCheckFrequency,
-            MessagesPullFrequency,
-            MessagesDefaultMaxWaitForCompletion,
-            DelayStartup,
-            MaxParallelRetryInvocations,
-            Serializer,
-            UtcNow
+            unhandledExceptionHandler: UnhandledExceptionHandler,
+            retentionPeriod: RetentionPeriod,
+            retentionCleanUpFrequency: RetentionCleanUpFrequency,
+            enableWatchdogs: EnableWatchdogs,
+            watchdogCheckFrequency: WatchdogCheckFrequency,
+            messagesPullFrequency: MessagesPullFrequency,
+            messagesDefaultMaxWaitForCompletion: MessagesDefaultMaxWaitForCompletion,
+            delayStartup: DelayStartup,
+            maxParallelRetryInvocations: MaxParallelRetryInvocations,
+            serializer: Serializer,
+            utcNow: UtcNow,
+            replicaHeartbeatFrequency: ReplicaHeartbeatFrequency
         );
 }
diff --git a/Samples/Cleipnir.Sample.AspNet/Program.cs b/Samples/Cleipnir.Sample.AspNet/Program.cs
@@ -27,7 +27,7 @@ private static async Task Main(string[] args)
         await DatabaseHelper.CreateDatabaseIfNotExists(connectionString); //use to create db initially or clean existing state in database
         builder.Services.AddFlows(c => c
             .UsePostgresStore(connectionString)
-            .WithOptions(new Options(leaseLength: TimeSpan.FromSeconds(5)))
+            .WithOptions(new Options(replicaHeartbeatFrequency: TimeSpan.FromSeconds(5)))
             .RegisterFlow<OrderFlow, Order>()
         );
         
diff --git a/Samples/Cleipnir.Sample.Presentation.AspNet/Program.cs b/Samples/Cleipnir.Sample.Presentation.AspNet/Program.cs
@@ -32,7 +32,7 @@ private static async Task Main(string[] args)
         //await DatabaseHelper.RecreateDatabase(connectionString);
         builder.Services.AddFlows(c => c
             .UsePostgresStore(connectionString)
-            .WithOptions(new Options(leaseLength: TimeSpan.FromSeconds(5), messagesDefaultMaxWaitForCompletion: TimeSpan.MaxValue))
+            .WithOptions(new Options(replicaHeartbeatFrequency: TimeSpan.FromSeconds(5), messagesDefaultMaxWaitForCompletion: TimeSpan.MaxValue))
             .RegisterFlow<OrderFlow, Order>()
             .RegisterFlow<BatchOrderFlow, List<Order>>()
             .RegisterFlow<SingleOrderFlow, Order, TransactionIdAndTrackAndTrace>()

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ await flows.Run(`
`35`	`35`	`param: "SomeParam",`
`36`	`36`	`new InitialState(`
`37`	`37`	`[new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],`
`38`		`- [new InitialEffect(0, "InitialEffectValue")]`
	`38`	`+ [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]`
`39`	`39`	`)`
`40`	`40`	`);`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ await flows.Run(`
`158`	`158`	`"SomeInstanceId",`
`159`	`159`	`new InitialState(`
`160`	`160`	`[new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],`
`161`		`- [new InitialEffect(0, "InitialEffectValue")]`
	`161`	`+ [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]`
`162`	`162`	`)`
`163`	`163`	`);`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ await flows.Run(`
`265`	`265`	`param: "SomeParam",`
`266`	`266`	`new InitialState(`
`267`	`267`	`[new MessageAndIdempotencyKey(new StringMessage("InitialMessageValue"))],`
`268`		`- [new InitialEffect(0, "InitialEffectValue")]`
	`268`	`+ [new InitialEffect(0.ToEffectId(), "InitialEffectValue")]`
`269`	`269`	`)`
`270`	`270`	`);`
`271`	`271`