Refactor Workflow Runtimes

Directory.Build.props

@@ -24,7 +24,11 @@
     <!-- https://github.com/dotnet/sourcelink -->
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+    <EnableTrimAnalyzer>false</EnableTrimAnalyzer>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <NoWarn>$(NoWarn);CS0162;CS1591</NoWarn>
   </PropertyGroup>
 
 </Project>

Directory.Packages.props

@@ -71,6 +71,7 @@
     <PackageVersion Include="Proto.Cluster" Version="1.6.0" />
     <PackageVersion Include="Proto.Cluster.CodeGen" Version="1.6.0" />
     <PackageVersion Include="Proto.Cluster.TestProvider" Version="1.6.0" />
+    <PackageVersion Include="Proto.Cluster.AzureContainerApps" Version="1.6.0" />
     <PackageVersion Include="Proto.Persistence" Version="1.6.0" />
     <PackageVersion Include="Proto.Persistence.Sqlite" Version="1.6.0" />
     <PackageVersion Include="Proto.Persistence.SqlServer" Version="1.6.0" />

migrations/efcore-3.2.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# Define the modules to update
+mods=("Alterations" "Runtime" "Management" "Identity" "Labels")
+
+# Define the list of providers
+providers=("MySql" "SqlServer" "Sqlite" "PostgreSql")
+
+# Loop through each module
+for module in "${mods[@]}"; do
+    # Loop through each provider
+    for provider in "${providers[@]}"; do
+        providerPath="../src/modules/Elsa.EntityFrameworkCore.$provider"
+        migrationsPath="Migrations/$module"
+
+        echo "Updating migrations for $provider..."
+        echo "Provider path: ${providerPath:?}/${migrationsPath}"
+        echo "Migrations path: $migrationsPath"
+        ef-migration-runtime-schema --interface Elsa.EntityFrameworkCore.Common.Contracts.IElsaDbContextSchema --efOptions "migrations add V3_2 -c ""$module""ElsaDbContext -p ""$providerPath""  -o ""$migrationsPath"""
+    done
+done

samples/aspnet/Elsa.Samples.AspNet.MassTransitWorkflow/Messages/Message.cs

@@ -2,5 +2,5 @@ namespace Elsa.Samples.AspNet.MassTransitWorkflow.Messages;
 
 public class Message
 {
-    public string Content { get; set; }
+    public string Content { get; set; } = default!;
 }

samples/aspnet/Elsa.Samples.AspNet.MyBackendApi/Controllers/RunWorkflowController.cs

@@ -1,4 +1,3 @@
-using System.Threading.Tasks;
 using Elsa.Http;
 using Elsa.Workflows.Contracts;
 using Microsoft.AspNetCore.Mvc;

samples/aspnet/Elsa.Samples.AspNet.MyBackendApi/Program.cs

@@ -1,7 +1,5 @@
 using Elsa.Extensions;
 using Elsa.Samples.AspNet.MyBackendApi.Workflows;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
 
 var builder = WebApplication.CreateBuilder(args);
 

samples/aspnet/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps/Elsa.Samples.AspNet.ProtoActorRuntime.AzureContainerApps.csproj

@@ -17,7 +17,6 @@
         <ProjectReference Include="..\..\..\src\modules\Elsa.EntityFrameworkCore\Elsa.EntityFrameworkCore.csproj" />
         <ProjectReference Include="..\..\..\src\modules\Elsa.Identity\Elsa.Identity.csproj" />
         <ProjectReference Include="..\..\..\src\modules\Elsa.JavaScript\Elsa.JavaScript.csproj" />
-        <ProjectReference Include="..\..\..\src\modules\Elsa.ProtoActor.Cluster.AzureContainerApps\Elsa.ProtoActor.Cluster.AzureContainerApps.csproj" />
         <ProjectReference Include="..\..\..\src\modules\Elsa.ProtoActor\Elsa.ProtoActor.csproj" />
         <ProjectReference Include="..\..\..\src\modules\Elsa.Scheduling\Elsa.Scheduling.csproj" />
         <ProjectReference Include="..\..\..\src\modules\Elsa.Workflows.Api\Elsa.Workflows.Api.csproj" />
@@ -26,6 +25,7 @@
     <ItemGroup>
         <PackageReference Include="Azure.Identity" />
         <PackageReference Include="Azure.ResourceManager" />
