AI removing things for me because I forgor: Merge pull request #2 from KinectToVR/copilot/cleanup-plugin-relay-sln

Remove RelayTestServer project and non-x64 platform configurations from solution

Author: Stiggimy

.gitignore

@@ -57,8 +57,12 @@ BenchmarkDotNet.Artifacts/
 
 # .NET Core
 project.lock.json
+RelayTestServer/
 project.fragment.lock.json
 artifacts/
+publish_ms_out/
+publish_out/
+*.zip
 
 # StyleCop
 StyleCopReport.xml

plugin_Relay/Models/Contract.cs

@@ -6,7 +6,7 @@
 using Amethyst.Plugins.Contract;
 using MemoryPack;
 using Microsoft.Extensions.Logging;
-using Stl.Rpc;
+using ActualLab.Rpc;
 
 namespace plugin_Relay.Models;
 

plugin_Relay/RelayDevice.cs

@@ -16,7 +16,7 @@
 using plugin_Relay.Models;
 using plugin_Relay.Pages;
 using Microsoft.Extensions.Logging;
-using Stl.Rpc;
+using ActualLab.Rpc;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
@@ -169,39 +169,29 @@ public void Initialize()
         // Mark as initialized
         IsInitialized = true;
 
-        try
-        {
-            MemoryPackFormatterProvider.Register(new TrackingDeviceFormatter());
-            MemoryPackFormatterProvider.Register(new TrackedJointFormatter());
+        MemoryPackFormatterProvider.Register(new TrackingDeviceFormatter());
+        MemoryPackFormatterProvider.Register(new TrackedJointFormatter());
 
-            if (RelayService.Instance?.IsBackfeed ?? false)
-            {
-                Status = RelayDeviceStatus.BackFeedDetected;
-                SettingsPage.DeviceStatusAppendix = string.Empty;
-                InitException = null;
-                return; // Don't proceed further
-            }
+        if (RelayService.Instance?.IsBackfeed ?? false)
+        {
+            Status = RelayDeviceStatus.BackFeedDetected;
+            SettingsPage.DeviceStatusAppendix = string.Empty;
+            InitException = null;
+            return; // Don't proceed further
+        }
 
-            var services = new ServiceCollection()
-                .AddLogging(logging => logging.AddConsole());
+        var services = new ServiceCollection()
+            .AddLogging();
 
-            services.AddRpc()
-                .AddWebSocketClient($"http://{ServerIp}:{ServerPort}/")
-                .AddClient<IRelayService>()
-                .AddServer<IRelayClient, DataClient>();
+        services.AddRpc()
+            .AddWebSocketClient($"http://{ServerIp}:{ServerPort}/")
+            .AddClient<IRelayService>();
 
-            ServiceChannel = services.BuildServiceProvider();
-            Service = ServiceChannel.GetRequiredService<IRelayService>();
+        ServiceChannel = services.BuildServiceProvider();
+        Service = ServiceChannel.GetRequiredService<IRelayService>();
 
-            SettingsPage.DeviceStatusAppendix = string.Empty;
-            SettingsPage.StartConnectionTest();
-        }
-        catch (Exception ex)
-        {
-            InitException = ex;
-            Status = RelayDeviceStatus.ServiceError;
-            return;
-        }
+        SettingsPage.DeviceStatusAppendix = string.Empty;
+        SettingsPage.StartConnectionTest();
 
         Host.Log($"Tried to initialize with status: {DeviceStatusString}");
         InitException = null;

plugin_Relay/RelayService.cs

@@ -15,10 +15,10 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using plugin_Relay.Models;
-using Stl.Rpc;
+using ActualLab.Rpc;
 using IServiceEndpoint = Amethyst.Plugins.Contract.IServiceEndpoint;
 using Microsoft.AspNetCore.Builder;
-using Stl.Rpc.Server;
+using ActualLab.Rpc.Server;
 using MemoryPack;
 using Microsoft.Extensions.Logging;
 
@@ -209,18 +209,6 @@ public int Initialize()
             rpc.AddServer<IRelayService, DataService>()
                 .AddClient<IRelayClient>();
 
-            builder.Services.AddSingleton<RpcCallRouter>(c =>
-            {
-                RpcHub rpcHub = null; // Necessary because of IRelayClient, which requires call routing
-                return (methodDef, args) =>
-                {
-                    rpcHub ??= c.RpcHub(); // We can't resolve it earlier, coz otherwise it will trigger recursion
-                    if (methodDef.Service.Type != typeof(IRelayClient)) return rpcHub.GetClientPeer(RpcPeerRef.Default);
-                    var peerRef = new RpcPeerRef(args.Get<Stl.Text.Symbol>(0), true);
-                    return rpcHub.GetServerPeer(peerRef);
-                };
-            });
-
             var app = builder.Build();
             app.Urls.Add($"http://0.0.0.0:{ServerPort}/");
             app.UseWebSockets();

plugin_Relay/plugin_Relay.csproj

@@ -24,13 +24,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="ActualLab.Generators" Version="12.1.51">
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		  <PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="ActualLab.Rpc" Version="12.1.51" />
+		<PackageReference Include="ActualLab.Rpc.Server" Version="12.1.51" />
 		<PackageReference Include="Amethyst.Plugins.Contract" Version="1.3.0" />
 		<PackageReference Include="MemoryPack" Version="1.21.4" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-		<PackageReference Include="Stl.Generators" Version="6.8.11" />
-		<PackageReference Include="Stl.Rpc" Version="6.8.11" />
-		<PackageReference Include="Stl.Rpc.Server" Version="6.8.11" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
 		<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
 		<PackageReference Include="System.ComponentModel.Composition.Registration" Version="8.0.0" />
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001" />