Update OscQueryLib

Author: LucHeart

ShockOsc/Services/ShockOsc.cs

@@ -3,9 +3,11 @@
 using System.Reactive.Subjects;
 using LucHeart.CoreOSC;
 using Microsoft.Extensions.Logging;
+using MudBlazor.Extensions;
 using OpenShock.Desktop.ModuleBase.Api;
 using OpenShock.Desktop.ModuleBase.Config;
 using OpenShock.Desktop.ModuleBase.Models;
+using OpenShock.MinimalEvents;
 using OpenShock.ShockOSC.Config;
 using OpenShock.ShockOSC.Models;
 using OpenShock.ShockOSC.Utils;
@@ -33,8 +35,8 @@ public sealed class ShockOsc
     private bool _isAfk;
     public string AvatarId = string.Empty;
     private readonly Random Random = new();
-
-    public event Func<Task>? OnGroupsChanged;
+    
+    private readonly MinimalEvent _onGroupsChanged = new();
 
     public static readonly string[] ShockerParams =
     {
@@ -81,14 +83,10 @@ public ShockOsc(ILogger<ShockOsc> logger,
         _chatboxService = chatboxService;
         _medalIcymiService = medalIcymiService;
 
-        OnGroupsChanged += () =>
-        {
-            SetupGroups();
-            return Task.CompletedTask;
-        };
+        _onGroupsChanged.Subscribe(SetupGroups);
 
-        oscQueryServer.FoundVrcClient += FoundVrcClient;
-        oscQueryServer.ParameterUpdate += OnAvatarChange;
+        oscQueryServer.FoundVrcClient.SubscribeAsync(endPoint => SetupVrcClient((oscQueryServer, endPoint))).AsTask().Wait();
+        oscQueryServer.ParameterUpdate.SubscribeAsync(OnAvatarChange).AsTask().Wait();
 
         SetupGroups();
     }
@@ -109,19 +107,13 @@ private void SetupGroups()
             _dataLayer.ProgramGroups[id] = new ProgramGroup(id, group.Name, _oscClient, group);
     }
 
-    public Task RaiseOnGroupsChanged() => OnGroupsChanged.Raise();
-    
+    public void RaiseOnGroupsChanged() => _onGroupsChanged.Invoke();
 
-    private Task FoundVrcClient(OscQueryServer arg1, IPEndPoint arg2)
-    {
-        return SetupVrcClient((arg1, arg2));
-    }
-
     private async Task SetupVrcClient((OscQueryServer, IPEndPoint)? client)
     {
         // stop tasks
         _oscServerActive = false;
-        await Task.Delay(1000); // wait for tasks to stop
+        await Task.Delay(1000); // wait for tasks to stop TODO: REWORK THIS
 
         if (client != null)
         {
@@ -149,9 +141,10 @@ private async Task SetupVrcClient((OscQueryServer, IPEndPoint)? client)
         await _chatboxService.SendGenericMessage("Game Connected");
     }
 
-    private Task OnAvatarChange(Dictionary<string, object?> parameters, string avatarId)
+    private Task OnAvatarChange(OscQueryServer.ParameterUpdateArgs parameterUpdateArgs)
     {
-        AvatarId = avatarId;
+        AvatarId = parameterUpdateArgs.AvatarId;
+        var parameters = parameterUpdateArgs.Parameters;
         try
         {
             foreach (var obj in _dataLayer.ProgramGroups)
@@ -252,7 +245,7 @@ private async Task ReceiveLogic()
             case "/avatar/change":
                 var avatarId = received.Arguments.ElementAtOrDefault(0);
                 _logger.LogDebug("Avatar changed: {AvatarId}", avatarId);
-                OsTask.Run(_oscQueryServer.GetParameters);
+                OsTask.Run(_oscQueryServer.RefreshParameters);
                 OsTask.Run(_underscoreConfig.SendUpdateForAll);
                 return;
             case "/avatar/parameters/AFK":

ShockOsc/ShockOsc.csproj

@@ -35,7 +35,7 @@
         <PackageReference Include="LucHeart.CoreOSC" Version="1.4.0" />
         <PackageReference Include="MeaMod.DNS" Version="1.0.71" />
         <PackageReference Include="OpenShock.Desktop.ModuleBase" Version="1.0.0-preview.1" />
-        <PackageReference Include="OscQueryLibrary" Version="1.1.2" />
+        <PackageReference Include="OscQueryLibrary" Version="1.2.0" />
         <PackageReference Include="SmartFormat.NET" Version="3.6.0" />
         <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>

ShockOsc/Ui/Pages/Dash/Tabs/GroupsTab.razor

@@ -36,7 +36,7 @@
 
         await InvokeAsync(StateHasChanged);
         ModuleConfig.SaveDeferred();
-        await ShockOsc.RaiseOnGroupsChanged();
+        ShockOsc.RaiseOnGroupsChanged();
     }
 
     public async Task DeleteGroup()
@@ -47,13 +47,13 @@
         Group = null;
         await InvokeAsync(StateHasChanged);
         ModuleConfig.SaveDeferred();
-        await ShockOsc.RaiseOnGroupsChanged();
+        ShockOsc.RaiseOnGroupsChanged();
     }
 
-    private async Task OnSettingsValueChange()
+    private void OnSettingsValueChange()
     {
         ModuleConfig.SaveDeferred();
-        await ShockOsc.RaiseOnGroupsChanged();
+        ShockOsc.RaiseOnGroupsChanged();
     }
 
     private void OnGroupSettingsValueChange()

ShockOsc/Utils/OsTask.cs

@@ -7,16 +7,21 @@ namespace OpenShock.ShockOSC.Utils;
 public static class OsTask
 {
     private static readonly ILogger Logger = Log.ForContext(typeof(OsTask));
-    
+
     public static Task Run(Func<Task?> function, CancellationToken token = default, [CallerFilePath] string file = "",
-        [CallerMemberName] string member = "", [CallerLineNumber] int line = -1) => Task.Run(function, token).ContinueWith(
-        t =>
-        {
-            if (!t.IsFaulted) return;
-            var index = file.LastIndexOf('\\');
-            if (index == -1) index = file.LastIndexOf('/');
-            Logger.Error(t.Exception,
-                "Error during task execution. {File}::{Member}:{Line}",
-                file.Substring(index + 1, file.Length - index - 1), member, line);
-        }, TaskContinuationOptions.OnlyOnFaulted);
+        [CallerMemberName] string member = "", [CallerLineNumber] int line = -1)
+    {
+        var task = Task.Run(function, token);
+        task.ContinueWith(
+            t =>
+            {
+                if (!t.IsFaulted) return;
+                var index = file.LastIndexOf('\\');
+                if (index == -1) index = file.LastIndexOf('/');
+                Logger.Error(t.Exception,
+                    "Error during task execution. {File}::{Member}:{Line}",
+                    file.Substring(index + 1, file.Length - index - 1), member, line);
+            }, TaskContinuationOptions.OnlyOnFaulted);
+        return task;
+    }
 }