Upgraded to ResilientFunctions latest commit

Cleipnir.Flows.Tests/Flows/FlowsWithResultTests.cs

@@ -88,7 +88,7 @@ public class MessageDrivenFuncFlow : Flow<string, int>
     {
         public override async Task<int> Run(string param)
         {
-            var next = await Messages.FirstOfType<int>();
+            var next = await Messages.FirstOfType<int>(maxWait: TimeSpan.MaxValue);
             return next;
         }
     }

Cleipnir.Flows.Tests/Flows/FlowsWithStateTests.cs

@@ -33,17 +33,17 @@ public async Task ParamlessFlowWithStateCanBeFetchedAfterExecution()
         controlPanel.Status.ShouldBe(Status.Succeeded);
     }
 
-    public class ParamlessFlowWithState : Flow, IHaveState<ParamlessFlowWithState.FlowState>
+    public class ParamlessFlowWithState : Flow, IHaveState<ParamlessFlowWithState.WorkflowState>
     {
-        public required FlowState State { get; init; }
+        public required WorkflowState State { get; init; }
 
         public override Task Run()
         {
             State.Boolean = true;
             return Task.CompletedTask;
         }
 
-        public class FlowState : WorkflowState
+        public class WorkflowState : FlowState
         {
             public bool Boolean { get; set; }
         }
@@ -73,22 +73,22 @@ public async Task ActionFlowWithStateCanBeFetchedAfterExecution()
         controlPanel.ShouldNotBeNull();
         controlPanel.Status.ShouldBe(Status.Succeeded);
 
-        var flowState = controlPanel.States.Get<FuncFlowWithState.FlowState>();
+        var flowState = controlPanel.States.Get<FuncFlowWithState.WorkflowState>();
         flowState.ShouldNotBeNull();
         flowState.Value.ShouldBe("someParameter");
     }
 
-    public class ActionFlowWithState : Flow<string>, IHaveState<ActionFlowWithState.FlowState>
+    public class ActionFlowWithState : Flow<string>, IHaveState<ActionFlowWithState.WorkflowState>
     {
-        public required FlowState State { get; init; }
+        public required WorkflowState State { get; init; }
 
         public override Task Run(string param)
         {
             State.Value = param;
             return Task.CompletedTask;
         }
 
-        public class FlowState : WorkflowState
+        public class WorkflowState : FlowState
         {
             public string Value { get; set; } = "";
         }
@@ -119,22 +119,22 @@ public async Task FuncFlowWithStateCanBeFetchedAfterExecution()
         controlPanel.Result.ShouldBe("someParameter");
         controlPanel.Status.ShouldBe(Status.Succeeded);
 
-        var flowState = controlPanel.States.Get<FuncFlowWithState.FlowState>();
+        var flowState = controlPanel.States.Get<FuncFlowWithState.WorkflowState>();
         flowState.ShouldNotBeNull();
         flowState.Value.ShouldBe("someParameter");
     }
 
-    public class FuncFlowWithState : Flow<string, string>, IHaveState<FuncFlowWithState.FlowState>
+    public class FuncFlowWithState : Flow<string, string>, IHaveState<FuncFlowWithState.WorkflowState>
     {
-        public required FlowState State { get; init; }
+        public required WorkflowState State { get; init; }
 
         public override Task<string> Run(string param)
         {
             State.Value = param;
             return Task.FromResult(param);
         }
 
-        public class FlowState : WorkflowState
+        public class WorkflowState : FlowState
         {
             public string Value { get; set; } = "";
         }

Cleipnir.Flows.Tests/Flows/ParamlessFlowsTests.cs

@@ -79,7 +79,7 @@ public class EventDrivenParamlessFlow : Flow
     {
         public override async Task Run()
         {
-            await Messages.FirstOfType<int>();
+            await Messages.FirstOfType<int>(maxWait: TimeSpan.MaxValue);
         }
     }
 

Cleipnir.Flows.Tests/Flows/UnitFlowsTests.cs

@@ -82,7 +82,7 @@ public class EventDrivenUnitFlow : Flow<string>
     {
         public override async Task Run(string param)
         {
-            await Messages.FirstOfType<int>();
+            await Messages.FirstOfType<int>(maxWait: TimeSpan.MaxValue);
         }
     }
 

Cleipnir.Flows/Flows.cs

@@ -125,7 +125,7 @@ public Flows(string flowName, FlowsContainer flowsContainer) : base(flowsContain
         return controlPanel;
     }
 
-    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : WorkflowState, new() 
+    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : FlowState, new() 
         => _registration.GetState<TState>(functionInstanceId);
 
     public MessageWriter MessageWriter(string instanceId) 
@@ -168,7 +168,7 @@ public Flows(string flowName, FlowsContainer flowsContainer) : base(flowsContain
         return controlPanel;
     }
 
-    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : WorkflowState, new() 
+    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : FlowState, new() 
         => _registration.GetState<TState>(functionInstanceId);
 
     public MessageWriter MessageWriter(string instanceId) 
@@ -233,6 +233,6 @@ public Task ScheduleIn(string functionInstanceId,
         TimeSpan delay
     ) => _registration.ScheduleIn(functionInstanceId, param, delay);
 
-    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : WorkflowState, new() 
+    protected Task<TState?> GetState<TState>(string functionInstanceId) where TState : FlowState, new() 
         => _registration.GetState<TState>(functionInstanceId);
 }

