test

FodyWeavers.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+	<Costura />
+</Weavers>

ProxySU.sln

@@ -9,6 +9,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.WPF", "ProxySupe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProxySuper.Core", "ProxySuper.Core\ProxySuper.Core.csproj", "{15779EE6-D8CA-44BF-BFE2-941E155EEF3F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "解决方案项", "解决方案项", "{327FE75A-7D23-4F0E-80E2-7D10C7603969}"
+	ProjectSection(SolutionItems) = preProject
+		FodyWeavers.xml = FodyWeavers.xml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

ProxySuper.Core/Converters/ProxyTypeConverter.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Globalization;
+using System.Linq;
+using System.Windows;
 using System.Windows.Data;
 
 namespace ProxySuper.Core.Converters
@@ -26,4 +28,19 @@ namespace ProxySuper.Core.Converters
             return parameter;
         }
     }
+
+    public class BooleanOrConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            return values.OfType<bool>().Any(v => v);
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
 }

ProxySuper.Core/Converters/VisibleConverter.cs

@@ -9,22 +9,47 @@ namespace ProxySuper.Core.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return value.Equals(true) ? Visibility.Visible : Visibility.Collapsed;
+            bool isMatch = (value != null && value.Equals(parameter));
+            // 如果匹配则显示，否则隐藏（Collapsed）
+            return isMatch ? Visibility.Visible : Visibility.Hidden;//Collapsed;
+            //return value.Equals(true) ? Visibility.Visible : Visibility.Hidden;//Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value == null)
+            throw new NotImplementedException();
-            {
+            //if (value == null)
-                return false;
+            //{
-            }
+            //    return false;
+            //}
 
-            if (value.Equals(Visibility.Visible))
+            //if (value.Equals(Visibility.Visible))
-            {
+            //{
-                return true;
+            //    return true;
-            }
+            //}
 
-            return false;
+            //return false;
+        }
+    }
+
+    public class BooleanOrToVisibilityConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            // 如果任一条件为 true，则返回 Visible，否则返回 Hidden/Collapsed
+            foreach (var value in values)
+            {
+                if (value is bool boolVal && boolVal)
+                {
+                    return Visibility.Visible;
+                }
+            }
+            return Visibility.Hidden;//Collapsed
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
         }
     }
 }

ProxySuper.Core/Models/Hosts/Host.cs

@@ -20,12 +20,12 @@ namespace ProxySuper.Core.Models.Hosts
 
         public string Address { get; set; }
 
+        public int Port { get; set; } = 22;
+
         public string UserName { get; set; }
 
         public string Password { get; set; }
 
-        public int Port { get; set; } = 22;
-
         public string PrivateKeyPath { get; set; }
 
         public string PrivateKeyPassPhrase { get; set; }
@@ -34,24 +34,47 @@ namespace ProxySuper.Core.Models.Hosts
 
         public LoginSecretType SecretType { get; set; }
 
-        public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
+        //public IMvxCommand UploadPrivateKeyCommand => new MvxCommand(UploadPrivateKey);
+        
+        private readonly IMvxCommand _uploadPrivateKeyCommand;
+        public IMvxCommand UploadPrivateKeyCommand => _uploadPrivateKeyCommand ?? new MvxCommand(UploadPrivateKey);
 
         private void UploadPrivateKey()
         {
-            var fileDialog = new OpenFileDialog();
+            var fileDialog = new OpenFileDialog() 
+            {
+                Filter = "Private Key (*.pem;*.key)|*.pem;*.key|All File (*.*)|*.*",
+                Title = "Select the private key file"
+            };
             fileDialog.FileOk += OnFileOk;
             fileDialog.ShowDialog();
         }
 
-        private void OnFileOk(object sender, CancelEventArgs e)
+        private async void OnFileOk(object sender, CancelEventArgs e)
         {
             var file = sender as OpenFileDialog;
-            PrivateKeyPath = file.FileName;
+            if (file != null)
-
-            Task.Delay(300).ContinueWith((t) =>
             {
-                MessageBox.Show("上传成功", "提示");
+                PrivateKeyPath = file.FileName;
-            });
+
+                //Task.Delay(300).ContinueWith((t) =>
+                //{
+                //    MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
+                //});
+
+                await Task.Delay(300);
+                MessageBox.Show("OK:" + PrivateKeyPath, "Tips");
+            }
+            else
+            {
+                //Task.Delay(300).ContinueWith((t) =>
+                //{
+                //    MessageBox.Show("Error:Unable to get file!", "Tips");
+                //});
+
+                await Task.Delay(300);
+                MessageBox.Show("Error:Unable to get file!", "Tips");
+            }
         }
     }
 }

ProxySuper.Core/ProxySuper.Core.csproj

@@ -47,8 +47,8 @@
     <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
       <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
+      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

ProxySuper.Core/Services/ServiceBase.cs

@@ -829,7 +829,8 @@ namespace ProxySuper.Core.Services
                     proxyType: _host.Proxy.Type,
                     proxyHost: _host.Proxy.Address,
                     proxyPort: _host.Proxy.Port,
-                    proxyUsername: _host.Proxy.UserName, proxyPassword: _host.Proxy.Password,
+                    proxyUsername: _host.Proxy.UserName,
+                    proxyPassword: _host.Proxy.Password,
                     authenticationMethods: authMethods.ToArray());
             }
             catch (Exception ex)

ProxySuper.Core/Services/XrayConfigBuilder.cs

@@ -79,7 +79,8 @@ namespace ProxySuper.Core.Services
                 }
                 var domain = parameters.MaskDomain
                     .TrimStart("http://".ToCharArray())
-                    .TrimStart("https://".ToCharArray());
+                    .TrimStart("https://".ToCharArray())
+                    .TrimEnd('/');
 
                 caddyStr = caddyStr.Replace("##reverse_proxy##", $"reverse_proxy {prefix}{domain} {{ \n        header_up Host {domain} \n    }}");
             }
@@ -103,7 +104,7 @@ namespace ProxySuper.Core.Services
                 }
                 else
                 {
-                    flow = "xtls-rprx-vision,none";//兼容普通tls与xtls
+                    flow = "xtls-rprx-vision";//兼容普通tls与xtls
                     obj = new { id = id, flow = flow };
                 }
 

ProxySuper.Core/packages.config

@@ -3,7 +3,7 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
   <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
   <package id="QRCoder" version="1.4.3" targetFramework="net472" />
-  <package id="SSH.NET" version="2020.0.2" targetFramework="net472" />
+  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Console" version="4.3.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />

ProxySuper.WPF/Controls/HostControl.xaml

@@ -13,6 +13,10 @@
     <UserControl.Resources>
         <convert:LoginSecretTypeConverter x:Key="SecretTypeConverter" />
         <convert:ProxyTypeConverter x:Key="ProxyTypeConverter" />
+        <convert:BooleanOrConverter x:Key="BooleanOrConverter" />
+        <convert:BooleanOrToVisibilityConverter x:Key="BooleanOrToVisibilityConverter" />
+        <convert:VisibleConverter x:Key="VisibleConverter" />
+        
     </UserControl.Resources>
     
     <Grid>
@@ -95,7 +99,13 @@
                                  }" />
                 </StackPanel>
 
-                <Label Content="{DynamicResource HostUploadSecretKey}" Grid.Row="6" Grid.Column="0" /> 
+                <Label Content="{DynamicResource HostUploadSecretKey}" 
+                       Grid.Row="6" Grid.Column="0" 
+                       Visibility="{
+                            Binding Host.SecretType,
+                            Converter={StaticResource VisibleConverter},
+                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
+                        }"/> 
                 <Button Height="24"
                         Width="100"
                         HorizontalAlignment="Left"
@@ -106,9 +116,20 @@
                             Converter={StaticResource SecretTypeConverter},
                             ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
                         }"
+                        Visibility="{
+                            Binding Host.SecretType,
+                            Converter={StaticResource VisibleConverter},
+                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
+                        }"
                         Content="{DynamicResource HostUploadSecretKey}" />
 
-                <Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" Grid.Row="7" Grid.Column="0" />
+                <Label Content="{DynamicResource HostSertTypePrivateKeyPassPhrase}" 
+                       Grid.Row="7" Grid.Column="0" 
+                       Visibility="{
+                            Binding Host.SecretType,
+                            Converter={StaticResource VisibleConverter},
+                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
+                        }"/>
                 <TextBox Grid.Row="7" Grid.Column="1"
                          Width="170"
                          Text="{Binding Host.PrivateKeyPassPhrase}"
