starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-02-14 13:44:47 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

changed the usage of loadUrl at CreateWindowAsync: adds protocol, host and port. You can also insert the port with {port}

Browse Source
This commit is contained in:
Yannik Höflich
2021-12-05 16:31:32 +01:00
parent c2a8c627b9
commit c7d2dabbc3
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ElectronNET.API/WindowManager.cs
View File

@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace ElectronNET.API
@@ -79,7 +80,7 @@ namespace ElectronNET.API
/// </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 = "http://localhost:{port}")
{
return await CreateWindowAsync(new BrowserWindowOptions(), loadUrl);
}
@@ -90,10 +91,9 @@ namespace ElectronNET.API
/// <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 = "http://localhost:{port}")
{
var taskCompletionSource = new TaskCompletionSource<BrowserWindow>();
BridgeConnector.Socket.On("BrowserWindowCreated", (id) =>
{
BridgeConnector.Socket.Off("BrowserWindowCreated");
@@ -119,10 +119,7 @@ namespace ElectronNET.API
}
});
if (loadUrl.ToUpper() == "HTTP://LOCALHOST")
{
loadUrl = $"{loadUrl}:{BridgeSettings.WebPort}";
}
loadUrl = ParseLoadUrl(loadUrl);
// Workaround Windows 10 / Electron Bug
// https://github.com/electron/electron/issues/4045
@@ -159,6 +156,22 @@ namespace ElectronNET.API
return taskCompletionSource.Task;
}
private string ParseLoadUrl(string loadUrl)
{
var match = Regex.Match(loadUrl, @"(ht|f)tp(s?)\:\/\/([a-z]+\.)+[a-z]+");
if (!match.Success || match.Index != 0)
{
match = Regex.Match(loadUrl, @"([a-z]+\.)+[a-z]+");
if (!match.Success || match.Index != 0)
loadUrl = "localhost:{port}" + loadUrl;
loadUrl = "http://" + loadUrl;
}
loadUrl = Regex.Replace(loadUrl, @"\{(P|p)(O|o)(R|r)(T|t)\}", BridgeSettings.WebPort);
return loadUrl;
}
private bool isWindows10()
{
return RuntimeInformation.OSDescription.Contains("Windows 10");