[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into from
Sep 28, 2022
Merged

[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS #76113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
115b8f4
Support create, debugging and running wasmbrowser template from VS
thaystg Sep 21, 2022
21c1b63
addings extra line in the end of the file
thaystg Sep 21, 2022
6b15f08
remove extra spaces
thaystg Sep 21, 2022
75ac7ed
fix compilation error
thaystg Sep 21, 2022
47b99ea
adding extra line in the end of the file
thaystg Sep 21, 2022
32d693a
Addressing @lewing comment.
thaystg Sep 23, 2022
878207f
Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0
lewing Sep 27, 2022
33246a7
Fix missing closing brace in wasmbrowser
radical Sep 27, 2022
1bda7af
WasmAppHost: use dictionary.TryGetValue instead of directly indexing
radical Sep 27, 2022
5d143c9
WasmAppHost: Use 127.0.0.1 for dynamic port binding
radical Sep 27, 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
5 changes: 5 additions & 0 deletions src/mono/wasm/build/WasmApp.targets
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
<WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
</PropertyGroup>

<ItemGroup>
<!-- Allow running/debugging from VS -->
<ProjectCapability Include="DotNetCoreWeb"/>
</ItemGroup>

<PropertyGroup Label="Identify app bundle directory to run from">
<!-- Allow running from custom WasmAppDir -->
<_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down
10 changes: 7 additions & 3 deletions src/mono/wasm/host/BrowserHost.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
debugging: _args.CommonConfig.Debugging);
runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
: new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

(ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
_args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
token);

string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
await host.WaitForShutdownAsync(token);
}

private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
{
WasmTestMessagesProcessor? logProcessor = null;
if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
ContentRootPath: Path.GetFullPath(appPath),
WebServerUseCors: true,
WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
);

(ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/host/WebServer.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
{
string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
string[] urls = options.Urls;

IWebHostBuilder builder = new WebHostBuilder()
.UseKestrel()
Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/host/WebServerOptions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
string? ContentRootPath,
bool WebServerUseCors,
bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
string DefaultFileName = "index.html"
);
77 changes: 72 additions & 5 deletions src/mono/wasm/host/WebServerStartup.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
private readonly IWebHostEnvironment _hostingEnvironment;

private static readonly object LaunchLock = new object();
private static string LaunchedDebugProxyUrl = "";
public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

public static int StartDebugProxy(string devToolsHost)
{
//we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
//on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
var ownerPid = Environment.ProcessId;
var generateRandomPort = new Random().Next(5000, 5300);
var processStartInfo = new ProcessStartInfo
{
FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
UseShellExecute = false,
RedirectStandardOutput = true,
};
var debugProxyProcess = Process.Start(processStartInfo);
if (debugProxyProcess is null)
{
throw new InvalidOperationException("Unable to start debug proxy process.");
}
return generateRandomPort;
}

public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
{
var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
});
}

// app.UseEndpoints(endpoints =>
// {
// endpoints.MapFallbackToFile(options.DefaultFileName);
// });
app.Map("/debug", app =>
{
app.Run(async (context) =>
{
//debug from VS
var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
var browserParam = queryParams.Get("browser");
Uri? browserUrl = null;
var devToolsHost = "http://localhost:9222";
if (browserParam != null)
{
browserUrl = new Uri(browserParam);
devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
}
lock (LaunchLock)
{
if (LaunchedDebugProxyUrl == "")
{
LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
}
}
var requestPath = context.Request.Path.ToString();
if (requestPath == string.Empty)
{
requestPath = "/";
}
context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
await Task.FromResult(0);
});
});
app.UseEndpoints(endpoints =>
{
endpoints.MapGet("/", context =>
{
context.Response.Redirect("index.html", permanent: false);
return Task.CompletedTask;
});
});
}
}
18 changes: 18 additions & 0 deletions src/mono/wasm/templates/templates/browser/.template.config/template.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
"type": "project"
},
"symbols": {
"kestrelHttpPortGenerated": {
"type": "generated",
"generator": "port",
"parameters": {
"low": 5000,
"high": 5300
},
"replaces": "5000"
},
"kestrelHttpsPortGenerated": {
"type": "generated",
"generator": "port",
"parameters": {
"low": 7000,
"high": 7300
},
"replaces": "5001"
},
"framework": {
"type": "parameter",
"description": "The target framework for the project.",
Expand Down
13 changes: 13 additions & 0 deletions src/mono/wasm/templates/templates/browser/Properties/launchSettings.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
"profiles": {
"browser.0": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:5001;http://localhost:5000",
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
}
}
}
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS#76113

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 10 commits into