@@ -117,7 +138,32 @@
                             Converter={StaticResource SecretTypeConverter},
                             ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
                         }"
-                         VerticalContentAlignment="Center" />
+                        Visibility="{
+                            Binding Host.SecretType,
+                            Converter={StaticResource VisibleConverter},
+                            ConverterParameter={x:Static host:LoginSecretType.PrivateKey}
+                        }"
+                         VerticalContentAlignment="Center" Height="26" >
+                    <TextBox.Resources>
+                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
+                            <VisualBrush.Visual>
+                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
+                            </VisualBrush.Visual>
+                        </VisualBrush>
+                    </TextBox.Resources>
+                    <TextBox.Style>
+                        <Style TargetType="TextBox">
+                            <Style.Triggers>
+                                <Trigger Property="Text" Value="{x:Null}">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                                <Trigger Property="Text" Value="">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </TextBox.Style>
+                </TextBox>
             </Grid>
         </GroupBox>
 
@@ -144,13 +190,6 @@
                                     Converter={StaticResource ProxyTypeConverter},
                                     ConverterParameter={x:Static ssh:ProxyTypes.None}
                                  }"/>
-                    <RadioButton Content="{DynamicResource ProxyTypeHttp}"
-                                 Margin="5,0"
-                                 IsChecked="{
-                                    Binding Host.Proxy.Type,
-                                    Converter={StaticResource ProxyTypeConverter},
-                                    ConverterParameter={x:Static ssh:ProxyTypes.Http}
-                                 }"/>
                     <RadioButton Content="{DynamicResource ProxyTypeSocks5}"
                                  Margin="5,0"
                                  IsChecked="{
@@ -158,19 +197,175 @@
                                     Converter={StaticResource ProxyTypeConverter},
                                     ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
                                  }"/>
+                    <RadioButton Content="{DynamicResource ProxyTypeHttp}"
+                                 Margin="5,0"
+                                 IsChecked="{
+                                    Binding Host.Proxy.Type,
+                                    Converter={StaticResource ProxyTypeConverter},
+                                    ConverterParameter={x:Static ssh:ProxyTypes.Http}
+                                 }"/>
                 </StackPanel>
 
-                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" />
+                <Label Content="{DynamicResource ProxyAddress}" Grid.Row="1" Grid.Column="0" >
-                <TextBox Text="{Binding Host.Proxy.Address}" Grid.Row="1" Grid.Column="1" />
+                    <Label.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                        </MultiBinding>
+                    </Label.Visibility>
+                </Label>
+                <TextBox Text="{Binding Host.Proxy.Address}" 
+                         Grid.Row="1" 
+                         Grid.Column="1" >
+                    <!-- IsEnabled="{
+                                    Binding Host.Proxy.Type,
+                                    Converter={StaticResource ProxyTypeConverter},
+                                    ConverterParameter={x:Static ssh:ProxyTypes.Socks5}
+                         }" -->
+                         <TextBox.IsEnabled>
+                            <MultiBinding Converter="{StaticResource BooleanOrConverter}">
+                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                                <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                            </MultiBinding>
+                        </TextBox.IsEnabled>
+                    <TextBox.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                        </MultiBinding>
+                    </TextBox.Visibility>
+                </TextBox>
 
-                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="2" Grid.Column="0" />
+                <Label Content="{DynamicResource HostPort}" Grid.Row="2" Grid.Column="0" >
-                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="2" Grid.Column="1" />
+                    <Label.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                               Converter="{StaticResource ProxyTypeConverter}" 
+                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                            <Binding Path="Host.Proxy.Type" 
+                               Converter="{StaticResource ProxyTypeConverter}" 
+                               ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                        </MultiBinding>
+                    </Label.Visibility>
+                </Label>
+                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="2" Grid.Column="1" >
+                    <TextBox.IsEnabled>
+                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
+                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                        </MultiBinding>
+                    </TextBox.IsEnabled>
+                    <TextBox.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Http}" />
+                        </MultiBinding>
+                    </TextBox.Visibility>
+                </TextBox>
 
-                <Label Content="{DynamicResource HostPort}" Grid.Row="3" Grid.Column="0" />
+                <Label Content="{DynamicResource ProxyUserName}" Grid.Row="3" Grid.Column="0" >
-                <TextBox Text="{Binding Host.Proxy.Port}" Grid.Row="3" Grid.Column="1" />
+                    <Label.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                               Converter="{StaticResource ProxyTypeConverter}" 
+                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </Label.Visibility>
+                </Label>
+                <TextBox Text="{Binding Host.Proxy.UserName}" Grid.Row="3" Grid.Column="1" Height="26" >
+                    <TextBox.IsEnabled>
+                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
+                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </TextBox.IsEnabled>
+                    <TextBox.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </TextBox.Visibility>
+                    <TextBox.Resources>
+                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
+                            <VisualBrush.Visual>
+                                <TextBlock FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
+                            </VisualBrush.Visual>
+                        </VisualBrush>
+                    </TextBox.Resources>
+                    <TextBox.Style>
+                        <Style TargetType="TextBox">
+                            <Style.Triggers>
+                                <Trigger Property="Text" Value="{x:Null}">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                                <Trigger Property="Text" Value="">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </TextBox.Style>
+                </TextBox>
 
-                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" />
+                <Label Content="{DynamicResource ProxyPassword}" Grid.Row="4" Grid.Column="0" >
-                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" />
+                    <Label.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                               Converter="{StaticResource ProxyTypeConverter}" 
+                               ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </Label.Visibility>
+                </Label>
+                <TextBox Text="{Binding Host.Proxy.Password}" Grid.Row="4" Grid.Column="1" Height="26" >
+                    <TextBox.IsEnabled>
+                        <MultiBinding Converter="{StaticResource BooleanOrConverter}">
+                            <Binding Path="Host.Proxy.Type" Converter="{StaticResource ProxyTypeConverter}" 
+                                         ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </TextBox.IsEnabled>
+                    <TextBox.Visibility>
+                        <MultiBinding Converter="{StaticResource BooleanOrToVisibilityConverter}">
+                            <Binding Path="Host.Proxy.Type" 
+                                Converter="{StaticResource ProxyTypeConverter}" 
+                                ConverterParameter="{x:Static ssh:ProxyTypes.Socks5}" />
+                        </MultiBinding>
+                    </TextBox.Visibility>
+                    <TextBox.Resources>
+                        <VisualBrush x:Key="HelpBrush" TileMode="None" Opacity="0.3" Stretch="None" AlignmentX="Left">
+                            <VisualBrush.Visual>
+                                <TextBlock Height="auto" FontStyle="Italic" Text="{DynamicResource TextBoxContentTipsNoneBlank}"/>
+                            </VisualBrush.Visual>
+                        </VisualBrush>
+                    </TextBox.Resources>
+                    <TextBox.Style>
+                        <Style TargetType="TextBox">
+                            <Style.Triggers>
+                                <Trigger Property="Text" Value="{x:Null}">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                                <Trigger Property="Text" Value="">
+                                    <Setter Property="Background" Value="{StaticResource HelpBrush}"/>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </TextBox.Style>
+                </TextBox>
 
             </Grid>
         </GroupBox>

ProxySuper.WPF/Controls/XraySettingsControl.xaml

@@ -17,6 +17,13 @@
             <StackPanel Orientation="Horizontal">
                 <!--#region VLESS -->
                 <WrapPanel Orientation="Vertical">
+                    <!--XTLS+Reality-->
+                    <CheckBox Width="150"
+                              VerticalContentAlignment="Center"
+                              IsChecked="{Binding Path=Checked_VLESS_TCP_XTLS}">
+                        <Label Content="{DynamicResource VlessXtlsRealityDesc}"  FontSize="12" Foreground="LimeGreen" />
+                    </CheckBox>
+
                     <!--XTLS-->
                     <CheckBox Width="150"
                               VerticalContentAlignment="Center"

ProxySuper.WPF/MainWindow.xaml

@@ -8,7 +8,7 @@
         mc:Ignorable="d"
         WindowStartupLocation="CenterScreen"
         Icon="/Resources/ProxySU.ico"
-        Title="ProxySU   v4.1.10" Height="600" Width="1000">
+        Title="ProxySU   v4.2.0" Height="600" Width="1000">
     <Grid>
         
     </Grid>

