Skip to content

changed the processing of loadUrl at CreateWindowAsync #631

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
merged 2 commits into from
Apr 6, 2022
Merged

changed the processing of loadUrl at CreateWindowAsync #631

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7d2dab
changed the usage of loadUrl at CreateWindowAsync: adds protocol, hos…
yannikHoeflich Dec 5, 2021
0d9483e
Updated TryParseLoadUrl with UriBuilder for better readability
yannikHoeflich Dec 8, 2021
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
26 changes: 20 additions & 6 deletions ElectronNET.API/WindowManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading.Tasks;

namespace ElectronNET.API
Expand Down Expand Up @@ -79,7 +80,7 @@ public bool IsQuitOnWindowAllClosed
/// </summary>
/// <param name="loadUrl">The load URL.</param>
/// <returns></returns>
public async Task<BrowserWindow> CreateWindowAsync(string loadUrl = "http://localhost")
public async Task<BrowserWindow> CreateWindowAsync(string loadUrl = "/")
{
return await CreateWindowAsync(new BrowserWindowOptions(), loadUrl);
}
Expand All @@ -90,10 +91,9 @@ public async Task<BrowserWindow> CreateWindowAsync(string loadUrl = "http://loca
/// <param name="options">The options.</param>
/// <param name="loadUrl">The load URL.</param>
/// <returns></returns>
public Task<BrowserWindow> CreateWindowAsync(BrowserWindowOptions options, string loadUrl = "http://localhost")
public Task<BrowserWindow> CreateWindowAsync(BrowserWindowOptions options, string loadUrl = "/")
{
var taskCompletionSource = new TaskCompletionSource<BrowserWindow>();

BridgeConnector.Socket.On("BrowserWindowCreated", (id) =>
{
BridgeConnector.Socket.Off("BrowserWindowCreated");
Expand All @@ -119,9 +119,9 @@ public Task<BrowserWindow> CreateWindowAsync(BrowserWindowOptions options, strin
}
});

if (loadUrl.ToUpper() == "HTTP://LOCALHOST")
{
loadUrl = $"{loadUrl}:{BridgeSettings.WebPort}";
if(!TryParseLoadUrl(loadUrl, out loadUrl))
{
throw new ArgumentException($"Unable to parse {loadUrl}", nameof(loadUrl));
}

// Workaround Windows 10 / Electron Bug
Expand Down Expand Up @@ -159,6 +159,20 @@ public Task<BrowserWindow> CreateWindowAsync(BrowserWindowOptions options, strin
return taskCompletionSource.Task;
}


private bool TryParseLoadUrl(string loadUrl, out string parsedUrl)
{
Uri BaseUri = new Uri($"http://localhost:{BridgeSettings.WebPort}");
if (Uri.TryCreate(loadUrl, UriKind.Absolute, out var url) ||
Uri.TryCreate(BaseUri, loadUrl, out url)) {
var uri = new UriBuilder(url.ToString());
parsedUrl = uri.ToString();
return true;
}
parsedUrl = loadUrl;
return false;
}

private bool isWindows10()
{
return RuntimeInformation.OSDescription.Contains("Windows 10");
Expand Down