Skip to content

Commit 8eb6164

Browse files
cdavernascdavernas
committed
fix(Runner): Fixed the ListenTaskExecutor, which did not work anymore without streaming, due to an invalid condition check
fix(Runner): Fixed the `ListenTaskExecutor`, which failed to read the content of events when the `ListenTask`'s `Read` property was not set. fix(Runner): Fixed the `ListenTaskExecutor`, which was reading the payload of CloudEvents, even when the `ListenTask`'s `Read` property was set to `envelope` Signed-off-by: Charles d'Avernas <charles.davernas@neuroglia.io>
1 parent 3f219a6 commit 8eb6164

File tree

13 files changed

+44
-45
lines changed

13 files changed

+44
-45
lines changed

‎src/api/Synapse.Api.Client.Http/Synapse.Api.Client.Http.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<ItemGroup>
4545
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
46-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha6.3" />
46+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0" />
4747
<PackageReference Include="System.Reactive" Version="6.0.1" />
4848
</ItemGroup>
4949

‎src/api/Synapse.Api.Http/Synapse.Api.Http.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
47-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
46+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.19.0" />
47+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.19.0" />
4848
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
4949
</ItemGroup>
5050

‎src/api/Synapse.Api.Server/Synapse.Api.Server.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
2828
<DockerfileContext>..\..\..</DockerfileContext>
2929
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
30-
<CETCompat>false</CETCompat>
3130
</PropertyGroup>
3231

3332
<ItemGroup>

‎src/cli/Synapse.Cli/Synapse.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
3434
<PackageReference Include="moment.net" Version="1.3.4" />
3535
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
36-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha6.3" />
36+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0" />
3737
<PackageReference Include="Spectre.Console" Version="0.49.1" />
3838
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
3939
</ItemGroup>

‎src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444

4545
<ItemGroup>
4646
<PackageReference Include="IdentityModel" Version="7.0.0" />
47-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
48-
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.18.1" />
49-
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.18.1" />
50-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.18.1" />
51-
<PackageReference Include="Neuroglia.Mediation" Version="4.18.1" />
52-
<PackageReference Include="Neuroglia.Plugins" Version="4.18.1" />
53-
<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.18.1" />
54-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha6.3" />
47+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.1" />
48+
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.19.0" />
49+
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.19.0" />
50+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.19.0" />
51+
<PackageReference Include="Neuroglia.Mediation" Version="4.19.0" />
52+
<PackageReference Include="Neuroglia.Plugins" Version="4.19.0" />
53+
<PackageReference Include="Neuroglia.Serialization.Xml" Version="4.19.0" />
54+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0" />
5555
</ItemGroup>
5656

5757
<ItemGroup>

‎src/core/Synapse.Core/Synapse.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
<ItemGroup>
6767
<PackageReference Include="Apache.Avro" Version="1.12.0" />
6868
<PackageReference Include="Docker.DotNet" Version="3.125.15" />
69-
<PackageReference Include="KubernetesClient" Version="16.0.1" />
70-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.18.1" />
71-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.18.1" />
69+
<PackageReference Include="KubernetesClient" Version="16.0.2" />
70+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.19.0" />
71+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.19.0" />
7272
<PackageReference Include="Semver" Version="3.0.0" />
73-
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha6.3" />
73+
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0" />
7474
</ItemGroup>
7575

7676
</Project>

‎src/correlator/Synapse.Correlator/Synapse.Correlator.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="9.0.1" />
3737
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
3838
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
39-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.18.1" />
40-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.18.1" />
41-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.18.1" />
42-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.18.1" />
43-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.18.1" />
44-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.18.1" />
39+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.19.0" />
40+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.19.0" />
41+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.19.0" />
42+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.19.0" />
43+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.19.0" />
44+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.19.0" />
4545
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.2.0" />
4646
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.2.0" />
4747
</ItemGroup>

‎src/dashboard/Synapse.Dashboard/Synapse.Dashboard.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
13+
<PackageReference Include="Blazor.Bootstrap" Version="3.3.0" />
1414
<PackageReference Include="BlazorMonaco" Version="3.3.0" />
1515
<PackageReference Include="IdentityModel" Version="7.0.0" />
1616
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1" />
1717
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1" />
1818
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.1" PrivateAssets="all" />
1919
<PackageReference Include="moment.net" Version="1.3.4" />
20-
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.18.1" />
20+
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.19.0" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/runner/Synapse.Runner/Services/ConnectedWorkflowExecutionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ public virtual async Task<CorrelationContext> CorrelateAsync(ITaskExecutionConte
424424
{
425425
ArgumentNullException.ThrowIfNull(task);
426426
if (task.Definition is not ListenTaskDefinition listenTask) throw new ArgumentException("The specified task's definition must be a 'listen' task", nameof(task));
427-
if (listenTask.Foreach == null) throw new ArgumentException($"Since the specified listen task uses streaming, the {nameof(StreamAsync)} method must be used instead");
427+
if (listenTask.Foreach != null) throw new ArgumentException($"Since the specified listen task uses streaming, the {nameof(StreamAsync)} method must be used instead");
428428
if (this.Instance.Status?.Correlation?.Contexts?.TryGetValue(task.Instance.Reference.OriginalString, out var context) == true && context != null) return context;
429429
var @namespace = task.Workflow.Instance.GetNamespace()!;
430430
var name = $"{task.Workflow.Instance.GetName()}.{task.Instance.Id}";

‎src/runner/Synapse.Runner/Services/Executors/ListenTaskExecutor.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ protected override async Task DoExecuteAsync(CancellationToken cancellationToken
6464
var context = await this.Task.CorrelateAsync(cancellationToken).ConfigureAwait(false);
6565
var events = this.Task.Definition.Listen.Read switch
6666
{
67-
EventReadMode.Data or EventReadMode.Raw => context.Events.Select(e => e.Value.Data),
68-
EventReadMode.Envelope => context.Events.Select(e => e.Value.Data),
67+
EventReadMode.Data or EventReadMode.Raw or null => context.Events.Select(e => e.Value.Data),
68+
EventReadMode.Envelope => context.Events.Select(e => e.Value),
6969
_ => throw new NotSupportedException($"The specified event read mode '{this.Task.Definition.Listen.Read}' is not supported")
7070
};
7171
await this.SetResultAsync(events, this.Task.Definition.Then, cancellationToken).ConfigureAwait(false);
@@ -115,7 +115,7 @@ protected virtual async Task OnStreamingEventAsync(IStreamedCloudEvent e)
115115
var arguments = this.GetExpressionEvaluationArguments();
116116
var eventData = this.Task.Definition.Listen.Read switch
117117
{
118-
EventReadMode.Data or EventReadMode.Raw => e.Event.Data,
118+
EventReadMode.Data or EventReadMode.Raw or null => e.Event.Data,
119119
EventReadMode.Envelope => e.Event,
120120
_ => throw new NotSupportedException($"The specified event read mode '{this.Task.Definition.Listen.Read}' is not supported")
121121
};

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy