diff --git a/conduit/Conduit.csproj b/conduit/Conduit.csproj index 5d15551..c8bce77 100644 --- a/conduit/Conduit.csproj +++ b/conduit/Conduit.csproj @@ -77,6 +77,7 @@ packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + @@ -86,8 +87,8 @@ 4.0 - - packages\websocket-sharp-customheaders.1.0.2.31869\lib\net35\websocket-sharp-customheaders.dll + + packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll diff --git a/conduit/HubConnectionHandler.cs b/conduit/HubConnectionHandler.cs index ce7cb76..cc91532 100644 --- a/conduit/HubConnectionHandler.cs +++ b/conduit/HubConnectionHandler.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Web; using WebSocketSharp; namespace Conduit @@ -23,12 +24,12 @@ public HubConnectionHandler(LeagueConnection league) { this.league = league; - socket = new WebSocket(Program.HUB_WS); - socket.CustomHeaders = new Dictionary() - { - {"Token", Persistence.GetHubToken()}, - {"Public-Key", CryptoHelpers.ExportPublicKey()} - }; + // Pass parameters in the URL. + socket = new WebSocket( + Program.HUB_WS + + "?token=" + HttpUtility.UrlEncode(Persistence.GetHubToken()) + + "&publicKey=" + HttpUtility.UrlEncode(CryptoHelpers.ExportPublicKey()) + ); socket.OnMessage += HandleMessage; socket.OnClose += (sender, ev) => diff --git a/conduit/Program.cs b/conduit/Program.cs index 289896d..261b001 100755 --- a/conduit/Program.cs +++ b/conduit/Program.cs @@ -1,12 +1,11 @@ using System; -using System.IO; namespace Conduit { class Program { public static string APP_NAME = "Mimic Conduit"; - public static string VERSION = "2.1.0"; + public static string VERSION = "2.2.0"; public static string HUB_WS = "wss://rift.mimic.lol/conduit"; public static string HUB = "https://rift.mimic.lol"; diff --git a/conduit/packages.config b/conduit/packages.config index 1159250..dfca357 100755 --- a/conduit/packages.config +++ b/conduit/packages.config @@ -10,5 +10,5 @@ - + \ No newline at end of file