Merge pull request #2841 from DGP-Studio/develop

Author: qhy040404

src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCacheDownloadOperation.cs

@@ -25,7 +25,14 @@ public async ValueTask DownloadFileAsync(Uri uri, string baseFile)
     {
         using (HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCacheDownloadOperation)))
         {
-            await DownloadFileUsingHttpClientAsync(httpClient, uri, baseFile).ConfigureAwait(false);
+            try
+            {
+                await DownloadFileUsingHttpClientAsync(httpClient, uri, baseFile).ConfigureAwait(false);
+            }
+            catch (HttpRequestException)
+            {
+                // Ignore
+            }
         }
 
         if (!File.Exists(baseFile))

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocHttpClientConfiguration.cs

@@ -7,8 +7,10 @@
 using Snap.Hutao.Service.Game.Package.Advanced;
 using Snap.Hutao.Web.Hoyolab;
 using Snap.Hutao.Win32;
+using System.Globalization;
 using System.Net.Http;
 using System.Net.Mime;
+using System.Text;
 
 namespace Snap.Hutao.Core.DependencyInjection;
 
@@ -52,11 +54,9 @@ private static void DefaultConfiguration(IServiceProvider serviceProvider, HttpC
     {
         client.Timeout = Timeout.InfiniteTimeSpan;
         client.DefaultRequestHeaders.UserAgent.ParseAdd(HutaoRuntime.UserAgent);
-        client.DefaultRequestHeaders.Add("x-hutao-device-name", Environment.MachineName);
         client.DefaultRequestHeaders.Add("x-hutao-device-id", HutaoRuntime.DeviceId);
-
-        HutaoPrivateWindowsVersion windowsVersion = HutaoNative.Instance.GetCurrentWindowsVersion();
-        client.DefaultRequestHeaders.Add("x-hutao-device-os", $"Windows {windowsVersion}");
+        client.DefaultRequestHeaders.Add("x-hutao-device-os", $"Windows {HutaoNative.Instance.GetCurrentWindowsVersion()}");
+        client.DefaultRequestHeaders.Add("x-hutao-device-name", EncodeNonAsciiChars(Environment.MachineName));
     }
 
     [UsedImplicitly]
@@ -128,4 +128,22 @@ private static void XRpc6Configuration(HttpClient client)
         client.DefaultRequestHeaders.Add("x-rpc-app_id", "ddxf6vlr1reo");
         client.DefaultRequestHeaders.Add("x-rpc-client_type", "3");
     }
+
+    private static string EncodeNonAsciiChars(string value)
+    {
+        StringBuilder sb = new();
+        foreach (char c in value)
+        {
+            if (c > 127)
+            {
+                sb.Append("\\u").Append(((int)c).ToString("x4", CultureInfo.InvariantCulture));
+            }
+            else
+            {
+                sb.Append(c);
+            }
+        }
+
+        return sb.ToString();
+    }
 }

src/Snap.Hutao/Snap.Hutao/Package.appxmanifest

@@ -13,7 +13,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutao"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.15.5.0" />
+    Version="1.15.6.0" />
 
   <Properties>
     <DisplayName>Snap Hutao</DisplayName>

src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest

@@ -13,7 +13,7 @@
   <Identity
     Name="60568DGPStudio.SnapHutaoDev"
     Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.15.5.0" />
+    Version="1.15.6.0" />
 
   <Properties>
     <DisplayName>Snap Hutao Dev</DisplayName>

src/Snap.Hutao/Snap.Hutao/Web/NetworkError.cs

@@ -15,6 +15,7 @@ internal enum NetworkError
     ERR_CONNECTION_NETWORK_UNREACHABLE,
     ERR_CONNECTION_NO_BUFFER_SPACE_AVAILABLE,
     ERR_CONNECTION_NO_DATA,
+    ERR_CONNECTION_NOT_SOCKET,
     ERR_CONNECTION_TIMED_OUT,
     ERR_NAME_RESOLUTION_HOST_NOT_FOUND,
     ERR_PROXY_TUNNEL_ERROR,

src/Snap.Hutao/Snap.Hutao/Web/Request/Builder/HttpRequestExceptionHandling.cs

@@ -127,6 +127,8 @@ public static NetworkError HttpRequestExceptionToNetworkError(HttpRequestExcepti
                                 return NetworkError.ERR_CONNECTION_NO_BUFFER_SPACE_AVAILABLE;
                             case SocketError.NoData:
                                 return NetworkError.ERR_CONNECTION_NO_DATA;
+                            case SocketError.NotSocket:
+                                return NetworkError.ERR_CONNECTION_NOT_SOCKET;
                             case SocketError.TimedOut:
                                 return NetworkError.ERR_CONNECTION_TIMED_OUT;
                         }