Fix warning

MareSynchronos/Services/AutoDetect/DiscoveryConfigProvider.cs

@@ -17,7 +17,6 @@ public class DiscoveryConfigProvider
     private readonly TokenProvider _tokenProvider;
 
     private WellKnownRoot? _config;
-    private DateTimeOffset _lastLoad = DateTimeOffset.MinValue;
 
     public DiscoveryConfigProvider(ILogger<DiscoveryConfigProvider> logger, ServerConfigurationManager serverManager, TokenProvider tokenProvider)
     {
@@ -51,7 +50,6 @@ public class DiscoveryConfigProvider
 
             root.NearbyDiscovery?.Hydrate();
             _config = root;
-            _lastLoad = DateTimeOffset.UtcNow;
             _logger.LogDebug("Loaded Nearby well-known (stapled), enabled={enabled}, expires={exp}", NearbyEnabled, _config?.NearbyDiscovery?.SaltExpiresAt);
             return true;
         }
@@ -97,7 +95,6 @@ public class DiscoveryConfigProvider
 
                     root.NearbyDiscovery?.Hydrate();
                     _config = root;
-                    _lastLoad = DateTimeOffset.UtcNow;
                     _logger.LogInformation("Loaded Nearby well-known (http {path}), enabled={enabled}", path, NearbyEnabled);
                     return true;
                 }

MareSynchronos/Services/AutoDetect/NearbyDiscoveryService.cs

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Hosting;
 using MareSynchronos.Services.Mediator;
@@ -52,6 +53,7 @@ public class NearbyDiscoveryService : IHostedService, IMediatorSubscriber
 
     public Task StartAsync(CancellationToken cancellationToken)
     {
+        CancelAndDispose(ref _loopCts);
         _loopCts = new CancellationTokenSource();
         _mediator.Subscribe<ConnectedMessage>(this, _ => { _isConnected = true; _configProvider.TryLoadFromStapled(); });
         _mediator.Subscribe<DisconnectedMessage>(this, _ => { _isConnected = false; _lastPublishedSignature = null; });
@@ -128,10 +130,25 @@ public class NearbyDiscoveryService : IHostedService, IMediatorSubscriber
     public Task StopAsync(CancellationToken cancellationToken)
     {
         _mediator.UnsubscribeAll(this);
-        try { _loopCts?.Cancel(); } catch { }
+        CancelAndDispose(ref _loopCts);
         return Task.CompletedTask;
     }
 
+    private static void CancelAndDispose(ref CancellationTokenSource? cts)
+    {
+        if (cts == null) return;
+        try
+        {
+            cts.Cancel();
+        }
+        catch (ObjectDisposedException)
+        {
+        }
+
+        cts.Dispose();
+        cts = null;
+    }
+
     private async Task Loop(CancellationToken ct)
     {
         _configProvider.TryLoadFromStapled();

MareSynchronos/Services/AutoDetect/NearbyPendingService.cs

@@ -15,8 +15,9 @@ public sealed class NearbyPendingService : IMediatorSubscriber
     private readonly ApiController _api;
     private readonly AutoDetectRequestService _requestService;
     private readonly ConcurrentDictionary<string, string> _pending = new(StringComparer.Ordinal);
-    private static readonly Regex ReqRegex = new(@"^Nearby Request: (.+) \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled);
-    private static readonly Regex AcceptRegex = new(@"^Nearby Accept: (.+) \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled);
+    private static readonly TimeSpan RegexTimeout = TimeSpan.FromSeconds(1);
+    private static readonly Regex ReqRegex = new(@"^Nearby Request: .+ \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled | RegexOptions.ExplicitCapture, RegexTimeout);
+    private static readonly Regex AcceptRegex = new(@"^Nearby Accept: .+ \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled | RegexOptions.ExplicitCapture, RegexTimeout);
 
     public NearbyPendingService(ILogger<NearbyPendingService> logger, MareMediator mediator, ApiController api, AutoDetectRequestService requestService)
     {