|
18 | 18 | using System.Web; |
19 | 19 | using Microsoft.AspNetCore.Builder; |
20 | 20 | using Microsoft.AspNetCore.Http; |
| 21 | +using Microsoft.AspNetCore.Http.Extensions; |
21 | 22 |
|
22 | 23 | namespace Microsoft.WebAssembly.AppHost.DevServer; |
23 | 24 |
|
@@ -428,9 +429,31 @@ private string GetDevToolsUrlWithProxy(BrowserTab tabToDebug) |
428 | 429 | { |
429 | 430 | var underlyingV8Endpoint = new Uri(tabToDebug.WebSocketDebuggerUrl); |
430 | 431 | var proxyEndpoint = new Uri(_debugProxyUrl); |
431 | | - var devToolsUrlAbsolute = new Uri(_browserHost + tabToDebug.DevtoolsFrontendUrl); |
| 432 | + var devToolsUrlAbsolute = new Uri(new Uri(_browserHost), relativeUri: NormalizeDevtoolsFrontendUrl(tabToDebug.DevtoolsFrontendUrl)); |
432 | 433 | var devToolsUrlWithProxy = $"{devToolsUrlAbsolute.Scheme}://{devToolsUrlAbsolute.Authority}{devToolsUrlAbsolute.AbsolutePath}?{underlyingV8Endpoint.Scheme}={proxyEndpoint.Authority}{underlyingV8Endpoint.PathAndQuery}"; |
433 | 434 | return devToolsUrlWithProxy; |
| 435 | + |
| 436 | + static string NormalizeDevtoolsFrontendUrl(string devtoolsFrontendUrl) |
| 437 | + { |
| 438 | + // Currently frontend url can be: |
| 439 | + // - absolute (since v135 of chrome and edge) |
| 440 | + // chrome example: https://chrome-devtools-frontend.appspot.com/serve_rev/@031848bc6ad02b97854f3d6154d3aefd0434756a/inspector.html?ws=localhost:9222/devtools/page/719FE9D3B43570193235446E0AB36859 |
| 441 | + // edge example: https://aka.ms/docs-landing-page/serve_rev/@4e2c41645f24197463afa2ab6aa999352ee8255c/inspector.html?ws=localhost:9222/devtools/page/3A4D56E09776321628432588FC9299F4 |
| 442 | + // - relative (managed as fallback for brosers with prior version) |
| 443 | + // example: /devtools/inspector.html?ws=localhost:9222/devtools/page/DAB7FB6187B554E10B0BD18821265734 |
| 444 | + // The absolute url can't be used as-is because is not valid for debugging and cannot be made relative because of lack "devtools" segment |
| 445 | + // before "inspector.html" but we can keep the query string and append to the default "devtools/inspector.html" browser devtools page |
| 446 | + |
| 447 | + const string DefaultBrowserDevToolsPagePath = "devtools/inspector.html"; |
| 448 | + |
| 449 | + if (devtoolsFrontendUrl.AsSpan().TrimStart('/').StartsWith(DefaultBrowserDevToolsPagePath)) |
| 450 | + { |
| 451 | + return devtoolsFrontendUrl; |
| 452 | + } |
| 453 | + |
| 454 | + UriHelper.FromAbsolute(devtoolsFrontendUrl, out _, out _, out _, out var query, out _); |
| 455 | + return $"{DefaultBrowserDevToolsPagePath}{query}"; |
| 456 | + } |
434 | 457 | } |
435 | 458 |
|
436 | 459 | private string GetLaunchChromeInstructions(string targetApplicationUrl) |
|
0 commit comments