Skip to content

fix: Adjust check for https in RemoteControlClient #20405

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+17 −5
Draft

fix: Adjust check for https in RemoteControlClient #20405

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc228de
fix: Adjust check for https in RemoteControlClient
MartinZikmund May 15, 2025
8914c16
chore: Unsafe blocks
MartinZikmund May 15, 2025
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
14 changes: 9 additions & 5 deletions src/Uno.UI.RemoteControl/RemoteControlClient.cs
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@
using System.Linq;
using System.Net;
using System.Net.WebSockets;
using System.Runtime.InteropServices.JavaScript;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
@@ -272,6 +273,9 @@ public void RegisterPreProcessor(IRemoteControlPreProcessor preprocessor)
return connection?.Socket;
}

[JSImport("globalThis.eval")]
private static partial string Eval(string js);

private async Task<Connection?> StartConnection()
{
try
@@ -287,11 +291,11 @@ public void RegisterPreProcessor(IRemoteControlPreProcessor preprocessor)
return default;
}

#if __WASM__
var isHttps = WebAssemblyRuntime.InvokeJS("window.location.protocol == 'https:'").Equals("true", StringComparison.OrdinalIgnoreCase);
#else
const bool isHttps = false;
#endif
var isHttps = false;
if (OperatingSystem.IsBrowser())
{
isHttps = Eval("window.location.protocol == 'https:'").Equals("true", StringComparison.OrdinalIgnoreCase);
}

_status.Report(ConnectionState.Connecting);

2 changes: 2 additions & 0 deletions src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Reference.csproj
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@
<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>

<UnoRuntimeIdentifier>Reference</UnoRuntimeIdentifier>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: It can be a follow-up PR, but I think you can simply add this to Directory.Build.props and remove it from all csprojs in the whole repo.

</PropertyGroup>

<ItemGroup>
2 changes: 2 additions & 0 deletions src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Skia.csproj
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@
<PlatformItemsBasePath>..\Uno.UI.RemoteControl\</PlatformItemsBasePath>

<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
2 changes: 2 additions & 0 deletions src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.Wasm.csproj
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@
<PlatformItemsBasePath>..\Uno.UI.RemoteControl\</PlatformItemsBasePath>

<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
2 changes: 2 additions & 0 deletions src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.netcoremobile.csproj
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,8 @@
<PackageId>Uno.UI.DevServer</PackageId>
<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.DevServer</PackageId>
<CommonOverridePackageId>$(PackageId)</CommonOverridePackageId>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>