From 4328b96c0c84eaa8524e0cf3ba4b3cab5d3ab0af Mon Sep 17 00:00:00 2001
From: XeroxDev <admin@xeroxdev.de>
Date: Mon, 26 Feb 2024 19:44:42 +0100
Subject: [PATCH] fix: socket server for net6.0+

---
 YTMDesktopCompanion.Example/Program.cs        | 21 ++---
 YTMDesktopCompanion.net472/App.config         | 14 +++-
 YTMDesktopCompanion.net472/Program.cs         | 10 +--
 .../YTMDesktopCompanion.net472.csproj         | 28 -------
 YTMDesktopCompanion.net472/packages.config    | 12 ---
 YTMDesktopCompanion.net6/Program.cs           | 19 ++---
 YTMDesktopCompanion/Clients/RestClient.cs     | 10 +--
 YTMDesktopCompanion/Clients/SocketClient.cs   | 56 +++++++++-----
 YTMDesktopCompanion/CompanionConnector.cs     |  4 +
 YTMDesktopCompanion/Enums/ECommand.cs         | 63 +++++++++++++++
 YTMDesktopCompanion/Enums/ESocketState.cs     |  3 +
 .../Exceptions/ApiException.cs                | 22 ++++++
 .../Interfaces/IGenericClient.cs              |  6 ++
 .../Models/Input/Auth/RequestCodeInput.cs     | 10 +--
 .../Models/Input/Auth/RequestInput.cs         |  8 +-
 .../Models/Input/CommandInput.cs              | 15 ++--
 .../Models/Output/Auth/RequestCodeOutput.cs   |  6 +-
 .../Models/Output/Auth/RequestOutput.cs       |  5 +-
 .../Models/Output/ErrorOutput.cs              | 16 ++--
 .../Models/Output/MetadataOutput.cs           |  4 +-
 .../Models/Output/PlaylistOutput.cs           |  8 +-
 .../Models/Output/StateOutput.cs              | 77 +++++++++----------
 .../Properties/AssemblyInfo.cs                | 21 +++++
 .../Settings/ConnectorSettings.cs             |  3 +
 .../YTMDesktopCompanion.csproj                | 15 ++--
 25 files changed, 278 insertions(+), 178 deletions(-)
 delete mode 100644 YTMDesktopCompanion.net472/packages.config
 create mode 100644 YTMDesktopCompanion/Properties/AssemblyInfo.cs

diff --git a/YTMDesktopCompanion.Example/Program.cs b/YTMDesktopCompanion.Example/Program.cs
index ac84729..c8d8eed 100644
--- a/YTMDesktopCompanion.Example/Program.cs
+++ b/YTMDesktopCompanion.Example/Program.cs
@@ -20,21 +20,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#region
+#region Setup
 
-using System.Reflection;
-using System.Text.Json;
+// Set YOUR version (or fetch them from anywhere)
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion;
 using XeroxDev.YTMDesktop.Companion.Settings;
 
-#endregion
-
-#region Setup
-
-// Set YOUR version (or fetch them from anywhere)
 var version = "1.0.0";
 
-// Check if file ".token" exists (i store it for this in the temp folder)
+// Check if file ".token" exists
 var tokenPath = Path.Combine(Path.GetTempPath(), "ytmd-csharp-lib-test.token");
 if (!File.Exists(tokenPath))
 {
@@ -75,7 +70,7 @@
     return;
 }
 
-Console.WriteLine(JsonSerializer.Serialize(metadata));
+Console.WriteLine(JsonConvert.SerializeObject(metadata, Formatting.Indented));
 
 // Example Rest Client usage
 
@@ -111,7 +106,7 @@
 
 // Get the current state and print it
 var state = await restClient.GetState();
-Console.WriteLine(JsonSerializer.Serialize(state));
+Console.WriteLine(JsonConvert.SerializeObject(state, Formatting.Indented));
 
 // Pause current track
 await restClient.Pause();
@@ -131,8 +126,8 @@
 // Register events
 socketClient.OnError += (sender, args) => Console.WriteLine($"Error: {args.Message}");
 socketClient.OnConnectionChange += (sender, args) => Console.WriteLine($"Connection changed: {args}");
-socketClient.OnStateChange += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
-socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
+socketClient.OnStateChange += (sender, args) => Console.WriteLine(JsonConvert.SerializeObject(args, Formatting.Indented));
+socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(JsonConvert.SerializeObject(args, Formatting.Indented));
 socketClient.OnPlaylistDeleted += (sender, args) => Console.WriteLine($"Playlist deleted: {args}");
 
 // Connect to the server
diff --git a/YTMDesktopCompanion.net472/App.config b/YTMDesktopCompanion.net472/App.config
index bf1dc02..09b837a 100644
--- a/YTMDesktopCompanion.net472/App.config
+++ b/YTMDesktopCompanion.net472/App.config
@@ -147,7 +147,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.HttpListener" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -211,7 +211,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.ObjectModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -319,7 +319,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -373,6 +373,14 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/YTMDesktopCompanion.net472/Program.cs b/YTMDesktopCompanion.net472/Program.cs
index ea61f45..439612a 100644
--- a/YTMDesktopCompanion.net472/Program.cs
+++ b/YTMDesktopCompanion.net472/Program.cs
@@ -24,8 +24,6 @@
 
 using System;
 using System.IO;
-using System.Reflection;
-using System.Text.Json;
 using System.Threading.Tasks;
 using XeroxDev.YTMDesktop.Companion;
 using XeroxDev.YTMDesktop.Companion.Settings;
@@ -90,7 +88,7 @@ private static async Task Test()
                 return;
             }
 
-            Console.WriteLine(JsonSerializer.Serialize(metadata));
+            Console.WriteLine(metadata.ToString());
 
             // Example Rest Client usage
 
