Updated contract

Author: meruune

plugin_OpenVR/OpenVR.cs

@@ -397,7 +397,7 @@ public string TrackingSystemName
         }
     }
 
-    public void OnLoad()
+    public Task OnLoad()
     {
         VrInput ??= new SteamEvrInput(Host, this);
         VrInputStatic = VrInput;
@@ -411,21 +411,23 @@ public void OnLoad()
 
         IsStandableSupportEnabled = Host?.PluginSettings
             .GetSetting("StandableSupport", false) ?? false;
+
+        return Task.CompletedTask;
     }
 
-    public int Initialize()
+    public async Task Initialize()
     {
         // Reset the status
         ServiceStatus = 0;
 
         // Check if Amethyst is running as admin
         // Check if OpenVR is running as admin
         // Initialize OpenVR if we're ready to go
-        if (VrHelper.IsCurrentProcessElevated() !=
-            VrHelper.IsOpenVrElevated() || !OpenVrStartup())
+        if (VrHelper.IsCurrentProcessElevated() != VrHelper.IsOpenVrElevated() ||
+            !await Task.Run(OpenVrStartup)) // Wait for the system to initialize
         {
             ServiceStatus = 1;
-            return 1;
+            return;
         }
 
         // Install the manifest
@@ -435,14 +437,10 @@ public int Initialize()
         UpdateBindingTexts();
 
         // Startup input actions
-        var serviceStatus = 0;
-        if (!EvrActionsStartup()) serviceStatus = 2;
+        EvrActionsStartup();
 
         // Connect to the server driver
-        K2ServerDriverRefresh();
-
-        // Return the binding error if the driver is fine
-        return ServiceStatus == 0 ? serviceStatus : ServiceStatus;
+        await K2ServerDriverRefresh();
     }
 
     public void Heartbeat()
@@ -487,7 +485,7 @@ public void Heartbeat()
         }
     }
 
-    public void Shutdown()
+    public Task Shutdown()
     {
         lock (InitLock)
         lock (Host.UpdateThreadLock)
@@ -500,6 +498,8 @@ public void Shutdown()
             // K2ServerDriverRefresh(); // TODO
             Host?.RefreshStatusInterface();
         }
+
+        return Task.CompletedTask;
     }
 
     public void DisplayToast((string Title, string Text) message)
@@ -764,7 +764,7 @@ public Task ProcessKeyInput(IKeyInputAction action, object data, TrackerType? re
             UpdateBindingTexts();
 
             // Refresh the driver, just in case
-            K2ServerDriverRefresh();
+            await K2ServerDriverRefresh();
 
             // Driver client sanity check: return empty or null if not valid
             if (!Initialized || OpenVR.System is null || DriverService is null ||
@@ -936,9 +936,9 @@ private async Task<int> CheckK2ServerStatusAsync()
          */
     }
 
-    private void K2ServerDriverRefresh()
+    private async Task K2ServerDriverRefresh()
     {
-        ServiceStatus = CheckK2ServerStatusAsync().Result;
+        ServiceStatus = await CheckK2ServerStatusAsync();
 
         // Request a quick status refresh
         Host?.RefreshStatusInterface();

plugin_OpenVR/plugin_OpenVR.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0"/>
     <PackageReference Include="Capnp.Net.Runtime" Version="1.3.118"/>
     <!--    <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.118" />-->
-    <PackageReference Include="Amethyst.Contract" Version="2.0.0"/>
+    <PackageReference Include="Amethyst.Contract" Version="2.2.0" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.4.0"/>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0"/>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>