+        <PackageReference Include="Proto.Cluster.AzureContainerApps" />
         <PackageReference Include="Proto.Persistence.Sqlite" />
     </ItemGroup>
 

samples/aspnet/Elsa.Samples.AspNet.RunTaskIntegration/Handlers/OrderFoodTaskHandler.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using Elsa.Extensions;
 using Elsa.Mediator.Contracts;
+using Elsa.Workflows.Runtime;
 using Elsa.Workflows.Runtime.Contracts;
 using Elsa.Workflows.Runtime.Notifications;
 
@@ -16,15 +14,15 @@ public OrderFoodTaskHandler(ITaskReporter taskReporter)
     {
         _taskReporter = taskReporter;
     }
-    
+
     public async Task HandleAsync(RunTaskRequest notification, CancellationToken cancellationToken)
     {
         if (notification.TaskName != "OrderFood")
             return;
 
         var args = notification.TaskPayload!;
         var foodName = args.GetValue<string>("Food");
-        
+
         Console.WriteLine("Preparing {0}...", foodName);
         await Task.Delay(1000, cancellationToken);
         Console.WriteLine("Food is ready for delivery!");

samples/aspnet/Elsa.Samples.AspNet.RunTaskIntegration/Program.cs

@@ -1,7 +1,5 @@
 using Elsa.Extensions;
 using Elsa.Samples.AspNet.RunTaskIntegration.Workflows;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
 
 var builder = WebApplication.CreateBuilder(args);
 

samples/aspnet/Elsa.Samples.AspNet.RunTaskIntegration/Workflows/HungryWorkflow.cs

@@ -1,11 +1,9 @@
-using System.Collections.Generic;
 using Elsa.Http;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Runtime.Activities;
-using Microsoft.AspNetCore.Http;
 
 namespace Elsa.Samples.AspNet.RunTaskIntegration.Workflows;
 

samples/aspnet/Elsa.Samples.AspNet.Webhooks.WorkflowServer/Program.cs

@@ -1,9 +1,5 @@
-using System;
 using Elsa.Extensions;
 using Elsa.Samples.AspNet.Webhooks.WorkflowServer.Workflows;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 
 var builder = WebApplication.CreateBuilder(args);
 

samples/aspnet/Elsa.Samples.AspNet.Webhooks.WorkflowServer/Workflows/HungryWorkflow.cs

@@ -1,11 +1,9 @@
-using System.Collections.Generic;
 using Elsa.Http;
 using Elsa.Workflows;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Contracts;
 using Elsa.Workflows.Models;
 using Elsa.Workflows.Runtime.Activities;
-using Microsoft.AspNetCore.Http;
 
 namespace Elsa.Samples.AspNet.Webhooks.WorkflowServer.Workflows;
 

samples/aspnet/Elsa.Samples.AspNet.WorkflowContexts/Entities/Customer.cs

@@ -2,9 +2,9 @@ namespace Elsa.Samples.AspNet.WorkflowContexts.Entities;
 
 public class Customer
 {
-    public string Id { get; set; }
-    public string Name { get; set; }
-    public string Email { get; set; }
-    public string Phone { get; set; }
-    public string Website { get; set; }
+    public string Id { get; set; } = default!;
+    public string Name { get; set; } = default!;
+    public string Email { get; set; } = default!;
+    public string Phone { get; set; } = default!;
+    public string Website { get; set; } = default!;
 }

samples/console/Elsa.Samples.ConsoleApp.JsonWorkflows/Elsa.Samples.ConsoleApp.JsonWorkflows.csproj

@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\..\src\bundles\Elsa\Elsa.csproj" />
-        <ProjectReference Include="..\..\..\src\common\Elsa.Testing.Shared\Elsa.Testing.Shared.csproj" />
+        <ProjectReference Include="..\..\..\src\common\Elsa.Testing.Shared.Integration\Elsa.Testing.Shared.Integration.csproj" />
     </ItemGroup>
 
     <ItemGroup>

samples/console/Elsa.Samples.ConsoleApp.JsonWorkflows/Program.cs

@@ -13,7 +13,7 @@
 // Build service container.
 var serviceProvider = services.BuildServiceProvider();
 
-// Populate registries. This is only necessary for applications  that are not using hosted services.
+// Populate registries. This is only necessary for applications that are not using hosted services.
 await serviceProvider.PopulateRegistriesAsync();
 
 // Import a workflow from a JSON file.

src/bundles/Elsa.Server.Web/Elsa.Server.Web.csproj

@@ -8,6 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\modules\Elsa.AzureServiceBus\Elsa.AzureServiceBus.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.Caching.Distributed.MassTransit\Elsa.Caching.Distributed.MassTransit.csproj" />
         <ProjectReference Include="..\..\modules\Elsa.EntityFrameworkCore.PostgreSql\Elsa.EntityFrameworkCore.PostgreSql.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.MassTransit.AzureServiceBus\Elsa.MassTransit.AzureServiceBus.csproj"/>
@@ -32,7 +33,6 @@
         <ProjectReference Include="..\..\modules\Elsa.MongoDb\Elsa.MongoDb.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.ProtoActor\Elsa.ProtoActor.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Identity\Elsa.Identity.csproj"/>
-        <ProjectReference Include="..\..\modules\Elsa.ProtoActor.Cluster.AzureContainerApps\Elsa.ProtoActor.Cluster.AzureContainerApps.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.WorkflowProviders.BlobStorage\Elsa.WorkflowProviders.BlobStorage.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Hangfire\Elsa.Hangfire.csproj"/>
         <ProjectReference Include="..\..\modules\Elsa.Http\Elsa.Http.csproj"/>

src/bundles/Elsa.Server.Web/Endpoints/Api1/Get/Endpoint.cs

@@ -1,8 +1,4 @@
 using Elsa.Abstractions;
-using Elsa.Workflows.Activities;
-using Elsa.Workflows.Models;
-using Elsa.Workflows.Runtime.Contracts;
-using Elsa.Workflows.Runtime.Parameters;
 using JetBrains.Annotations;
 
 namespace Elsa.Server.Web.Endpoints.Api1.Get;

src/bundles/Elsa.Server.Web/Endpoints/DynamicWorkflows/Post/Endpoint.cs

@@ -1,13 +1,15 @@
 using Elsa.Abstractions;
 using Elsa.Workflows.Activities;
 using Elsa.Workflows.Models;
+using Elsa.Workflows.Options;
+using Elsa.Workflows.Runtime;
 using Elsa.Workflows.Runtime.Contracts;
 using Elsa.Workflows.Runtime.Options;
 using Elsa.Workflows.Runtime.Parameters;
 
 namespace Elsa.Server.Web.Endpoints.DynamicWorkflows.Post;
 
-public class Post(IWorkflowRegistry workflowRegistry, IWorkflowRuntime workflowRuntime) : ElsaEndpointWithoutRequest
+public class Post(IWorkflowInvoker workflowInvoker) : ElsaEndpointWithoutRequest
 {
     public override void Configure()
     {
@@ -31,7 +33,6 @@ public override async Task HandleAsync(CancellationToken ct)
             }
         };
 
-        await workflowRegistry.RegisterAsync(workflow, ct);
-        await workflowRuntime.StartWorkflowAsync("DynamicWorkflow1", new StartWorkflowRuntimeParams());
+        await workflowInvoker.InvokeAsync(workflow, cancellationToken: ct);
     }
 }