@@ -126,7 +124,7 @@ private static async Task Test()
 
             // Get the current state and print it
             var state = await restClient.GetState();
-            Console.WriteLine(JsonSerializer.Serialize(state));
+            Console.WriteLine(state.ToString());
 
             // Pause current track
             await restClient.Pause();
@@ -146,8 +144,8 @@ private static async Task Test()
             // Register events
             socketClient.OnError += (sender, args) => Console.WriteLine($"Error: {args.Message}");
             socketClient.OnConnectionChange += (sender, args) => Console.WriteLine($"Connection changed: {args}");
-            socketClient.OnStateChange += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
-            socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
+            socketClient.OnStateChange += (sender, args) => Console.WriteLine(args.ToString());
+            socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(args.ToString());
             socketClient.OnPlaylistDeleted += (sender, args) => Console.WriteLine($"Playlist deleted: {args}");
 
             // Connect to the server
diff --git a/YTMDesktopCompanion.net472/YTMDesktopCompanion.net472.csproj b/YTMDesktopCompanion.net472/YTMDesktopCompanion.net472.csproj
index fe74927..fb23f70 100644
--- a/YTMDesktopCompanion.net472/YTMDesktopCompanion.net472.csproj
+++ b/YTMDesktopCompanion.net472/YTMDesktopCompanion.net472.csproj
@@ -34,38 +34,11 @@
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
     <ItemGroup>
-        <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-        </Reference>
         <Reference Include="mscorlib" />
         <Reference Include="System"/>
-        <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-        </Reference>
         <Reference Include="System.Core"/>
         <Reference Include="System.Data"/>
-        <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-        </Reference>
         <Reference Include="System.Numerics" />
-        <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Text.Json, Version=8.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Text.Json.8.0.2\lib\net462\System.Text.Json.dll</HintPath>
-        </Reference>
-        <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-        </Reference>
-        <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-          <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
-        </Reference>
         <Reference Include="System.Xml"/>
     </ItemGroup>
     <ItemGroup>
@@ -80,7 +53,6 @@
     </ItemGroup>
     <ItemGroup>
       <None Include="App.config" />
-      <None Include="packages.config" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets"/>
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/YTMDesktopCompanion.net472/packages.config b/YTMDesktopCompanion.net472/packages.config
deleted file mode 100644
index 7f920d9..0000000
--- a/YTMDesktopCompanion.net472/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="8.0.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-</packages>
\ No newline at end of file
diff --git a/YTMDesktopCompanion.net6/Program.cs b/YTMDesktopCompanion.net6/Program.cs
index 38e7208..e71ddd9 100644
--- a/YTMDesktopCompanion.net6/Program.cs
+++ b/YTMDesktopCompanion.net6/Program.cs
@@ -20,18 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#region
+#region Setup
 
-using System.Reflection;
-using System.Text.Json;
+// Set YOUR version (or fetch them from anywhere)
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion;
 using XeroxDev.YTMDesktop.Companion.Settings;
 
-#endregion
-
-#region Setup
-
-// Set YOUR version (or fetch them from anywhere)
 var version = "1.0.0";
 
 // Check if file ".token" exists
@@ -75,7 +70,7 @@
     return;
 }
 
-Console.WriteLine(JsonSerializer.Serialize(metadata));
+Console.WriteLine(JsonConvert.SerializeObject(metadata, Formatting.Indented));
 
 // Example Rest Client usage
 
@@ -111,7 +106,7 @@
 
 // Get the current state and print it
 var state = await restClient.GetState();
-Console.WriteLine(JsonSerializer.Serialize(state));
+Console.WriteLine(JsonConvert.SerializeObject(state, Formatting.Indented));
 
 // Pause current track
 await restClient.Pause();
@@ -131,8 +126,8 @@
 // Register events
 socketClient.OnError += (sender, args) => Console.WriteLine($"Error: {args.Message}");
 socketClient.OnConnectionChange += (sender, args) => Console.WriteLine($"Connection changed: {args}");
-socketClient.OnStateChange += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
-socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(JsonSerializer.Serialize(args));
+socketClient.OnStateChange += (sender, args) => Console.WriteLine(JsonConvert.SerializeObject(args, Formatting.Indented));
+socketClient.OnPlaylistCreated += (sender, args) => Console.WriteLine(JsonConvert.SerializeObject(args, Formatting.Indented));
 socketClient.OnPlaylistDeleted += (sender, args) => Console.WriteLine($"Playlist deleted: {args}");
 
 // Connect to the server
diff --git a/YTMDesktopCompanion/Clients/RestClient.cs b/YTMDesktopCompanion/Clients/RestClient.cs
index e261e06..4da5fdd 100644
--- a/YTMDesktopCompanion/Clients/RestClient.cs
+++ b/YTMDesktopCompanion/Clients/RestClient.cs
@@ -24,8 +24,8 @@
 
 using System;
 using System.Net.Http;
-using System.Text.Json;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 using XeroxDev.YTMDesktop.Companion.Enums;
 using XeroxDev.YTMDesktop.Companion.Exceptions;
