From f8eea714e8fd830b1823a344f92306fc8679beeb Mon Sep 17 00:00:00 2001
From: RMBGAME <rmb@rmbgame.net>
Date: Thu, 23 Jun 2022 17:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9E=E5=8A=A9=E7=94=A8=E6=88=B7=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/UI/Views/MainView.axaml       |  4 +--
 .../Models/IReverseProxyConfig.cs             |  2 ++
 .../Models/ReverseProxyConfig.cs              | 28 ++++++++++++++++---
 src/ST.Client/Services/Mvvm/ProxyService.cs   |  4 +--
 .../UI/Resx/AppResources.Designer.cs          |  2 +-
 src/ST.Client/UI/Resx/AppResources.resx       |  2 +-
 .../Pages/ProxyScriptManagePageViewModel.cs   |  2 +-
 .../FastGithub.Configuration/DomainConfig.cs  | 21 ++++++++++++++
 .../Models/ScriptDTO.cs                       |  2 +-
 9 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
index 391de9ca1..f077bee28 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/MainView.axaml
@@ -139,10 +139,10 @@
               <StackPanel IsVisible="{ReflectionBinding Path=User,Mode=OneWay,Source={x:Static service:UserService.Current},Converter={StaticResource IsNullConverter},ConverterParameter=invert}">
                 <controls:ScrollingTextBlock Text="{ReflectionBinding Path=User.NickName,Mode=OneWay,Source={x:Static service:UserService.Current}}"
                        Foreground="{DynamicResource HighlightForegroundBrushKey}"
-                       Classes="h7"
+                       Classes="h5"
                        VerticalAlignment="Center"/>
                 <Border IsVisible="{ReflectionBinding Path=User.IsSponsorUser,Mode=OneWay,Source={x:Static service:UserService.Current}}">
-                  <TextBlock Text="{ReflectionBinding Path=Res.User_Sponsor,Mode=OneWay,Source={x:Static resx:R.Current}}"
+                  <TextBlock Text="{ReflectionBinding Path=Res.User_Sponsor,Mode=OneWay,Source={x:Static resx:R.Current},StringFormat={}💖 {0}}"
                              Classes="h8"/>
                 </Border>
                 <!--<TextBlock Text="{ReflectionBinding Path=User.LevelStr,Mode=OneWay,Source={x:Static service:UserService.Current}}"
diff --git a/src/ST.Client.ReverseProxy.Yarp/Models/IReverseProxyConfig.cs b/src/ST.Client.ReverseProxy.Yarp/Models/IReverseProxyConfig.cs
index a27392481..6c48613bb 100644
--- a/src/ST.Client.ReverseProxy.Yarp/Models/IReverseProxyConfig.cs
+++ b/src/ST.Client.ReverseProxy.Yarp/Models/IReverseProxyConfig.cs
@@ -17,6 +17,8 @@ public partial interface IReverseProxyConfig
 
     IReadOnlyCollection<AccelerateProjectDTO>? ProxyDomains { get; set; }
 
+    IReadOnlyCollection<ScriptDTO>? ProxyScripts { get; set; }
+
     /// <summary>
     /// 是否匹配指定的域名
     /// </summary>
diff --git a/src/ST.Client.ReverseProxy.Yarp/Models/ReverseProxyConfig.cs b/src/ST.Client.ReverseProxy.Yarp/Models/ReverseProxyConfig.cs
index 50b38b5d0..c5549fa0d 100644
--- a/src/ST.Client.ReverseProxy.Yarp/Models/ReverseProxyConfig.cs
+++ b/src/ST.Client.ReverseProxy.Yarp/Models/ReverseProxyConfig.cs
@@ -10,6 +10,7 @@ namespace System.Application.Models;
 sealed class ReverseProxyConfig : IReverseProxyConfig
 {
     readonly SortedDictionary<DomainPattern, IDomainConfig> domainConfigs;
+    readonly SortedDictionary<DomainPattern, IDomainConfig> scriptConfigs;
     readonly ConcurrentDictionary<string, IDomainConfig?> domainConfigCache;
     readonly YarpReverseProxyServiceImpl reverseProxyService;
 
@@ -17,7 +18,8 @@ sealed class ReverseProxyConfig : IReverseProxyConfig
     {
         this.reverseProxyService = reverseProxyService;
         domainConfigs = new();
-        AddDomainConfigs(domainConfigs, reverseProxyService.ProxyDomains);
+        scriptConfigs = new();
+        AddDomainConfigs(domainConfigs, reverseProxyService.ProxyDomains, reverseProxyService.Scripts);
         domainConfigCache = new();
     }
 
@@ -35,11 +37,18 @@ sealed class ReverseProxyConfig : IReverseProxyConfig
         set => reverseProxyService.ProxyDomains = value;
     }
 
-    static void AddDomainConfigs(IDictionary<DomainPattern, IDomainConfig> dict, IEnumerable<AccelerateProjectDTO>? domainConfigs)
+    public IReadOnlyCollection<ScriptDTO>? ProxyScripts
     {
-        if (domainConfigs != null)
+        get => reverseProxyService.Scripts;
+        set => reverseProxyService.Scripts = value;
+    }
+
+    static void AddDomainConfigs(IDictionary<DomainPattern, IDomainConfig> dict,
+        IEnumerable<AccelerateProjectDTO>? accelerates, IEnumerable<ScriptDTO>? scripts)
+    {
+        if (accelerates != null)
         {
-            foreach (var item in domainConfigs)
+            foreach (var item in accelerates)
             {
                 foreach (var domainName in item.DomainNamesArray)
                 {
@@ -47,6 +56,17 @@ sealed class ReverseProxyConfig : IReverseProxyConfig
                 }
             }
         }
+
+        if (scripts != null)
+        {
+            foreach (var item in scripts)
+            {
+                foreach (var domainName in item.MatchDomainNamesArray)
+                {
+                    dict.Add(new DomainPattern(domainName) { Sort = item.Order }, item);
+                }
+            }
+        }
     }
 
     //static void AddDomainConfigs(IDictionary<DomainPattern, IDomainConfig> dict, IReadOnlyDictionary<string, DomainConfig>? domainConfigs)
