Electron support for Linux (#1074)

* init * SQLite changes * Move html folder, edit build scripts * AppApi interface * Build flags * AppApi inheritance * Finishing touches * Merge upstream changes * Test CI * Fix class inits * Rename AppApi * Merge upstream changes * Fix SQLiteLegacy on Linux, Add Linux interop, build tools * Linux specific localisation strings * Make it run * Bring back most of Linux functionality * Clean up * Fix TTS voices * Fix UI var * Changes * Electron minimise to tray * Remove separate toggle for WlxOverlay * Fixes * Touchups * Move csproj * Window zoom, Desktop Notifications, VR check on Linux * Fix desktop notifications, VR check spam * Fix building on Linux * Clean up * Fix WebApi headers * Rewrite VRCX updater * Clean up * Linux updater * Add Linux to build action * init * SQLite changes * Move html folder, edit build scripts * AppApi interface * Build flags * AppApi inheritance * Finishing touches * Merge upstream changes * Test CI * Fix class inits * Rename AppApi * Merge upstream changes * Fix SQLiteLegacy on Linux, Add Linux interop, build tools * Linux specific localisation strings * Make it run * Bring back most of Linux functionality * Clean up * Fix TTS voices * Changes * Electron minimise to tray * Remove separate toggle for WlxOverlay * Fixes * Touchups * Move csproj * Window zoom, Desktop Notifications, VR check on Linux * Fix desktop notifications, VR check spam * Fix building on Linux * Clean up * Fix WebApi headers * Rewrite VRCX updater * Clean up * Linux updater * Add Linux to build action * Test updater * Rebase and handle merge conflicts * Fix Linux updater * Fix Linux app restart * Fix friend order * Handle AppImageInstaller, show an install message on Linux * Updates to the AppImage installer * Fix Linux updater, fix set version, check for .NET, copy wine prefix * Handle random errors * Rotate tall prints * try fix Linux restart bug * Final --------- Co-authored-by: rs189 <35667100+rs189@users.noreply.github.com>
2026-04-19 06:43:51 +02:00 · 2025-01-11 13:09:44 +13:00
parent a39eb9d5ed
commit 938fff63d0
223 changed files with 15841 additions and 9562 deletions
--- a/Dotnet/Overlay/SystemMonitor.cs
+++ b/Dotnet/Overlay/SystemMonitor.cs
@@ -0,0 +1,151 @@
+// Copyright(c) 2019-2022 pypy, Natsumi and individual contributors.
+// All rights reserved.
+//
+// This work is licensed under the terms of the MIT license.
+// For a copy, see <https://opensource.org/licenses/MIT>.
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using NLog;
+
+namespace VRCX
+{
+    public class SystemMonitor
+    {
+        public static readonly SystemMonitor Instance;
+        public float CpuUsage;
+        public double UpTime;
+        private bool _enabled;
+        private PerformanceCounter _performanceCounterCpuUsage;
+        private PerformanceCounter _performanceCounterUpTime;
+        private Thread _thread;
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
+
+        static SystemMonitor()
+        {
+            Instance = new SystemMonitor();
+        }
+
+        public void Start(bool enabled)
+        {
+            if (enabled == _enabled)
+                return;
+            
+            _enabled = enabled;
+            if (enabled)
+                StartThread();
+            else
+                Exit();
+        }
+
+        internal void Exit()
+        {
+            CpuUsage = 0;
+            UpTime = 0;
+            try
+            {
+                if (_thread != null)
+                {
+                    _thread.Interrupt();
+                    _thread.Join();
+                    _thread = null;
+                }
+            }
+            catch (ThreadInterruptedException)
+            {
+            }
+
+            _performanceCounterCpuUsage?.Dispose();
+            _performanceCounterCpuUsage = null;
+            _performanceCounterUpTime?.Dispose();
+            _performanceCounterUpTime = null;
+        }
+        
+        private void StartThread()
+        {
+            Exit();
+            
+            try
+            {
+                _performanceCounterCpuUsage = new PerformanceCounter(
+                    "Processor Information",
+                    "% Processor Utility",
+                    "_Total",
+                    true
+                );
+                _performanceCounterCpuUsage?.NextValue();
+            }
+            catch (Exception ex)
+            {
+                logger.Warn($"Failed to create \"Processor Utility\" PerformanceCounter ${ex}");
+            }
+
+            // fallback
+            if (_performanceCounterCpuUsage == null)
+            {
+                try
+                {
+                    _performanceCounterCpuUsage = new PerformanceCounter(
+                        "Processor",
+                        "% Processor Time",
+                        "_Total",
+                        true
+                    );
+                    _performanceCounterCpuUsage?.NextValue();
+                }
+                catch (Exception ex)
+                {
+                    logger.Warn($"Failed to create \"Processor Time\" PerformanceCounter ${ex}");
+                }
+            }
+            
+            try
+            {
+                _performanceCounterUpTime = new PerformanceCounter("System", "System Up Time");
+                _performanceCounterUpTime?.NextValue();
+            }
+            catch
+            {
+                logger.Warn("Failed to create \"System Up Time\" PerformanceCounter");
+            }
+
+            if (_performanceCounterCpuUsage == null &&
+                _performanceCounterUpTime == null)
+            {
+                logger.Error("Failed to create any PerformanceCounter");
+                return;
+            }
+            logger.Info("SystemMonitor started");
+            
+            _thread = new Thread(ThreadProc)
+            {
+                IsBackground = true
+            };
+            _thread.Start();
+        }
+        
+        private void ThreadProc()
+        {
+            try
+            {
+                while (_enabled)
+                {
+                    if (_performanceCounterCpuUsage != null)
+                        CpuUsage = _performanceCounterCpuUsage.NextValue();
+
+                    if (_performanceCounterUpTime != null)
+                        UpTime = TimeSpan.FromSeconds(_performanceCounterUpTime.NextValue()).TotalMilliseconds;
+                    
+                    Thread.Sleep(1000);
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.Warn($"SystemMonitor thread exception: {ex}");
+            }
+
+            Exit();
+        }
+    }
+}
--- a/Dotnet/Overlay/VRCXVR.cs
+++ b/Dotnet/Overlay/VRCXVR.cs
@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using CefSharp;
+using NLog;
 using SharpDX;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
@@ -26,7 +27,7 @@ namespace VRCX
    public class VRCXVR : VRCXVRInterface
    {
        public static VRCXVRInterface Instance;
-        private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
        private static readonly float[] _rotation = { 0f, 0f, 0f };
        private static readonly float[] _translation = { 0f, 0f, 0f };
        private static readonly float[] _translationLeft = { -7f / 100f, -5f / 100f, 6f / 100f };
@@ -401,7 +402,7 @@ namespace VRCX
                        if (isHmdAfk != IsHmdAfk)
                        {
                            IsHmdAfk = isHmdAfk;
-                            AppApi.Instance.CheckGameRunning();
+                            Program.AppApiInstance.CheckGameRunning();
                        }

                        var headsetErr = ETrackedPropertyError.TrackedProp_Success;
--- a/Dotnet/Overlay/VRCXVRLegacy.cs
+++ b/Dotnet/Overlay/VRCXVRLegacy.cs
@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using CefSharp;
+using NLog;
 using SharpDX;
 using SharpDX.Direct3D11;
 using SharpDX.DXGI;
@@ -22,7 +23,7 @@ namespace VRCX
    public class VRCXVRLegacy : VRCXVRInterface
    {
        public static VRCXVRInterface Instance;
-        private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
        private static readonly float[] _rotation = { 0f, 0f, 0f };
        private static readonly float[] _translation = { 0f, 0f, 0f };
        private static readonly float[] _translationLeft = { -7f / 100f, -5f / 100f, 6f / 100f };
@@ -329,7 +330,7 @@ namespace VRCX
                        if (isHmdAfk != IsHmdAfk)
                        {
                            IsHmdAfk = isHmdAfk;
-                            AppApi.Instance.CheckGameRunning();
+                            Program.AppApiInstance.CheckGameRunning();
                        }

                        var headsetErr = ETrackedPropertyError.TrackedProp_Success;