Merge branch 'dev'

Author: VolcanicArts

VRCOSC.App/AppManager.cs

@@ -464,16 +464,23 @@ private async Task startAsync()
     {
         if (ModuleManager.GetInstance().GetEnabledModulesOfType<ISpeechHandler>().Any() && SettingsManager.GetInstance().GetValue<bool>(VRCOSCSetting.SpeechEnabled))
         {
-            if (string.IsNullOrWhiteSpace(SettingsManager.GetInstance().GetValue<string>(VRCOSCSetting.SpeechModelPath)))
+            if (SettingsManager.GetInstance().GetValue<SpeechModel>(VRCOSCSetting.SpeechModel) == SpeechModel.Custom && string.IsNullOrWhiteSpace(SettingsManager.GetInstance().GetValue<string>(VRCOSCSetting.SpeechModelPath)))
             {
                 var result = MessageBox.Show("You have enabled modules that require the speech engine.\nWould you like to automatically set it up?", "Set Up Speech Engine?", MessageBoxButton.YesNo);
 
                 if (result == MessageBoxResult.Yes)
                 {
-                    await InstallSpeechModel();
+                    await InstallSpeechModel(SpeechModel.Small);
+                }
+                else
+                {
+                    SettingsManager.GetInstance().GetObservable<bool>(VRCOSCSetting.SpeechEnabled).Value = false;
                 }
             }
+        }
 
+        if (ModuleManager.GetInstance().GetEnabledModulesOfType<ISpeechHandler>().Any() && SettingsManager.GetInstance().GetValue<bool>(VRCOSCSetting.SpeechEnabled))
+        {
             SpeechEngine.Initialise();
         }
 
@@ -499,10 +506,19 @@ private async Task startAsync()
         sendControlParameters();
     }
 
