feat(repeater): adopt repeater self-deploying

closes #174

src/SecTester.Repeater/Bus/DefaultRepeaterBusFactory.cs

@@ -22,7 +22,7 @@ public DefaultRepeaterBusFactory(Configuration config, ILoggerFactory loggerFact
     _scopeFactory = scopeFactory ?? throw new ArgumentNullException(nameof(scopeFactory));
   }
 
-  public IRepeaterBus Create(string repeaterId)
+  public IRepeaterBus Create()
   {
     if (_config.Credentials is null)
     {
@@ -39,7 +39,7 @@ public IRepeaterBus Create(string repeaterId)
       ReconnectionDelayMax = options.ReconnectionDelayMax,
       ConnectionTimeout = options.ConnectionTimeout,
       Transport = TransportProtocol.WebSocket,
-      Auth = new { token = _config.Credentials.Token, domain = repeaterId }
+      Auth = new { token = _config.Credentials.Token, domain = System.Net.Dns.GetHostName() }
     })
     {
       Serializer = new SocketIOMessagePackSerializer()

src/SecTester.Repeater/Bus/IRepeaterBus.cs

@@ -11,5 +11,5 @@ public interface IRepeaterBus : IAsyncDisposable
   event Action<Version> UpgradeAvailable;
 
   Task Connect();
-  Task Deploy(string repeaterId, CancellationToken? cancellationToken = null);
+  Task<string?> Deploy(string? repeaterId, CancellationToken? cancellationToken = null);
 }

src/SecTester.Repeater/Bus/IRepeaterBusFactory.cs

@@ -2,5 +2,5 @@ namespace SecTester.Repeater.Bus;
 
 public interface IRepeaterBusFactory
 {
-  IRepeaterBus Create(string repeaterId);
+  IRepeaterBus Create();
 }

src/SecTester.Repeater/Bus/RepeaterInfo.cs

@@ -6,5 +6,5 @@ namespace SecTester.Repeater.Bus;
 public sealed record RepeaterInfo
 {
   [Key("repeaterId")]
-  public string RepeaterId { get; set; } = null!;
+  public string RepeaterId { get; init; } = null!;
 }

src/SecTester.Repeater/Bus/SocketIoRepeaterBus.cs

@@ -17,7 +17,8 @@ internal sealed class SocketIoRepeaterBus : IRepeaterBus
   private readonly ILogger<IRepeaterBus> _logger;
   private readonly SocketIoRepeaterBusOptions _options;
 
