Files
jaap-jan 4300d917a8
ci / build and test (push) Failing after 3s
ci / android head (push) Failing after 2s
Stop making people wait for a handshake, and give the host list a pointer
Connecting held the vault's busy gate, which meant a window that did nothing visible for
as long as a machine took to answer — and against one that is merely asleep, that is the
whole timeout. The gate is gone from that one command. A tab now appears in the strip in
the same turn as the click, carrying "connecting…" rather than a pane, and the terminal's
rectangle draws a card naming the host and the address being dialled. Every other screen
stays usable, and two connections can be in flight at once.

That splits the vault's one connection event into three, carrying an attempt id, because
"which tab is this about" can no longer be answered by "the most recent one". The id also
buys the two kinds of not-connecting their different endings: a refusal stays in the strip
as a tab holding its reason, since by then the user is quite likely three screens away and
a status line they are not looking at is not where a failure should end; a host key
question takes the tab away and puts the window back on HOSTS, because the prompt is drawn
there and a tab claiming failure would be competing with the thing about to resume it.

ConnectAsync takes no CancellationToken any more, and that is load-bearing rather than
tidying. A [RelayCommand] over a method that takes one generates a command that cancels
the previous execution's token on every invocation — so asking for a second machine
silently abandoned the first, measured as the first tab disappearing with "Cancelled." the
instant the second was asked for. Giving up on a connection is closing its tab, and a
session that lands after that is adopted rather than dropped: a shell running with nothing
naming it cannot be closed at all.

A tab is marked active on IsShowing rather than IsSelected. The selection survives
navigating away — that is what makes the strip a way back to a terminal instead of a way
to lose one — so a tab lit while preferences filled the window was a second "you are here"
mark pointing at something nobody could see. The nav rail's own entries have always made
this distinction.

The host list grows the two gestures it looked like it already had. A right click selects
the row under the pointer before opening a menu of Connect, Edit and Delete — the menu is
on the list rather than in the item template, so its entries are the vault's own commands
and not a row's, and it is cancelled outright over a group heading. Dragging a host onto a
heading files it there, onto a host files it beside that one, and onto UNGROUPED takes it
out of a group; the write is one field of one host through the same repository a save
uses, refused while the editor is open because a drop is a gesture on the list and not on
a half-typed form.

Clicking a result in the palette connects, which is what a list of hosts under a search
box looks like it does. It went through the shell's own command, so the pointer and Enter
take one path.

And the files screen's two pickers followed the vault's lists once, at unlock: a host or a
bucket created afterwards could not be picked until the keychain had been locked and
opened again, with nothing on screen explaining why the machine plainly in the host list
was missing. They follow the collections now, re-finding the selection by id across the
rebuild a sync pass causes every minute.

165 shell tests and 69 layout tests green, including the connecting tab, both failure
endings, two connections at once, a connection in flight across a lock, and the right
click acting on the row under the pointer rather than on the selection. The drag itself is
in docs/manual-checks.md with the rest of phase 7 — headless Avalonia has no platform
drag, and a test that claimed to have dropped something would pass while confirming
nothing.
2026-07-31 22:59:33 +02:00

329 lines
13 KiB
C#