ProxySuper.WPF/Properties/AssemblyInfo.cs

@@ -49,5 +49,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.10.0")]
+[assembly: AssemblyVersion("4.2.0.0")]
-[assembly: AssemblyFileVersion("4.1.10.0")]
+[assembly: AssemblyFileVersion("4.2.0.0")]

ProxySuper.WPF/ProxySuper.WPF.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
   　　<AllowedReferenceRelatedFileExtensions>
@@ -18,7 +19,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -32,6 +33,9 @@
     <StartupObject>ProxySuper.WPF.App</StartupObject>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
@@ -44,8 +48,8 @@
     <Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
       <HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
     </Reference>
-    <Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
+    <Reference Include="Renci.SshNet, Version=2023.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
+      <HintPath>..\packages\SSH.NET.2023.0.0\lib\net462\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -712,5 +716,10 @@
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.7.0\build\net461\System.Runtime.WindowsRuntime.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
   </Target>
+  <Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
+  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
 </Project>

ProxySuper.WPF/Resources/Languages/en.xaml

@@ -29,6 +29,7 @@
     <sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
     <sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>
+    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">Related Resources and Tutorials</sys:String>
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">Tag</sys:String>
@@ -51,11 +52,12 @@
     <sys:String x:Key="HostPassword">Password</sys:String>
     <sys:String x:Key="HostPort">Port</sys:String>
     <sys:String x:Key="HostSecretType">SecretType</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">LoadingKey</sys:String>
     <sys:String  x:Key="HostSertTypePassword">Password</sys:String>
     <sys:String  x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>
     <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">PKPassword</sys:String>
 
+    <sys:String x:Key="TextBoxContentTipsNoneBlank">None,Blank</sys:String>
 
     <sys:String x:Key="ProxyGroupName">Proxy</sys:String>
     <sys:String x:Key="ProxyAddress">Address</sys:String>
@@ -72,6 +74,7 @@
     <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
 
     <!--Xray-->
+    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
     <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
     <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
     <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>

ProxySuper.WPF/Resources/Languages/fa_IR.xaml

@@ -29,6 +29,7 @@
     <sys:String x:Key="MainMenuHelperUseRoot">اکانت روت را فعال کنید</sys:String>
     <sys:String x:Key="MainMenuHelperCertQuestion">در مورد گواهینامه</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">در مورد سوال</sys:String>
+    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">منابع و آموزش های مرتبط</sys:String>
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">برچسب</sys:String>
@@ -51,11 +52,12 @@
     <sys:String x:Key="HostPassword">رمز عبور</sys:String>
     <sys:String x:Key="HostPort">پورت</sys:String>
     <sys:String x:Key="HostSecretType">نوع تأیید ورود</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">کلید آپلود</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">بارگیری کلید خصوصی</sys:String>
     <sys:String  x:Key="HostSertTypePassword">رمز عبور</sys:String>
     <sys:String  x:Key="HostSertTypePrivateKey">کلید خصوصی</sys:String>
     <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">رمز عبور PK</sys:String>
 
+    <sys:String x:Key="TextBoxContentTipsNoneBlank">اگر هیچ کدام، آن را خالی بگذارید</sys:String>
 
     <sys:String x:Key="ProxyGroupName">پروکسی</sys:String>
     <sys:String x:Key="ProxyAddress">آدرس</sys:String>
@@ -65,13 +67,14 @@
     <sys:String x:Key="ProxyType">نوع</sys:String>
     <sys:String x:Key="ProxyTypeNone">None</sys:String>
     <sys:String x:Key="ProxyTypeHttp">Http</sys:String>
-    <sys:String x:Key="ProxyTypeSocks5">ساکس5</sys:String>
+    <sys:String x:Key="ProxyTypeSocks5">Socks5</sys:String>
     
     <!--editor-->
     <sys:String x:Key="EditorProxyType" xml:space="preserve">نوع پروکسی</sys:String>
     <sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
 
     <!--Xray-->
+    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS TCP XTLS REALITY</sys:String>
     <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
     <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
     <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>

ProxySuper.WPF/Resources/Languages/tw_cn.xaml

