Skip to content
Merged
Changes from 1 commit
Commits
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
27 changes: 26 additions & 1 deletion src/Components/WebAssembly/Server/src/TargetPickerUi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,34 @@ private string GetDevToolsUrlWithProxy(BrowserTab tabToDebug)
{
var underlyingV8Endpoint = new Uri(tabToDebug.WebSocketDebuggerUrl);
var proxyEndpoint = new Uri(_debugProxyUrl);
var devToolsUrlAbsolute = new Uri(_browserHost + tabToDebug.DevtoolsFrontendUrl);
var devToolsUrlAbsolute = new Uri(new Uri(_browserHost), relativeUri: NormalizeDevtoolsFrontendUrl(tabToDebug.DevtoolsFrontendUrl));
var devToolsUrlWithProxy = $"{devToolsUrlAbsolute.Scheme}://{devToolsUrlAbsolute.Authority}{devToolsUrlAbsolute.AbsolutePath}?{underlyingV8Endpoint.Scheme}={proxyEndpoint.Authority}{underlyingV8Endpoint.PathAndQuery}";
return devToolsUrlWithProxy;

static string NormalizeDevtoolsFrontendUrl(string devtoolsFrontendUrl)
{
// Frontend url can be absolute or relative based on browser
string localPath;
string queryString;
if (Uri.TryCreate(devtoolsFrontendUrl, UriKind.Absolute, out var devtoolsFrontendUri))
{
localPath = devtoolsFrontendUri.LocalPath;
queryString = devtoolsFrontendUri.Query;
}
else
{
var queryStringBeginCharIndex = devtoolsFrontendUrl.IndexOf('?');
localPath = devtoolsFrontendUrl[..queryStringBeginCharIndex];
queryString = devtoolsFrontendUrl[queryStringBeginCharIndex..];
}

// We need only the last segment of the path
localPath = localPath.Split('/').Last().TrimStart('/');
// Ensure starts with "devtools"
localPath = $"devtools/{localPath}";

return $"{localPath}?{queryString}";
}
}

private string GetLaunchChromeInstructions(string targetApplicationUrl)
Expand Down
Loading