src/bundles/Elsa.Server.Web/Enums/WorkflowRuntime.cs

@@ -0,0 +1,8 @@
+namespace Elsa.Server.Web;
+
+public enum WorkflowRuntime
+{
+    Default,
+    Distributed,
+    ProtoActor
+}

src/bundles/Elsa.Server.Web/Program.cs

@@ -24,6 +24,7 @@
 using Elsa.Workflows;
 using Elsa.Workflows.Management.Compression;
 using Elsa.Workflows.Management.Stores;
+using Elsa.Workflows.Runtime.Distributed.Extensions;
 using Elsa.Workflows.Runtime.Stores;
 using JetBrains.Annotations;
 using Medallion.Threading.FileSystem;
@@ -39,17 +40,18 @@
 const bool usePostgres = false;
 const bool useCockroachDb = false;
 const bool useDapper = false;
-const bool useProtoActor = false;
 const bool useHangfire = false;
-const bool useQuartz = false;
+const bool useQuartz = true;
 const bool useMassTransit = true;
 const bool useZipCompression = false;
 const bool runEFCoreMigrations = true;
 const bool useMemoryStores = false;
 const bool useCaching = true;
+const bool useAzureServiceBusModule = false;
 const bool useReadOnlyMode = false;
+const WorkflowRuntime workflowRuntime = WorkflowRuntime.ProtoActor;
 const DistributedCachingTransport distributedCachingTransport = DistributedCachingTransport.MassTransit;
