Skip to content

[release/6.0] [wasm][debugger] Fix debugging an app that has another .NET Wasm instance in a service worker #76075

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

Merged
carlossanlop merged 2 commits into from
Oct 5, 2022
Merged

[release/6.0] [wasm][debugger] Fix debugging an app that has another .NET Wasm instance in a service worker #76075

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db37dec
backport 76072
thaystg Sep 23, 2022
f3b2b86
Update MonoProxy.cs
thaystg Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
backport 76072
  • Loading branch information
@thaystg
thaystg committed Sep 23, 2022
commit db37dec9987c031b091045d7b5b6da7e909a497a
5 changes: 4 additions & 1 deletion src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, string meth
{
case "Runtime.consoleAPICalled":
{
// Don't process events from sessions we aren't tracking
if (!contexts.TryGetValue(sessionId, out ExecutionContext context))
return false;
string type = args["type"]?.ToString();
if (type == "debug")
{
Expand All @@ -68,7 +71,6 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, string meth
{
// The optional 3rd argument is the stringified assembly
// list so that we don't have to make more round trips
ExecutionContext context = GetContext(sessionId);
string loaded = a?[2]?["value"]?.ToString();
if (loaded != null)
context.LoadedFiles = JToken.Parse(loaded).ToObject<string[]>();
Expand Down Expand Up @@ -242,6 +244,7 @@ private async Task<bool> IsRuntimeAlreadyReadyAlready(SessionId sessionId, Cance

protected override async Task<bool> AcceptCommand(MessageId id, string method, JObject args, CancellationToken token)
{
System.Diagnostics.Debugger.Launch();
// Inspector doesn't use the Target domain or sessions
// so we try to init immediately
if (id == SessionId.Null)
Expand Down