0.0.6.9 (#7)

CatboyEngineering · web-flow · commit fc44843ae09e · 2024-04-05T17:14:23.000-06:00
* Close the ShellWindow if connection is lost

* Reorganize models

* Actually v0.0.6.9

---------

Co-authored-by: Kenji &lt;&gt;
diff --git a/KinkShellClient/Configuration.cs b/KinkShellClient/Configuration.cs
@@ -1,7 +1,6 @@
 ﻿using CatboyEngineering.KinkShellClient.Models;
 using CatboyEngineering.KinkShellClient.Models.API.Response;
 using CatboyEngineering.KinkShellClient.Models.Toy;
-using CatboyEngineering.KinkShellClient.ShellData;
 using CatboyEngineering.KinkShellClient.Toy;
 using Dalamud.Configuration;
 using Dalamud.Plugin;
diff --git a/KinkShellClient/KinkShellClient.csproj b/KinkShellClient/KinkShellClient.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<Product>KinkShellClient</Product>
-		<Version>0.0.6.7</Version>
+		<Version>0.0.6.9</Version>
 		<Description>Pair and synchronize toys with other users.</Description>
 		<PackageProjectUrl>https://github.com/CatboyEngineering/KinkShellClient</PackageProjectUrl>
 		<Copyright>Copyright CatboyEngineering 2024</Copyright>
diff --git a/KinkShellClient/KinkShellClient.json b/KinkShellClient/KinkShellClient.json
@@ -6,8 +6,9 @@
   "Tags": [ "kink", "buttplug", "toys", "sync", "erp", "nsfw" ],
   "InternalName": "KinkShellClient",
   "RepoUrl": "https://github.com/CatboyEngineering/KinkShellClient",
+  "IconUrl": "https://github.com/CatboyEngineering/Plugins/raw/main/assets/img/KSLogoSmall.png",
   "ApplicableVersion": "any",
   "DalamudApiLevel": 9,
   "LoadPriority": 0,
-  "AssemblyVersion": "0.0.6.7"
+  "AssemblyVersion": "0.0.6.9"
 }
