Public Access
The terminal works end to end. A new integration test drives a real sshd in a container through a real PTY, the real pump, the real loopback WebSocket with its token and origin checks, and a ClientWebSocket standing in for the page: the login banner arrives, typed input round-trips, and `stty size` reports the 100x30 the session asked for. The only untested link left is xterm drawing bytes it was handed. The WebView is de-risked on Windows, which was the plan's largest risk. Not by assertion: with the app running there is an established TCP connection from msedgewebview2 to the data plane port, so WebView2 launched, navigated to the loopback page, executed terminal.js, and completed the WebSocket handshake against the real token and origin checks. Linux remains unproven and the package's own release notes now corroborate the concern -- Linux uses a WPE backend, and it ships a NativeWebDialog described as useful where embedded WebViews may be unavailable. Two bugs found by building it, both of which would have shipped: - ShellStream.Write buffers and needs an explicit Flush. Without one a keystroke is accepted, reported as written, and never reaches the remote: the terminal displays output perfectly and simply stops responding to input. SSH.NET's own WriteLine flushes, which is why the earlier spike never hit it. Found by isolating the pump against real SSH and reading BytesRead=51 -- banner and prompt through, nothing after. - The Windows app manifest needs a supportedOS list, or Avalonia's native control host fails outright and the terminal never starts. Also fixed a genuinely flaky test I happened to catch: SyncCursorTests tampered with the *last* base64url character, whose low bits the decoder ignores when the input length is not a multiple of three -- so a tampered cursor sometimes decoded to identical bytes and verified. It failed roughly one run in thirty, depending on a random key. Now tampers the penultimate character, which is fully significant at every length; 40 consecutive runs are clean. xterm 6.0.0 plus the fit and webgl addons are vendored as UMD bundles rather than built with npm, so a clean clone needs only the .NET SDK. Provenance and licences are recorded next to them, along with the UMD global names terminal.js depends on -- a bundle that switched to ES modules would load without error and leave Terminal undefined. The renderer acknowledges output from term.write's completion callback, not on receipt. Acknowledging early would return flow-control credit for bytes the screen has not caught up with, which is the one thing the credit window exists to measure. TerminalWorkspace moved into DodoSSH.Client.Terminal: it has no Avalonia dependency, and having it there is what let the end-to-end test exist at all. 404 tests pass, zero warnings on a clean rebuild, format clean.
128 lines
4.3 KiB
C#
128 lines
4.3 KiB
C#
using System.Text;
|
|
using DodoSSH.Client.Terminal;
|
|
|
|
namespace DodoSSH.Client.Ssh.Tests;
|
|
|
|
/// <summary>
|
|
/// The pump against a real shell, with the transport replaced by a recorder.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Sits between the pump's unit tests, which use a fake shell, and the full end-to-end test, which
|
|
/// adds the loopback socket. Its value is diagnostic: when output does not reach a renderer, this
|
|
/// says whether the pump and SSH.NET are producing anything at all.
|
|
/// </remarks>
|
|
[Collection(SshCollection.Name)]
|
|
public sealed class PumpOverRealSshTests(SshServerFixture fixture)
|
|
{
|
|
/// <summary>Trusts the container's host key, then connects. First contact is refused by design.</summary>
|
|
private async Task<ISshConnection> ConnectTrustedAsync()
|
|
{
|
|
var knownHosts = new InMemoryKnownHostStore();
|
|
var factory = new SshNetConnectionFactory(knownHosts);
|
|
|
|
var request = new SshConnectionRequest(
|
|
fixture.Host,
|
|
fixture.Port,
|
|
SshServerFixture.Username,
|
|
new SshPasswordCredential(SshServerFixture.Password));
|
|
|
|
var unknown = await Should.ThrowAsync<SshHostKeyUnknownException>(async () =>
|
|
await factory.ConnectAsync(request, TestContext.Current.CancellationToken));
|
|
|
|
await knownHosts.TrustAsync(unknown.Presentation, TestContext.Current.CancellationToken);
|
|
|
|
return await factory.ConnectAsync(request, TestContext.Current.CancellationToken);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task ThePump_ForwardsRealShellOutput()
|
|
{
|
|
await using var connection = await ConnectTrustedAsync();
|
|
|
|
var shell = await connection.OpenShellAsync(
|
|
new TerminalSize(100, 30, 1000, 750), TestContext.Current.CancellationToken);
|
|
|
|
var transport = new CountingTransport();
|
|
|
|
await using var pump = new TerminalSessionPump(
|
|
1,
|
|
shell,
|
|
transport,
|
|
TimeProvider.System,
|
|
new TerminalPumpOptions { FlushInterval = TimeSpan.FromMilliseconds(20) });
|
|
|
|
transport.Pump = pump;
|
|
|
|
var run = pump.RunAsync(TestContext.Current.CancellationToken);
|
|
|
|
// Marker split so the PTY's echo of the command line does not satisfy the match.
|
|
await pump.WriteInputAsync(
|
|
Encoding.UTF8.GetBytes("echo \"DODO\"\"SSH-OK\"\n"),
|
|
TestContext.Current.CancellationToken);
|
|
|
|
var deadline = TimeProvider.System.GetUtcNow() + TimeSpan.FromSeconds(20);
|
|
|
|
while (TimeProvider.System.GetUtcNow() < deadline
|
|
&& !transport.Text.Contains("DODOSSH-OK", StringComparison.Ordinal))
|
|
{
|
|
await Task.Delay(50, TestContext.Current.CancellationToken);
|
|
}
|
|
|
|
transport.Text.Contains("DODOSSH-OK", StringComparison.Ordinal).ShouldBeTrue(
|
|
$"BytesRead={pump.BytesRead}, FramesSent={pump.FramesSent}, "
|
|
+ $"OutputFrames={transport.OutputFrames}, Text=<{transport.Text}>");
|
|
|
|
await pump.DisposeAsync();
|
|
|
|
try
|
|
{
|
|
await run;
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
// Expected: disposing the pump cancels its run.
|
|
}
|
|
}
|
|
|
|
/// <summary>Accumulates output and acknowledges it, as a keeping-up renderer would.</summary>
|
|
private sealed class CountingTransport : ITerminalTransport
|
|
{
|
|
private readonly StringBuilder text = new();
|
|
private readonly Lock gate = new();
|
|
|
|
internal TerminalSessionPump? Pump { get; set; }
|
|
|
|
internal int OutputFrames { get; private set; }
|
|
|
|
internal string Text
|
|
{
|
|
get
|
|
{
|
|
lock (gate)
|
|
{
|
|
return text.ToString();
|
|
}
|
|
}
|
|
}
|
|
|
|
public ValueTask SendAsync(ReadOnlyMemory<byte> frame, CancellationToken cancellationToken)
|
|
{
|
|
if (!TerminalFrame.TryRead(frame.Span, out var opcode, out _, out var payload)
|
|
|| opcode != (byte)TerminalServerOpcode.Output)
|
|
{
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
|
|
lock (gate)
|
|
{
|
|
OutputFrames++;
|
|
text.Append(Encoding.UTF8.GetString(payload));
|
|
}
|
|
|
|
Pump?.Acknowledge((uint)payload.Length);
|
|
|
|
return ValueTask.CompletedTask;
|
|
}
|
|
}
|
|
}
|