diff --git a/src/Febe.Server/BrowserRemoteView.cs b/src/Febe.Server/BrowserRemoteView.cs
index 310262b..1593f3f 100644
--- a/src/Febe.Server/BrowserRemoteView.cs
+++ b/src/Febe.Server/BrowserRemoteView.cs
@@ -17,18 +17,40 @@ namespace Febe.Server;
/// the older view is always ended — and its screencast stopped — before the newer one starts). Keys go to the browser
/// and nowhere else.
///
-internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseTracker tracker, IClock clock, FebeLog log) : IRemoteViewHost
+internal sealed class BrowserRemoteViewHost : IRemoteViewHost
{
+ private readonly IFebeBrowser _browser;
+ private readonly BrowserUseTracker _tracker;
+ private readonly IClock _clock;
+ private readonly IClock _browserClock;
+ private readonly FebeLog _log;
private readonly Lock _gate = new();
private readonly SemaphoreSlim _opening = new(1, 1);
private BrowserRemoteViewConnection? _current;
private bool _shuttingDown;
+ /// The browser shown.
+ /// Notes when Alberto last used the browser.
+ /// The composition's clock (the time of that note).
+ /// Febe's log.
+ ///
+ /// Time for the waits on the browser itself; null: the wall clock, because the browser commits a navigation in real
+ /// time whatever clock the engine runs on (the tests compress it).
+ ///
+ public BrowserRemoteViewHost(IFebeBrowser browser, BrowserUseTracker tracker, IClock clock, FebeLog log, IClock? browserClock = null)
+ {
+ _browser = browser ?? throw new ArgumentNullException(nameof(browser));
+ _tracker = tracker ?? throw new ArgumentNullException(nameof(tracker));
+ _clock = clock ?? throw new ArgumentNullException(nameof(clock));
+ _log = log ?? throw new ArgumentNullException(nameof(log));
+ _browserClock = browserClock ?? new SystemClock(clock.LocalZone);
+ }
+
public async Task OpenAsync(CancellationToken ct)
{
- if (!browser.IsAvailable)
+ if (!_browser.IsAvailable)
{
- throw new RemoteViewUnavailableException(browser.LastError is { } error
+ throw new RemoteViewUnavailableException(_browser.LastError is { } error
? "Il browser di Febe non è in funzione: " + error
: "Il browser di Febe si sta avviando: riprova fra qualche secondo.");
}
@@ -37,6 +59,7 @@ internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseT
// would both start and the later assignment would orphan the other (still holding its lease, and stopping the
// shared screencast when it closes).
await _opening.WaitAsync(ct).ConfigureAwait(false);
+ IDisposable? handover = null;
try
{
BrowserRemoteViewConnection? previous;
@@ -53,13 +76,17 @@ internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseT
if (previous is not null)
{
+ // Alberto is still at the browser while one view takes the place of the other: without this lease the
+ // engine would see nobody driving for a moment and put the page back to rest (a navigation under the new
+ // view's start) or even begin a session.
+ handover = _browser.UserDriving.Begin();
await previous.EndAsync(RemoteViewEnd.Replaced).ConfigureAwait(false);
}
- var connection = new BrowserRemoteViewConnection(this, browser, tracker, clock);
+ var connection = new BrowserRemoteViewConnection(this, _browser, _tracker, _clock, _browserClock);
try
{
- await connection.StartAsync(browser.BrowserOptions.WindowWidth, browser.BrowserOptions.WindowHeight, ct).ConfigureAwait(false);
+ await connection.StartAsync(_browser.WindowWidth, _browser.WindowHeight, ct).ConfigureAwait(false);
}
catch (Exception ex)
{
@@ -90,11 +117,13 @@ internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseT
throw new RemoteViewUnavailableException("Febe si sta fermando.");
}
- log.Info("vista", "Vista remota aperta: il motore resta fermo finché è aperta.");
+ _log.Info("vista", "Vista remota aperta: il motore resta fermo finché è aperta.");
return connection;
}
finally
{
+ // The new view holds its own lease by now; if it did not start, nobody is at the browser any more.
+ handover?.Dispose();
_opening.Release();
}
}
@@ -126,7 +155,7 @@ internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseT
}
}
- log.Info("vista", "Vista remota chiusa.");
+ _log.Info("vista", "Vista remota chiusa.");
}
}
@@ -134,7 +163,7 @@ internal sealed class BrowserRemoteViewHost(ChromiumBrowser browser, BrowserUseT
internal sealed class BrowserRemoteViewConnection : IRemoteViewConnection
{
private readonly BrowserRemoteViewHost _owner;
- private readonly ChromiumBrowser _browser;
+ private readonly IFebeBrowser _browser;
private readonly BrowserUseTracker _tracker;
private readonly IClock _clock;
private readonly RemoteViewSession _session;
@@ -155,18 +184,18 @@ internal sealed class BrowserRemoteViewConnection : IRemoteViewConnection
private int _disposed;
private bool _used;
- public BrowserRemoteViewConnection(BrowserRemoteViewHost owner, ChromiumBrowser browser, BrowserUseTracker tracker, IClock clock)
+ public BrowserRemoteViewConnection(BrowserRemoteViewHost owner, IFebeBrowser browser, BrowserUseTracker tracker, IClock clock, IClock browserClock)
{
_owner = owner;
_browser = browser;
_tracker = tracker;
_clock = clock;
- _session = new RemoteViewSession(browser.Host.Cdp, browser.Host.UserDriving);
+ _session = new RemoteViewSession(browser.Cdp, browser.UserDriving, clock: browserClock);
}
public RemoteViewEnd? Ended { get; private set; }
- private ICdpSession Cdp => _browser.Host.Cdp;
+ private ICdpSession Cdp => _browser.Cdp;
public async Task StartAsync(int width, int height, CancellationToken ct)
{
diff --git a/src/Febe.Server/DockerPlatform.cs b/src/Febe.Server/DockerPlatform.cs
index e37aca2..1ef5ae8 100644
--- a/src/Febe.Server/DockerPlatform.cs
+++ b/src/Febe.Server/DockerPlatform.cs
@@ -53,7 +53,7 @@ internal sealed class DockerPlatform(ServerOptions options) : IFebePlatform
{
ArgumentNullException.ThrowIfNull(services);
ArgumentNullException.ThrowIfNull(app);
- RemoteView = new BrowserRemoteViewHost((ChromiumBrowser)app.Browser!, app.Tracker, app.Clock, app.Log);
+ RemoteView = new BrowserRemoteViewHost(app.Browser!, app.Tracker, app.Clock, app.Log);
services.AddSingleton(RemoteView);
}