add current proxy to feedback page

2025-11-19 21:02:53 +08:00 · 2024-01-26 22:08:38 +08:00
parent 1e216e9823
commit 75ed512e4a
5 changed files with 64 additions and 27 deletions
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/DynamicProxy/DynamicHttpProxy.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/DynamicProxy/DynamicHttpProxy.cs
@@ -1,6 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

+using CommunityToolkit.Mvvm.ComponentModel;
+using Snap.Hutao.Web;
 using Snap.Hutao.Win32.Registry;
 using System.Net;
 using System.Reflection;
@@ -8,7 +10,7 @@ using System.Reflection;
 namespace Snap.Hutao.Core.IO.Http.DynamicProxy;

 [Injection(InjectAs.Singleton)]
-internal sealed partial class DynamicHttpProxy : IWebProxy, IDisposable
+internal sealed partial class DynamicHttpProxy : ObservableObject, IWebProxy, IDisposable
 {
    private const string ProxySettingPath = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections";

@@ -33,7 +35,7 @@ internal sealed partial class DynamicHttpProxy : IWebProxy, IDisposable
    {
        UpdateProxy();

-        watcher = new(ProxySettingPath, UpdateProxy);
+        watcher = new(ProxySettingPath, OnProxyChanged);
        watcher.Start();
    }

@@ -44,6 +46,17 @@ internal sealed partial class DynamicHttpProxy : IWebProxy, IDisposable
        set => InnerProxy.Credentials = value;
    }

+    public string CurrentProxy
+    {
+        get
+        {
+            Uri? proxyUri = GetProxy(HutaoEndpoints.Website(string.Empty).ToUri());
+            return proxyUri is null
+                ? SH.ViewPageFeedbackCurrentProxyNoProxyDescription
+                : proxyUri.AbsoluteUri;
+        }
+    }
+
    private IWebProxy InnerProxy
    {
        get => innerProxy;
@@ -61,15 +74,6 @@ internal sealed partial class DynamicHttpProxy : IWebProxy, IDisposable
        }
    }

-    [MemberNotNull(nameof(innerProxy))]
-    public void UpdateProxy()
-    {
-        IWebProxy? proxy = ConstructSystemProxyMethod.Invoke(default, default) as IWebProxy;
-        ArgumentNullException.ThrowIfNull(proxy);
-
-        InnerProxy = proxy;
-    }
-
    public Uri? GetProxy(Uri destination)
    {
        return InnerProxy.GetProxy(destination);
@@ -85,4 +89,20 @@ internal sealed partial class DynamicHttpProxy : IWebProxy, IDisposable
        (innerProxy as IDisposable)?.Dispose();
        watcher.Dispose();
    }
+
+    public void OnProxyChanged()
+    {
+        UpdateProxy();
+
+        Ioc.Default.GetRequiredService<ITaskContext>().InvokeOnMainThread(() => OnPropertyChanged(nameof(CurrentProxy)));
+    }
+
+    [MemberNotNull(nameof(innerProxy))]
+    private void UpdateProxy()
+    {
+        IWebProxy? proxy = ConstructSystemProxyMethod.Invoke(default, default) as IWebProxy;
+        ArgumentNullException.ThrowIfNull(proxy);
+
+        InnerProxy = proxy;
+    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx
@@ -60,45 +60,45 @@
            : and then encoded with base64 encoding.
    -->
  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
@@ -1862,6 +1862,12 @@
  <data name="ViewPageFeedbackCommonLinksHeader" xml:space="preserve">
    <value>Useful Links</value>
  </data>
+  <data name="ViewPageFeedbackCurrentProxyHeader" xml:space="preserve">
+    <value>Current Proxy</value>
+  </data>
+  <data name="ViewPageFeedbackCurrentProxyNoProxyDescription" xml:space="preserve">
+    <value>No Proxy</value>
+  </data>
  <data name="ViewPageFeedbackEngageWithUsDescription" xml:space="preserve">
    <value>Keep in touch with us</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -1862,6 +1862,12 @@
  <data name="ViewPageFeedbackCommonLinksHeader" xml:space="preserve">
    <value>常用链接</value>
  </data>
+  <data name="ViewPageFeedbackCurrentProxyHeader" xml:space="preserve">
+    <value>当前代理</value>
+  </data>
+  <data name="ViewPageFeedbackCurrentProxyNoProxyDescription" xml:space="preserve">
+    <value>无代理</value>
+  </data>
  <data name="ViewPageFeedbackEngageWithUsDescription" xml:space="preserve">
    <value>与我们密切联系</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/FeedbackPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/FeedbackPage.xaml
@@ -55,6 +55,7 @@
                                        Header="{shcm:ResourceString Name=ViewPageSettingDeviceIdHeader}"
                                        IsClickEnabled="True"/>
                                    <cwc:SettingsCard Description="{Binding IPInformation}" Header="{shcm:ResourceString Name=ViewPageSettingDeviceIpHeader}"/>
+                                    <cwc:SettingsCard Description="{Binding DynamicHttpProxy.CurrentProxy}" Header="{shcm:ResourceString Name=ViewPageFeedbackCurrentProxyHeader}"/>
                                    <cwc:SettingsCard Description="{Binding RuntimeOptions.WebView2Version}" Header="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
                                </cwc:SettingsExpander.Items>
                            </cwc:SettingsExpander>
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Feedback/FeedbackViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Feedback/FeedbackViewModel.cs
@@ -3,6 +3,7 @@

 using Snap.Hutao.Core;
 using Snap.Hutao.Core.IO.DataTransfer;
+using Snap.Hutao.Core.IO.Http.DynamicProxy;
 using Snap.Hutao.Service;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Web.Hutao;
@@ -20,6 +21,7 @@ internal sealed partial class FeedbackViewModel : Abstraction.ViewModel
    private readonly HutaoInfrastructureClient hutaoInfrastructureClient;
    private readonly HutaoDocumentationClient hutaoDocumentationClient;
    private readonly IClipboardProvider clipboardProvider;
+    private readonly DynamicHttpProxy dynamicHttpProxy;
    private readonly IInfoBarService infoBarService;
    private readonly CultureOptions cultureOptions;
    private readonly RuntimeOptions runtimeOptions;
@@ -31,6 +33,8 @@ internal sealed partial class FeedbackViewModel : Abstraction.ViewModel

    public RuntimeOptions RuntimeOptions { get => runtimeOptions; }

+    public DynamicHttpProxy DynamicHttpProxy { get => dynamicHttpProxy; }
+
    public string? SearchText { get => searchText; set => SetProperty(ref searchText, value); }

    public List<AlgoliaHit>? SearchResults { get => searchResults; set => SetProperty(ref searchResults, value); }