Skip to content

Fixed the OpenApiFunctionProcessor, which was failling unexpectedly when returned contentless responses #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Fixed the OpenApiFunctionProcessor, which was failling unexpectedly when returned contentless responses #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions src/apps/Synapse.Worker/Services/Processors/OpenApiFunctionProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,8 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
foreach (string server in this.Servers)
{
var requestUri = $"{server}{this.Path}";
if (requestUri.StartsWith("//"))
requestUri = $"https:{requestUri}";
if (!string.IsNullOrWhiteSpace(this.QueryString))
requestUri += $"?{this.QueryString}";
if (requestUri.StartsWith("//"))requestUri = $"https:{requestUri}";
if (!string.IsNullOrWhiteSpace(this.QueryString)) requestUri += $"?{this.QueryString}";
using var request = new HttpRequestMessage(this.HttpMethod, requestUri);
foreach (var header in this.Headers)
{
Expand All @@ -303,34 +301,29 @@ protected override async Task ProcessAsync(CancellationToken cancellationToken)
request.Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json); //todo: support other media types?
}
using var response = await this.HttpClient.SendAsync(request, cancellationToken);
if (response.StatusCode == HttpStatusCode.ServiceUnavailable)
continue;
if (response.StatusCode == HttpStatusCode.ServiceUnavailable)continue;
var rawContent = await response.Content.ReadAsByteArrayAsync(cancellationToken)!;
var contentString = null as string;
if (rawContent != null)
contentString = Encoding.UTF8.GetString(rawContent);
if (rawContent != null) contentString = Encoding.UTF8.GetString(rawContent);
if (!response.IsSuccessStatusCode)
{
this.Logger.LogInformation("Failed to execute the Open API operation '{operationId}' at '{uri}'. The remote server responded with a non-success status code '{statusCode}'.", this.Operation.OperationId, response.RequestMessage!.RequestUri, response.StatusCode);
this.Logger.LogError("Failed to execute the Open API operation '{operationId}' at '{uri}'. The remote server responded with a non-success status code '{statusCode}'.", this.Operation.OperationId, response.RequestMessage!.RequestUri, response.StatusCode);
this.Logger.LogDebug("Response content:\r\n{responseContent}", contentString ?? "None");
response.EnsureSuccessStatusCode(contentString);
}
if (rawContent != null)
if (rawContent != null && rawContent.Length > 0)
{
var mediaType = response.Content?.Headers.ContentType?.MediaType;
var serializer = this.SerializerProvider.GetSerializersFor(mediaType).FirstOrDefault();
if (serializer == null)
throw new NotSupportedException($"Failed to find a serializer for the specified media type '{mediaType}'");
if(string.IsNullOrWhiteSpace(mediaType)) this.Logger.LogWarning("Failed to determine the response's content type. Assuming {json}", MediaTypeNames.Application.Json);
var serializer = this.SerializerProvider.GetSerializersFor(mediaType).FirstOrDefault() ?? throw new NotSupportedException($"Failed to find a serializer for the specified media type '{mediaType}'");
using var stream = new MemoryStream(rawContent!);
output = (await serializer.DeserializeAsync<JToken>(stream, cancellationToken)).ToObject();
}
success = true;
break;
}
if (output == null)
output = new();
if (!success)
throw new HttpRequestException($"Failed to execute the operation activity '{this.Operation.OperationId}' (id: '{this.Activity.Id}'): No service available", null, HttpStatusCode.ServiceUnavailable);
output ??= new();
if (!success)throw new HttpRequestException($"Failed to execute the operation activity '{this.Operation.OperationId}' (id: '{this.Activity.Id}'): No service available", null, HttpStatusCode.ServiceUnavailable);
await this.OnNextAsync(new V1WorkflowActivityCompletedIntegrationEvent(this.Activity.Id, output), cancellationToken);
await this.OnCompletedAsync(cancellationToken);
}
Expand Down