using Avalonia;
using Avalonia.Controls;
using Avalonia.Headless;
using Avalonia.Input;
using Avalonia.Threading;
using Avalonia.VisualTree;
using DodoSSH.Client.App.Views;
using DodoSSH.Client.Session;
using DodoSSH.Client.Session.Tests;
using DodoSSH.Client.Shell.ViewModels;
using DodoSSH.Client.Ssh;
using DodoSSH.Client.Storage;
using DodoSSH.Client.Terminal;
using DodoSSH.Crypto;
using NSubstitute;
namespace DodoSSH.Client.App.Layout.Tests;
/// <summary>
/// How the quick-connect palette answers a keyboard and a pointer.
/// </summary>
/// <remarks>
/// <para>
/// This is the suite the palette shipped without, and the reason it shipped without one is that all of this
/// used to live on <c>MainWindow</c> — which cannot be shown here at all, because attaching the terminal's
/// WebView initialises WebView2 on a thread it refuses. See
/// <see cref="LayoutHarnessTests.WhyTheWindowItselfIsNeverShown"/>. A <c>UserControl</c> hosts in a bare
/// window, takes real key and pointer input, and can therefore be held to what it promises.
/// </para>
/// <para>
/// Three things were wrong and each has a test here: nothing answered a press outside the palette, so the one
/// gesture everybody tries first did nothing; the caret never reached the query box, because the window
/// focused it from the view model's <c>PropertyChanged</c> — ahead of the binding that reveals the control,
/// and focus on a collapsed control is a no-op; and the keys were answered only by a handler on the window,
/// which anything on the route could have taken first.
/// </para>
/// <para>
/// A real <see cref="MainWindowViewModel"/> over a real unlocked vault, for the same reason the layout suite
/// uses one: compiled bindings resolve against the declared type, and the palette's list is populated by the
/// vault's own hosts. Nothing here reaches a network — the connect the Enter test performs fails inside the
/// vault's own error handling, which is fine, because what Enter promises is to take the highlighted result
/// and close.
/// </para>
/// </remarks>
public sealed class QuickConnectTests : IAsyncLifetime
{
private const string Passphrase = "a sufficiently long passphrase";
private const string ServerUrl = "https://dodossh.example";
/// <remarks>Far below the shipped profile: nothing here attacks a wrap.</remarks>
private static readonly Argon2Profile CheapProfile =
Argon2Profile.FromStoredParameters(memoryKibibytes: 8 * 1024, passes: 1, parallelism: 1);
private readonly FakeAccountServer server = new();
private readonly StubKeyBinding keyBinding = new();
private readonly VaultKnownHostStore knownHosts = new();
private ClientCacheFactory caches = null!;
private TerminalWorkspace workspace = null!;
private VaultSession session = null!;
private VaultViewModel vault = null!;
private MainWindowViewModel shell = null!;
private static CancellationToken Token => TestContext.Current.CancellationToken;
/// <inheritdoc />
public async ValueTask InitializeAsync()
{
caches = ClientCacheFactory.ForMemory($"palette-{Guid.CreateVersion7():N}");
await caches.MigrateAsync(Token);
await new AccountProvisioner(server, keyBinding, caches, TimeProvider.System, CheapProfile)
.EnrollAsync(ServerUrl, Passphrase, "laptop", "Personal", Token);
var outcome = await new SessionOpener(caches, TimeProvider.System).UnlockAsync(Passphrase, Token);
outcome.IsUnlocked.ShouldBeTrue(outcome.Message);
session = outcome.Session!;
workspace = new TerminalWorkspace(
new InMemoryTerminalAssetProvider(new Dictionary<string, TerminalAsset>(StringComparer.Ordinal)),
Substitute.For<ISshConnectionFactory>(),
TimeProvider.System);
await knownHosts.OpenAsync(session, Token);
vault = new VaultViewModel(session, workspace, knownHosts, static () => null);
await SeedAsync();
shell = new MainWindowViewModel(
ClientPaths.Default,
caches,
workspace,
knownHosts,
Substitute.For<IDeviceKeyStore>(),
(_, _) => throw new NotSupportedException("nothing here signs in"),
TimeProvider.System,
// Never asked for a session: the palette searches the host list and connects through the
// vault's own command, and nothing on this screen transfers a file.
Substitute.For<ISftpSessionFactory>(),
CheapProfile)
{
// The state the palette is only ever open in. Assigned rather than reached through the unlock
// path, which would be a second enrollment and a second Argon2 pass for no extra coverage.
State = ShellState.Unlocked,
Vault = vault,
};
}
/// <inheritdoc />
public async ValueTask DisposeAsync()
{
await shell.DisposeAsync();
knownHosts.Close();
await workspace.DisposeAsync();
await session.DisposeAsync();
caches.Dispose();
}
/// <remarks>
/// The gesture everybody tries first, and the one that did nothing at all: the wash took no pointer input,
/// so the only ways out of the palette were a key and the button that opened it.
/// </remarks>
[Fact]
public async Task APressOnTheWashClosesThePalette()
{
await OnThePaletteAsync((_, window) =>
{
// The bottom-left corner: the card is 520 wide, centred, and starts 90 pixels down, so nothing
// here belongs to it.
window.MouseDown(new Point(12, 520), MouseButton.Left);
shell.IsSearching.ShouldBeFalse();
});
}
/// <remarks>
/// The other half of the same rule, and the one that makes it worth a handler rather than a press anywhere
/// closing: a press on the card bubbles through the wash on its way out, so a handler that did not check
/// where the press started would close the palette the moment somebody clicked into the box.
/// </remarks>
[Fact]
public async Task APressOnTheCardDoesNotClose()
{
await OnThePaletteAsync((palette, window) =>
{
window.MouseDown(Centre(palette.QueryBox, window), MouseButton.Left);
shell.IsSearching.ShouldBeTrue();
});
}
[Fact]
public async Task EscapeClosesThePalette()
{
await OnThePaletteAsync((palette, window) =>
{
palette.QueryBox.Focus().ShouldBeTrue();
window.KeyPressQwerty(PhysicalKey.Escape, RawInputModifiers.None);
shell.IsSearching.ShouldBeFalse();
});
}
/// <remarks>
/// The second assertion is the whole reason the selection is moved by hand rather than by letting the list
/// take focus: a palette whose arrow keys moved the caret out of the query box would stop receiving the
/// next character typed.
/// </remarks>
[Fact]
public async Task TheArrowsMoveTheSelectionAndLeaveTheKeyboardInTheBox()
{
await OnThePaletteAsync((palette, window) =>
{
palette.QueryBox.Focus().ShouldBeTrue();
shell.SearchResults.Count.ShouldBeGreaterThan(2, "an empty list would prove nothing");
shell.SelectedSearchResult.ShouldBe(shell.SearchResults[0]);
window.KeyPressQwerty(PhysicalKey.ArrowDown, RawInputModifiers.None);
shell.SelectedSearchResult.ShouldBe(shell.SearchResults[1]);
window.KeyPressQwerty(PhysicalKey.ArrowUp, RawInputModifiers.None);
shell.SelectedSearchResult.ShouldBe(shell.SearchResults[0]);
// Clamped rather than wrapped, which is the palette's own rule.
window.KeyPressQwerty(PhysicalKey.ArrowUp, RawInputModifiers.None);
shell.SelectedSearchResult.ShouldBe(shell.SearchResults[0]);
palette.QueryBox.IsFocused.ShouldBeTrue("the arrows must not move the caret out of the box");
});
}
/// <remarks>
/// What Enter promises is to take the highlighted row: the palette closes and the vault is pointed at that
/// host. The connection it then asks for fails in this suite — there is no server and no shell — and it
/// fails inside the vault's own handling, which is the point of connecting through the vault's command
/// rather than opening a session from the palette.
/// </remarks>
[Fact]
public async Task EnterTakesTheHighlightedResult()
{
await OnThePaletteAsync((palette, window) =>
{
palette.QueryBox.Focus().ShouldBeTrue();
window.KeyPressQwerty(PhysicalKey.ArrowDown, RawInputModifiers.None);
var highlighted = shell.SelectedSearchResult.ShouldNotBeNull();
window.KeyPressQwerty(PhysicalKey.Enter, RawInputModifiers.None);
shell.IsSearching.ShouldBeFalse();
vault.SelectedHost?.EntityId.ShouldBe(highlighted.EntityId);
});
}
/// <remarks>
/// The pointer's version of Enter, and the gesture a list of hosts under a search box plainly looks like
/// it offers. It did not: a click moved the highlight and left the palette open over a choice that had
/// already been made, so the second thing everybody tried was to click and then press Enter.
/// </remarks>
[Fact]
public async Task ClickingAResultConnectsToIt()
{
await OnThePaletteAsync((palette, window) =>
{
var wanted = shell.SearchResults[2];
var row = RowFor(palette, wanted);
window.MouseDown(Centre(row, window), MouseButton.Left);
window.MouseUp(Centre(row, window), MouseButton.Left);
shell.IsSearching.ShouldBeFalse("connecting closes the palette, as Enter does");
vault.SelectedHost?.EntityId.ShouldBe(wanted.EntityId);
});
}
/// <remarks>
/// The palette is a box somebody is expected to start typing into, and for a while it was not: the window
/// focused it from the view model's <c>PropertyChanged</c>, which runs before the binding that reveals the
/// control, and <c>Focus()</c> on a collapsed control is a no-op that is never replayed. Becoming visible
/// is the moment that cannot be too early, so that is where the palette takes the keyboard — and this is
/// the test that says so.
/// </remarks>
[Fact]
public async Task ThePaletteTakesTheKeyboardWhenItAppears()
{
await LayoutHarness.OnTheUiThreadAsync(
() =>
{
var elsewhere = new TextBox();
var palette = new QuickConnect { DataContext = shell, IsVisible = false };
var window = new Window { Content = new Panel { Children = { elsewhere, palette } } };
LayoutHarness.Settle(window, 900, 600);
try
{
elsewhere.Focus().ShouldBeTrue();
shell.ToggleSearchCommand.Execute(null);
palette.IsVisible = true;
// The layout pass the application's dispatcher would run anyway. Without it the query box
// is not in the visual tree yet, which is the whole reason the palette defers this.
Dispatcher.UIThread.RunJobs();
palette.QueryBox.IsFocused.ShouldBeTrue();
}
finally
{
window.Close();
}
},
Token);
}
// ---- Helpers ----
/// <summary>Opens the palette in a window the size the application's is, and runs one body against it.</summary>
private Task OnThePaletteAsync(Action<QuickConnect, Window> body) =>
LayoutHarness.OnTheUiThreadAsync(
() =>
{
shell.ToggleSearchCommand.Execute(null);
shell.IsSearching.ShouldBeTrue("every case here starts with the palette open");
var palette = new QuickConnect { DataContext = shell };
var window = new Window { Content = palette };
LayoutHarness.Settle(window, 900, 600);
try
{
body(palette, window);
}
finally
{
window.Close();
}
},
Token);
/// <summary>The list row showing one result.</summary>
private static ListBoxItem RowFor(Visual palette, HostRowViewModel host) =>
palette.GetVisualDescendants()
.OfType<ListBoxItem>()
.First(item => ReferenceEquals(item.DataContext, host));
private static Point Centre(Visual control, Visual window) =>
control.TranslatePoint(new Point(control.Bounds.Width / 2, control.Bounds.Height / 2), window)
?? throw new InvalidOperationException("the control is not in this window's tree");
/// <remarks>Enough hosts that the arrow keys have somewhere to go.</remarks>
private async Task SeedAsync()
{
for (var i = 0; i < 6; i++)
{
vault.NewHostCommand.Execute(null);
vault.EditorLabel = $"host-{i}";
vault.EditorHostname = $"host-{i}.internal";
vault.EditorUsername = "deploy";
await vault.SaveHostCommand.ExecuteAsync(null);
}
await vault.LoadAsync(Token);
}
}