-const MassTransitBroker useMassTransitBroker = MassTransitBroker.RabbitMq;
+const MassTransitBroker massTransitBroker = MassTransitBroker.Memory;
 
 var builder = WebApplication.CreateBuilder(args);
 var services = builder.Services;
@@ -64,7 +66,7 @@
 var azureServiceBusConnectionString = configuration.GetConnectionString("AzureServiceBus")!;
 var rabbitMqConnectionString = configuration.GetConnectionString("RabbitMq")!;
 var redisConnectionString = configuration.GetConnectionString("Redis")!;
-var distributedLockProviderName = configuration.GetSection("Runtime")["DistributedLockProvider"];
+var distributedLockProviderName = configuration.GetSection("Runtime:DistributedLocking")["Provider"];
 var appRole = Enum.Parse<ApplicationRole>(configuration["AppRole"]);
 
 // Add Elsa services.
@@ -186,7 +188,12 @@
                         ef.RunMigrations = runEFCoreMigrations;
                     });
 
-                if (useProtoActor)
+                if (workflowRuntime == WorkflowRuntime.Distributed)
+                {
+                    runtime.UseDistributedRuntime();
+                }
+
+                if (workflowRuntime == WorkflowRuntime.ProtoActor)
                 {
                     runtime.UseProtoActor(proto => proto.PersistenceProvider = _ =>
                     {
@@ -207,12 +214,13 @@
                 {
                     runtime.ActivityExecutionLogStore = sp => sp.GetRequiredService<MemoryActivityExecutionStore>();
                     runtime.WorkflowExecutionLogStore = sp => sp.GetRequiredService<MemoryWorkflowExecutionLogStore>();
-                    runtime.WorkflowInboxStore = sp => sp.GetRequiredService<MemoryWorkflowInboxMessageStore>();
                 }
 
                 if (useCaching)
                     runtime.UseCache();
 
+                runtime.DistributedLockingOptions = options => configuration.GetSection("Runtime:DistributedLocking").Bind(options);
+
                 runtime.DistributedLockProvider = _ =>
                 {
                     switch (distributedLockProviderName)
@@ -328,23 +336,23 @@
             {
                 massTransit.DisableConsumers = appRole == ApplicationRole.Api;
 
-                if (useMassTransitBroker == MassTransitBroker.AzureServiceBus)
+                if (massTransitBroker == MassTransitBroker.AzureServiceBus)
                 {
                     massTransit.UseAzureServiceBus(azureServiceBusConnectionString, serviceBusFeature => serviceBusFeature.ConfigureServiceBus = bus =>
                     {
-                        bus.PrefetchCount = 100;
+                        bus.PrefetchCount = 50;
                         bus.LockDuration = TimeSpan.FromMinutes(5);
                         bus.MaxConcurrentCalls = 32;
                         bus.MaxDeliveryCount = 8;
                         // etc.
                     });
                 }
 
-                if (useMassTransitBroker == MassTransitBroker.RabbitMq)
+                if (massTransitBroker == MassTransitBroker.RabbitMq)
                 {
                     massTransit.UseRabbitMq(rabbitMqConnectionString, rabbit => rabbit.ConfigureServiceBus = bus =>
                     {
-                        bus.PrefetchCount = 4;
+                        bus.PrefetchCount = 50;
                         bus.Durable = true;
                         bus.AutoDelete = false;
                         bus.ConcurrentMessageLimit = 32;
@@ -362,6 +370,14 @@
             });
         }
 
+        if (useAzureServiceBusModule)
+        {
+            elsa.UseAzureServiceBus(azureServiceBusConnectionString, asb =>
+            {
+                asb.AzureServiceBusOptions = options => configuration.GetSection("AzureServiceBus").Bind(options);
+            });
+        }
+
         elsa.InstallDropIns(options => options.DropInRootDirectory = Path.Combine(Directory.GetCurrentDirectory(), "App_Data", "DropIns"));
         elsa.AddSwagger();
         elsa.AddFastEndpointsAssembly<Program>();
@@ -433,4 +449,4 @@ public partial class Program
     /// Set by the test runner to configure the module for testing.
     /// </summary>
     public static Action<IModule>? ConfigureForTest { get; set; }
-}
+}