@@ -29,7 +29,7 @@
     <sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>
     <sys:String x:Key="MainMenuHelperCertQuestion">證書問題</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">私鑰問題</sys:String>
-
+    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相關資源與教程</sys:String>
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">名稱</sys:String>
@@ -52,11 +52,13 @@
     <sys:String x:Key="HostPassword">密碼</sys:String>
     <sys:String x:Key="HostPort">端口</sys:String>
     <sys:String x:Key="HostSecretType">登録驗證</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">上傳Key</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">載入私鑰</sys:String>
     <sys:String x:Key="HostSertTypePassword">密碼</sys:String>
     <sys:String x:Key="HostSertTypePrivateKey">私鑰</sys:String>
     <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私鑰密碼</sys:String>
 
+    <sys:String x:Key="TextBoxContentTipsNoneBlank">若無,則留空</sys:String>
+
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
     <sys:String x:Key="ProxyPort">端口</sys:String>
@@ -72,7 +74,8 @@
     <sys:String x:Key="EditorProxyParams" xml:space="preserve">節點參數</sys:String>
 
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
+    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
     <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
     <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
     <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>

ProxySuper.WPF/Resources/Languages/zh_cn.xaml

@@ -29,7 +29,7 @@
     <sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>
     <sys:String x:Key="MainMenuHelperCertQuestion">证书问题</sys:String>
     <sys:String x:Key="MainMenuHelperPrivateKey">私钥问题</sys:String>
-
+    <sys:String x:Key="MainMenuHelperResourcesAndTutorials">相关资源与教程</sys:String>
 
     <!--Main DataGrid-->
     <sys:String x:Key="MainDataGridColumnTag">名称</sys:String>
@@ -53,11 +53,13 @@
     <sys:String x:Key="HostPassword">密码</sys:String>
     <sys:String x:Key="HostPort">端口</sys:String>
     <sys:String x:Key="HostSecretType">登陆验证</sys:String>
-    <sys:String x:Key="HostUploadSecretKey">上传Key</sys:String>
+    <sys:String x:Key="HostUploadSecretKey">载入私钥</sys:String>
     <sys:String x:Key="HostSertTypePassword">密码</sys:String>
     <sys:String x:Key="HostSertTypePrivateKey">私钥</sys:String>
     <sys:String x:Key="HostSertTypePrivateKeyPassPhrase">私钥密码</sys:String>
 
+    <sys:String x:Key="TextBoxContentTipsNoneBlank">若无,则留空</sys:String>
+
     <sys:String x:Key="ProxyGroupName">代理</sys:String>
     <sys:String x:Key="ProxyAddress">IP/地址</sys:String>
     <sys:String x:Key="ProxyPort">端口</sys:String>
@@ -73,7 +75,8 @@
     <sys:String x:Key="EditorProxyParams" xml:space="preserve">节点参数</sys:String>
 
     <!--Xray-->
-    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS TCP XTLS</sys:String>
+    <sys:String x:Key="VlessXtlsRealityDesc" xml:space="preserve">VLESS XTLS REALITY</sys:String>
+    <sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
     <sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
     <sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
     <sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>

ProxySuper.WPF/Templates/xray/server/05_inbounds/VLESS_TCP_XTLS.json

@@ -5,7 +5,7 @@
     "clients": [
       {
         "id": "",
-        "flow": "xtls-rprx-vision,none"
+        "flow": "xtls-rprx-vision"
       }
     ],
     "decryption": "none",

ProxySuper.WPF/Views/HomeView.xaml

@@ -41,6 +41,7 @@
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperUseRoot}" Click="LaunchUseRootSite"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperCertQuestion}" Click="LaunchCertQuestion"></MenuItem>
                 <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperPrivateKey}" Click="LaunchPrivateKeyQuestion"></MenuItem>
+                <MenuItem Padding="0,5" Header="{DynamicResource MainMenuHelperResourcesAndTutorials}" Click="LaunchResourcesAndTutorials"></MenuItem>
             </MenuItem>
         </Menu>
 

ProxySuper.WPF/Views/HomeView.xaml.cs

@@ -62,6 +62,10 @@ namespace ProxySuper.WPF.Views
             System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/PrivateKey%E8%BD%AC%E6%8D%A2");
         }
 
