Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 29 additions & 3 deletions backend/FwHeadless/FwHeadlessKernel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using FwLiteProjectSync;
using LcmCrdt;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Http.Resilience;
using Microsoft.Extensions.Options;
using MiniLcm.Project;
using MiniLcmWeb;
Expand All @@ -14,6 +15,7 @@ namespace FwHeadless;
public static class FwHeadlessKernel
{
public const string LexboxHttpClientName = "LexboxHttpClient";
public const string LexboxSyncHttpClientName = "LexboxSyncHttpClient";
public static IServiceCollection AddFwHeadless(this IServiceCollection services)
{
services
Expand Down Expand Up @@ -51,11 +53,35 @@ public static IServiceCollection AddFwHeadless(this IServiceCollection services)
services.AddScoped<CrdtSyncService>();
services.AddScoped<ProjectContextFromIdService>();
services.AddTransient<HttpClientAuthHandler>();
services.AddHttpClient(LexboxHttpClientName,
services.AddLexboxHttpClient(LexboxHttpClientName);
// Lexbox stores a push in one transaction, so a project's whole unpushed history must fit in one attempt.
services.AddLexboxHttpClient(LexboxSyncHttpClientName, options =>
{
options.AttemptTimeout.Timeout = TimeSpan.FromSeconds(30);
options.TotalRequestTimeout.Timeout = TimeSpan.FromSeconds(90);
// must be at least twice the attempt timeout
options.CircuitBreaker.SamplingDuration = TimeSpan.FromSeconds(60);
});
return services;
}

private static IHttpClientBuilder AddLexboxHttpClient(this IServiceCollection services, string name,
Action<HttpStandardResilienceOptions>? configureResilience = null)
{
var builder = services.AddHttpClient(name,
(provider, client) =>
{
client.BaseAddress = new Uri(provider.GetRequiredService<IOptions<FwHeadlessConfig>>().Value.LexboxUrl);
}).AddHttpMessageHandler<HttpClientAuthHandler>();
return services;
});
if (configureResilience is not null)
{
#pragma warning disable EXTEXP0001
builder.RemoveAllResilienceHandlers()
#pragma warning restore EXTEXP0001
.AddStandardResilienceHandler(configureResilience);
}
// Auth goes after the resilience handler (the default one is added first), so every retry re-runs auth.
builder.AddHttpMessageHandler<HttpClientAuthHandler>();
return builder;
}
}
2 changes: 1 addition & 1 deletion backend/FwHeadless/Services/CrdtSyncService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public virtual async Task SyncHarmonyProject()
activity?.SetTag("app.project_id", currentProjectService.ProjectData.Id);
var lexboxRemoteServer = await httpSyncService.CreateProjectSyncable(
currentProjectService.ProjectData,
httpClientFactory.CreateClient(FwHeadlessKernel.LexboxHttpClientName)
httpClientFactory.CreateClient(FwHeadlessKernel.LexboxSyncHttpClientName)
);
var syncResults = await dataModel.SyncWith(lexboxRemoteServer);
if (!syncResults.IsSynced) throw new InvalidOperationException("Sync failed");
Expand Down
3 changes: 2 additions & 1 deletion backend/LexBoxApi/Services/CrdtCommitService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ public async Task<int> AddCommits(Guid projectId, IAsyncEnumerable<ServerCommit>
//A projection lambda here would let linq2db v6 wrap our Sql.Expr<...>::jsonb cast in the
//EF value-converter (JsonSerializer.Serialize) and fail SQL translation.
var stampedCommits = commits.Select(c => { c.ProjectId = projectId; return c; });
await tmpTable.BulkCopyAsync(new BulkCopyOptions{BulkCopyType = BulkCopyType.ProviderSpecific, MaxBatchSize = 10}, stampedCommits, token);
//rows stream into COPY either way; a small MaxBatchSize only adds a server round trip per batch
await tmpTable.BulkCopyAsync(new BulkCopyOptions{BulkCopyType = BulkCopyType.ProviderSpecific}, stampedCommits, token);

var commitsTable = linqToDbContext.GetTable<ServerCommit>();
var inserted = await commitsTable
Expand Down
39 changes: 39 additions & 0 deletions backend/Testing/FwHeadless/LexboxHttpClientTests.cs
Comment thread
myieye marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using FwHeadless;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Http.Resilience;
using WebServiceDefaults;

namespace Testing.FwHeadless;

public class LexboxHttpClientTests
{
private static ServiceProvider BuildServices()
{
var builder = Host.CreateApplicationBuilder();
builder.AddServiceDefaults("test");
builder.Services.AddFwHeadless();
return builder.Services.BuildServiceProvider();
}

private static List<Type> HandlerChain(ServiceProvider services, string clientName)
{
var handler = services.GetRequiredService<IHttpMessageHandlerFactory>().CreateHandler(clientName);
var chain = new List<Type>();
while (handler is DelegatingHandler delegating)
{
if (delegating is ResilienceHandler or HttpClientAuthHandler) chain.Add(delegating.GetType());
handler = delegating.InnerHandler!;
}
return chain;
}

[Theory]
[InlineData(FwHeadlessKernel.LexboxHttpClientName)]
[InlineData(FwHeadlessKernel.LexboxSyncHttpClientName)]
public void EachRetryRunsAuth(string clientName)
{
using var services = BuildServices();
HandlerChain(services, clientName).Should().Equal(typeof(ResilienceHandler), typeof(HttpClientAuthHandler));
}
}
Loading