Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix async deadlock issues and improve error handling

Browse Source 
Co-authored-by: Kvarkas <3611964+Kvarkas@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-10-17 17:56:04 +00:00
parent 5839a836c8
commit 0579273964
1 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
View File

@@ -152,7 +152,11 @@ namespace mRemoteNG.Connection.Protocol.Http
webView2.Source = new Uri(GetUrl());
}
}
}, TaskScheduler.FromCurrentSynchronizationContext());
else if (t.IsFaulted)
{
Runtime.MessageCollector.AddExceptionStackTrace(Language.HttpConnectFailed, t.Exception);
}
});
}
else if (webView2.CoreWebView2 != null)
{
@@ -281,19 +285,40 @@ namespace mRemoteNG.Connection.Protocol.Http
{
try
{
// Wait for initialization to complete before disposing
// Wait for initialization to complete before disposing (non-blocking approach)
if (_webView2InitializationTask != null && !_webView2InitializationTask.IsCompleted)
{
try
// Create a continuation to dispose after initialization completes
var cleanupTask = _webView2InitializationTask.ContinueWith(_ =>
{
_webView2InitializationTask.Wait(TimeSpan.FromSeconds(5));
}
catch (Exception ex)
DisposeWebView2Environment();
});
// Give it a reasonable time to complete, but don't block the Close operation
if (!cleanupTask.Wait(TimeSpan.FromSeconds(2)))
{
Runtime.MessageCollector.AddExceptionStackTrace("Error waiting for WebView2 initialization to complete", ex);
// Initialization is taking too long, proceed with disposal anyway
Runtime.MessageCollector.AddMessage(mRemoteNG.Messages.MessageClass.WarningMsg,
"WebView2 initialization did not complete in time during cleanup");
}
}
else
{
DisposeWebView2Environment();
}
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionStackTrace("Error during HTTPBase cleanup", ex);
}
base.Close();
}
private void DisposeWebView2Environment()
{
try
{
// Dispose of WebView2 environment
_webView2Environment?.Dispose();
@@ -321,10 +346,8 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
Runtime.MessageCollector.AddExceptionStackTrace("Error during HTTPBase cleanup", ex);
Runtime.MessageCollector.AddExceptionStackTrace("Error disposing WebView2 environment", ex);
}
base.Close();
}
#endregion