+        private void LaunchResourcesAndTutorials(object sender, RoutedEventArgs e)
+        {
+            System.Diagnostics.Process.Start("explorer.exe", "https://github.com/proxysu/ProxySU/wiki/%E7%9B%B8%E5%85%B3%E8%B5%84%E6%BA%90%E4%B8%8E%E6%95%99%E7%A8%8B");
+        }
 
         ResourceDictionary resource = new ResourceDictionary();
         private void SetSimpleChinese(object sender, RoutedEventArgs e)

ProxySuper.WPF/packages.config

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Fody" version="6.8.2" targetFramework="net472" developmentDependency="true" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="7.0.0" targetFramework="net472" />
   <package id="MvvmCross" version="8.0.2" targetFramework="net472" />
   <package id="MvvmCross.Platforms.Wpf" version="8.0.2" targetFramework="net472" />
   <package id="QRCoder" version="1.4.3" targetFramework="net472" />
-  <package id="SSH.NET" version="2020.0.2" targetFramework="net472" />
+  <package id="SSH.NET" version="2023.0.0" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Console" version="4.3.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />

README.md

@@ -1,10 +1,13 @@
 # ProxySU
 V2ray, Xray, Trojan, NaiveProxy, Trojan-Go, MTProto Go, Brook,BBR install tools for windows。  
 V2ray，Xray, Trojan，NaiveProxy, Trojan-Go, MTProto Go, Brook 及相关插件。支持纯ipv6主机一键安装代理。  
-BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文。
+BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语言:English、简体中文、正体（繁体）中文，波斯语。  
 
 编译环境Visual Studio 2019  使用WPF界面。可一键安装 V2ray/Xray, Shadowsocks, Trojan, Trojan-Go, NaiveProxy, MTProto Go, Brook 后续还会再添加其他。  
 
+零基础用户，强烈建议看一下[Xray官网](https://xtls.github.io)的[小小白白话文-自建教程](https://xtls.github.io/document/level-0)。  
+更多相关资源与工具请看本项目Wiki[资源和工具](https://github.com/proxysu/ProxySU/wiki/%E8%B5%84%E6%BA%90%E5%92%8C%E5%B7%A5%E5%85%B7)。  
+
 ![photo_2021-05-31_17-23-29](https://user-images.githubusercontent.com/73510229/120171754-f46ffd00-c234-11eb-8105-4e6a941a65bb.jpg)
 ![photo_2021-05-31_17-24-29](https://user-images.githubusercontent.com/73510229/120171966-297c4f80-c235-11eb-921a-2ddebad5dc58.jpg)
 
@@ -15,8 +18,9 @@ BBR一键开启（仅支持CentOS8/Debian9/10/Ubuntu18.04及以上）,支持语
 #### 再次声明：  
 ##### ProxySU本着技术中立的原则，没有任何立场，也不持任何见解，更不涉及任何政治因素。ProxySU仅仅主张人的知情权，这是一项天赋人权，也是各国宪法所保障的最基本人权。知情权包含对同一事物正负两方面评价的知情，至于相信哪个，由人自己选择。正如李文亮医生临终所言：一个正常的社会是不应该只有一种声音的。如果真的存在对某一事物只有一种声音的评价，无论其评价是正面还是负面，都是要慎重对待，并需要重新审视的。  
 
-##### 上传自有证书 #####
+
-需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”
+##### 代理版本的选择  
+多数情况下，ProxySU安装代理工具的Latest版。  
 
 ##### 支持的VPS系统为：  
 * CentOS 7/8   
@@ -86,6 +90,9 @@ Let's Encrypt证书申请频率的限制
 同一IP地址，在短时间内过于频繁的申请证书，也会被限制，此时更换域名也无法申请成功，只能等待一段时间，或者更换Ip.  
 (网友分享)  
 
+##### 上传自有证书 #####
+需要将crt和key文件打包成zip，在安装界面选择“上传自有证书”
+
 ##### 关于卸载功能  
 有网友要求，可以卸载其他方法安装的，经过考虑，还是不这样做。1，容易引起争议。2，不容易卸载干净，在用ProxySU安装时可能还会出错。所以第一次使用ProxySU建议使用全新系统，如果以前安装过代理程序，请尽可能将系统重装一下，可以减少很多安装的错误和冲突。