diff --git a/src/ST.Client/Services/Mvvm/ProxyService.cs b/src/ST.Client/Services/Mvvm/ProxyService.cs
index ca527a080..8c3abb1a5 100644
--- a/src/ST.Client/Services/Mvvm/ProxyService.cs
+++ b/src/ST.Client/Services/Mvvm/ProxyService.cs
@@ -670,7 +670,7 @@ namespace System.Application.Services
             //}
             ProxyScripts.AddRange(scriptList);
 
-            CheckUpdate();
+            CheckScriptUpdate();
         }
 
         public async void DownloadScript(ScriptDTO model)
@@ -716,7 +716,7 @@ namespace System.Application.Services
             model.IsLoading = false;
         }
 
-        public async void CheckUpdate()
+        public async void CheckScriptUpdate()
         {
             var items = ProxyScripts.Items.Where(x => x.Id.HasValue).Select(x => x.Id!.Value).ToList();
             var client = ICloudServiceClient.Instance.Script;
diff --git a/src/ST.Client/UI/Resx/AppResources.Designer.cs b/src/ST.Client/UI/Resx/AppResources.Designer.cs
index 09ab4ba2a..44287e10d 100644
--- a/src/ST.Client/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client/UI/Resx/AppResources.Designer.cs
@@ -6241,7 +6241,7 @@ namespace System.Application.UI.Resx {
         }
         
         /// <summary>
-        ///   查找类似 捐助用户 的本地化字符串。
+        ///   查找类似 赞助用户 的本地化字符串。
         /// </summary>
         public static string User_Sponsor {
             get {
diff --git a/src/ST.Client/UI/Resx/AppResources.resx b/src/ST.Client/UI/Resx/AppResources.resx
index e2b2d8a48..e17fe50ed 100644
--- a/src/ST.Client/UI/Resx/AppResources.resx
+++ b/src/ST.Client/UI/Resx/AppResources.resx
@@ -2113,7 +2113,7 @@ AAAAA-BBBBB-CCCC3</value>
     <value>积分</value>
   </data>
   <data name="User_Sponsor" xml:space="preserve">
-    <value>捐助用户</value>
+    <value>赞助用户</value>
   </data>
   <data name="Account_SignIn_Ok" xml:space="preserve">
     <value>签到成功</value>
diff --git a/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs b/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs
index d6ce2e51d..2edf79a63 100644
--- a/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs
+++ b/src/ST.Client/UI/ViewModels/Pages/ProxyScriptManagePageViewModel.cs
@@ -105,7 +105,7 @@ namespace System.Application.UI.ViewModels
         {
             if (IsFirstActivation)
                 if (ProxySettings.IsAutoCheckScriptUpdate)
-                    ProxyService.Current.CheckUpdate();
+                    ProxyService.Current.CheckScriptUpdate();
             base.Activation();
         }
 
diff --git a/src/ST.Services.CloudService.Models/Models/FastGithub.Configuration/DomainConfig.cs b/src/ST.Services.CloudService.Models/Models/FastGithub.Configuration/DomainConfig.cs
index 870a23e0d..76965bbef 100644
--- a/src/ST.Services.CloudService.Models/Models/FastGithub.Configuration/DomainConfig.cs
+++ b/src/ST.Services.CloudService.Models/Models/FastGithub.Configuration/DomainConfig.cs
@@ -152,5 +152,26 @@ partial class AccelerateProjectDTO : IDomainConfig
 
     string? IDomainConfig.UserAgent => UserAgent;
 
+    IResponseConfig? IDomainConfig.Response => null; // or null
+}
+
+partial class ScriptDTO : IDomainConfig
+{
+    bool IDomainConfig.TlsSni => true;
+
+    string? IDomainConfig.TlsSniPattern => null;
+
+    bool IDomainConfig.TlsIgnoreNameMismatch => true;
+
+    IPAddress? IDomainConfig.IPAddress => null;
+
+    string? IDomainConfig.ForwardDestination => null;
+
+    TimeSpan? IDomainConfig.Timeout => null;
+
+    Uri? IDomainConfig.Destination => null;
+
+    string? IDomainConfig.UserAgent => null;
+
     IResponseConfig? IDomainConfig.Response => null; // or null
 }
\ No newline at end of file
diff --git a/src/ST.Services.CloudService.Models/Models/ScriptDTO.cs b/src/ST.Services.CloudService.Models/Models/ScriptDTO.cs
index c74b4782b..489dbe6fa 100644
--- a/src/ST.Services.CloudService.Models/Models/ScriptDTO.cs
+++ b/src/ST.Services.CloudService.Models/Models/ScriptDTO.cs
@@ -20,7 +20,7 @@ namespace System.Application.Models
     /// 脚本
     /// </summary>
     [MPObj]
-    public class ScriptDTO
+    public partial class ScriptDTO
 #if MVVM_VM
         : ReactiveObject
 #endif