feat(stream): retry a dropped push instead of ending the session (TASK 32·1)
A dead encoder used to run the whole stop path, so a one-second blip ended the broadcast. Now a dropped push is relaunched against the same ingest while the broadcast is still alive. - `Services/StreamRetryPolicy.cs` — immediate, +1 s, +2 s, +3 s. Minimum waits on purpose (creator ruling): YouTube's grace is short, so every second not pushing is grace spent. - `Services/StreamRecovery.cs` — the loop, with the audio pipe recreated before every attempt (its server is single-instance and unusable after the old client dies, so a naive relaunch fails on a missing input). After a push comes up it asks the API whether the broadcast survived: "complete" ends recovery as `BroadcastComplete` instead of showing a live sign over a dead stream; an API hiccup counts as recovered rather than ending a healthy session. - `FramePump.EncoderFailed` — a dead push is recoverable; a compositor fault still goes through `Failed` and ends the session, because retrying it would loop. - `MainViewModel.Recovery.cs` — wires the steps, reports each episode into the left panel alert stack (one row per episode, updated in place, log range painted), and cancels on Stop. - Alert stack polish: a rule and a gap now separate the stack from the scene layers (they read as one list before), and the licence indicator uses the creator's wording — `STEAM ID NOT PRESENT` / `Steam ID Limit: 30fps` / `Click for More Info`, becoming `STEAM ID PRESENT` / `60fps` with a close control once owned. Tests: `StreamRecoveryTests` (schedule, recover on attempt 2 with the pipe restarted each time, complete-broadcast honesty, unknown liveness, give-up, cancel, audio-restart fault), `FramePumpTests` now pin that process death raises `EncoderFailed` and not `Failed`. FAST gate: 538 passed (one documented pre-existing audio failure), 0 warnings.
This commit is contained in:
@@ -29,22 +29,25 @@ public partial class MainViewModel
|
||||
|
||||
public RelayCommand<AttentionAlert> ActivateAlertCommand => new(ActivateAlert);
|
||||
|
||||
/// <summary>The licence indicator's text: what this build is entitled to, and the maximum.
|
||||
/// A status readout — deliberately not a description of what is missing (creator ruling: the
|
||||
/// resolution picker explains that).</summary>
|
||||
/// <summary>The licence indicator's text (creator wording, 2026-11-05): the limit this build runs
|
||||
/// at, plus where to find out why. Not a warning — the resolution picker explains the detail, and
|
||||
/// clicking the row opens About.</summary>
|
||||
private string SteamLicenceText()
|
||||
{
|
||||
if (QualityOptions.Length == 0) return "Entitlement 30 fps · Maximum 60 fps";
|
||||
|
||||
var max = QualityOptions.Max(option => option.Fps);
|
||||
var entitled = QualityOptions
|
||||
.Where(option => HasProOutput || !option.RequiresPro)
|
||||
.Select(option => option.Fps)
|
||||
.DefaultIfEmpty(max)
|
||||
.Max();
|
||||
return $"Entitlement {entitled} fps · Maximum {max} fps";
|
||||
var entitled = 30;
|
||||
if (QualityOptions.Length > 0)
|
||||
{
|
||||
entitled = QualityOptions
|
||||
.Where(option => HasProOutput || !option.RequiresPro)
|
||||
.Select(option => option.Fps)
|
||||
.DefaultIfEmpty(30)
|
||||
.Max();
|
||||
}
|
||||
return $"Steam ID Limit: {entitled}fps\nClick for More Info";
|
||||
}
|
||||
|
||||
private string SteamLicenceLabel() => IsAppOwned ? "STEAM ID PRESENT" : "STEAM ID NOT PRESENT";
|
||||
|
||||
/// <summary>Recomputes row 1 in place. Called at startup and whenever ownership changes.</summary>
|
||||
private void RefreshSteamLicenceAlert()
|
||||
{
|
||||
@@ -60,7 +63,7 @@ public partial class MainViewModel
|
||||
|
||||
var alert = new AttentionAlert(
|
||||
SteamLicenceAlertId,
|
||||
"STEAM LICENCE",
|
||||
SteamLicenceLabel(),
|
||||
SteamLicenceText(),
|
||||
IsPinned: !IsAppOwned,
|
||||
AttentionAlertAction.About);
|
||||
|
||||
@@ -0,0 +1,149 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using ytLive.Helpers;
|
||||
using ytLive.Services;
|
||||
using ytLive.Services.Encoder;
|
||||
|
||||
namespace ytLive.ViewModels;
|
||||
|
||||
/// <summary>
|
||||
/// TASK 32·1 — a dropped push is retried instead of ending the session. The loop itself lives in
|
||||
/// <see cref="StreamRecovery"/> (pure, testable); this partial supplies the app-side steps and reports
|
||||
/// each episode into the left panel's alert stack.
|
||||
/// <para>Deliberately narrow: only the ENCODER dying is recoverable. A compositor fault still goes
|
||||
/// through <see cref="OnFramePumpFailed"/> and ends the session, because retrying it would loop.</para>
|
||||
/// </summary>
|
||||
public partial class MainViewModel
|
||||
{
|
||||
private CancellationTokenSource? _recoveryCts;
|
||||
|
||||
/// <summary>True while a push is being relaunched — slice 2 binds the amber sign to this.</summary>
|
||||
public bool IsReconnecting { get; private set; }
|
||||
|
||||
/// <summary>The attempt currently in flight (0 when idle).</summary>
|
||||
public int ReconnectAttempt { get; private set; }
|
||||
|
||||
private void OnEncoderFailed(object? sender, string message)
|
||||
{
|
||||
if (!IsLive && !IsRecording) return;
|
||||
if (_recoveryCts != null) return; // one recovery at a time
|
||||
if (!IsLive) return; // a recording-only session has nothing to relive
|
||||
|
||||
AppLog.Write($"RECONNECT: encoder process failed: {message}");
|
||||
_recoveryCts = new CancellationTokenSource();
|
||||
_ = RecoverStreamAsync(message, _recoveryCts.Token);
|
||||
}
|
||||
|
||||
private async Task RecoverStreamAsync(string reason, CancellationToken cancellationToken)
|
||||
{
|
||||
IsReconnecting = true;
|
||||
ReconnectAttempt = 0;
|
||||
|
||||
var logFrom = AppLog.SnapshotCurrentLaunch().Count > 0
|
||||
? AppLog.SnapshotCurrentLaunch()[^1].Sequence + 1
|
||||
: 1;
|
||||
|
||||
var recovery = new StreamRecovery(
|
||||
StreamRetryPolicy.Default,
|
||||
new StreamRecoverySteps
|
||||
{
|
||||
RestartAudio = _ =>
|
||||
{
|
||||
// The audio pipe's server is single-instance and its client just died, so it has
|
||||
// to be recreated before ffmpeg can attach — otherwise the restart fails on a
|
||||
// missing input.
|
||||
_audioMixer.StopLive();
|
||||
_audioMixer.StartLive(EncoderOptions.DefaultAudioPipeName);
|
||||
return Task.CompletedTask;
|
||||
},
|
||||
StartPush = async ct =>
|
||||
{
|
||||
await _framePump.StartAsync(ct);
|
||||
return _framePump.IsRunning;
|
||||
},
|
||||
CheckBroadcast = async ct =>
|
||||
{
|
||||
if (_currentBroadcastId == null || _reusableStream?.Id == null)
|
||||
return BroadcastLiveness.Unknown;
|
||||
var status = await _youtubeStream.GetBroadcastStatusAsync(_currentBroadcastId);
|
||||
return status switch
|
||||
{
|
||||
"complete" => BroadcastLiveness.Complete,
|
||||
null => BroadcastLiveness.Unknown,
|
||||
_ => BroadcastLiveness.Live,
|
||||
};
|
||||
},
|
||||
Report = text =>
|
||||
{
|
||||
var progress = text.StartsWith("Stream dropped", StringComparison.Ordinal)
|
||||
? ParseAttempt(text)
|
||||
: 0;
|
||||
if (progress > 0) ReconnectAttempt = progress;
|
||||
|
||||
var to = AppLog.SnapshotCurrentLaunch() is { Count: > 0 } entries
|
||||
? entries[^1].Sequence
|
||||
: logFrom;
|
||||
PushAttentionAlert(
|
||||
"stream-recovery",
|
||||
"STREAM",
|
||||
text,
|
||||
logFrom,
|
||||
Math.Max(logFrom, to));
|
||||
},
|
||||
Log = line => AppLog.Write(line, AppLogMessageType.Error, AppLogErrorClass.Class2),
|
||||
});
|
||||
|
||||
try
|
||||
{
|
||||
var result = await recovery.RunAsync(cancellationToken);
|
||||
|
||||
switch (result.Outcome)
|
||||
{
|
||||
case RecoveryOutcome.Recovered:
|
||||
ReconnectAttempt = result.Attempts;
|
||||
AppLog.WriteSuccess(
|
||||
$"RECONNECT: recovered on attempt {result.Attempts} after {result.Elapsed.TotalSeconds:0.0} s");
|
||||
break;
|
||||
|
||||
case RecoveryOutcome.Cancelled:
|
||||
// The creator stopped the stream mid-recovery: nothing to report.
|
||||
break;
|
||||
|
||||
default:
|
||||
// Gave up, or the broadcast was already complete: this session is over. The alert
|
||||
// stack keeps the reason; the normal stop path clears pills, audio and recording.
|
||||
AppLog.Write("RECONNECT: session ended — the broadcast could not be recovered",
|
||||
AppLogMessageType.Error, AppLogErrorClass.Class1);
|
||||
StopStream();
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
AppLog.Write(ex, "RECONNECT: recovery loop faulted");
|
||||
StopStream();
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsReconnecting = false;
|
||||
ReconnectAttempt = 0;
|
||||
_recoveryCts?.Dispose();
|
||||
_recoveryCts = null;
|
||||
}
|
||||
}
|
||||
|
||||
private static int ParseAttempt(string text)
|
||||
{
|
||||
// "Stream dropped — reconnecting (attempt 2 of 4)"
|
||||
var marker = text.IndexOf("attempt ", StringComparison.Ordinal);
|
||||
if (marker < 0) return 0;
|
||||
var rest = text[(marker + "attempt ".Length)..];
|
||||
var space = rest.IndexOf(' ');
|
||||
return int.TryParse(space > 0 ? rest[..space] : rest, out var attempt) ? attempt : 0;
|
||||
}
|
||||
|
||||
/// <summary>The creator asked to stop: never race a stop against a relaunch.</summary>
|
||||
private void CancelStreamRecovery() => _recoveryCts?.Cancel();
|
||||
}
|
||||
@@ -339,6 +339,8 @@ public partial class MainViewModel : ViewModelBase
|
||||
|
||||
private async void StopStream()
|
||||
{
|
||||
CancelStreamRecovery(); // a stop wins over a relaunch in flight
|
||||
RemoveAttentionAlert("stream-recovery");
|
||||
var wasLive = IsLive;
|
||||
var wasRecording = IsRecording;
|
||||
|
||||
|
||||
@@ -457,6 +457,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
transition: _transition,
|
||||
sceneGraph: _sceneGraph);
|
||||
_framePump.Failed += OnFramePumpFailed;
|
||||
_framePump.EncoderFailed += OnEncoderFailed;
|
||||
_framePump.HealthUpdated += OnFramePumpHealthUpdated;
|
||||
|
||||
LoadLayout();
|
||||
|
||||
Reference in New Issue
Block a user