Cleipnir.Flows/FlowsContainer.cs

@@ -31,6 +31,7 @@ public FlowsContainer(IFunctionStore flowStore, IServiceProvider serviceProvider
                     options.EnableWatchdogs,
                     options.WatchdogCheckFrequency,
                     options.MessagesPullFrequency,
+                    options.MessagesDefaultMaxWaitForCompletion,
                     options.DelayStartup, 
                     options.MaxParallelRetryInvocations, 
                     options.Serializer

Cleipnir.Flows/IHaveState.cs

@@ -2,7 +2,7 @@
 
 namespace Cleipnir.Flows;
 
-public interface IHaveState<TState> where TState : WorkflowState, new()
+public interface IHaveState<TState> where TState : FlowState, new()
 {
     public TState State { get; init; }
 }

Cleipnir.Flows/Options.cs

@@ -20,6 +20,7 @@ public class Options
     internal TimeSpan? DelayStartup { get; }
     internal int? MaxParallelRetryInvocations { get; }
     internal TimeSpan? MessagesPullFrequency { get; }
+    internal TimeSpan? MessagesDefaultMaxWaitForCompletion { get; }
     internal ISerializer? Serializer { get; }
     internal IEnumerable<RoutingInformation>? Routes { get; }
     internal List<MiddlewareInstanceOrType> Middlewares  { get; } = new();
@@ -32,6 +33,7 @@ public Options(
         bool? enableWatchdogs = null,
         TimeSpan? watchdogCheckFrequency = null,
         TimeSpan? messagesPullFrequency = null,
+        TimeSpan? messagesDefaultMaxWaitForCompletion = null,
         TimeSpan? delayStartup = null, 
         int? maxParallelRetryInvocations = null, 
         ISerializer? serializer = null,
@@ -45,6 +47,7 @@ public Options(
         RetentionCleanUpFrequency = retentionCleanUpFrequency;
         EnableWatchdogs = enableWatchdogs;
         MessagesPullFrequency = messagesPullFrequency;
+        MessagesDefaultMaxWaitForCompletion = messagesDefaultMaxWaitForCompletion;
         DelayStartup = delayStartup;
         MaxParallelRetryInvocations = maxParallelRetryInvocations;
         Serializer = serializer;
@@ -72,6 +75,7 @@ internal Settings MapToRFunctionsSettings()
             EnableWatchdogs,
             WatchdogCheckFrequency,
             MessagesPullFrequency,
+            MessagesDefaultMaxWaitForCompletion,
             DelayStartup,
             MaxParallelRetryInvocations,
             Serializer,

Samples/Cleipnir.Flows.Sample.Presentation/C_NewsletterSender/Solution/NewsletterFlow.cs

@@ -5,9 +5,9 @@
 
 namespace Cleipnir.Flows.Sample.Presentation.C_NewsletterSender.Solution;
 
-public class NewsletterFlow : Flow<MailAndRecipients>, IHaveState<NewsletterFlow.FlowState>
+public class NewsletterFlow : Flow<MailAndRecipients>, IHaveState<NewsletterFlow.NewsletterState>
 {
-    public required FlowState State { get; init; }
+    public required NewsletterState State { get; init; }
 
     public override async Task Run(MailAndRecipients mailAndRecipients)
     {
@@ -31,7 +31,7 @@ public override async Task Run(MailAndRecipients mailAndRecipients)
         }
     }
 
-    public class FlowState : WorkflowState
+    public class NewsletterState : FlowState
     {
         public int AtRecipient { get; set; }
     }

Samples/Cleipnir.Flows.Sample.Presentation/D_LoanApplication/Solution/LoanApplicationFlow.cs

@@ -12,7 +12,7 @@ public override async Task Run(LoanApplication loanApplication)
             .OfType<CreditCheckOutcome>()
             .Take(3)
             .TakeUntilTimeout("Timeout", TimeSpan.FromMinutes(15))
-            .SuspendUntilCompletion();
+            .Completion();
 
         if (outcomes.Count < 2)
             await MessageBroker.Send(new LoanApplicationRejected(loanApplication));

Samples/Cleipnir.Flows.Sample.Presentation/E_CustomerSignup/Solution/SignupFlow.cs

@@ -13,7 +13,7 @@ public override async Task Run(string customerEmail)
             var emailVerifiedOption = await Messages
                 .OfType<EmailVerified>()
                 .TakeUntilTimeout($"Timeout_{i}", expiresIn: TimeSpan.FromDays(1))
-                .SuspendUntilFirstOrNone();
+                .FirstOrNone();
 
             if (emailVerifiedOption.HasValue)
                 break;

Samples/Cleipnir.Flows.Sample.Presentation/F_SmsVerificationFlow/SmsFlow.cs

@@ -3,9 +3,9 @@
 
 namespace Cleipnir.Flows.Sample.Presentation.F_SmsVerificationFlow;
 
-public class SmsFlow : Flow<string>, IHaveState<SmsFlow.FlowState>
+public class SmsFlow : Flow<string>, IHaveState<SmsFlow.SmsState>
 {
-    public required FlowState State { get; init; }
+    public required SmsState State { get; init; }
 
     public override async Task Run(string customerPhoneNumber)
     {
@@ -24,7 +24,7 @@ public override async Task Run(string customerPhoneNumber)
             var codeFromUser = await Messages
                 .OfType<CodeFromUser>()
                 .Skip(i)
-                .SuspendUntilFirst();
+                .First();
 
             if (IsExpired(codeFromUser))
                 State.Status = MostRecentAttempt.CodeExpired;
@@ -40,7 +40,7 @@ public override async Task Run(string customerPhoneNumber)
         State.Status = MostRecentAttempt.MaxAttemptsExceeded;
     }
 
-    public class FlowState : WorkflowState
+    public class SmsState : FlowState
     {
         public MostRecentAttempt Status { get; set; }
     }

Samples/Cleipnir.Flows.Sample.Presentation/G_SupportTicket/Solution/SupportTicketFlow.cs

@@ -20,7 +20,7 @@ await Effect.Capture(
                 .OfTypes<SupportTicketTaken, SupportTicketRejected>()
                 .Where(e => e.Match(taken => taken.Iteration, rejected => rejected.Iteration) == i)
                 .TakeUntilTimeout(timeoutEventId: i.ToString(), expiresIn: TimeSpan.FromMinutes(15))
-                .SuspendUntilFirstOrNone();
+                .FirstOrNone();
 
             if (!option.HasValue && option.Value.AsObject() is SupportTicketTaken)
                 return; //ticket was taken in iteration i

Samples/Cleipnir.Flows.Sample.Presentation/Solutions/D_LoanApplication/LoanApplicationFlow2.cs

@@ -13,7 +13,7 @@ public override async Task Run(LoanApplication loanApplication)
             .OfType<CreditCheckOutcome>()
             .Take(3)
             .TakeUntilTimeout("Timeout", TimeSpan.FromMinutes(15))
-            .SuspendUntilCompletion();
+            .Completion();
 
         if (outcomes.Count < 2)
             await MessageBroker.Send(LoanApplicationRejected(loanApplication));

Samples/Cleipnir.Flows.Sample.Presentation/Solutions/E_CustomerSignup/SignupFlow1.cs

@@ -13,7 +13,7 @@ public override async Task Run(string customerEmail)
             var emailVerifiedOption = await Messages
                 .OfType<EmailVerified>()
                 .TakeUntilTimeout($"Timeout_{i}", expiresIn: TimeSpan.FromDays(1))
-                .SuspendUntilFirstOrNone();
+                .FirstOrNone();
 
             if (emailVerifiedOption.HasValue)
                 break;

Samples/Cleipnir.Flows.Samples.Console/Engagement/EngagementFlow.cs

@@ -22,7 +22,7 @@ await Effect.Capture(
                     )
                 )
                 .TakeUntilTimeout($"Timeout_{i}", expiresIn: TimeSpan.FromHours(1))
-                .SuspendUntilFirstOrDefault();
+                .FirstOrDefault();
 
             if (either?.AsObject() is EngagementAccepted)
             {

Samples/Cleipnir.Flows.Samples.Console/State/StateFlow.cs

@@ -2,9 +2,9 @@
 
 namespace Cleipnir.Flows.Sample.ConsoleApp.State;
 
-public class StateFlow : Flow<string, string>, IHaveState<StateFlow.FlowState>
+public class StateFlow : Flow<string, string>, IHaveState<StateFlow.WorkflowState>
 {
-    public required FlowState State { get; init; }
+    public required WorkflowState State { get; init; }
 
     public override async Task<string> Run(string param)
     {
@@ -19,7 +19,7 @@ public override async Task<string> Run(string param)
         return param;
     }
 
-    public class FlowState : WorkflowState
+    public class WorkflowState : FlowState
     {
         public DateTime? Started { get; set; }
     }

ServiceBuses/Cleipnir.Flows.Rebus.Tests/IntegrationTests.cs

@@ -24,7 +24,7 @@ private class RebusTestFlow : Flow, ISubscribeTo<MyMessage>
 
         public override async Task Run()
         {
-            ReceivedMyMessage = await Messages.FirstOfType<MyMessage>();
+            ReceivedMyMessage = await Messages.FirstOfType<MyMessage>(maxWait: TimeSpan.MaxValue);
         }
     }
 

SourceGeneration/Cleipnir.Flows.SourceGeneratorDebugger/Program.cs

@@ -41,7 +41,7 @@ public override Task Run()
             return Task.CompletedTask;
         }
 
-        public class FunFlowState : WorkflowState
+        public class FunFlowState : FlowState
         {
             public string Value { get; set; } = "";
         }