-  internal SocketIoRepeaterBus(SocketIoRepeaterBusOptions options, ISocketIoConnection connection, ITimerProvider heartbeat, ILogger<IRepeaterBus> logger)
+  internal SocketIoRepeaterBus(SocketIoRepeaterBusOptions options, ISocketIoConnection connection, ITimerProvider heartbeat,
+    ILogger<IRepeaterBus> logger)
   {
     _options = options ?? throw new ArgumentNullException(nameof(options));
     _connection = connection ?? throw new ArgumentNullException(nameof(connection));
@@ -48,13 +49,13 @@ private void DelegateEvents()
     _connection.On("error", response =>
     {
       var err = response.GetValue<RepeaterError>();
-      ErrorOccurred?.Invoke(new(err.Message));
+      ErrorOccurred?.Invoke(new Exception(err.Message));
     });
 
     _connection.On("update-available", response =>
     {
       var version = response.GetValue<RepeaterVersion>();
-      UpgradeAvailable?.Invoke(new(version.Version));
+      UpgradeAvailable?.Invoke(new Version(version.Version));
     });
 
     _connection.On("request", async response =>
@@ -90,21 +91,27 @@ public async ValueTask DisposeAsync()
     GC.SuppressFinalize(this);
   }
 
-  public async Task Deploy(string repeaterId, CancellationToken? cancellationToken = null)
+  public async Task<string?> Deploy(string? repeaterId, CancellationToken? cancellationToken = default)
   {
     try
     {
       var tcs = new TaskCompletionSource<RepeaterInfo>();
 
       _connection.On("deployed", response => tcs.TrySetResult(response.GetValue<RepeaterInfo>()));
 
-      await _connection.EmitAsync("deploy", new RepeaterInfo { RepeaterId = repeaterId }).ConfigureAwait(false);
+      var args = repeaterId == null ? Array.Empty<object>() : new object[] { new RepeaterInfo { RepeaterId = repeaterId } };
+
+      await _connection
+        .EmitAsync("deploy", args)
+        .ConfigureAwait(false);
 
       using var _ = cancellationToken?.Register(() => tcs.TrySetCanceled());
 
       var result = await tcs.Task.ConfigureAwait(false);
 
       _logger.LogDebug("Repeater ({RepeaterId}) deployed", result?.RepeaterId);
+
+      return result?.RepeaterId;
     }
     finally
     {
@@ -120,13 +127,7 @@ private async Task SchedulePing()
     _heartbeat.Start();
   }
 
-  private async void Ping(object sender, ElapsedEventArgs args)
-  {
-    await Ping().ConfigureAwait(false);
-  }
+  private async void Ping(object sender, ElapsedEventArgs args) => await Ping().ConfigureAwait(false);
 
-  private async Task Ping()
-  {
-    await _connection.EmitAsync("ping").ConfigureAwait(false);
-  }
+  private async Task Ping() => await _connection.EmitAsync("ping").ConfigureAwait(false);
 }

src/SecTester.Repeater/DefaultRepeaterFactory.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Logging;
 using SecTester.Core;
 using SecTester.Core.Logger;
-using SecTester.Repeater.Api;
 using SecTester.Repeater.Bus;
 
 namespace SecTester.Repeater;
@@ -12,30 +11,24 @@ public class DefaultRepeaterFactory : IRepeaterFactory
 {
   private readonly Configuration _configuration;
   private readonly IRepeaterBusFactory _busFactory;
-  private readonly IRepeaters _repeaters;
   private readonly ILoggerFactory _loggerFactory;
   private readonly IAnsiCodeColorizer _ansiCodeColorizer;
   private readonly RequestRunnerResolver _requestRunnerResolver;
 
-  public DefaultRepeaterFactory(IRepeaters repeaters, IRepeaterBusFactory busFactory, Configuration configuration, ILoggerFactory loggerFactory, IAnsiCodeColorizer ansiCodeColorizer, RequestRunnerResolver requestRunnerResolver)
+  public DefaultRepeaterFactory(IRepeaterBusFactory busFactory, Configuration configuration, ILoggerFactory loggerFactory, IAnsiCodeColorizer ansiCodeColorizer, RequestRunnerResolver requestRunnerResolver)
   {
-    _repeaters = repeaters ?? throw new ArgumentNullException(nameof(repeaters));
     _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
     _busFactory = busFactory ?? throw new ArgumentNullException(nameof(busFactory));
     _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
     _ansiCodeColorizer = ansiCodeColorizer ?? throw new ArgumentNullException(nameof(ansiCodeColorizer));
     _requestRunnerResolver = requestRunnerResolver ?? throw new ArgumentNullException(nameof(requestRunnerResolver));
   }
 
-  public async Task<IRepeater> CreateRepeater(RepeaterOptions? options = default)
+  public async Task<IRepeater> CreateRepeater()
   {
-    options ??= new RepeaterOptions();
-
-    var repeaterId = await _repeaters.CreateRepeater($"{options.NamePrefix}-{Guid.NewGuid()}", options.Description).ConfigureAwait(false);
-
-    var bus = _busFactory.Create(repeaterId);
+    var bus = _busFactory.Create();
     var version = new Version(_configuration.RepeaterVersion);
 
-    return new Repeater(repeaterId, bus, version, _loggerFactory.CreateLogger<Repeater>(), _ansiCodeColorizer, _requestRunnerResolver);
+    return new Repeater(bus, version, _loggerFactory.CreateLogger<Repeater>(), _ansiCodeColorizer, _requestRunnerResolver);
   }
 }

src/SecTester.Repeater/Extensions/ServiceCollectionExtensions.cs

@@ -7,7 +7,6 @@
 using SecTester.Core;
 using SecTester.Core.Bus;
 using SecTester.Core.Utils;
-using SecTester.Repeater.Api;
 using SecTester.Repeater.Bus;
 using SecTester.Repeater.Dispatchers;
 using SecTester.Repeater.RetryStrategies;
@@ -28,7 +27,6 @@ public static IServiceCollection AddSecTesterRepeater(this IServiceCollection co
       .AddSingleton<IRetryStrategy, ExponentialBackoffIRetryStrategy>()
       .AddSingleton<IRepeaterBusFactory, DefaultRepeaterBusFactory>()
       .AddScoped<IRepeaterFactory, DefaultRepeaterFactory>()
-      .AddScoped<IRepeaters, DefaultRepeaters>()
       .AddScoped<ITimerProvider, SystemTimerProvider>()
       .AddScoped<IRequestRunner, HttpRequestRunner>()
       .AddScoped<RequestRunnerResolver>(sp =>

src/SecTester.Repeater/IRepeater.cs

@@ -6,7 +6,7 @@ namespace SecTester.Repeater;
 
 public interface IRepeater : IAsyncDisposable
 {
-  string RepeaterId { get; }
+  string? RepeaterId { get; }
   Task Start(CancellationToken cancellationToken = default);
   Task Stop(CancellationToken cancellationToken = default);
 }

src/SecTester.Repeater/IRepeaterFactory.cs

@@ -4,5 +4,5 @@ namespace SecTester.Repeater;
 
 public interface IRepeaterFactory
 {
-  Task<IRepeater> CreateRepeater(RepeaterOptions? options = default);
+  Task<IRepeater> CreateRepeater();
 }

src/SecTester.Repeater/Repeater.cs

@@ -21,10 +21,9 @@ public class Repeater : IRepeater
   private readonly IAnsiCodeColorizer _ansiCodeColorizer;
   private readonly RequestRunnerResolver _requestRunnersAccessor;
 
-  public Repeater(string repeaterId, IRepeaterBus bus, Version version, ILogger<Repeater> logger,
+  public Repeater(IRepeaterBus bus, Version version, ILogger<Repeater> logger,
     IAnsiCodeColorizer ansiCodeColorizer, RequestRunnerResolver requestRunnersAccessor)
   {
-    RepeaterId = repeaterId ?? throw new ArgumentNullException(nameof(repeaterId));
     _logger = logger ?? throw new ArgumentNullException(nameof(logger));
     _version = version ?? throw new ArgumentNullException(nameof(version));
     _bus = bus ?? throw new ArgumentNullException(nameof(bus));
@@ -33,7 +32,7 @@ public Repeater(string repeaterId, IRepeaterBus bus, Version version, ILogger<Re
   }
 
   public RunningStatus Status { get; private set; } = RunningStatus.Off;
-  public string RepeaterId { get; }
+  public string? RepeaterId { get; private set; }
 
   public async ValueTask DisposeAsync()
   {
@@ -60,7 +59,7 @@ public async Task Start(CancellationToken cancellationToken = default)
       SubscribeToEvents();
 
       await _bus.Connect().ConfigureAwait(false);
-      await _bus.Deploy(RepeaterId, cancellationToken).ConfigureAwait(false);
+      RepeaterId = await _bus.Deploy(RepeaterId, cancellationToken).ConfigureAwait(false);
 
       Status = RunningStatus.Running;
     }

src/SecTester.Repeater/SecTester.Repeater.csproj

@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Api"/>
     <Folder Include="Bus" />
     <Folder Include="Commands" />
     <Folder Include="Dispatchers" />

src/SecTester.Runner/SecRunner.cs

@@ -5,7 +5,6 @@
 using SecTester.Core;
 using SecTester.Core.Extensions;
 using SecTester.Repeater;
-using SecTester.Repeater.Api;
 using SecTester.Repeater.Extensions;
 using SecTester.Reporter;
 using SecTester.Scan;
@@ -18,17 +17,15 @@ public class SecRunner : IAsyncDisposable
   private readonly Configuration _configuration;
   private readonly IFormatter _formatter;
   private readonly IRepeaterFactory _repeaterFactory;
-  private readonly IRepeaters _repeatersManager;
   private readonly IScanFactory _scanFactory;
   private IRepeater? _repeater;
 
-  public SecRunner(Configuration configuration, IRepeaterFactory repeaterFactory, IScanFactory scanFactory, IRepeaters repeatersManager,
+  public SecRunner(Configuration configuration, IRepeaterFactory repeaterFactory, IScanFactory scanFactory,
     IFormatter formatter)
   {
     _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
     _repeaterFactory = repeaterFactory ?? throw new ArgumentNullException(nameof(repeaterFactory));
     _scanFactory = scanFactory ?? throw new ArgumentNullException(nameof(scanFactory));
-    _repeatersManager = repeatersManager ?? throw new ArgumentNullException(nameof(repeatersManager));
     _formatter = formatter ?? throw new ArgumentNullException(nameof(formatter));
   }
 
@@ -60,7 +57,7 @@ public static async Task<SecRunner> Create(Configuration configuration)
     return sp.GetRequiredService<SecRunner>();
   }
 
-  public async Task Init(RepeaterOptions? options = default, CancellationToken cancellationToken = default)
+  public async Task Init(CancellationToken cancellationToken = default)
   {
     if (_repeater is not null)
     {
@@ -69,7 +66,7 @@ public async Task Init(RepeaterOptions? options = default, CancellationToken can
 
     await _configuration.LoadCredentials().ConfigureAwait(false);
 
-    _repeater = await _repeaterFactory.CreateRepeater(options).ConfigureAwait(false);
+    _repeater = await _repeaterFactory.CreateRepeater().ConfigureAwait(false);
     await _repeater.Start(cancellationToken).ConfigureAwait(false);
   }
 
@@ -80,7 +77,6 @@ public async Task Clear(CancellationToken cancellationToken = default)
       if (_repeater is not null)
       {
         await _repeater.Stop(cancellationToken).ConfigureAwait(false);
-        await _repeatersManager.DeleteRepeater(_repeater.RepeaterId).ConfigureAwait(false);
         await _repeater.DisposeAsync().ConfigureAwait(false);
       }
     }