from

Sep 28, 2022
 Merged


[release/7.0] [wasm][debugger] Support create, debugging and running wasmbrowser template from VS
#76113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
115b8f4

Support create, debugging and running wasmbrowser template from VS


thaystg Sep 21, 2022
21c1b63

addings extra line in the end of the file


thaystg Sep 21, 2022
6b15f08

remove extra spaces


thaystg Sep 21, 2022
75ac7ed

fix compilation error


thaystg Sep 21, 2022
47b99ea

adding extra line in the end of the file


thaystg Sep 21, 2022
32d693a

Addressing @lewing comment.


thaystg Sep 23, 2022
878207f

Merge branch 'release/7.0' into backport/pr-75986-to-release/7.0


lewing Sep 27, 2022
33246a7

Fix missing closing brace in wasmbrowser


radical Sep 27, 2022
1bda7af

WasmAppHost: use dictionary.TryGetValue instead of directly indexing


radical Sep 27, 2022
5d143c9

WasmAppHost: Use 127.0.0.1 for dynamic port binding


radical Sep 27, 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


5 changes: 5 additions & 0 deletions
src/mono/wasm/build/WasmApp.targets

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,11 @@
 <WasmDebugLevel Condition="('$(WasmDebugLevel)' == '' or '$(WasmDebugLevel)' == '0') and ('$(DebuggerSupport)' == 'true' or '$(Configuration)' == 'Debug')">-1</WasmDebugLevel>
 </PropertyGroup>

 <ItemGroup>
 <!-- Allow running/debugging from VS -->
 <ProjectCapability Include="DotNetCoreWeb"/>
 </ItemGroup>

 <PropertyGroup Label="Identify app bundle directory to run from">
 <!-- Allow running from custom WasmAppDir -->
 <_AppBundleDirForRunCommand Condition="'$(WasmAppDir)' != ''">$(WasmAppDir)</_AppBundleDirForRunCommand>
Expand Down

10 changes: 7 additions & 3 deletions
src/mono/wasm/host/BrowserHost.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,9 +71,13 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 debugging: _args.CommonConfig.Debugging);
 runArgsJson.Save(Path.Combine(_args.CommonConfig.AppPath, "runArgs.json"));

 string[] urls = envVars.TryGetValue("ASPNETCORE_URLS", out string? aspnetUrls)
 ? aspnetUrls.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)
 : new string[] { $"http://127.0.0.1:{_args.CommonConfig.HostProperties.WebServerPort}", "https://127.0.0.1:0" };

 (ServerURLs serverURLs, IWebHost host) = await StartWebServerAsync(_args.CommonConfig.AppPath,
 _args.ForwardConsoleOutput ?? false,
_args.CommonConfig.HostProperties.WebServerPort,
urls,
 token);

 string[] fullUrls = BuildUrls(serverURLs, _args.AppArgs);
