Update 0.1.4 - AutoDetect WIP Debug & Fix UI & Optimization

2025-09-11 22:37:29 +02:00
parent 95d9f65068
commit b79a51748f
10 changed files with 211 additions and 34 deletions
--- a/MareSynchronos/Services/AutoDetect/NearbyPendingService.cs
+++ b/MareSynchronos/Services/AutoDetect/NearbyPendingService.cs
@@ -0,0 +1,70 @@
+using System.Collections.Concurrent;
+using System.Text.RegularExpressions;
+using MareSynchronos.Services.Mediator;
+using MareSynchronos.WebAPI;
+using Microsoft.Extensions.Logging;
+
+namespace MareSynchronos.Services.AutoDetect;
+
+public sealed class NearbyPendingService : IMediatorSubscriber
+{
+    private readonly ILogger<NearbyPendingService> _logger;
+    private readonly MareMediator _mediator;
+    private readonly ApiController _api;
+    private readonly ConcurrentDictionary<string, string> _pending = new(StringComparer.Ordinal);
+    private static readonly Regex ReqRegex = new(@"^Nearby Request: (.+) \[(?<uid>[A-Z0-9]+)\]$", RegexOptions.Compiled);
+
+    public NearbyPendingService(ILogger<NearbyPendingService> logger, MareMediator mediator, ApiController api)
+    {
+        _logger = logger;
+        _mediator = mediator;
+        _api = api;
+        _mediator.Subscribe<NotificationMessage>(this, OnNotification);
+    }
+
+    public MareMediator Mediator => _mediator;
+
+    public IReadOnlyDictionary<string, string> Pending => _pending;
+
+    private void OnNotification(NotificationMessage msg)
+    {
+        // Watch info messages for Nearby request pattern
+        if (msg.Type != MareSynchronos.MareConfiguration.Models.NotificationType.Info) return;
+        var m = ReqRegex.Match(msg.Message);
+        if (!m.Success) return;
+        var uid = m.Groups["uid"].Value;
+        if (string.IsNullOrEmpty(uid)) return;
+        // Try to extract name as everything before space and '['
+        var name = msg.Message;
+        try
+        {
+            var idx = msg.Message.IndexOf(':');
+            if (idx >= 0) name = msg.Message[(idx + 1)..].Trim();
+            var br = name.LastIndexOf('[');
+            if (br > 0) name = name[..br].Trim();
+        }
+        catch { name = uid; }
+        _pending[uid] = name;
+        _logger.LogInformation("NearbyPending: received request from {uid} ({name})", uid, name);
+    }
+
+    public void Remove(string uid)
+    {
+        _pending.TryRemove(uid, out _);
+    }
+
+    public async Task<bool> AcceptAsync(string uid)
+    {
+        try
+        {
+            await _api.UserAddPair(new MareSynchronos.API.Dto.User.UserDto(new MareSynchronos.API.Data.UserData(uid))).ConfigureAwait(false);
+            _pending.TryRemove(uid, out _);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogWarning(ex, "NearbyPending: accept failed for {uid}", uid);
+            return false;
+        }
+    }
+}