@@ -158,7 +158,7 @@ private async Task<TResponse> SendGetRequest<TResponse>(string path, string toke
                 if (token != null) request.Headers.Add("Authorization", token);
                 try
                 {
-                    request.Content = new StringContent(JsonSerializer.Serialize(body), System.Text.Encoding.UTF8, "application/json");
+                    request.Content = new StringContent(JsonConvert.SerializeObject(body), System.Text.Encoding.UTF8, "application/json");
                 }
                 catch (Exception e)
                 {
@@ -190,7 +190,7 @@ private async Task<TResponse> SendRequest<TResponse>(HttpRequestMessage request)
 
             if (!response.IsSuccessStatusCode)
             {
-                var error = JsonSerializer.Deserialize<ErrorOutput>(content);
+                var error = JsonConvert.DeserializeObject<ErrorOutput>(content);
                 if (error == null)
                 {
                     throw new ApiException(new ErrorOutput
@@ -212,7 +212,7 @@ private async Task<TResponse> SendRequest<TResponse>(HttpRequestMessage request)
             // Try parsing the response to ErrorOutput, if it's successful, throw an ApiException
             try
             {
-                var errorOutput = JsonSerializer.Deserialize<ErrorOutput>(content);
+                var errorOutput = JsonConvert.DeserializeObject<ErrorOutput>(content);
                 if (errorOutput?.Error != null && errorOutput.Message != null && errorOutput.StatusCode != null && errorOutput.Code != null) throw new ApiException(errorOutput);
             }
             catch (Exception e)
@@ -220,7 +220,7 @@ private async Task<TResponse> SendRequest<TResponse>(HttpRequestMessage request)
                 if (e is ApiException) throw;
             }
 
-            return JsonSerializer.Deserialize<TResponse>(content);
+            return JsonConvert.DeserializeObject<TResponse>(content);
         }
 
         #region Commands
diff --git a/YTMDesktopCompanion/Clients/SocketClient.cs b/YTMDesktopCompanion/Clients/SocketClient.cs
index 220ab4d..a7eb722 100644
--- a/YTMDesktopCompanion/Clients/SocketClient.cs
+++ b/YTMDesktopCompanion/Clients/SocketClient.cs
@@ -23,8 +23,13 @@
 #region
 
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
-using H.Socket.IO;
+using Newtonsoft.Json;
+using SocketIOClient;
+using SocketIOClient.Newtonsoft.Json;
+using SocketIOClient.Transport;
+using XeroxDev.YTMDesktop.Companion.Constants;
 using XeroxDev.YTMDesktop.Companion.Enums;
 using XeroxDev.YTMDesktop.Companion.Interfaces;
 using XeroxDev.YTMDesktop.Companion.Models.Output;
@@ -34,6 +39,9 @@
 
 namespace XeroxDev.YTMDesktop.Companion.Clients
 {
+    /// <summary>
+    ///    The socket client for the YTMDesktop Companion
+    /// </summary>
     public class SocketClient : IGenericClient
     {
         private ConnectorSettings _settings;
@@ -41,8 +49,12 @@ public class SocketClient : IGenericClient
         /// <summary>
         ///     The socket client
         /// </summary>
-        private SocketIoClient _client;
+        private SocketIO _client;
 
+        /// <summary>
+        ///    The socket client for the YTMDesktop Companion
+        /// </summary>
+        /// <param name="settings">The settings for the socket client.</param>
         public SocketClient(ConnectorSettings settings)
         {
             _settings = settings;
@@ -91,7 +103,7 @@ public void SetAuthToken(string token)
         ///     Useful for custom things that are not implemented in the library yet.
         /// </summary>
         /// <returns>The socket object</returns>
-        public SocketIoClient GetClient()
+        public SocketIO GetClient()
         {
             return _client;
         }
@@ -113,21 +125,29 @@ public async Task Connect()
 
                 OnConnectionChange(this, ESocketState.Connecting);
 
-                _client = new SocketIoClient();
-
-                // _socket = new SocketIOClient.SocketIO($"http://{Settings.Host}:{Settings.Port}{Endpoints.Realtime}", new SocketIOOptions
-                // {
-                // Transport = TransportProtocol.WebSocket,
-                // Auth = Settings.Token
-                // });
-
-                _client.Connected += (sender, _) => OnConnectionChange(sender ?? this, ESocketState.Connected);
-                _client.Disconnected += (sender, _) => OnConnectionChange(sender ?? this, ESocketState.Disconnected);
-                _client.ExceptionOccurred += (sender, args) => OnError(sender ?? this, args.Exception);
-                _client.ErrorReceived += (sender, args) => OnError(sender ?? this, new Exception(args.ToString()));
-                _client.On<StateOutput>("state-update", data => OnStateChange(this, data));
-                _client.On<PlaylistOutput>("playlist-created", data => OnPlaylistCreated(this, data));
-                _client.On<string>("playlist-delete", data => OnPlaylistDeleted(this, data));
+                _client = new SocketIO($"http://{Settings.Host}:{Settings.Port}{Endpoints.Realtime}", new SocketIOOptions
+                {
+                    Transport = TransportProtocol.WebSocket,
+                    Auth = new Dictionary<string, string> { { "token", Settings.Token } }
+                });
+                _client.JsonSerializer = new NewtonsoftJsonSerializer(new JsonSerializerSettings
+                {
+                    NullValueHandling = NullValueHandling.Ignore,
+                    DefaultValueHandling = DefaultValueHandling.Ignore
+                });
+
+                _client.OnConnected += (sender, _) => OnConnectionChange(sender ?? this, ESocketState.Connected);
+                _client.OnDisconnected += (sender, _) => OnConnectionChange(sender ?? this, ESocketState.Disconnected);
+                _client.OnError += (sender, args) => OnError(sender ?? this, new Exception(args));
+                _client.OnReconnectError += (sender, args) => OnError(sender ?? this, args);
+                _client.OnReconnectFailed += (sender, args) => OnConnectionChange(sender ?? this, ESocketState.Disconnected);
+                _client.OnReconnected += (sender, _) => OnConnectionChange(sender ?? this, ESocketState.Connected);
+                _client.OnReconnectAttempt += (sender, args) => OnConnectionChange(sender ?? this, ESocketState.Connecting);
+                _client.On("state-update", data => OnStateChange(this, data.GetValue<StateOutput>()));
+                _client.On("playlist-created", data => OnPlaylistCreated(this, data.GetValue<PlaylistOutput>()));
+                _client.On("playlist-delete", data => OnPlaylistDeleted(this, data.GetValue<string>()));
+
+                await _client.ConnectAsync();
             }
             catch (Exception ex)
             {
diff --git a/YTMDesktopCompanion/CompanionConnector.cs b/YTMDesktopCompanion/CompanionConnector.cs
index 4462a59..fa5cfac 100644
--- a/YTMDesktopCompanion/CompanionConnector.cs
+++ b/YTMDesktopCompanion/CompanionConnector.cs
@@ -36,6 +36,10 @@ namespace XeroxDev.YTMDesktop.Companion
     /// </summary>
     public class CompanionConnector
     {
+        /// <summary>
+        ///    The companion connector. This class is the main class of the library. It contains the rest and socket client.<br />
+        /// </summary>
+        /// <param name="settings">The settings for the rest and socket clients.</param>
         public CompanionConnector(ConnectorSettings settings)
         {
             RestClient = new RestClient(settings);
diff --git a/YTMDesktopCompanion/Enums/ECommand.cs b/YTMDesktopCompanion/Enums/ECommand.cs
index 56f208c..6fdbbd5 100644
--- a/YTMDesktopCompanion/Enums/ECommand.cs
+++ b/YTMDesktopCompanion/Enums/ECommand.cs
@@ -27,21 +27,84 @@ namespace XeroxDev.YTMDesktop.Companion.Enums
     /// </summary>
     public enum ECommand
     {
+        /// <summary>
+        ///    Play or pause the current song.
+        /// </summary>
         PlayPause,
+
+        /// <summary>
+        ///   Play the current song.
+        /// </summary>
         Play,
+
+        /// <summary>
+        ///  Pause the current song.
+        /// </summary>
         Pause,
+
+        /// <summary>
+        /// Stop the current song.
+        /// </summary>
         VolumeUp,
+
+        /// <summary>
+        /// Decrease the volume.
+        /// </summary>
         VolumeDown,
+
+        /// <summary>
+        /// Set the volume to a specific value.
+        /// </summary>
         SetVolume,
+
+        /// <summary>
+        /// Mute the volume.
+        /// </summary>
         Mute,
+
+        /// <summary>
+        /// Unmute the volume.
+        /// </summary>
         Unmute,
+
+        /// <summary>
+        /// Seek to a specific time in the song.
+        /// </summary>
         SeekTo,
+
+        /// <summary>
+        /// Skip to the next song.
+        /// </summary>
         Next,
+
+        /// <summary>
+        /// Skip to the previous song.
+        /// </summary>
         Previous,
+
+        /// <summary>
+        /// Repeat the current song.
+        /// </summary>
         RepeatMode,
+
+        /// <summary>
+        /// Shuffle the queue.
+        /// </summary>
         Shuffle,
+
+        /// <summary>
+        /// Add a song to the queue.
+        /// </summary>
         PlayQueueIndex,
+
+        /// <summary>
+        /// Remove a song from the queue.
+        /// </summary>
         ToggleLike,
+
+        /// <summary>
+        /// Remove a song from the queue.
+        /// </summary>
         ToggleDislike
     }
 
diff --git a/YTMDesktopCompanion/Enums/ESocketState.cs b/YTMDesktopCompanion/Enums/ESocketState.cs
index f139d29..56332bd 100644
--- a/YTMDesktopCompanion/Enums/ESocketState.cs
+++ b/YTMDesktopCompanion/Enums/ESocketState.cs
@@ -22,6 +22,9 @@
 
 namespace XeroxDev.YTMDesktop.Companion.Enums
 {
+    /// <summary>
+    ///    The state of the socket
+    /// </summary>
     public enum ESocketState
     {
         /// <summary>
diff --git a/YTMDesktopCompanion/Exceptions/ApiException.cs b/YTMDesktopCompanion/Exceptions/ApiException.cs
index 2b2fdc2..0151176 100644
--- a/YTMDesktopCompanion/Exceptions/ApiException.cs
+++ b/YTMDesktopCompanion/Exceptions/ApiException.cs
@@ -35,21 +35,43 @@ namespace XeroxDev.YTMDesktop.Companion.Exceptions
     [Serializable]
     public class ApiException : Exception
     {
+        /// <summary>
+        ///    Represents an exception that is thrown when an API error occurs.
+        /// </summary>
+        /// <param name="error">The error output from the API.</param>
         public ApiException(ErrorOutput error) : this(null, null, error)
         {
         }
 
+        /// <summary>
+        ///   Represents an exception that is thrown when an API error occurs.
+        /// </summary>
+        /// <param name="message">The error message.</param>
+        /// <param name="error">The error output from the API.</param>
         public ApiException(string message, ErrorOutput error) : this(message, null, error)
         {
         }
 
+        /// <summary>
+        ///   Represents an exception that is thrown when an API error occurs.
+        /// </summary>
+        /// <param name="message">The error message.</param>
+        /// <param name="innerException">The inner exception.</param>
+        /// <param name="error">The error output from the API.</param>
         public ApiException(string message, Exception innerException, ErrorOutput error) : base(message, innerException)
         {
             Error = error;
         }
 
+        /// <summary>
+        ///    The error output from the API.
+        /// </summary>
         public ErrorOutput Error { get; }
 
+        /// <summary>
+        ///   Returns a string that represents the current object.
+        /// </summary>
+        /// <returns></returns>
         public override string ToString()
         {
             return $"{base.ToString()}\n=========\nAPI Error\n=========\n{Error}";
diff --git a/YTMDesktopCompanion/Interfaces/IGenericClient.cs b/YTMDesktopCompanion/Interfaces/IGenericClient.cs
index 98874c7..09ac4fd 100644
--- a/YTMDesktopCompanion/Interfaces/IGenericClient.cs
+++ b/YTMDesktopCompanion/Interfaces/IGenericClient.cs
@@ -28,8 +28,14 @@
 
 namespace XeroxDev.YTMDesktop.Companion.Interfaces
 {
+    /// <summary>
+    ///    The generic client interface
+    /// </summary>
     public interface IGenericClient
     {
+        /// <summary>
+        ///    The settings for the client
+        /// </summary>
         ConnectorSettings Settings { get; set; }
 
         /// <summary>
diff --git a/YTMDesktopCompanion/Models/Input/Auth/RequestCodeInput.cs b/YTMDesktopCompanion/Models/Input/Auth/RequestCodeInput.cs
index 23a0afb..dac34aa 100644
--- a/YTMDesktopCompanion/Models/Input/Auth/RequestCodeInput.cs
+++ b/YTMDesktopCompanion/Models/Input/Auth/RequestCodeInput.cs
@@ -23,8 +23,9 @@
 #region
 
 using System;
-using System.Text.Json.Serialization;
+
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 
 #endregion
 
@@ -33,7 +34,6 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Input.Auth
     /// <summary>
     ///     The input for the request code endpoint.
     /// </summary>
-    [JsonSerializable(typeof(RequestCodeInput))]
     public class RequestCodeInput
     {
         private string _appId;
@@ -62,7 +62,7 @@ public RequestCodeInput(string appId, string appName, string appVersion)
         ///     The id of your app. Must be all lowercase with only alphanumeric characters, no spaces and between 2 and 32 characters.<br />
         ///     <b>Regex</b>: <c>^[a-z0-9_\\-]{2,32}$</c>
         /// </summary>
-        [JsonPropertyName("appId")]
+        [JsonProperty("appId")]
         [JsonRequired]
         public string AppId
         {
@@ -79,7 +79,7 @@ public string AppId
         /// <summary>
         ///     The name of your app. Must be between 2 and 48 characters.
         /// </summary>
-        [JsonPropertyName("appName")]
+        [JsonProperty("appName")]
         [JsonRequired]
         public string AppName
         {
@@ -98,7 +98,7 @@ public string AppName
         /// <summary>
         ///     The version of your app. Must be semantic versioning compatible.
         /// </summary>
-        [JsonPropertyName("appVersion")]
+        [JsonProperty("appVersion")]
         [JsonRequired]
         public string AppVersion { get; set; }
     }
diff --git a/YTMDesktopCompanion/Models/Input/Auth/RequestInput.cs b/YTMDesktopCompanion/Models/Input/Auth/RequestInput.cs
index 5c93b89..30cf42e 100644
--- a/YTMDesktopCompanion/Models/Input/Auth/RequestInput.cs
+++ b/YTMDesktopCompanion/Models/Input/Auth/RequestInput.cs
@@ -23,8 +23,9 @@
 #region
 
 using System;
-using System.Text.Json.Serialization;
+
 using System.Text.RegularExpressions;
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Models.Output.Auth;
 
 #endregion
@@ -34,7 +35,6 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Input.Auth
     /// <summary>
     ///     The input for the request code endpoint.
     /// </summary>
-    [JsonSerializable(typeof(RequestInput))]
     public class RequestInput
     {
         private string _appId;
@@ -59,7 +59,7 @@ public RequestInput(string appId, string code)
         ///     The id of your app. Must be all lowercase with only alphanumeric characters, no spaces and between 2 and 32 characters.<br />
         ///     <b>Regex</b>: <c>^[a-z0-9_\\-]{2,32}$</c>
         /// </summary>
-        [JsonPropertyName("appId")]
+        [JsonProperty("appId")]
         [JsonRequired]
         public string AppId
         {
@@ -76,7 +76,7 @@ public string AppId
         /// <summary>
         ///     The <see cref="RequestOutput.Token" /> you've received from the server via <see cref="RequestCodeOutput" />
         /// </summary>
-        [JsonPropertyName("code")]
+        [JsonProperty("code")]
         [JsonRequired]
         public string Code { get; set; }
     }
diff --git a/YTMDesktopCompanion/Models/Input/CommandInput.cs b/YTMDesktopCompanion/Models/Input/CommandInput.cs
index 9ddc5f7..3f55c14 100644
--- a/YTMDesktopCompanion/Models/Input/CommandInput.cs
+++ b/YTMDesktopCompanion/Models/Input/CommandInput.cs
@@ -22,7 +22,8 @@
 
 #region
 
-using System.Text.Json.Serialization;
+
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Enums;
 
 #endregion
@@ -32,7 +33,6 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Input
     /// <summary>
     ///     The input for the command endpoint.
     /// </summary>
-    [JsonSerializable(typeof(CommandInput))]
     public class CommandInput
     {
         /// <summary>
@@ -55,12 +55,17 @@ public CommandInput(ECommand command, object data = null) : this(command.ToComma
         {
         }
 
-        [JsonPropertyName("command")]
+        /// <summary>
+        ///    The command to execute
+        /// </summary>
+        [JsonProperty("command")]
         [JsonRequired]
         public string Command { get; set; }
 
-        [JsonPropertyName("data")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        /// <summary>
+        ///   The data to send with
+        /// </summary>
+        [JsonProperty("data")]
         public object Data { get; set; }
     }
 }
\ No newline at end of file
diff --git a/YTMDesktopCompanion/Models/Output/Auth/RequestCodeOutput.cs b/YTMDesktopCompanion/Models/Output/Auth/RequestCodeOutput.cs
index 47bfd59..1c862c4 100644
--- a/YTMDesktopCompanion/Models/Output/Auth/RequestCodeOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/Auth/RequestCodeOutput.cs
@@ -22,7 +22,8 @@
 
 #region
 
-using System.Text.Json.Serialization;
+
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 
 #endregion
@@ -32,13 +33,12 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Output.Auth
     /// <summary>
     ///     This class is the output from the <see cref="Endpoints.AuthRequestCode" /> endpoint.
     /// </summary>
-    [JsonSerializable(typeof(RequestCodeOutput))]
     public class RequestCodeOutput
     {
         /// <summary>
         ///     The code to use to authenticate the app.
         /// </summary>
-        [JsonPropertyName("code")]
+        [JsonProperty("code")]
         [JsonRequired]
         public string Code { get; set; } = null;
     }
diff --git a/YTMDesktopCompanion/Models/Output/Auth/RequestOutput.cs b/YTMDesktopCompanion/Models/Output/Auth/RequestOutput.cs
index 5b78160..d98ce50 100644
--- a/YTMDesktopCompanion/Models/Output/Auth/RequestOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/Auth/RequestOutput.cs
@@ -22,7 +22,7 @@
 
 #region
 
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 
 #endregion
@@ -32,13 +32,12 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Output.Auth
     /// <summary>
     ///     This class is the output from the <see cref="Endpoints.AuthRequest" /> endpoint.
     /// </summary>
-    [JsonSerializable(typeof(RequestOutput))]
     public class RequestOutput
     {
         /// <summary>
         ///     The authorization token that has to be used for all the privileged endpoints.
         /// </summary>
-        [JsonPropertyName("token")]
+        [JsonProperty("token")]
         [JsonRequired]
         public string Token { get; set; } = null;
     }
diff --git a/YTMDesktopCompanion/Models/Output/ErrorOutput.cs b/YTMDesktopCompanion/Models/Output/ErrorOutput.cs
index 1481cc9..05733ce 100644
--- a/YTMDesktopCompanion/Models/Output/ErrorOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/ErrorOutput.cs
@@ -22,7 +22,8 @@
 
 #region
 
-using System.Text.Json.Serialization;
+
+using Newtonsoft.Json;
 
 #endregion
 
@@ -31,34 +32,37 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Output
     /// <summary>
     ///     This class is used to represent the error output of the API.
     /// </summary>
-    [JsonSerializable(typeof(ErrorOutput))]
     public class ErrorOutput
     {
         /// <summary>
         ///     The status code of the error. (e.g. 403)
         /// </summary>
-        [JsonPropertyName("statusCode")]
+        [JsonProperty("statusCode")]
         public int? StatusCode { get; set; }
 
         /// <summary>
         ///     An error code with specific information about the error (e.g. AUTHORIZATION_DISABLED)<br />
         ///     It is not always available.
         /// </summary>
-        [JsonPropertyName("code")]
+        [JsonProperty("code")]
         public string Code { get; set; }
 
         /// <summary>
         ///     The error message title. (e.g. Forbidden)
         /// </summary>
-        [JsonPropertyName("error")]
+        [JsonProperty("error")]
         public string Error { get; set; }
 
         /// <summary>
         ///     The error message. (e.g. Authorization requests are disabled)
         /// </summary>
-        [JsonPropertyName("message")]
+        [JsonProperty("message")]
         public string Message { get; set; }
 
+        /// <summary>
+        ///    Returns a string that represents the current object.
+        /// </summary>
+        /// <returns></returns>
         public override string ToString()
         {
             return $"Status Code: {StatusCode}\nCode: {Code}\nError: {Error}\nMessage: {Message}";
diff --git a/YTMDesktopCompanion/Models/Output/MetadataOutput.cs b/YTMDesktopCompanion/Models/Output/MetadataOutput.cs
index 5549588..0a4e06e 100644
--- a/YTMDesktopCompanion/Models/Output/MetadataOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/MetadataOutput.cs
@@ -23,7 +23,7 @@
 #region
 
 using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 
 #endregion
@@ -38,7 +38,7 @@ public class MetadataOutput
         /// <summary>
         ///     All available API version.
         /// </summary>
-        [JsonPropertyName("apiVersions")]
+        [JsonProperty("apiVersions")]
         [JsonRequired]
         public List<string> ApiVersions { get; set; } = null;
     }
diff --git a/YTMDesktopCompanion/Models/Output/PlaylistOutput.cs b/YTMDesktopCompanion/Models/Output/PlaylistOutput.cs
index 1ecba3d..492e799 100644
--- a/YTMDesktopCompanion/Models/Output/PlaylistOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/PlaylistOutput.cs
@@ -22,7 +22,8 @@
 
 #region
 
-using System.Text.Json.Serialization;
+
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 
 #endregion
@@ -32,20 +33,19 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Output
     /// <summary>
     ///     This class is the output from the <see cref="Endpoints.Playlists" /> endpoint. (as a single item, the endpoint will return an array of this)
     /// </summary>
-    [JsonSerializable(typeof(PlaylistOutput))]
     public class PlaylistOutput
     {
         /// <summary>
         ///     The playlist id
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonProperty("id")]
         [JsonRequired]
         public string Id { get; set; } = null;
 
         /// <summary>
         ///     The playlist title
         /// </summary>
-        [JsonPropertyName("title")]
+        [JsonProperty("title")]
         [JsonRequired]
         public string Title { get; set; } = null;
     }
diff --git a/YTMDesktopCompanion/Models/Output/StateOutput.cs b/YTMDesktopCompanion/Models/Output/StateOutput.cs
index 4f411c4..1b7b850 100644
--- a/YTMDesktopCompanion/Models/Output/StateOutput.cs
+++ b/YTMDesktopCompanion/Models/Output/StateOutput.cs
@@ -22,7 +22,8 @@
 
 #region
 
-using System.Text.Json.Serialization;
+
+using Newtonsoft.Json;
 using XeroxDev.YTMDesktop.Companion.Constants;
 using XeroxDev.YTMDesktop.Companion.Enums;
 
@@ -33,26 +34,25 @@ namespace XeroxDev.YTMDesktop.Companion.Models.Output
     /// <summary>
     ///     This class is the output from the <see cref="Endpoints.State" /> endpoint. (as a single item, the endpoint will return an array of this)
     /// </summary>
-    [JsonSerializable(typeof(StateOutput))]
     public class StateOutput
     {
         /// <summary>
         ///     The player state
         /// </summary>
-        [JsonPropertyName("player")]
+        [JsonProperty("player")]
         [JsonRequired]
         public Player Player { get; set; } = null;
 
         /// <summary>
         ///     The video state
         /// </summary>
-        [JsonPropertyName("video")]
+        [JsonProperty("video")]
         public Video Video { get; set; }
 
         /// <summary>
         ///     The playlist id
         /// </summary>
-        [JsonPropertyName("playlistId")]
+        [JsonProperty("playlistId")]
         [JsonRequired]
         public string PlaylistId { get; set; } = null;
     }
@@ -62,27 +62,26 @@ public class StateOutput
     /// <summary>
     ///     The thumbnail
     /// </summary>
-    [JsonSerializable(typeof(Thumbnail))]
     public class Thumbnail
     {
         /// <summary>
         ///     The url
         /// </summary>
-        [JsonPropertyName("url")]
+        [JsonProperty("url")]
         [JsonRequired]
         public string Url { get; set; } = null;
 
         /// <summary>
         ///     The width
         /// </summary>
-        [JsonPropertyName("width")]
+        [JsonProperty("width")]
         [JsonRequired]
         public int Width { get; set; }
 
         /// <summary>
         ///     The height
         /// </summary>
-        [JsonPropertyName("height")]
+        [JsonProperty("height")]
         [JsonRequired]
         public int Height { get; set; }
     }
@@ -94,141 +93,138 @@ public class Thumbnail
     /// <summary>
     ///     The player state
     /// </summary>
-    [JsonSerializable(typeof(Player))]
     public class Player
     {
         /// <summary>
         ///     The track state
         /// </summary>
-        [JsonPropertyName("trackState")]
+        [JsonProperty("trackState")]
         public ETrackState TrackState { get; set; } = ETrackState.Unknown;
 
         /// <summary>
         ///     The video progress
         /// </summary>
-        [JsonPropertyName("videoProgress")]
+        [JsonProperty("videoProgress")]
         public double VideoProgress { get; set; }
 
         /// <summary>
         ///     The volume
         /// </summary>
-        [JsonPropertyName("volume")]
+        [JsonProperty("volume")]
         public double Volume { get; set; }
 
         /// <summary>
         ///     If an ad is playing
         /// </summary>
-        [JsonPropertyName("adPlaying")]
+        [JsonProperty("adPlaying")]
         public bool AdPlaying { get; set; }
 
         /// <summary>
         ///     The queue
         /// </summary>
-        [JsonPropertyName("queue")]
+        [JsonProperty("queue")]
         public Queue Queue { get; set; }
     }
 
     /// <summary>
     ///     The queue
     /// </summary>
-    [JsonSerializable(typeof(Queue))]
     public class Queue
     {
         /// <summary>
         ///     If autoplay is enabled
         /// </summary>
-        [JsonPropertyName("autoplay")]
+        [JsonProperty("autoplay")]
         public bool Autoplay { get; set; }
 
         /// <summary>
         ///     The queue items
         /// </summary>
-        [JsonPropertyName("items")]
+        [JsonProperty("items")]
         [JsonRequired]
         public QueueItem[] Items { get; set; } = null;
 
         /// <summary>
         ///     The automix items
         /// </summary>
-        [JsonPropertyName("automixItems")]
+        [JsonProperty("automixItems")]
         public QueueItem[] AutomixItems { get; set; }
 
         /// <summary>
         ///     If the queue is generating
         /// </summary>
-        [JsonPropertyName("isGenerating")]
+        [JsonProperty("isGenerating")]
         public bool IsGenerating { get; set; }
 
         /// <summary>
         ///     If the queue is infinite
         /// </summary>
-        [JsonPropertyName("isInfinite")]
+        [JsonProperty("isInfinite")]
         public bool IsInfinite { get; set; }
 
         /// <summary>
         ///     The repeat mode
         /// </summary>
-        [JsonPropertyName("repeatMode")]
+        [JsonProperty("repeatMode")]
         public ERepeatMode RepeatMode { get; set; }
 
         /// <summary>
         ///     The selected item index
         /// </summary>
-        [JsonPropertyName("selectedItemIndex")]
+        [JsonProperty("selectedItemIndex")]
         public int SelectedItemIndex { get; set; }
     }
 
     /// <summary>
     ///     The queue item
     /// </summary>
-    [JsonSerializable(typeof(QueueItem))]
     public class QueueItem
     {
         /// <summary>
         ///     The thumbnails
         /// </summary>
-        [JsonPropertyName("thumbnails")]
+        [JsonProperty("thumbnails")]
         [JsonRequired]
         public Thumbnail[] Thumbnails { get; set; } = null;
 
         /// <summary>
         ///     The title
         /// </summary>
-        [JsonPropertyName("title")]
+        [JsonProperty("title")]
         [JsonRequired]
         public string Title { get; set; } = null;
 
         /// <summary>
         ///     The author
         /// </summary>
-        [JsonPropertyName("author")]
+        [JsonProperty("author")]
         [JsonRequired]
         public string Author { get; set; } = null;
 
         /// <summary>
         ///     The duration
         /// </summary>
-        [JsonPropertyName("duration")]
+        [JsonProperty("duration")]
         [JsonRequired]
         public string Duration { get; set; } = null;
 
         /// <summary>
         ///     If the item is selected
         /// </summary>
-        [JsonPropertyName("selected")]
+        [JsonProperty("selected")]
         public bool Selected { get; set; }
 
         /// <summary>
         ///     The video id
         /// </summary>
-        [JsonPropertyName("videoId")]
+        [JsonProperty("videoId")]
         [JsonRequired]
         public string VideoId { get; set; } = null;
 
         /// <summary>
         ///     The counterparts
         /// </summary>
-        [JsonPropertyName("counterparts")]
+        [JsonProperty("counterparts")]
         public QueueItem[] Counterparts { get; set; }
     }
 
@@ -239,66 +235,65 @@ public class QueueItem
     /// <summary>
     ///     The video state
     /// </summary>
-    [JsonSerializable(typeof(Video))]
     public class Video
     {
         /// <summary>
         ///     The author
         /// </summary>
-        [JsonPropertyName("author")]
+        [JsonProperty("author")]
         [JsonRequired]
         public string Author { get; set; } = null;
 
         /// <summary>
         ///     The channel id
         /// </summary>
-        [JsonPropertyName("channelId")]
+        [JsonProperty("channelId")]
         [JsonRequired]
         public string ChannelId { get; set; } = null;
 
         /// <summary>
         ///     The title
         /// </summary>
-        [JsonPropertyName("title")]
+        [JsonProperty("title")]
         [JsonRequired]
         public string Title { get; set; } = null;
 
         /// <summary>
         ///     The album
         /// </summary>
-        [JsonPropertyName("album")]
+        [JsonProperty("album")]
         public string Album { get; set; }
 
         /// <summary>
         ///     The album id
         /// </summary>
-        [JsonPropertyName("albumId")]
+        [JsonProperty("albumId")]
         public string AlbumId { get; set; }
 
         /// <summary>
         ///     The like status
         /// </summary>
-        [JsonPropertyName("likeStatus")]
+        [JsonProperty("likeStatus")]
         public ELikeStatus? LikeStatus { get; set; }
 
         /// <summary>
         ///     The thumbnails
         /// </summary>
-        [JsonPropertyName("thumbnails")]
+        [JsonProperty("thumbnails")]
         [JsonRequired]
         public Thumbnail[] Thumbnails { get; set; } = null;
 
         /// <summary>
         ///     The duration in seconds
         /// </summary>
-        [JsonPropertyName("durationSeconds")]
+        [JsonProperty("durationSeconds")]
         [JsonRequired]
         public int DurationSeconds { get; set; }
 
         /// <summary>
         ///     The id
         /// </summary>
-        [JsonPropertyName("id")]
+        [JsonProperty("id")]
         [JsonRequired]
         public string Id { get; set; } = null;
     }
diff --git a/YTMDesktopCompanion/Properties/AssemblyInfo.cs b/YTMDesktopCompanion/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..029fd05
--- /dev/null
+++ b/YTMDesktopCompanion/Properties/AssemblyInfo.cs
@@ -0,0 +1,21 @@
+// This file is part of the YTMDesktopCompanion project.
+// 
+// Copyright (c) 2024 Dominic Ris
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
\ No newline at end of file
diff --git a/YTMDesktopCompanion/Settings/ConnectorSettings.cs b/YTMDesktopCompanion/Settings/ConnectorSettings.cs
index 28e5c92..471c9dc 100644
--- a/YTMDesktopCompanion/Settings/ConnectorSettings.cs
+++ b/YTMDesktopCompanion/Settings/ConnectorSettings.cs
@@ -29,6 +29,9 @@
 
 namespace XeroxDev.YTMDesktop.Companion.Settings
 {
+    /// <summary>
+    ///    The settings for the connector.
+    /// </summary>
     public class ConnectorSettings
     {
         private string _appId;
diff --git a/YTMDesktopCompanion/YTMDesktopCompanion.csproj b/YTMDesktopCompanion/YTMDesktopCompanion.csproj
index ef8e9b7..2a5bdf4 100644
--- a/YTMDesktopCompanion/YTMDesktopCompanion.csproj
+++ b/YTMDesktopCompanion/YTMDesktopCompanion.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <ImplicitUsings>disable</ImplicitUsings>
         <RootNamespace>XeroxDev.YTMDesktop.Companion</RootNamespace>
         <PackageId>XeroxDev.YTMDesktop.Companion</PackageId>
         <AssemblyName>XeroxDev.YTMDesktop.Companion</AssemblyName>
         <Title>YTMDesktopCompanion</Title>
         <Authors>XeroxDev</Authors>
         <Description>This library will help you communicate with the YTMDesktop Companion Server.</Description>
+        <Company>XeroxDev</Company>
+        <Product>XeroxDev.YTMDesktop.Companion</Product>
         <!-- x-release-please-start-version -->
         <AssemblyVersion>1.1.0</AssemblyVersion>
         <FileVersion>1.1.0</FileVersion>
@@ -28,18 +29,16 @@
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
         <NeutralLanguage>en</NeutralLanguage>
-        <AssemblyOriginatorKeyFile>XeroxDev.YTMDesktop.Companion.snk</AssemblyOriginatorKeyFile>
-        <TargetFrameworks>net6.0;netstandard2.0;net472</TargetFrameworks>
+        <TargetFrameworks>net6.0;net472</TargetFrameworks>
         <LangVersion>7.3</LangVersion>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
         <ProjectGuid>{749F5EBA-0CFB-4F3A-84A7-9D0E288620D2}</ProjectGuid>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="H.Socket.IO" Version="1.2.*"/>
-        <PackageReference Include="System.Text.Json" Version="8.0.*"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+        <PackageReference Include="SocketIOClient" Version="3.0.8" />
+        <PackageReference Include="SocketIOClient.Newtonsoft.Json" Version="3.0.7"/>
     </ItemGroup>
 
     <ItemGroup>