Public Access
Say how far a connection has got while it is still being made
The connecting card set its status string once, when the tab was created, and never touched it again. Every connection therefore looked identical from the outside: one three seconds into a key exchange, one waiting out a fifteen-second timeout against a machine that is asleep, and one that had hung all drew the same "connecting…". The card now draws the five steps of getting there, each lit at the moment the handshake reports reaching it, over an amber track that fills as they finish. ◆ NOTHING ON THE LIST IS INVENTED. Every row changes state because a layer below it said so, at the instant the thing it names actually began. That is the whole reason it is worth showing, and it is why most of this commit is plumbing rather than XAML: there was no progress reporting anywhere in the stack to hook a step list onto, and a card animating plausible progress would have been indistinguishable from one that had stopped receiving any. SshConnectionPhase names four phases and deliberately not more. SSH.NET runs the entire handshake inside one ConnectAsync and raises exactly one event from the middle of it — HostKeyReceived, once the key exchange has produced a key to show — so that event is the only interior moment there is to report. Everything before it is Reaching and everything after it is Authenticating. A fifth phase in that assembly would have to be a timer, so there is not one. OpeningShell is reported by TerminalWorkspace instead, because that is where it happens: the factory's work ends with an authenticated connection, and asking for a pseudo-terminal on one is a separate round trip. The SFTP path passes null — a second connection opened behind an already-open shell has nobody watching a step list for it. The card's fifth step, "Starting the terminal", is the renderer wait and lives in the shell rather than in the SSH assembly, which has never heard of a renderer. On the first connection after a cold start it is a real wait with a real failure mode of its own — a missing WebView2 runtime — so a list that began at "reaching the host" would leave the one wait most likely to hang unnamed. Amber for the step in flight, and that follows the palette's rule rather than bending it. Green is what is true and purple is what you can press; a step still happening is neither, and it is exactly the caveat-worth-reading that amber exists for. Steps behind it go green as they become true. Nothing animates, which is the argument TransfersScreen.axaml already makes for its own track, reaching a screen with far more reason to want a spinner: a spinner is furniture invented to fill a state nobody measured, and these states are measured, so the track fills to what has finished and then waits there. A refusal keeps the step it stopped on, in red, with the ones behind it still green. That is the half a progress bar could not do, and it is the difference between "that host is not there" and "that host is there and would not have me" — a question the reason sentence alone frequently does not settle. The strip's dot goes amber while a tab is connecting, on both heads. It was grey, and so is a tab whose shell has exited: the two states in that strip with the least in common, one worth waiting for and one over. PhoneShell's own comment already recorded half of this — the dot stopped being green before anything had answered — and this is the other half. Progress is raised inline rather than through System.Progress<T>, which captures whatever synchronisation context it was constructed on and posts to it. That reads like a convenience and is really a second place the marshalling decision gets made: silently, differently under a test with no context, and out of order with respect to the failure that follows a phase. The shell marshals once, in one handler, through a new optional post parameter on MainWindowViewModel — the same seam TransfersViewModel already uses, and for the reason its own remark gives. The three Dispatcher.UIThread.Post calls that predate it are the ones this suite's comments record as out of reach; they are left alone rather than swept in here. Both heads draw the list. They differ in one place: Phone.axaml's mono class sets a colour and a size along with the family, so the caption rule names its own family instead of composing the two and asking two rules for one Foreground. The desktop's mono sets the family alone, which is why ConnectingCard does compose them. Each head also gains SHOW LOGS beside the button that gives up — the step list is this attempt and the log is every other one, which is what a connection taking too long actually raises. Seven tests, and the two that matter most run against the container rather than a fake: a real handshake reports its phases in order, and a host-key refusal never claims to have authenticated. A fake asserting what it was written to assert would have established nothing about either. The rest cover the tab advancing while the connection is gated, the step a refusal stops on, and a phase reported after the user has given up on the tab. 1,861 tests, none failing. The Android head's layout is not verified by anything. It compiles, and compiled bindings mean every new binding path resolves, but that project is not in DodoSSH.slnx, there is no test project for it and no device here — so unlike the desktop card, whose shapes the layout harness measures, these rows have not been drawn. Vertical fit is reasoned, not observed.
This commit is contained in:
@@ -143,7 +143,14 @@ public sealed class ShellFlowTests : IAsyncLifetime
|
||||
{
|
||||
clipboard.Add(text);
|
||||
return Task.CompletedTask;
|
||||
});
|
||||
},
|
||||
|
||||
// Inline, because this suite has no window and therefore no dispatcher to drain — the same
|
||||
// answer TransferQueueingTests reached, and for the reason its own remark gives: reaching
|
||||
// Dispatcher.UIThread from a test means asserting on a queue owned by whichever class touched
|
||||
// it first. Running the action where it was raised takes the thread out of the question, and
|
||||
// every phase this suite reports is raised on the thread doing the asserting anyway.
|
||||
post: action => action());
|
||||
|
||||
return ValueTask.CompletedTask;
|
||||
}
|
||||
@@ -1303,6 +1310,119 @@ public sealed class ShellFlowTests : IAsyncLifetime
|
||||
shell.IsConnectingShowing.ShouldBeFalse();
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// <para>
|
||||
/// What the card draws while the stretch above is going on. The tab used to carry one line of prose
|
||||
/// fixed at the moment it was created, which made a handshake stuck on a key exchange look exactly like
|
||||
/// one stuck on a dead socket — and made a connection that was progressing look exactly like one that
|
||||
/// was not.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// The gate is held open on the step the fake reports before it, so this asserts the state the card is
|
||||
/// actually drawn in rather than one it passes through: one step behind, one step lit, three not
|
||||
/// reached. Nothing here waits or polls, which is the other half of the claim — the report arrives on
|
||||
/// the thread that raised it and the tab is up to date in the same turn.
|
||||
/// </para>
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public async Task Connecting_LightsTheStepTheHandshakeHasActuallyReached()
|
||||
{
|
||||
var vault = await ReadyToConnectAsync();
|
||||
|
||||
await using var renderer = await FakeRenderer.AttachAsync(workspace, Token);
|
||||
|
||||
ssh.Gate = new TaskCompletionSource();
|
||||
var connecting = vault.ConnectCommand.ExecuteAsync(null);
|
||||
|
||||
var tab = shell.Tabs.ShouldHaveSingleItem();
|
||||
|
||||
tab.Steps.Select(step => step.State).ShouldBe(
|
||||
[
|
||||
ConnectionStepState.Done,
|
||||
ConnectionStepState.Running,
|
||||
ConnectionStepState.Pending,
|
||||
ConnectionStepState.Pending,
|
||||
ConnectionStepState.Pending,
|
||||
],
|
||||
"the renderer attached, the host is being reached, and nothing after that has happened");
|
||||
|
||||
tab.StepsDone.ShouldBe(1, "the track fills to what finished, and the running step is not half a step");
|
||||
tab.Status.ShouldBe("Reaching the host");
|
||||
|
||||
ssh.Gate.SetResult();
|
||||
await connecting;
|
||||
|
||||
tab.Steps.ShouldAllBe(step => step.IsDone, "a session that opened got through all of them");
|
||||
tab.StepsDone.ShouldBe(tab.StepCount);
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// The half of the step list a progress bar could not do: where it stopped is kept, and the steps behind
|
||||
/// it stay done. That is the difference between "that host is not there" and "that host is there and
|
||||
/// would not have me", and it is the question the reason sentence alone often does not settle.
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public async Task ARefusedConnection_KeepsTheStepItStoppedOn()
|
||||
{
|
||||
var vault = await ReadyToConnectAsync();
|
||||
|
||||
await using var renderer = await FakeRenderer.AttachAsync(workspace, Token);
|
||||
|
||||
ssh.Failure = new InvalidOperationException("No route to host.");
|
||||
|
||||
await vault.ConnectCommand.ExecuteAsync(null);
|
||||
|
||||
var tab = shell.Tabs.ShouldHaveSingleItem();
|
||||
|
||||
tab.Steps.Select(step => step.State).ShouldBe(
|
||||
[
|
||||
ConnectionStepState.Done,
|
||||
ConnectionStepState.Stopped,
|
||||
ConnectionStepState.Pending,
|
||||
ConnectionStepState.Pending,
|
||||
ConnectionStepState.Pending,
|
||||
],
|
||||
"it got as far as reaching the host and no further");
|
||||
|
||||
tab.Steps[1].Mark.ShouldBe("✕", "and says so without relying on the colour");
|
||||
|
||||
// The reason still goes where it always went. The list says how far, and this says what happened.
|
||||
tab.Status.ShouldBe("No route to host.");
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// A report that arrives for an attempt the shell has forgotten. Giving up on a connecting tab removes
|
||||
/// it while the handshake is still running — see <c>CloseTabAsync</c> — so every phase reported after
|
||||
/// that has no tab to land on. Dropped rather than resurrecting the tab, and above all not thrown: the
|
||||
/// handshake is still going, and its session is still adopted if it opens.
|
||||
/// </remarks>
|
||||
[Fact]
|
||||
public async Task GivingUpOnATab_LeavesLaterPhasesWithNothingToDo()
|
||||
{
|
||||
var vault = await ReadyToConnectAsync();
|
||||
|
||||
await using var renderer = await FakeRenderer.AttachAsync(workspace, Token);
|
||||
|
||||
ssh.Gate = new TaskCompletionSource();
|
||||
var connecting = vault.ConnectCommand.ExecuteAsync(null);
|
||||
|
||||
var tab = shell.Tabs.ShouldHaveSingleItem();
|
||||
await shell.CloseTabCommand.ExecuteAsync(tab);
|
||||
|
||||
// Everything after the gate — the host key, the credential, the shell — is reported to a shell that
|
||||
// no longer has a tab for this attempt.
|
||||
ssh.Gate.SetResult();
|
||||
await connecting;
|
||||
|
||||
// The session opened anyway and was adopted, which is the behaviour giving up already promised.
|
||||
var adopted = shell.Tabs.ShouldHaveSingleItem();
|
||||
adopted.HasSession.ShouldBeTrue();
|
||||
adopted.ShouldNotBe(tab);
|
||||
|
||||
// And the forgotten tab was left where it was rather than being advanced from the sidelines.
|
||||
tab.Steps[1].IsRunning.ShouldBeTrue("nothing moved it on after the shell let go of it");
|
||||
}
|
||||
|
||||
/// <remarks>
|
||||
/// A refusal has to end up somewhere the user will see it, and by the time one arrives they are quite
|
||||
/// likely looking at another screen — which is exactly what not blocking bought. The tab is that place,
|
||||
@@ -2341,6 +2461,7 @@ public sealed class ShellFlowTests : IAsyncLifetime
|
||||
await workspace.OpenSessionAsync(
|
||||
new SshConnectionRequest("host.invalid", 22, "dodo", new SshPasswordCredential("irrelevant")),
|
||||
TerminalSize.Default,
|
||||
progress: null,
|
||||
Token);
|
||||
|
||||
workspace.LiveSessionCount.ShouldBe(1);
|
||||
@@ -8112,6 +8233,7 @@ public sealed class ShellFlowTests : IAsyncLifetime
|
||||
await workspace.OpenSessionAsync(
|
||||
new SshConnectionRequest("host.invalid", 22, "dodo", new SshPasswordCredential("irrelevant")),
|
||||
TerminalSize.Default,
|
||||
progress: null,
|
||||
Token);
|
||||
|
||||
shell.SignOutCommand.Execute(null);
|
||||
|
||||
Reference in New Issue
Block a user