fix(adminui): close a browse session that opens after its picker is gone (R04 L4)
Every picker and RawBrowseModal stored the OpenAsync token after the await; if the host was disposed (or the modal closed) meanwhile, its teardown had already run with no token, so the plant-side session lived until the reaper's idle TTL. BrowseOpenGuard.CloseIfOrphaned closes it at once; each host sets _disposed first thing in DisposeAsync (RawBrowseModal also treats !Visible as gone). Refs #745 Claude-Session: https://claude.ai/code/session_01Ub9hGmYLQvn9XETzw7CMsT
This commit is contained in:
@@ -0,0 +1,44 @@
|
||||
namespace ZB.MOM.WW.OtOpcUa.AdminUI.Browsing;
|
||||
|
||||
/// <summary>
|
||||
/// Closes a browse session that finished opening after its host went away (R04 L4). Every picker and
|
||||
/// <c>RawBrowseModal</c> awaited <see cref="IBrowserSessionService.OpenAsync"/> and then stored the token;
|
||||
/// if the host was disposed (or the modal closed) meanwhile, its teardown had already run with no token,
|
||||
/// so the session — an OPC UA client session, an MQTT connection, a SQL connection against the plant —
|
||||
/// stayed open until the reaper's idle TTL (2 min + one 30 s tick).
|
||||
/// </summary>
|
||||
public static class BrowseOpenGuard
|
||||
{
|
||||
/// <summary>
|
||||
/// Call right after <see cref="IBrowserSessionService.OpenAsync"/> returns. When the host is gone it
|
||||
/// closes the new session (fire-and-forget, like the hosts' own teardown) and returns
|
||||
/// <see langword="true"/>, telling the caller not to adopt the token.
|
||||
/// </summary>
|
||||
/// <param name="result">The open result.</param>
|
||||
/// <param name="hostGone">Whether the host was disposed (or closed) while the open was in flight.</param>
|
||||
/// <param name="service">The browse service the session was opened on.</param>
|
||||
/// <returns><see langword="true"/> when the caller must drop the result.</returns>
|
||||
public static bool CloseIfOrphaned(BrowseOpenResult result, bool hostGone, IBrowserSessionService service)
|
||||
{
|
||||
if (!hostGone) return false;
|
||||
if (result.Ok && result.Token != Guid.Empty)
|
||||
{
|
||||
// Never block (or throw into) a dead host's continuation on a slow remote close.
|
||||
_ = CloseQuietlyAsync(service, result.Token);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private static async Task CloseQuietlyAsync(IBrowserSessionService service, Guid token)
|
||||
{
|
||||
try
|
||||
{
|
||||
await service.CloseAsync(token).ConfigureAwait(false);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// The reaper still bounds a session whose close failed.
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
@@ -89,6 +89,8 @@
|
||||
private string _built = "";
|
||||
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _canBrowse;
|
||||
private string? _openError;
|
||||
@@ -110,6 +112,8 @@
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
@@ -155,6 +159,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow capture.
|
||||
|
||||
+5
@@ -164,6 +164,8 @@
|
||||
private string _built = "";
|
||||
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _canBrowse;
|
||||
private string? _openError;
|
||||
@@ -185,6 +187,8 @@
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
@@ -229,6 +233,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow capture.
|
||||
|
||||
+5
@@ -111,6 +111,8 @@
|
||||
private string _attributeName = "";
|
||||
private string _built = "";
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _attrsLoading;
|
||||
private bool _canOperate;
|
||||
@@ -134,6 +136,8 @@
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
var result = await BrowserService.OpenAsync("GalaxyMxGateway", json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
@@ -216,6 +220,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow remote.
|
||||
|
||||
+5
@@ -65,6 +65,8 @@
|
||||
private string _nodeId = "";
|
||||
private string _built = "";
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _canOperate;
|
||||
private string? _openError;
|
||||
@@ -85,6 +87,8 @@
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
var result = await BrowserService.OpenAsync("OpcUaClient", json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
@@ -114,6 +118,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow remote.
|
||||
|
||||
+5
@@ -240,6 +240,8 @@ else
|
||||
private string _built = "";
|
||||
private string _selectedColumnNodeId = "";
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _canOperate;
|
||||
private string? _openError;
|
||||
@@ -268,6 +270,8 @@ else
|
||||
// sole place it is read, and it dies with the local variable.
|
||||
var json = BuildBrowseConfig();
|
||||
var result = await BrowserService.OpenAsync(DriverTypeNames.Sql, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) { _token = result.Token; }
|
||||
else { _openError = result.Message; }
|
||||
}
|
||||
@@ -429,6 +433,7 @@ else
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow database.
|
||||
|
||||
+5
@@ -76,6 +76,8 @@
|
||||
private string _built = "";
|
||||
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private bool _canBrowse;
|
||||
private string? _openError;
|
||||
@@ -97,6 +99,8 @@
|
||||
{
|
||||
var json = GetConfigJson() ?? "{}";
|
||||
var result = await BrowserService.OpenAsync(DriverType, json, default);
|
||||
// Host disposed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed, BrowserService)) { return; }
|
||||
if (result.Ok) _token = result.Token;
|
||||
else _openError = result.Message;
|
||||
}
|
||||
@@ -134,6 +138,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow capture.
|
||||
|
||||
@@ -300,6 +300,8 @@
|
||||
private string? _groupPrefix;
|
||||
|
||||
private Guid _token = Guid.Empty;
|
||||
// Set first thing in DisposeAsync; an open that lands afterwards closes its own session.
|
||||
private volatile bool _disposed;
|
||||
private bool _opening;
|
||||
private string? _openError;
|
||||
|
||||
@@ -459,6 +461,8 @@
|
||||
try
|
||||
{
|
||||
var result = await BrowserService.OpenAsync(_driverType, _mergedConfig, default);
|
||||
// Host disposed or modal closed mid-open: close the session nobody will (R04 L4).
|
||||
if (BrowseOpenGuard.CloseIfOrphaned(result, _disposed || !Visible, BrowserService)) { return; }
|
||||
if (result.Ok)
|
||||
{
|
||||
_token = result.Token;
|
||||
@@ -823,6 +827,7 @@
|
||||
|
||||
public ValueTask DisposeAsync()
|
||||
{
|
||||
_disposed = true;
|
||||
if (_token != Guid.Empty)
|
||||
{
|
||||
// Fire-and-forget — don't block circuit teardown on a slow remote.
|
||||
|
||||
Reference in New Issue
Block a user