Add OSCQuery to Sender and Receiver

Sergey004 · Jan 8, 2025 · 28d6db0 · 28d6db0
1 parent 56fce2e
commit 28d6db0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/Quest2-VRC.Core/Services/Receiver.cs b/Quest2-VRC.Core/Services/Receiver.cs
@@ -8,8 +8,8 @@
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using VRC.OSCQuery;
 using Extensions = VRC.OSCQuery.Extensions;
+using VRC.OSCQuery;
 
 namespace Quest2_VRC
 
@@ -36,16 +36,14 @@ public static async void Run()
             RGBController.SendRGBRawData(0, 0, 0);      // Set to Black
             var tcpPort = Extensions.GetAvailableTcpPort();
             var udpPort = Extensions.GetAvailableUdpPort();
-
-
             var oscQuery = new OSCQueryServiceBuilder()
-                .WithTcpPort(tcpPort)
-                .WithUdpPort(udpPort)
-                .WithServiceName("Quest2-VRC OSCQuery Receiver")
-                .WithDefaults()
-                .Build();
+            .WithTcpPort(tcpPort)
+            .WithUdpPort(udpPort)
+            .WithServiceName("Quest2-VRC OSCQuery Receiver")
+            .WithDefaults()
+            .Build();
+
 
-            oscQuery.AddEndpoint<int>("/avatar", Attributes.AccessValues.WriteOnly);
 
             string json = File.ReadAllText("vars.json");
             JObject vars = JObject.Parse(json);

diff --git a/Quest2-VRC.Core/Services/Sender.cs b/Quest2-VRC.Core/Services/Sender.cs
@@ -8,6 +8,7 @@
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using VRC.OSCQuery;
 using static Quest2_VRC.ADB;
 using static Quest2_VRC.Logger;
 using static Quest2_VRC.PacketSender;
@@ -30,7 +31,7 @@ public class Global
 
         public static async void Run(bool wirlessmode, bool audioEnadled, bool disableerrmsg, string hostip)
         {
-
+            var tcpPort = Extensions.GetAvailableTcpPort();
             string json = File.ReadAllText("vars.json");
             JObject vars = JObject.Parse(json);
 
@@ -43,6 +44,14 @@ public static async void Run(bool wirlessmode, bool audioEnadled, bool disableer
             {
                 Uport = Extensions.GetAvailableUdpPort();
             }
+            var oscQuery = new OSCQueryServiceBuilder()
+             .WithTcpPort(tcpPort)
+             .WithUdpPort(Uport)
+             .WithServiceName("Quest2-VRC OSCQuery Sender")
+             .WithDefaults()
+             .Build();
+
+            oscQuery.AddEndpoint<int>("/avatar", Attributes.AccessValues.WriteOnly);
             Console.WriteLine("OSC UDP port is {0}", Uport);
             await questwd(Uport, wirlessmode, audioEnadled, disableerrmsg, hostip);
         }