diff --git a/KinkShellClient/Models/API/Request/ShellAdjustUsersRequest.cs b/KinkShellClient/Models/API/Request/ShellAdjustUsersRequest.cs
@@ -1,9 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 
 namespace CatboyEngineering.KinkShellClient.Models.API.Request
 {
-    public struct ShellUpdateUsersRequest
+    public struct ShellAdjustUsersRequest
     {
         public List<ShellNewUser> Users { get; set; }
     }
diff --git a/KinkShellClient/Models/API/Response/APIResponse.cs b/KinkShellClient/Models/API/Response/APIResponse.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CatboyEngineering.KinkShellClient.Network
+namespace CatboyEngineering.KinkShellClient.Models.API.Response
 {
     public struct APIResponse<T> where T : struct
     {
diff --git a/KinkShellClient/Models/API/Response/ShellListResponse.cs b/KinkShellClient/Models/API/Response/ShellListResponse.cs
@@ -1,5 +1,4 @@
-﻿using CatboyEngineering.KinkShellClient.ShellData;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
 namespace CatboyEngineering.KinkShellClient.Models.API.Response
 {
diff --git a/KinkShellClient/Models/API/WebSocket/Request/ShellSocketCommandRequest.cs b/KinkShellClient/Models/API/WebSocket/Request/ShellSocketCommandRequest.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request
 {
     public struct ShellSocketCommandRequest
     {
diff --git a/KinkShellClient/Models/API/WebSocket/Request/ShellSocketConnectRequest.cs b/KinkShellClient/Models/API/WebSocket/Request/ShellSocketConnectRequest.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request
 {
     public struct ShellSocketConnectRequest
     {
diff --git a/KinkShellClient/Models/API/WebSocket/Request/ShellSocketTextMessageRequest.cs b/KinkShellClient/Models/API/WebSocket/Request/ShellSocketTextMessageRequest.cs
@@ -1,11 +1,9 @@
-﻿using CatboyEngineering.KinkShellClient.ShellData;
-using System;
-using System.Collections.Generic;
+﻿using System;
 using System.Numerics;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request
 {
-    public struct ShellSocketTextMessage
+    public struct ShellSocketTextMessageRequest
     {
         public Guid ShellID { get; set; }
         public DateTime DateTime { get; set; }
diff --git a/KinkShellClient/Models/API/WebSocket/Response/ShellSocketCommandResponse.cs b/KinkShellClient/Models/API/WebSocket/Response/ShellSocketCommandResponse.cs
@@ -1,7 +1,7 @@
 ﻿using CatboyEngineering.KinkShellClient.Models.Toy;
 using System;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Response
 {
     public struct ShellSocketCommandResponse
     {
diff --git a/KinkShellClient/Models/API/WebSocket/Response/ShellSocketConnectedUsersResponse.cs b/KinkShellClient/Models/API/WebSocket/Response/ShellSocketConnectedUsersResponse.cs
@@ -1,10 +1,9 @@
-﻿using CatboyEngineering.KinkShellClient.ShellData;
-using System;
+﻿using System;
 using System.Collections.Generic;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Response
 {
-    public struct ShellSocketConnectResponse
+    public struct ShellSocketConnectedUsersResponse
     {
         public Guid ShellID { get; set; }
         public List<KinkShellMember> ConnectedUsers { get; set; }
diff --git a/KinkShellClient/Models/API/WebSocket/Response/ShellSocketTextMessageResponse.cs b/KinkShellClient/Models/API/WebSocket/Response/ShellSocketTextMessageResponse.cs
@@ -1,11 +1,10 @@
-﻿using CatboyEngineering.KinkShellClient.ShellData;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Numerics;
 
-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket
+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Response
 {
-    public struct ShellSocketTextResponse
+    public struct ShellSocketTextMessageResponse
     {
         public Guid ShellID { get; set; }
         public KinkShellMember UserFrom { get; set; }
diff --git a/KinkShellClient/Models/KinkShell.cs b/KinkShellClient/Models/KinkShell.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 
-namespace CatboyEngineering.KinkShellClient.ShellData
+namespace CatboyEngineering.KinkShellClient.Models
 {
     public struct KinkShell
     {
diff --git a/KinkShellClient/Models/KinkShellMember.cs b/KinkShellClient/Models/KinkShellMember.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CatboyEngineering.KinkShellClient.ShellData
+namespace CatboyEngineering.KinkShellClient.Models
 {
     public struct KinkShellMember
     {
diff --git a/KinkShellClient/Models/Shell/ShellNewUser.cs b/KinkShellClient/Models/Shell/ShellNewUser.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CatboyEngineering.KinkShellClient.Models
+namespace CatboyEngineering.KinkShellClient.Models.Shell
 {
     public struct ShellNewUser
     {
diff --git a/KinkShellClient/Models/Shell/ShellSession.cs b/KinkShellClient/Models/Shell/ShellSession.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Net.WebSockets;
 
-namespace CatboyEngineering.KinkShellClient.ShellData
+namespace CatboyEngineering.KinkShellClient.Models.Shell
 {
     public class ShellSession
     {
@@ -27,7 +27,7 @@ public ShellSession(KinkShell kinkShell)
         public void ReceivedNewMessage(ChatMessage message)
         {
             ScrollMessages = true;
-            this.Messages.Add(message);
+            Messages.Add(message);
         }
     }
 }
diff --git a/KinkShellClient/Network/ConnectionHandler.cs b/KinkShellClient/Network/ConnectionHandler.cs
@@ -2,9 +2,12 @@
 using CatboyEngineering.KinkShellClient.Models.API.Request;
 using CatboyEngineering.KinkShellClient.Models.API.Response;
 using CatboyEngineering.KinkShellClient.Models.API.WebSocket;
+using CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request;
+using CatboyEngineering.KinkShellClient.Models.API.WebSocket.Response;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 using CatboyEngineering.KinkShellClient.Models.Toy;
-using CatboyEngineering.KinkShellClient.ShellData;
 using CatboyEngineering.KinkShellClient.Utilities;
+using CatboyEngineering.KinkShellClient.Windows;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
@@ -81,7 +84,7 @@ public async Task<HttpStatusCode> CreateShell(string name)
 
         public async Task<HttpStatusCode> UpdateShell(Guid shellID, List<ShellNewUser> users)
         {
-            var request = new ShellUpdateUsersRequest
+            var request = new ShellAdjustUsersRequest
             {
                 Users = users
             };
@@ -139,11 +142,18 @@ public ShellSession CreateShellSession(KinkShell kinkShell)
             }
         }
 
-        public async Task OpenConnection(ShellSession shellSession)
+        public async Task OpenConnection(ShellWindow window)
         {
-            var socket = await Plugin.HTTP.ConnectWebSocket("ws", shellSession);
+            try
+            {
+                var socket = await Plugin.HTTP.ConnectWebSocket("ws", window.State.Session);
 
-            await ListenWebSocket(socket, shellSession);
+                await ListenWebSocket(socket, window);
+            }
+            catch
+            {
+                window.OnClose();
+            }
         }
 
         public async Task CloseConnection(KinkShell kinkShell)
@@ -152,13 +162,20 @@ public async Task CloseConnection(KinkShell kinkShell)
 
             if (session != null && session.WebSocket != null)
             {
-                await session.WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Client disconnected safely.", CancellationToken.None);
-                Connections.Remove(session);
+                try
+                {
+                    await session.WebSocket.CloseAsync(WebSocketCloseStatus.NormalClosure, "Client disconnected safely.", CancellationToken.None);
+                }
+                catch { }
             }
+
+            Connections.Remove(session);
         }
 
-        private async Task ListenWebSocket(ClientWebSocket ws, ShellSession session)
+        private async Task ListenWebSocket(ClientWebSocket ws, ShellWindow window)
         {
+            var session = window.State.Session;
+
             if (session.Status == ShellConnectionStatus.CONNECTING)
             {
                 await SendShellConnectRequest(session);
@@ -171,8 +188,9 @@ private async Task ListenWebSocket(ClientWebSocket ws, ShellSession session)
             {
                 var result = await ws.ReceiveAsync(new ArraySegment<byte>(buffer), CancellationToken.None);
 
-                if (result.MessageType == WebSocketMessageType.Close || session.Status == Models.ShellConnectionStatus.CLOSED)
+                if (result.MessageType == WebSocketMessageType.Close || session.Status == ShellConnectionStatus.CLOSED)
                 {
+                    window.OnClose();
                     break;
                 }
 
@@ -202,7 +220,7 @@ public async Task SendShellChatMessage(ShellSession shellSession, string message
             var connectMessage = new ShellSocketMessage
             {
                 MessageType = ShellSocketMessageType.TEXT,
-                MessageData = JObject.FromObject(new ShellSocketTextMessage
+                MessageData = JObject.FromObject(new ShellSocketTextMessageRequest
                 {
                     ShellID = shellSession.KinkShell.ShellID,
                     DateTime = DateTime.UtcNow,
@@ -263,7 +281,7 @@ private async Task HandleWebSocketResponse(string message, ShellSession session)
 
         private void HandleUserConnectedMessage(ShellSocketMessage message, ShellSession session)
         {
-            var request = APIRequestMapper.MapRequestToModel<ShellSocketConnectResponse>(message.MessageData);
+            var request = APIRequestMapper.MapRequestToModel<ShellSocketConnectedUsersResponse>(message.MessageData);
 
             if (request != null)
             {
@@ -274,7 +292,7 @@ private void HandleUserConnectedMessage(ShellSocketMessage message, ShellSession
 
         private void HandleUserTextMessage(ShellSocketMessage message, ShellSession session)
         {
-            var request = APIRequestMapper.MapRequestToModel<ShellSocketTextResponse>(message.MessageData);
+            var request = APIRequestMapper.MapRequestToModel<ShellSocketTextMessageResponse>(message.MessageData);
 
             if (request != null)
             {
diff --git a/KinkShellClient/Network/HTTPHandler.cs b/KinkShellClient/Network/HTTPHandler.cs
@@ -1,5 +1,6 @@
-﻿using CatboyEngineering.KinkShellClient.Models.API.WebSocket;
-using CatboyEngineering.KinkShellClient.ShellData;
+﻿using CatboyEngineering.KinkShellClient.Models.API.Response;
+using CatboyEngineering.KinkShellClient.Models.API.WebSocket;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 using CatboyEngineering.KinkShellClient.Utilities;
 using Lumina.Excel.GeneratedSheets2;
 using Newtonsoft.Json;
diff --git a/KinkShellClient/Toy/ToyController.cs b/KinkShellClient/Toy/ToyController.cs
@@ -21,8 +21,11 @@ public ToyController(Plugin plugin)
 
         public async Task Connect()
         {
-            Connector = new ButtplugWebsocketConnector(new Uri($"{Plugin.Configuration.IntifaceServerAddress}"));
-            Client = new ButtplugClient("KinkShell Client");
+            await Task.Run(() =>
+            {
+                Connector = new ButtplugWebsocketConnector(new Uri($"{Plugin.Configuration.IntifaceServerAddress}"));
+                Client = new ButtplugClient("KinkShell Client");
+            });
 
             try
             {
diff --git a/KinkShellClient/UIHandler.cs b/KinkShellClient/UIHandler.cs
@@ -1,12 +1,12 @@
 ﻿using Dalamud.Interface.Windowing;
 using Dalamud.Plugin;
-using CatboyEngineering.KinkShellClient.ShellData;
 using CatboyEngineering.KinkShellClient.Windows;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 
 namespace CatboyEngineering.KinkShellClient
 {
diff --git a/KinkShellClient/Windows/MainWindow.cs b/KinkShellClient/Windows/MainWindow.cs
@@ -1,12 +1,13 @@
 ﻿using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
 using ImGuiNET;
-using CatboyEngineering.KinkShellClient.ShellData;
 using CatboyEngineering.KinkShellClient.Windows.Utilities;
 using System;
 using System.Numerics;
 using System.Text;
 using CatboyEngineering.KinkShellClient.Models;
+using CatboyEngineering.KinkShellClient.Windows.States;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 
 namespace CatboyEngineering.KinkShellClient.Windows
 {
@@ -253,15 +254,9 @@ private void BuildUIPopupCreateShell()
                 DrawUICenteredText("New Kinkshell");
                 ImGui.Spacing();
                 ImGui.Text("New KinkShell Name:");
+                ImGui.SetKeyboardFocusHere(0);
 
-                if(ImGui.InputText("##NewKinkShellName", ref State.stringBuffer, 64, ImGuiInputTextFlags.EnterReturnsTrue))
-                {
-                    IssueCreateShell();
-                }
-
-                ImGui.SameLine();
-
-                if (ImGui.Button("Create Shell"))
+                if (ImGui.InputText("##NewKinkShellName", ref State.stringBuffer, 64, ImGuiInputTextFlags.EnterReturnsTrue))
                 {
                     IssueCreateShell();
                 }
diff --git a/KinkShellClient/Windows/PatternBuilderWindow.cs b/KinkShellClient/Windows/PatternBuilderWindow.cs
@@ -1,4 +1,6 @@
 ﻿using CatboyEngineering.KinkShellClient.Models.Toy;
+using CatboyEngineering.KinkShellClient.Windows.States;
+using CatboyEngineering.KinkShellClient.Windows.States.Models;
 using CatboyEngineering.KinkShellClient.Windows.Utilities;
 using Dalamud.Interface.Windowing;
 using Dalamud.Utility;
diff --git a/KinkShellClient/Windows/ShellWindow.cs b/KinkShellClient/Windows/ShellWindow.cs
@@ -1,4 +1,5 @@
-﻿using CatboyEngineering.KinkShellClient.ShellData;
+﻿using CatboyEngineering.KinkShellClient.Models;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 using CatboyEngineering.KinkShellClient.Toy;
 using CatboyEngineering.KinkShellClient.Windows.Utilities;
 using Dalamud.Interface.Windowing;
@@ -16,7 +17,7 @@ public class ShellWindow : Window, IDisposable
         public ShellWindow(Plugin plugin, KinkShell kinkShell, ShellSession session) : base(kinkShell.ShellName, ImGuiWindowFlags.NoResize)
         {
             Plugin = plugin;
-            State = new ShellWindowState(plugin, kinkShell);
+            State = new ShellWindowState(plugin, kinkShell, this);
 
             State.Session = session;
         }
@@ -26,7 +27,7 @@ public override void OnClose()
             base.OnClose();
 
             _ = ShellWindowUtilities.DisconnectFromShellWebSocket(Plugin, State.KinkShell);
-            State = new ShellWindowState(Plugin, State.KinkShell);
+            State = new ShellWindowState(Plugin, State.KinkShell, this);
 
             Plugin.UIHandler.RemoveShellWindow(this);
         }
diff --git a/KinkShellClient/Windows/States/MainWindowState.cs b/KinkShellClient/Windows/States/MainWindowState.cs
@@ -1,12 +1,12 @@
 ﻿using CatboyEngineering.KinkShellClient.Models;
-using CatboyEngineering.KinkShellClient.ShellData;
+using CatboyEngineering.KinkShellClient.Models.Shell;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace CatboyEngineering.KinkShellClient.Windows.Utilities
+namespace CatboyEngineering.KinkShellClient.Windows.States
 {
     public class MainWindowState
     {
diff --git a/KinkShellClient/Windows/States/Models/PatternStateItem.cs b/KinkShellClient/Windows/States/Models/PatternStateItem.cs
diff --git a/KinkShellClient/Windows/States/PatternBuilderWindowState.cs b/KinkShellClient/Windows/States/PatternBuilderWindowState.cs
diff --git a/KinkShellClient/Windows/States/ShellWindowState.cs b/KinkShellClient/Windows/States/ShellWindowState.cs
diff --git a/KinkShellClient/Windows/Utilities/MainWindowUtilities.cs b/KinkShellClient/Windows/Utilities/MainWindowUtilities.cs
diff --git a/KinkShellClient/Windows/Utilities/ShellWindowUtilities.cs b/KinkShellClient/Windows/Utilities/ShellWindowUtilities.cs

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using CatboyEngineering.KinkShellClient.Models.Shell;`
`3`	`4`
`4`	`5`	`namespace CatboyEngineering.KinkShellClient.Models.API.Request`
`5`	`6`	`{`
`6`		`- public struct ShellUpdateUsersRequest`
	`7`	`+ public struct ShellAdjustUsersRequest`
`7`	`8`	`{`
`8`	`9`	`public List<ShellNewUser> Users { get; set; }`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Text;`
`7`	`7`	`using System.Threading.Tasks;`
`8`	`8`
`9`		`-namespace CatboyEngineering.KinkShellClient.Network`
	`9`	`+namespace CatboyEngineering.KinkShellClient.Models.API.Response`
`10`	`10`	`{`
`11`	`11`	`public struct APIResponse<T> where T : struct`
`12`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using CatboyEngineering.KinkShellClient.ShellData;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`
`4`	`3`	`namespace CatboyEngineering.KinkShellClient.Models.API.Response`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`
`5`		`-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket`
	`5`	`+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request`
`6`	`6`	`{`
`7`	`7`	`public struct ShellSocketCommandRequest`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`
`7`		`-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket`
	`7`	`+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request`
`8`	`8`	`{`
`9`	`9`	`public struct ShellSocketConnectRequest`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`		`-using CatboyEngineering.KinkShellClient.ShellData;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
	`1`	`+using System;`
`4`	`2`	`using System.Numerics;`
`5`	`3`
`6`		`-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket`
	`4`	`+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Request`
`7`	`5`	`{`
`8`		`- public struct ShellSocketTextMessage`
	`6`	`+ public struct ShellSocketTextMessageRequest`
`9`	`7`	`{`
`10`	`8`	`public Guid ShellID { get; set; }`
`11`	`9`	`public DateTime DateTime { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using CatboyEngineering.KinkShellClient.Models.Toy;`
`2`	`2`	`using System;`
`3`	`3`
`4`		`-namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket`
	`4`	`+namespace CatboyEngineering.KinkShellClient.Models.API.WebSocket.Response`
`5`	`5`	`{`
`6`	`6`	`public struct ShellSocketCommandResponse`
`7`	`7`	`{`