-    public Task InstallSpeechModel() => Application.Current.Dispatcher.Invoke(() =>
+    public Task InstallSpeechModel(SpeechModel model) => Application.Current.Dispatcher.Invoke(() =>
     {
-        var action = new FileDownloadAction(new Uri("https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-small.bin?download=true"), Storage.GetStorageForDirectory("runtime/whisper"), "ggml-small.bin");
-        action.OnComplete += () => SettingsManager.GetInstance().GetObservable<string>(VRCOSCSetting.SpeechModelPath).Value = Storage.GetStorageForDirectory("runtime/whisper").GetFullPath("ggml-small.bin");
+        var modelName = model switch
+        {
+            SpeechModel.Tiny => "ggml-tiny.bin",
+            SpeechModel.Small => "ggml-small.bin",
+            _ => throw new ArgumentOutOfRangeException(nameof(model), model, null)
+        };
+
+        var action = new FileDownloadAction(new Uri($"https://huggingface.co/ggerganov/whisper.cpp/resolve/main/{modelName}?download=true"), Storage.GetStorageForDirectory("runtime/whisper"), modelName);
+
+        action.OnComplete += () => SettingsManager.GetInstance().GetObservable<SpeechModel>(VRCOSCSetting.SpeechModel).Value = model;
+
         return MainWindow.GetInstance().ShowLoadingOverlay(action);
     });
 
@@ -557,7 +573,7 @@ public async Task StopAsync()
         await ChatBoxManager.GetInstance().Stop();
         VRChatClient.Teardown();
         VRChatOscClient.DisableSend();
-        RouterManager.GetInstance().Stop();
+        await RouterManager.GetInstance().Stop();
 
         lock (oscMessageQueueLock)
         {

VRCOSC.App/Audio/AudioCapture.cs

@@ -17,6 +17,8 @@ internal class AudioCapture
 
     public bool IsCapturing => capture.CaptureState == CaptureState.Capturing;
 
+    public Action? OnNewDataAvailable;
+
     public AudioCapture(MMDevice device)
     {
         capture = new WasapiCapture(device)
@@ -38,6 +40,7 @@ public void StartCapture()
     public void StopCapture()
     {
         capture.StopRecording();
+        ClearBuffer();
     }
 
     private void OnDataAvailable(object? sender, WaveInEventArgs e)
@@ -46,6 +49,8 @@ private void OnDataAvailable(object? sender, WaveInEventArgs e)
         {
             buffer.Write(e.Buffer, 0, e.BytesRecorded);
         }
+
+        OnNewDataAvailable?.Invoke();
     }
 
     private void OnRecordingStopped(object? sender, StoppedEventArgs e)

VRCOSC.App/Audio/Whisper/AudioProcessor.cs

@@ -37,7 +37,15 @@ public AudioProcessor(MMDevice device)
 
     private void buildWhisperProcessor()
     {
-        var modelFilePath = SettingsManager.GetInstance().GetValue<string>(VRCOSCSetting.SpeechModelPath);
+        var speechModel = SettingsManager.GetInstance().GetValue<SpeechModel>(VRCOSCSetting.SpeechModel);
+
+        var modelFilePath = speechModel switch
+        {
+            SpeechModel.Custom => SettingsManager.GetInstance().GetValue<string>(VRCOSCSetting.SpeechModelPath),
+            SpeechModel.Tiny => AppManager.GetInstance().Storage.GetFullPath("runtime/whisper/ggml-tiny.bin"),
+            SpeechModel.Small => AppManager.GetInstance().Storage.GetFullPath("runtime/whisper/ggml-small.bin"),
+            _ => throw new ArgumentOutOfRangeException()
+        };
 
         try
         {
@@ -65,7 +73,7 @@ private void buildWhisperProcessor()
         catch (Exception e)
         {
             whisper = null;
-            ExceptionHandler.Handle(e, "The Whisper model path is empty or incorrect. Please go into the app's speech settings and restore the model by clicking 'Auto Install Model'");
+            ExceptionHandler.Handle(e, "The Whisper model path is empty or incorrect. Please go into the app's speech settings and select a model");
         }
     }
 

VRCOSC.App/MainApp.xaml

@@ -1,7 +1,6 @@
 <Application x:Class="VRCOSC.App.MainApp"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:core="clr-namespace:VRCOSC.App.UI.Core"
              xmlns:themes="clr-namespace:VRCOSC.App.UI.Themes">
     <Application.Resources>
         <ResourceDictionary>
@@ -18,11 +17,6 @@
                 <ResourceDictionary Source="UI/Styles/KeybindPickerStyle.xaml" />
                 <ResourceDictionary Source="UI/Styles/VRCOSCSliderStyle.xaml" />
             </ResourceDictionary.MergedDictionaries>
-            <Style TargetType="{x:Type core:IPPortTextBox}" BasedOn="{StaticResource {x:Type TextBox}}" />
-            <Style TargetType="Window">
-                <Setter Property="Background" Value="Black" />
-                <Setter Property="AllowsTransparency" Value="False"/>
-            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>

VRCOSC.App/Modules/ModuleManager.cs

@@ -10,6 +10,7 @@
 using System.Runtime.Loader;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.Win32;
 using VRCOSC.App.ChatBox;
 using VRCOSC.App.Modules.Serialisation;
 using VRCOSC.App.OSC.VRChat;
@@ -140,6 +141,7 @@ public void LoadAllModules(Dictionary<string, string>? filePathOverrides = null)
 
         loadLocalModules();
         loadRemoteModules();
+        PInvoke.SetDllDirectory((string?)null);
 
         foreach (var module in modules)
         {
@@ -362,6 +364,8 @@ private List<Module> retrieveModuleInstances(string packageId, AssemblyLoadConte
     private AssemblyLoadContext loadContextFromPath(string path)
     {
         var assemblyLoadContext = new AssemblyLoadContext(null, true);
+        PInvoke.SetDllDirectory(path);
+
         foreach (var dllPath in Directory.GetFiles(path, "*.dll")) loadAssemblyFromPath(assemblyLoadContext, dllPath);
         return assemblyLoadContext;
     }

VRCOSC.App/Modules/Serialisation/ModuleSerialiser.cs

@@ -2,11 +2,16 @@
 // See the LICENSE file in the repository root for full license text.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
+using Semver;
+using VRCOSC.App.Packages;
 using VRCOSC.App.SDK.Modules;
 using VRCOSC.App.SDK.Modules.Attributes.Settings;
 using VRCOSC.App.Serialisation;
 using VRCOSC.App.Utils;
+using Module = VRCOSC.App.SDK.Modules.Module;
 
 namespace VRCOSC.App.Modules.Serialisation;
 
@@ -26,10 +31,50 @@ protected override bool ExecuteAfterDeserialisation(SerialisableModule data)
 
         Reference.Enabled.Value = data.Enabled;
 
+        var clonedSettings = new Dictionary<string, object?>(data.Settings);
+
         foreach (var settingPair in data.Settings)
         {
             var (settingKey, settingValue) = settingPair;
 
+            var savedVersion = data.PackageVersion is not null ? SemVersion.Parse(data.PackageVersion) : new SemVersion(0);
+            var latestVersion = PackageManager.GetInstance().GetInstalledVersion(Reference.PackageID);
+
+            while (savedVersion != latestVersion)
+            {
+                if (Reference.Migrators.TryGetValue(settingKey, out var migrator))
+                {
+                    if (migrator.TryGetValue(savedVersion, out MethodInfo? info))
+                    {
+                        var attribute = info.GetCustomAttribute<ModuleMigrationAttribute>()!;
+                        var sourceType = info.GetParameters()[0].ParameterType;
+
+                        if (TryConvertToTargetType(settingValue, sourceType, out var convertedValue))
+                        {
+                            settingValue = info.Invoke(Reference, [convertedValue]);
+                            settingKey = attribute.DestinationSetting;
+                            savedVersion = attribute.DestinationVersion;
+                            shouldReserialise = true;
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            clonedSettings[settingKey] = settingValue;
+        }
+
+        foreach (var settingPair in clonedSettings)
+        {
+            var (settingKey, settingValue) = settingPair;
+
             try
             {
                 var setting = Reference.GetSetting<ModuleSetting>(settingKey);

VRCOSC.App/Modules/Serialisation/SerialisableModule.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
+using VRCOSC.App.Packages;
 using VRCOSC.App.SDK.Modules;
 using VRCOSC.App.Serialisation;
 using VRCOSC.App.Utils;
@@ -12,6 +13,9 @@ namespace VRCOSC.App.Modules.Serialisation;
 
 public class SerialisableModule : SerialisableVersion
 {
+    [JsonProperty("package_version")]
+    public string? PackageVersion;
+
     [JsonProperty("enabled")]
     public bool Enabled;
 
@@ -29,6 +33,7 @@ public SerialisableModule()
     public SerialisableModule(Module module)
     {
         Version = 1;
+        PackageVersion = PackageManager.GetInstance().GetInstalledVersion(module.PackageID).ToString();
 
         Enabled = module.Enabled.Value;
         module.Settings.Where(pair => !pair.Value.InternalIsDefault()).ForEach(pair => Settings.Add(pair.Key, pair.Value.InternalSerialise()));

VRCOSC.App/NativeMethods.txt

@@ -12,4 +12,5 @@ CoTaskMemFree
 GetDpiForSystem
 MonitorFromWindow
 GetMonitorInfoW
-DwmSetWindowAttribute
+DwmSetWindowAttribute
+SetDllDirectory

VRCOSC.App/OVR/OVRDeviceManager.cs

@@ -47,6 +47,8 @@ public void AddOrUpdateDeviceRole(string serialNumber, DeviceRole deviceRole)
         if (TrackedDevices.TryGetValue(serialNumber, out var device))
         {
             index = device.Index;
+            if (device.Role == deviceRole) return;
+
             Logger.Log($"Updating {serialNumber} to role {deviceRole}");
         }
         else
@@ -183,4 +185,4 @@ private void auditGenericTrackedDevices()
             addTrackedDevice<TrackedDevice>(connectedGenericDeviceSerial, DeviceRole.Unset, connectedGenericDeviceIndex);
         }
     }
-}
+}

VRCOSC.App/Packages/PackageManager.cs

@@ -9,6 +9,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using Octokit;
+using Semver;
 using VRCOSC.App.Modules;
 using VRCOSC.App.Packages.Serialisation;
 using VRCOSC.App.Serialisation;
@@ -177,13 +178,13 @@ public async Task UninstallPackage(PackageSource packageSource)
 
     public bool IsInstalled(PackageSource packageSource) => packageSource.PackageID is not null && InstalledPackages.ContainsKey(packageSource.PackageID);
     public string GetInstalledVersion(PackageSource packageSource) => packageSource.PackageID is not null && InstalledPackages.TryGetValue(packageSource.PackageID, out var version) ? version : string.Empty;
+    public SemVersion GetInstalledVersion(string packageId) => packageId == "local" ? new SemVersion(0) : SemVersion.Parse(InstalledPackages[packageId], SemVersionStyles.Any);
 
     private async Task loadCommunityPackages()
     {
         var repos = await GitHubProxy.Client.Search.SearchRepo(new SearchRepositoriesRequest
         {
-            Topic = community_tag,
-            Fork = ForkQualifier.IncludeForks
+            Topic = community_tag
         }).WaitAsync(TimeSpan.FromSeconds(5));
 
         foreach (var repo in repos.Items.Where(repo => repo.Name != "VRCOSC"))

VRCOSC.App/Packages/PackageSource.cs

@@ -60,7 +60,9 @@ public bool IsUpdateAvailable()
     {
         if (InstalledRelease?.IsPreRelease ?? false) return null;
 
-        var latestNonPreRelease = filterReleases(true, false).First();
+        var latestNonPreRelease = filterReleases(true, false).FirstOrDefault();
+        if (latestNonPreRelease is null) return null;
+
         var installedVersion = SemVersion.Parse(InstalledVersion, SemVersionStyles.Any);
         var latestNonPreReleaseVersion = SemVersion.Parse(latestNonPreRelease.Version, SemVersionStyles.Any);
         return SemVersion.ComparePrecedence(latestNonPreReleaseVersion, installedVersion) == 1 ? latestNonPreRelease : null;

VRCOSC.App/Router/RouterInstance.cs

@@ -2,16 +2,19 @@
 // See the LICENSE file in the repository root for full license text.
 
 using System.Net;
-using Newtonsoft.Json;
 using VRCOSC.App.Utils;
 
 namespace VRCOSC.App.Router;
 
 public class RouterInstance
 {
-    [JsonProperty("name")]
-    public Observable<string> Name { get; } = new("My Label");
-
-    [JsonProperty("endpoint")]
+    public Observable<string> Name { get; } = new("My Router Instance");
+    public Observable<RouterMode> Mode { get; } = new(RouterMode.Send);
     public Observable<string> Endpoint { get; } = new($"{IPAddress.Loopback}:9000");
 }
+
+public enum RouterMode
+{
+    Send,
+    Receive
+}