[fix] Clean up upload network issue handling

Made-with: Cursor

Author: paul-fresquet

src/ByteSync.Client/Services/Communications/Transfers/Strategies/UploadFailureClassifier.cs

@@ -31,7 +31,7 @@ public static UploadFileResponse Classify(Exception exception, CancellationToken
 
     private static bool IsClientNetworkError(Exception exception)
     {
-        if (exception is not HttpRequestException and not IOException)
+        if (exception is not HttpRequestException and not IOException and not SocketException)
         {
             return false;
         }

src/ByteSync.Client/Services/Communications/Transfers/Uploading/AdaptiveUploadController.cs

@@ -14,7 +14,7 @@ public class AdaptiveUploadController : IAdaptiveUploadController
     private const int MAX_CHUNK_SIZE_BYTES = 16 * 1024 * 1024; // 16 MB
     private const int MIN_PARALLELISM = 2;
     private const int MAX_PARALLELISM = 4;
-    private const int CLIENT_TIMEOUTS_BEFORE_DOWNSCALE = 2;
+    private const int CLIENT_NETWORK_ISSUES_BEFORE_DOWNSCALE = 2;
 
     private const double MULTIPLIER_2_X = 2.0;
     private const double MULTIPLIER_1_75_X = 1.75;
@@ -37,7 +37,7 @@ public class AdaptiveUploadController : IAdaptiveUploadController
     private readonly Queue<long> _recentBytes;
     private int _successesInWindow;
     private int _windowSize;
-    private int _consecutiveClientTimeouts;
+    private int _consecutiveClientNetworkIssues;
     private readonly ILogger<AdaptiveUploadController> _logger;
     private readonly object _syncRoot = new();
 
@@ -90,7 +90,7 @@ public void RecordUploadResult(UploadResult uploadResult)
         {
             if (uploadResult.FailureKind == UploadFailureKind.ClientCancellation)
             {
-                _consecutiveClientTimeouts = 0;
+                _consecutiveClientNetworkIssues = 0;
                 return;
             }
 
@@ -100,7 +100,7 @@ public void RecordUploadResult(UploadResult uploadResult)
                 return;
             }
 
-            _consecutiveClientTimeouts = 0;
+            _consecutiveClientNetworkIssues = 0;
 
             EnqueueSample(uploadResult.Elapsed, uploadResult.IsSuccess, uploadResult.ActualBytes);
 
@@ -164,24 +164,24 @@ private void EnqueueSample(TimeSpan elapsed, bool isSuccess, long actualBytes)
 
     private void HandleClientNetworkIssue(string? fileId, UploadFailureKind failureKind)
     {
-        _consecutiveClientTimeouts += 1;
-        if (_consecutiveClientTimeouts < CLIENT_TIMEOUTS_BEFORE_DOWNSCALE)
+        _consecutiveClientNetworkIssues += 1;
+        if (_consecutiveClientNetworkIssues < CLIENT_NETWORK_ISSUES_BEFORE_DOWNSCALE)
         {
             _logger.LogDebug(
-                "Adaptive: file {FileId} client network issue {FailureKind} {TimeoutCount}/{Threshold}. Waiting before downscale",
+                "Adaptive: file {FileId} client network issue {FailureKind} {IssueCount}/{Threshold}. Waiting before downscale",
                 fileId ?? "-",
                 failureKind,
-                _consecutiveClientTimeouts,
-                CLIENT_TIMEOUTS_BEFORE_DOWNSCALE);
+                _consecutiveClientNetworkIssues,
+                CLIENT_NETWORK_ISSUES_BEFORE_DOWNSCALE);
 
             return;
         }
 
         _logger.LogInformation(
-            "Adaptive: file {FileId} client network issue threshold reached ({TimeoutCount}). Downscaling upload settings",
+            "Adaptive: file {FileId} client network issue threshold reached ({IssueCount}). Downscaling upload settings",
             fileId ?? "-",
-            _consecutiveClientTimeouts);
-        _consecutiveClientTimeouts = 0;
+            _consecutiveClientNetworkIssues);
+        _consecutiveClientNetworkIssues = 0;
         Downscale(fileId, "client network issues");
     }
 
@@ -396,7 +396,7 @@ private void ResetState()
             _currentChunkSizeBytes = Math.Clamp(INITIAL_CHUNK_SIZE_BYTES, MIN_CHUNK_SIZE_BYTES, MAX_CHUNK_SIZE_BYTES);
             _currentParallelism = MIN_PARALLELISM;
             _windowSize = _currentParallelism;
-            _consecutiveClientTimeouts = 0;
+            _consecutiveClientNetworkIssues = 0;
         }
 
         ResetWindow();

tests/ByteSync.Client.UnitTests/Services/Communications/Transfers/Strategies/UploadFailureClassifierTests.cs

@@ -110,4 +110,18 @@ public void Classify_HttpRequestExceptionWithConnectionReset_ShouldReturnClientN
         response.FailureKind.Should().Be(UploadFailureKind.ClientNetworkError);
         response.Exception.Should().BeSameAs(ex);
     }
+
+    [Test]
+    public void Classify_DirectSocketExceptionWithConnectionReset_ShouldReturnClientNetworkError()
+    {
+        using var cts = new CancellationTokenSource();
+        var ex = new SocketException((int)SocketError.ConnectionReset);
+
+        var response = UploadFailureClassifier.Classify(ex, cts.Token);
+
+        response.IsSuccess.Should().BeFalse();
+        response.StatusCode.Should().Be(0);
+        response.FailureKind.Should().Be(UploadFailureKind.ClientNetworkError);
+        response.Exception.Should().BeSameAs(ex);
+    }
 }