Expand All@@ -84,7 +88,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 await host.WaitForShutdownAsync(token);
 }

 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, int port, CancellationToken token)
 private async Task<(ServerURLs, IWebHost)> StartWebServerAsync(string appPath, bool forwardConsole, string[] urls, CancellationToken token)
 {
 WasmTestMessagesProcessor? logProcessor = null;
 if (forwardConsole)
Expand All@@ -100,7 +104,7 @@ private async Task RunAsync(ILoggerFactory loggerFactory, CancellationToken toke
 ContentRootPath: Path.GetFullPath(appPath),
 WebServerUseCors: true,
 WebServerUseCrossOriginPolicy: true,
Port: port
Urls: urls
 );

 (ServerURLs serverURLs, IWebHost host) = await WebServer.StartAsync(options, _logger, token);
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServer.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@ public class WebServer
{
 internal static async Task<(ServerURLs, IWebHost)> StartAsync(WebServerOptions options, ILogger logger, CancellationToken token)
 {
 string[]? urls = new string[] { $"http://127.0.0.1:{options.Port}", "https://127.0.0.1:0" };
 string[] urls = options.Urls;

 IWebHostBuilder builder = new WebHostBuilder()
 .UseKestrel()
Expand Down

2 changes: 1 addition & 1 deletion
src/mono/wasm/host/WebServerOptions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,6 @@ internal sealed record WebServerOptions
 string? ContentRootPath,
 bool WebServerUseCors,
 bool WebServerUseCrossOriginPolicy,
int Port,
string [] Urls,
 string DefaultFileName = "index.html"
);

77 changes: 72 additions & 5 deletions
src/mono/wasm/host/WebServerStartup.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.WebSockets;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.StaticFiles;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Options;
using Microsoft.WebAssembly.Diagnostics;

#nullable enable

Expand All@@ -16,9 +26,32 @@ namespace Microsoft.WebAssembly.AppHost;
internal sealed class WebServerStartup
{
 private readonly IWebHostEnvironment _hostingEnvironment;

 private static readonly object LaunchLock = new object();
 private static string LaunchedDebugProxyUrl = "";
 public WebServerStartup(IWebHostEnvironment hostingEnvironment) => _hostingEnvironment = hostingEnvironment;

 public static int StartDebugProxy(string devToolsHost)
 {
 //we need to start another process, otherwise it will be running the BrowserDebugProxy in the same process that will be debugged, so pausing in a breakpoint
 //on managed code will freeze because it will not be able to continue executing the BrowserDebugProxy to get the locals value
 var executablePath = Path.Combine(System.AppContext.BaseDirectory, "BrowserDebugHost.dll");
 var ownerPid = Environment.ProcessId;
 var generateRandomPort = new Random().Next(5000, 5300);
 var processStartInfo = new ProcessStartInfo
 {
 FileName = "dotnet" + (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? ".exe" : ""),
 Arguments = $"exec \"{executablePath}\" --OwnerPid {ownerPid} --DevToolsUrl {devToolsHost} --DevToolsProxyPort {generateRandomPort}",
 UseShellExecute = false,
 RedirectStandardOutput = true,
 };
 var debugProxyProcess = Process.Start(processStartInfo);
 if (debugProxyProcess is null)
 {
 throw new InvalidOperationException("Unable to start debug proxy process.");
 }
 return generateRandomPort;
 }

 public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> optionsContainer)
 {
 var provider = new FileExtensionContentTypeProvider();
Expand DownExpand Up@@ -73,9 +106,43 @@ public void Configure(IApplicationBuilder app, IOptions<WebServerOptions> option
 });
 }

 // app.UseEndpoints(endpoints =>
 // {
 // endpoints.MapFallbackToFile(options.DefaultFileName);
 // });
 app.Map("/debug", app =>
 {
 app.Run(async (context) =>
 {
 //debug from VS
 var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 var browserParam = queryParams.Get("browser");
 Uri? browserUrl = null;
 var devToolsHost = "http://localhost:9222";
 if (browserParam != null)
 {
 browserUrl = new Uri(browserParam);
 devToolsHost = $"http://{browserUrl.Host}:{browserUrl.Port}";
 }
 lock (LaunchLock)
 {
 if (LaunchedDebugProxyUrl == "")
 {
 LaunchedDebugProxyUrl = $"http://localhost:{StartDebugProxy(devToolsHost)}";
 }
 }
 var requestPath = context.Request.Path.ToString();
 if (requestPath == string.Empty)
 {
 requestPath = "/";
 }
 context.Response.Redirect($"{LaunchedDebugProxyUrl}{browserUrl!.PathAndQuery}");
 await Task.FromResult(0);
 });
 });
 app.UseEndpoints(endpoints =>
 {
 endpoints.MapGet("/", context =>
 {
 context.Response.Redirect("index.html", permanent: false);
 return Task.CompletedTask;
 });
 });
 }
}

18 changes: 18 additions & 0 deletions
src/mono/wasm/templates/templates/browser/.template.config/template.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,24 @@
 "type": "project"
 },
 "symbols": {
 "kestrelHttpPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 5000,
 "high": 5300
 },
 "replaces": "5000"
 },
 "kestrelHttpsPortGenerated": {
 "type": "generated",
 "generator": "port",
 "parameters": {
 "low": 7000,
 "high": 7300
 },
 "replaces": "5001"
 },
 "framework": {
 "type": "parameter",
 "description": "The target framework for the project.",
Expand Down

13 changes: 13 additions & 0 deletions
src/mono/wasm/templates/templates/browser/Properties/launchSettings.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
{
 "profiles": {
 "browser.0": {
 "commandName": "Project",
 "launchBrowser": true,
 "environmentVariables": {
 "ASPNETCORE_ENVIRONMENT": "Development"
 },
 "applicationUrl": "https://localhost:5001;http://localhost:5000",
 "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/debug?browser={browserInspectUri}"
 }
 }
}