PATCH v3.2.1 (Fixed a bug of not using Player pref when WS failed)

weedeej · May 15, 2022 · 1b1fce6 · 1b1fce6
1 parent 258d917
commit 1b1fce6
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 25 deletions.
diff --git a/ValorantCC/MainWindow.xaml.cs b/ValorantCC/MainWindow.xaml.cs
@@ -354,7 +354,11 @@ private async void spinner_Loaded(object sender, RoutedEventArgs e)
             try
             {
                 if (Directory.Exists(Path.GetTempPath() + $"EZ_Updater0"))
+                {
+                    if (Directory.Exists(Path.GetTempPath() + $"EZ_Updater0{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}"))
+                        Directory.Delete(Path.GetTempPath() + $"EZ_Updater0{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}", true);
                     Directory.Move(Path.GetTempPath() + $"EZ_Updater0", Path.GetTempPath() + $"EZ_Updater0{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}");
+                }
                 Updater.CustomLogger = Utilities.Utils.Log;
                 Updater.LogInterfix = "  | ";
                 if (await Updater.CheckUpdateAsync("weedeej", "ValorantCC"))

diff --git a/ValorantCC/ValorantCC.csproj b/ValorantCC/ValorantCC.csproj
@@ -14,7 +14,7 @@
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <AssemblyVersion></AssemblyVersion>
     <FileVersion></FileVersion>
-    <Version>3.2.0</Version>
+    <Version>3.2.1</Version>
     <SignAssembly>true</SignAssembly>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
   </PropertyGroup>

diff --git a/ValorantCC/src/Auth.cs b/ValorantCC/src/Auth.cs
@@ -114,7 +114,7 @@ private async Task<AuthTokens> ObtainAuthTokens()
 
         private async static Task<String> GetVersion()
         {
-            string ver = "release-04.04-shipping-15-678808";
+            string ver = "release-04.04-shipping-16-679250";
             Utilities.Utils.Log("Obtaining Client Version info");
             RestRequest request = new RestRequest("https://vtools-next.vercel.app/api/skinslist/version", Method.Get);
 

diff --git a/ValorantCC/src/BackgroundAuth.cs b/ValorantCC/src/BackgroundAuth.cs
@@ -98,6 +98,19 @@ public async void LoopCheck()
 
         public async Task<bool> LoginFlagExists()
         {
+            DirectoryInfo LogDir = new DirectoryInfo(Environment.GetEnvironmentVariable("LocalAppData") + "\\Riot Games\\Riot Client\\Logs\\Riot Client Logs");
+            var log = LogDir.GetFiles().OrderByDescending(f => f.LastWriteTime).First();
+
+            string content;
+            using (FileStream fileStream = File.Open(log.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using (StreamReader sr = new StreamReader(fileStream))
+                content = (String)sr.ReadToEnd().Clone();
+
+            if (content.Contains("riot-messaging-service: State is now Connected"))
+                return true;
+
+            await Task.Delay(1);
+
             if (_lockfileData == null) return false;
             RestClient wsClient = new RestClient(new RestClientOptions() { RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true });
             wsClient.Authenticator = new RestSharp.Authenticators.HttpBasicAuthenticator("riot",_lockfileData.Key);

diff --git a/ValorantCC/src/Processor.cs b/ValorantCC/src/Processor.cs
@@ -135,7 +135,7 @@ private async Task<Data> FetchUserSettings()
         {
             Utilities.Utils.Log("Obtaining User Settings using WS");
             RestRequest request = new RestRequest($"{AuthResponse.LockfileData.Protocol}://127.0.0.1:{AuthResponse.LockfileData.Port}/player-preferences/v1/data-json/Ares.PlayerSettings", Method.Get);
-            
+
             RestResponse resp = await client.ExecuteAsync(request);
             FetchResponseData response;
             if (!resp.IsSuccessful)
@@ -146,23 +146,24 @@ private async Task<Data> FetchUserSettings()
                 } catch (NullReferenceException ex)
                 {
                     Utilities.Utils.Log("WS Failed to fetch settings error: " + ex.StackTrace.ToString());
-                    request = new RestRequest("https://playerpreferences.riotgames.com/playerPref/v3/getPreference/Ares.PlayerSettings", Method.Get);
-                    request.AddHeaders(_headers);
-                    resp = await (new RestClient().ExecuteAsync(request));
-                    if (!resp.IsSuccessful) return new Data();
-                    var responseData = JsonConvert.DeserializeObject<Dictionary<string, object>>(resp.Content);
-                    Data settings;
-                    try
-                    {
-                        settings = Utilities.Utils.Decompress(Convert.ToString(responseData["data"]));
-                    }catch (KeyNotFoundException)
-                    {
-                        Utilities.Utils.Log("Player pref failed to fetch settings");
-                        return new Data();
-                    }
-                    return settings;
+                }
 
+                request = new RestRequest("https://playerpreferences.riotgames.com/playerPref/v3/getPreference/Ares.PlayerSettings", Method.Get);
+                request.AddHeaders(_headers);
+                resp = await (new RestClient().ExecuteAsync(request));
+                if (!resp.IsSuccessful) return new Data();
+                var responseData = JsonConvert.DeserializeObject<Dictionary<string, object>>(resp.Content);
+                Data settings;
+                try
+                {
+                    settings = Utilities.Utils.Decompress(Convert.ToString(responseData["data"]));
                 }
+                catch (KeyNotFoundException)
+                {
+                    Utilities.Utils.Log("Player pref failed to fetch settings");
+                    return new Data();
+                }
+                return settings;
             }
             string responseContent = resp.Content;
             try
@@ -189,18 +190,27 @@ private async Task<bool> putUserSettings(Data newData)
                 try
                 {
                     Utilities.Utils.Log("savePreference Unsuccessfull: " + response.Content.ToString());
-                    return false;
-                } catch (NullReferenceException)
+                } catch (NullReferenceException ex)
                 {
-                    request = new RestRequest("https://playerpreferences.riotgames.com/playerPref/v3/savePreference", Method.Put);
-                    request.AddJsonBody(new { type = "Ares.PlayerSettings", data = Utilities.Utils.Compress(newData) });
-                    request.AddHeaders(_headers);
-                    response = await (new RestClient().ExecuteAsync(request));
-                    if (!response.IsSuccessful)
+                    Utilities.Utils.Log("WS savePreference Unsuccessfull: " + ex.StackTrace.ToString());
+                }
+
+                request = new RestRequest("https://playerpreferences.riotgames.com/playerPref/v3/savePreference", Method.Put);
+                request.AddJsonBody(new { type = "Ares.PlayerSettings", data = Utilities.Utils.Compress(newData) });
+                request.AddHeaders(_headers);
+                response = await (new RestClient().ExecuteAsync(request));
+
+                if (!response.IsSuccessful)
+                {
+                    try
                     {
                         Utilities.Utils.Log("savePreference Unsuccessfull: " + response.Content.ToString());
                         return false;
                     }
+                    catch (NullReferenceException ex)
+                    {
+                        Utilities.Utils.Log("Player pref savePreference Unsuccessfull: " + ex.StackTrace.ToString());
+                    }
                 }
             }
 

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.101"
+  }
+}