Merge branch '1.12.3' into banner-api-changes

LightlessSync/WebAPI/Files/FileDownloadManager.cs

@@ -215,6 +215,26 @@ public partial class FileDownloadManager : DisposableMediatorSubscriberBase
 
                 await Task.Delay(retryDelay, ct).ConfigureAwait(false);
             }
+            catch (TaskCanceledException ex) when (!ct.IsCancellationRequested)
+            {
+                response?.Dispose();
+                retryCount++;
+
+                Logger.LogWarning(ex, "Cancellation/timeout during download of {requestUrl}. Attempt {attempt} of {maxRetries}", requestUrl, retryCount, maxRetries);
+
+                if (retryCount >= maxRetries)
+                {
+                    Logger.LogError("Max retries reached for {requestUrl} after TaskCanceledException", requestUrl);
+                    throw;
+                }
+
+                await Task.Delay(retryDelay, ct).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) when (ct.IsCancellationRequested)
+            {
+                response?.Dispose();
+                throw;
+            }
             catch (HttpRequestException ex)
             {
                 response?.Dispose();

LightlessSync/WebAPI/SignalR/ApiController.Functions.Callbacks.cs

@@ -107,17 +107,17 @@ public partial class ApiController
     }
     public Task Client_ReceiveBroadcastPairRequest(UserPairNotificationDto dto)
     {
-        if (dto == null)
+        Logger.LogDebug("Client_ReceiveBroadcastPairRequest: {dto}", dto);
+        
+        if (dto is null)
+        {
             return Task.CompletedTask;
+        }
 
-        var request = _pairRequestService.RegisterIncomingRequest(dto.myHashedCid, dto.message ?? string.Empty);
-        var senderName = string.IsNullOrEmpty(request.DisplayName) ? "Unknown User" : request.DisplayName;
-
-        _lightlessNotificationService.ShowPairRequestNotification(
-            senderName,
-            request.HashedCid,
-            onAccept: () => _pairRequestService.AcceptPairRequest(request.HashedCid, senderName),
-            onDecline: () => _pairRequestService.DeclinePairRequest(request.HashedCid));
+        ExecuteSafely(() =>
+        {
+            Mediator.Publish(new PairRequestReceivedMessage(dto.myHashedCid, dto.message ?? string.Empty));
+        });
 
         return Task.CompletedTask;
     }

LightlessSync/WebAPI/SignalR/ApiController.cs

@@ -32,7 +32,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
     private readonly ServerConfigurationManager _serverManager;
     private readonly TokenProvider _tokenProvider;
     private readonly LightlessConfigService _lightlessConfigService;
-    private readonly NotificationService _lightlessNotificationService;
     private CancellationTokenSource _connectionCancellationTokenSource;
     private ConnectionDto? _connectionDto;
     private bool _doNotNotifyOnNextInfo = false;
@@ -54,7 +53,6 @@ public sealed partial class ApiController : DisposableMediatorSubscriberBase, IL
         _serverManager = serverManager;
         _tokenProvider = tokenProvider;
         _lightlessConfigService = lightlessConfigService;
-        _lightlessNotificationService = lightlessNotificationService;
         _connectionCancellationTokenSource = new CancellationTokenSource();
 
         Mediator.Subscribe<DalamudLoginMessage>(this, (_) => DalamudUtilOnLogIn());