add server URI IPC

marzent · Mar 29, 2023 · e87f054 · e87f054
1 parent bf04aa3
commit e87f054
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/IINACT/IpcProviders.cs b/IINACT/IpcProviders.cs
@@ -6,7 +6,7 @@ namespace IINACT;
 
 internal class IpcProviders : IDisposable
 {
-    internal static Version IpcVersion => new(1, 0, 0);
+    internal static Version IpcVersion => new(2, 0, 0);
     internal readonly ICallGateProvider<Version> GetVersion;
     internal readonly ICallGateProvider<Version> GetIpcVersion;
 
@@ -15,8 +15,7 @@ internal class IpcProviders : IDisposable
     internal readonly ICallGateProvider<int> GetServerPort;
     internal readonly ICallGateProvider<string> GetServerIp;
     internal readonly ICallGateProvider<bool> GetServerSslEnabled;
-
-    internal readonly ICallGateProvider<bool> GetInCombat;
+    internal readonly ICallGateProvider<Uri?> GetServerUri;
 
     internal IpcProviders(DalamudPluginInterface pluginInterface)
     {
@@ -27,8 +26,7 @@ internal IpcProviders(DalamudPluginInterface pluginInterface)
         GetServerPort = pluginInterface.GetIpcProvider<int>("IINACT.Server.Port");
         GetServerIp = pluginInterface.GetIpcProvider<string>("IINACT.Server.Ip");
         GetServerSslEnabled = pluginInterface.GetIpcProvider<bool>("IINACT.Server.SslEnabled");
-
-        GetInCombat = pluginInterface.GetIpcProvider<bool>("IINACT.InCombat");
+        GetServerUri = pluginInterface.GetIpcProvider<Uri?>("IINACT.Server.Uri");
 
         Register();
     }
@@ -42,8 +40,7 @@ private void Register()
         GetServerPort.RegisterFunc(() => Server?.Port ?? 0);
         GetServerIp.RegisterFunc(() => Server?.Address ?? "");
         GetServerSslEnabled.RegisterFunc(() => Server?.Secure ?? false);
-
-        GetInCombat.RegisterFunc(() => Advanced_Combat_Tracker.ActGlobals.oFormActMain.InCombat);
+        GetServerUri.RegisterFunc(() => Server?.Uri);
     }
 
     public void Dispose()
@@ -55,7 +52,6 @@ public void Dispose()
         GetServerPort.UnregisterFunc();
         GetServerIp.UnregisterFunc();
         GetServerSslEnabled.UnregisterFunc();
-
-        GetInCombat.UnregisterFunc();
+        GetServerUri.UnregisterFunc();
     }
 }
diff --git a/OverlayPlugin.Core/WebSocket/ServerController.cs b/OverlayPlugin.Core/WebSocket/ServerController.cs
@@ -27,6 +27,7 @@ public ServerController(TinyIoCContainer container)
     public string? Address => Server?.Address;
     public int? Port => Server?.Port;
     public bool Secure => false;
+    public Uri Uri => new Uri($"{(Secure ? "wss" : "ws")}//{Address}:{Port}");
 
     public void Stop()
     {