AppStd/Leanetec.EConnect
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring (LogExtensions): Ersetzen der benutzerdefinierten LogCurlAsync durch eine auf HttpClientToCurl basierende Implementierung

Browse Source 
- Manuelle cURL-Zeichenfolgenkonstruktion in `LogExtensions` entfernt.
- Überladungen von `LogCurl` unter Verwendung von `HttpClient.GenerateCurlInString` eingeführt.
- Unterstützung für das Kürzen langer cURL-Ausgaben mit `maxLength` hinzugefügt.
- Parameter vereinfacht und Wartbarkeit verbessert.
This commit is contained in:
tekh 2025-08-18 16:48:23 +02:00
parent 0273beb6f8
commit e9a7ef910f
3 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Leanetec.EConnect.Infrastructure/EConnectClient.cs
View File

@ -108,12 +108,12 @@ public class EConnectClient<TError> : IEConnectClient<TError> where TError : cl
{
{ fileContent, "file", fileName }
};
message.Content = form;
var res = await Http.SendAsync(message, cancel);
_logger?.LogCurlAsync(Http, requestMessage: message);
_logger?.LogCurl(Http, message);
return res.IsSuccessStatusCode
? new()

1
src/Leanetec.EConnect.Infrastructure/Leanetec.EConnect.Infrastructure.csproj
View File

@ -7,6 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HttpClientToCurl" Version="2.0.6" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.3.0" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.19" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />

115
src/Leanetec.EConnect.Infrastructure/LogExtensions.cs
View File

@ -1,75 +1,66 @@
using Microsoft.Extensions.Logging;
using System.Text;
using HttpClientToCurl;
using HttpClientToCurl.Config;
using Microsoft.Extensions.Logging;
using System.Net.Http.Headers;
namespace Leanetec.EConnect.Infrastructure;
public static class LogExtensions
{
public static async Task LogCurlAsync<TCategoryName>(
public static void LogCurl<TCategoryName>(
this ILogger<TCategoryName> logger,
HttpClient client,
HttpMethod? method = null,
string? route = null,
HttpContent? content = null,
HttpRequestMessage? requestMessage = null,
HttpRequestMessage request,
Action<StringConfig>? config = null,
int maxLength = 1000,
LogLevel logLevel = LogLevel.Information)
{
route ??= requestMessage?.RequestUri?.ToString();
var curl = client.GenerateCurlInString(
request,
config
).Substring(0, maxLength) + "...[truncated]";
logger?.Log(logLevel, "{curl}", curl);
}
var sb = new StringBuilder();
sb.Append("curl");
public static void LogCurl<TCategoryName>(
this ILogger<TCategoryName> logger,
HttpClient client,
HttpMethod method,
string uri = "",
HttpRequestHeaders? headers = null,
HttpContent? content = null,
Action<StringConfig>? config = null,
int maxLength = 1000,
LogLevel logLevel = LogLevel.Information)
{
var curl = client.GenerateCurlInString(
method,
uri,
headers,
content,
config
).Substring(0, maxLength) + "...[truncated]";
logger?.Log(logLevel, "{curl}", curl);
}
// Method
sb.Append($" -X {method?.Method ?? requestMessage?.Method.ToString()}");
// URL
var fullUrl = string.Empty;
if (client.BaseAddress is not null && route is not null)
fullUrl = new Uri(client.BaseAddress, route).ToString();
else if (route is not null)
fullUrl = route;
else if (client.BaseAddress is not null)
fullUrl = client.BaseAddress.ToString();
if (!string.IsNullOrWhiteSpace(fullUrl))
sb.AppendLine($" \"{fullUrl}\"");
// Headers
foreach (var header in client.DefaultRequestHeaders)
{
sb.AppendLine($"\t-H \"{header.Key}: {string.Join(", ", header.Value)}\"");
}
// Headers
if (requestMessage is not null)
foreach (var header in requestMessage.Headers)
{
sb.AppendLine($"\t-H \"{header.Key}: {string.Join(", ", header.Value)}\"");
}
if (content != null)
{
foreach (var header in content.Headers)
{
sb.AppendLine($"\t-H \"{header.Key}: {string.Join(", ", header.Value)}\"");
}
var mediaType = content.Headers.ContentType?.MediaType;
if (mediaType is not null && mediaType.StartsWith("text") || mediaType!.Contains("json"))
{
var body = await content.ReadAsStringAsync();
if (!string.IsNullOrWhiteSpace(body))
{
// Escape double quotes
body = body.Replace("\"", "\\\"");
sb.AppendLine($"\t-d \"{body}\"");
}
}
else
// Binary content, only placeholder in log
sb.AppendLine("\t-d \"<binary data>\"");
}
logger.Log(logLevel, "{message}", sb.ToString());
public static void LogCurl<TCategoryName>(
this ILogger<TCategoryName> logger,
HttpClient client,
HttpMethod method,
Uri uri,
HttpRequestHeaders? headers = null,
HttpContent? content = null,
Action<StringConfig>? config = null,
int maxLength = 1000,
LogLevel logLevel = LogLevel.Information)
{
var curl = client.GenerateCurlInString(
method,
uri,
headers,
content,
config
).Substring(0, maxLength) + "...[truncated]";
logger?.Log(logLevel, "{curl}", curl);
}
}