Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid unhandled exceptions on unawaited async path #2289

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Avoid unhandled exceptions on unawaited async path #2289

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ac62f
Avoid unhandled exceptions on unawaited async path
jnyrup Aug 23, 2023
fc4e432
Add "Async" suffix to Task returning methods
jnyrup Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 14 additions & 7 deletions lib/PuppeteerSharp/ChromeTargetManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ private void OnMessageReceived(object sender, MessageEventArgs e)
return;

case "Target.targetDestroyed":
OnTargetDestroyed(e.MessageData.ToObject<TargetDestroyedResponse>(true));
_ = OnTargetDestroyedAsync(e.MessageID, e.MessageData.ToObject<TargetDestroyedResponse>(true));
return;

case "Target.targetInfoChanged":
Expand Down Expand Up @@ -198,15 +198,22 @@ private void OnTargetCreated(TargetCreatedResponse e)
}
}

private async void OnTargetDestroyed(TargetDestroyedResponse e)
private async Task OnTargetDestroyedAsync(string messageId, TargetDestroyedResponse e)
{
_discoveredTargetsByTargetId.TryRemove(e.TargetId, out var targetInfo);
await EnsureTargetsIdsForInit().ConfigureAwait(false);
FinishInitializationIfReady(e.TargetId);
try
{
_discoveredTargetsByTargetId.TryRemove(e.TargetId, out var targetInfo);
await EnsureTargetsIdsForInit().ConfigureAwait(false);
jnyrup marked this conversation as resolved.
Show resolved Hide resolved
FinishInitializationIfReady(e.TargetId);

if (targetInfo?.Type == TargetType.ServiceWorker && _availableTargetsByTargetIdDictionary.TryRemove(e.TargetId, out var target))
if (targetInfo?.Type == TargetType.ServiceWorker && _availableTargetsByTargetIdDictionary.TryRemove(e.TargetId, out var target))
{
TargetGone?.Invoke(this, new TargetChangedArgs { Target = target, TargetInfo = targetInfo });
}
}
catch (Exception ex)
{
TargetGone?.Invoke(this, new TargetChangedArgs { Target = target, TargetInfo = targetInfo });
HandleExceptionOnMessageReceived(messageId, ex);
}
}

Expand Down