Fix large CMS upload timeout with idle heartbeat and add per-file progress meter

Replace the 100s default HttpClient timeout (set Timeout=Infinite) with an idle/heartbeat deadline driven by a ProgressStreamContent wrapper that reports bytes-on-the-wire. Each tick resets the idle window and advances a MudProgressLinear per upload row. Idle window is configurable via Upload:IdleTimeoutSeconds (default 90s).
2026-06-17 11:07:19 -04:00
parent ec3989c354
commit c9c6286571
10 changed files with 328 additions and 8 deletions
@@ -476,9 +476,26 @@
                    {
                        // New track — upload, then link cover art with a follow-up update (same
                        // two-step pattern as BatchUpload; the upload endpoint takes no imagePath).
-                        await using var wavStream = row.WavFile!.OpenReadStream(MaxUploadBytes);
+                        row.UploadedBytes = 0;
+                        row.TotalBytes = row.WavFile!.Size;
+                        await using var wavStream = row.WavFile.OpenReadStream(MaxUploadBytes);
+
+                        // Re-render only on whole-percent change so a large upload paints ~100 frames,
+                        // not thousands. Progress<T> marshals back onto the renderer dispatcher.
+                        var lastPercent = -1;
+                        var progress = new Progress<long>(written =>
+                        {
+                            row.UploadedBytes = written;
+                            if (row.UploadPercent != lastPercent)
+                            {
+                                lastPercent = row.UploadPercent;
+                                StateHasChanged();
+                            }
+                        });
+
                        var uploadResult = await CmsTrackService.UploadTrackAsync(
                            wavStream,
+                            row.WavFile.Size,
                            row.WavFile.Name,
                            row.WavFile.ContentType,
                            row.TrackName,
@@ -491,7 +508,8 @@
                            createdByUserId,
                            _releaseType,
                            trackNumber,
-                            _medium);
+                            _medium,
+                            progress);

                        if (!uploadResult.Success || uploadResult.Value is null)
                        {
@@ -27,6 +27,17 @@ public class BatchRowModel
    public BatchRowStatus Status { get; set; } = BatchRowStatus.Queued;

    public string? ErrorMessage { get; set; }
+
+    /// <summary>Bytes pushed to the wire so far for this row's in-flight upload. Reset per attempt.</summary>
+    public long UploadedBytes { get; set; }
+
+    /// <summary>Total payload bytes for this row (the WAV file size), the progress denominator.</summary>
+    public long TotalBytes { get; set; }
+
+    /// <summary>Upload completion as a 0–100 percent, or 0 when the total is unknown.</summary>
+    public int UploadPercent => TotalBytes > 0
+        ? (int)Math.Clamp(UploadedBytes * 100 / TotalBytes, 0, 100)
+        : 0;
 }

 public enum BatchRowStatus { Queued, Uploading, Done, Failed }
@@ -41,6 +41,13 @@
                                       OnClick="@(() => OnRemove.InvokeAsync(index))"
                                       aria-label="Remove track" />
                    </MudStack>
+                    @if (row.Status == BatchRowStatus.Uploading)
+                    {
+                        <MudProgressLinear Color="Color.Info"
+                                           Value="@row.UploadPercent"
+                                           Class="mx-2 mb-2"
+                                           aria-label="@($"Uploading {row.TrackName}")" />
+                    }
                </div>
            }
        </MudList>
@@ -64,6 +64,12 @@
                {
                    @* Track name is derived from the Release Name for Session/Mix — no separate input. *@
                    <MudText Typo="Typo.caption">Selected: @(_tracks[0].WavFile?.Name ?? "—")</MudText>
+                    @if (_tracks[0].Status == BatchRowStatus.Uploading)
+                    {
+                        <MudProgressLinear Color="Color.Info"
+                                           Value="@_tracks[0].UploadPercent"
+                                           aria-label="Uploading track" />
+                    }
                }
            </MudStack>
        </MudPaper>
@@ -330,14 +336,33 @@
                row.Status = BatchRowStatus.Uploading;
                StateHasChanged();

+                row.UploadedBytes = 0;
+                row.TotalBytes = row.WavFile!.Size;
+
                try
                {
                    // OpenReadStream streams chunks from the browser via the SignalR circuit; the
-                    // service wraps it in StreamContent so the whole file is never materialised in
-                    // memory before DeepDrftAPI receives it.
-                    await using var wavStream = row.WavFile!.OpenReadStream(MaxUploadBytes);
+                    // service wraps it in ProgressStreamContent so the whole file is never materialised
+                    // in memory before DeepDrftAPI receives it, and reports bytes-on-the-wire back here.
+                    await using var wavStream = row.WavFile.OpenReadStream(MaxUploadBytes);
+
+                    // Progress ticks fire ~once per 80 KB; re-render only when the whole-percent changes
+                    // so a half-gig upload paints ~100 frames, not thousands. Progress<T> marshals the
+                    // callback onto the component's renderer dispatcher, so StateHasChanged is safe here.
+                    var lastPercent = -1;
+                    var progress = new Progress<long>(written =>
+                    {
+                        row.UploadedBytes = written;
+                        if (row.UploadPercent != lastPercent)
+                        {
+                            lastPercent = row.UploadPercent;
+                            StateHasChanged();
+                        }
+                    });
+
                    var result = await CmsTrackService.UploadTrackAsync(
                        wavStream,
+                        row.WavFile.Size,
                        row.WavFile.Name,
                        row.WavFile.ContentType,
                        row.TrackName,
@@ -350,7 +375,8 @@
                        createdByUserId,
                        _releaseType,
                        trackNumber,
-                        _medium);
+                        _medium,
+                        progress);

                    if (!result.Success || result.Value is null)
                    {