diff --git a/ProxySU/MainWindow.xaml b/ProxySU/MainWindow.xaml index 2256d76..be9e36f 100644 --- a/ProxySU/MainWindow.xaml +++ b/ProxySU/MainWindow.xaml @@ -5,7 +5,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:ProxySU" mc:Ignorable="d" - Title="ProxySU - v2.4.15" Height="675" Width="650"> + Title="ProxySU - v2.4.16" Height="675" Width="650"> diff --git a/ProxySU/MainWindow.xaml.cs b/ProxySU/MainWindow.xaml.cs index d8e25d6..62e669c 100644 --- a/ProxySU/MainWindow.xaml.cs +++ b/ProxySU/MainWindow.xaml.cs @@ -70,13 +70,13 @@ namespace ProxySU //ReceiveConfigurationParameters[0]----模板类型 //ReceiveConfigurationParameters[1]----服务端口 //ReceiveConfigurationParameters[2]----V2Ray uuid/(naive/Trojan-go/Trojan/SSR/SS)' Password - //ReceiveConfigurationParameters[3]----QUIC加密方式/SSR 加密方法/SS 加密方式/naive'user/VLESS ws Path + //ReceiveConfigurationParameters[3]----QUIC加密方式/SSR 加密方法/SS 加密方式/naive'user/VLESS ws Path/trojan-go mux concurrency //ReceiveConfigurationParameters[4]----Domain - //ReceiveConfigurationParameters[5]----伪装类型/插件名称 + //ReceiveConfigurationParameters[5]----伪装类型/插件名称/trojan-go mux idle_timeout //ReceiveConfigurationParameters[6]----V2Ray&Trojan-go&SS--Websocket'Path/http2'Path/QUIC密钥/mKCP Seed/VMESS ws Path //ReceiveConfigurationParameters[7]----伪装网站 //ReceiveConfigurationParameters[8]----方案名称 - //ReceiveConfigurationParameters[9]----插件参数选项/VMESS tcp Path/MTProto Parameters + //ReceiveConfigurationParameters[9]----插件参数选项/VMESS tcp Path/MTProto Parameters/trojan-go是否启用Mux(true) //public static ConnectionInfo ConnectionInfo; public static string proxyType = "V2Ray"; //代理类型标识: V2Ray\TrojanGo\Trojan\NaiveProxy @@ -2569,6 +2569,23 @@ namespace ProxySU clientJson["websocket"]["enabled"] = true; clientJson["websocket"]["path"] = ReceiveConfigurationParameters[6]; } + //如果开启了mux，设置客户端配置文件参数 + if (String.Equals(ReceiveConfigurationParameters[9],"true") == true) + { + clientJson["mux"]["enabled"] = true; + clientJson["mux"]["concurrency"] = int.Parse(ReceiveConfigurationParameters[3]); + clientJson["mux"]["idle_timeout"] = int.Parse(ReceiveConfigurationParameters[5]); + //if(int.TryParse(ReceiveConfigurationParameters[3],out int value) == true) + //{ + // clientJson["mux"]["concurrency"] = value; + //} + //if (int.TryParse(ReceiveConfigurationParameters[5], out int value2) == true) + //{ + // clientJson["mux"]["idle_timeout"] = value2; + //} + //clientJson["mux"]["idle_timeout"] = int.TryParse(ReceiveConfigurationParameters[5], out int value2); + //clientJson["mux"]["idle_timeout"] = value2; + } using (StreamWriter sw = new StreamWriter(@"trojan-go_config\config.json")) { @@ -6919,7 +6936,7 @@ namespace ProxySU #region 测试用代码 private void Button_Click(object sender, RoutedEventArgs e) { - proxyType = "V2Ray"; + proxyType = "TrojanGo"; ResultClientInformation resultClientInformation = new ResultClientInformation(); resultClientInformation.ShowDialog(); return; diff --git a/ProxySU/Properties/AssemblyInfo.cs b/ProxySU/Properties/AssemblyInfo.cs index 9882fbe..0719fe1 100644 --- a/ProxySU/Properties/AssemblyInfo.cs +++ b/ProxySU/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.4.15.0")] -[assembly: AssemblyFileVersion("2.4.15.0")] +[assembly: AssemblyVersion("2.4.16.0")] +[assembly: AssemblyFileVersion("2.4.16.0")] diff --git a/ProxySU/ResultClientInformation.xaml b/ProxySU/ResultClientInformation.xaml index 239c808..3f062ea 100644 --- a/ProxySU/ResultClientInformation.xaml +++ b/ProxySU/ResultClientInformation.xaml @@ -13,7 +13,7 @@ - + @@ -93,12 +93,12 @@ - + - + @@ -107,6 +107,7 @@ + @@ -124,8 +125,25 @@ - - + + + + + + + + + + + + + + + + + + + diff --git a/ProxySU/ResultClientInformation.xaml.cs b/ProxySU/ResultClientInformation.xaml.cs index 35c5da7..f9476a0 100644 --- a/ProxySU/ResultClientInformation.xaml.cs +++ b/ProxySU/ResultClientInformation.xaml.cs @@ -362,6 +362,10 @@ namespace ProxySU TextBlockTrojanGoWebSocketPath.Visibility = Visibility.Hidden; TextBlockTrojanGoCaption.Visibility = Visibility.Hidden; + TextBlockMuxSelect.Visibility = Visibility.Hidden; + GridMuxSelect.Visibility = Visibility.Hidden; + TextBlockExplainCheckBoxMuxSelectResult.Visibility = Visibility.Hidden; + //******"可用于ShadowRocket (ios)、igniter（Android）、Qv2ray (windows) 扫码和导入url。注意：有的客户端可能不支持WebSocket模式。" ****** TextBlockQrURLexplain.Text = Application.Current.FindResource("TextBlockQrURLexplainTrojan-go").ToString(); @@ -383,6 +387,14 @@ namespace ProxySU TextBlockTrojanGoCaption.Visibility = Visibility.Visible; } + if(String.Equals(MainWindow.ReceiveConfigurationParameters[9],"true") == true) + { + TextBoxConcurrency.Text = MainWindow.ReceiveConfigurationParameters[3]; + TextBoxIdle_timeout.Text = MainWindow.ReceiveConfigurationParameters[5]; + TextBlockMuxSelect.Visibility = Visibility.Visible; + GridMuxSelect.Visibility = Visibility.Visible; + TextBlockExplainCheckBoxMuxSelectResult.Visibility = Visibility.Visible; + } CheckDir("trojan-go_config"); GenerateTrojanGoShareQRcodeAndBase64Url(); } @@ -2062,7 +2074,7 @@ namespace ProxySU //sw.WriteLine(Application.Current.FindResource("TextBlockTrojanGoPassword").ToString() + $"{TextBoxTrojanGoServerPassword.Text}"); //strApplicat = "TextBlockTrojanGoPassword"; strParam = TextBoxTrojanGoType.Text; - sw.WriteLine(AlignmentStrFunc("Type", strLenth) + strParam); + sw.WriteLine(AlignmentStrFunc("Type:", strLenth) + strParam); //sw.WriteLine(AlignmentStrFunc(Application.Current.FindResource($"{strApplicat}").ToString(), strLenth) + strParam); //****** WebSocket路径: ****** @@ -2071,6 +2083,24 @@ namespace ProxySU strParam = TextBoxTrojanGoWSPath.Text; sw.WriteLine(AlignmentStrFunc(Application.Current.FindResource($"{strApplicat}").ToString(), strLenth) + strParam); + //****** Mux多路复用 ****** + //sw.WriteLine(Application.Current.FindResource("TextBlockTrojanGoWebSocketPath").ToString() + $"{TextBoxTrojanGoWSPath.Text}"); + strApplicat = "CheckBoxMuxSelect"; + strParam = ":"; + sw.WriteLine(AlignmentStrFunc(Application.Current.FindResource($"{strApplicat}").ToString(), strLenth) + strParam); + + //****** concurrency: ****** + //sw.WriteLine(Application.Current.FindResource("TextBlockTrojanGoWebSocketPath").ToString() + $"{TextBoxTrojanGoWSPath.Text}"); + strApplicat = "concurrency:"; + strParam = TextBoxConcurrency.Text; + sw.WriteLine(AlignmentStrFunc(strApplicat, strLenth) + strParam); + + //****** idle_timeout: ****** + //sw.WriteLine(Application.Current.FindResource("TextBlockTrojanGoWebSocketPath").ToString() + $"{TextBoxTrojanGoWSPath.Text}"); + strApplicat = "idle_timeout:"; + strParam = TextBoxIdle_timeout.Text; + sw.WriteLine(AlignmentStrFunc(strApplicat, strLenth) + strParam); + } } @@ -2098,6 +2128,15 @@ namespace ProxySU { CopyToClipboard(TextBoxTrojanGoWSPath.Text); } + private void TextBoxConcurrency_MouseDoubleClick(object sender, MouseButtonEventArgs e) + { + CopyToClipboard(TextBoxConcurrency.Text); + } + + private void TextBoxIdle_timeout_MouseDoubleClick(object sender, MouseButtonEventArgs e) + { + CopyToClipboard(TextBoxIdle_timeout.Text); + } #endregion //生成TrojanGo的分享链接 @@ -3059,7 +3098,7 @@ namespace ProxySU return spaceString + strTemp; } - + } diff --git a/ProxySU/Translations/ProxySU.en-US.xaml b/ProxySU/Translations/ProxySU.en-US.xaml index 16a2fc4..0090a85 100644 --- a/ProxySU/Translations/ProxySU.en-US.xaml +++ b/ProxySU/Translations/ProxySU.en-US.xaml @@ -138,6 +138,9 @@ Password: Use the existing password and paste it directly into the box WebSocket Path: + Mux multiplexing + The settings here are only valid for the official client configuration file config.json, other clients need to be set manually, and the server automatically adapts. + This field does not appear in the QR code and sharing URL. The client needs to set it by itself, and the server enables automatic adaptation by default. OK Cancel diff --git a/ProxySU/Translations/ProxySU.zh-CN.xaml b/ProxySU/Translations/ProxySU.zh-CN.xaml index 16b7925..fc43b83 100644 --- a/ProxySU/Translations/ProxySU.zh-CN.xaml +++ b/ProxySU/Translations/ProxySU.zh-CN.xaml @@ -139,6 +139,9 @@ 密码: 使用已有密码，直接粘贴到框中 WebSocket路径: + Mux多路复用 + 此处设置只对官方客户端配置文件config.json有效，其他客户端需手动设置，服务端自动适配。 + 此字段不出现在QR码及分享URL中，客户端需自行设置，服务端默认启用自动适配。 确定 取消 diff --git a/ProxySU/Translations/ProxySU.zh-TW.xaml b/ProxySU/Translations/ProxySU.zh-TW.xaml index bb206ca..b606651 100644 --- a/ProxySU/Translations/ProxySU.zh-TW.xaml +++ b/ProxySU/Translations/ProxySU.zh-TW.xaml @@ -138,6 +138,9 @@ 密碼: 使用已有密碼，直接粘貼到框中 WebSocket路徑: + Mux多路復用 + 此處設置只對官方客戶端配置文件config.json有效，其他客戶端需手動設置，服務端自動適配。 + 此字段不出現在QR碼及分享URL中，客戶端需自行設置，服務端默認啟用自動適配。 確定 取消 diff --git a/ProxySU/TrojanGoTemplateWindow.xaml b/ProxySU/TrojanGoTemplateWindow.xaml index 948de9a..9bcf057 100644 --- a/ProxySU/TrojanGoTemplateWindow.xaml +++ b/ProxySU/TrojanGoTemplateWindow.xaml @@ -74,7 +74,7 @@ - + @@ -92,10 +92,26 @@ - + + + + + + + + + + + + + + + + + - + @@ -103,8 +119,8 @@ - - + + diff --git a/ProxySU/TrojanGoTemplateWindow.xaml.cs b/ProxySU/TrojanGoTemplateWindow.xaml.cs index 6f6cebb..b0510ee 100644 --- a/ProxySU/TrojanGoTemplateWindow.xaml.cs +++ b/ProxySU/TrojanGoTemplateWindow.xaml.cs @@ -22,6 +22,9 @@ namespace ProxySU { InitializeComponent(); RadioButtonTrojanGoTLS2Web.IsChecked = true; + CheckBoxMuxSelect.IsChecked = false; + GridTrojanGoMuxSelected.Visibility = Visibility.Collapsed; + TextBlockExplainCheckBoxMuxSelect.Visibility = Visibility.Collapsed; } private void ButtondDecide_Click(object sender, RoutedEventArgs e) { @@ -71,7 +74,13 @@ namespace ProxySU //传递路径 MainWindow.ReceiveConfigurationParameters[6] = TextBoxPath.Text; } - + //传递Mux的concurrency与idle_timeout + if (CheckBoxMuxSelect.IsChecked == true) + { + MainWindow.ReceiveConfigurationParameters[9] = "true"; + MainWindow.ReceiveConfigurationParameters[3] = TextBoxConcurrency.Text; + MainWindow.ReceiveConfigurationParameters[5] = TextBoxIdle_timeout.Text; + } this.Close(); } //更新密码 @@ -153,5 +162,16 @@ namespace ProxySU } } + private void CheckBoxMuxSelect_Checked(object sender, RoutedEventArgs e) + { + GridTrojanGoMuxSelected.Visibility = Visibility.Visible; + TextBlockExplainCheckBoxMuxSelect.Visibility = Visibility.Visible; + } + + private void CheckBoxMuxSelect_Unchecked(object sender, RoutedEventArgs e) + { + GridTrojanGoMuxSelected.Visibility = Visibility.Collapsed; + TextBlockExplainCheckBoxMuxSelect.Visibility = Visibility.Collapsed; + } } } diff --git a/ProxySU/bin/Beta/Beta.zip b/ProxySU/bin/Beta/Beta.zip index 9cef0cf..568c585 100644 Binary files a/ProxySU/bin/Beta/Beta.zip and b/ProxySU/bin/Beta/Beta.zip differ diff --git a/TemplateConfg/trojan-go/trojan-go_all_config.json b/TemplateConfg/trojan-go/trojan-go_all_config.json index 40af417..4cd3c65 100644 --- a/TemplateConfg/trojan-go/trojan-go_all_config.json +++ b/TemplateConfg/trojan-go/trojan-go_all_config.json @@ -14,5 +14,10 @@ "websocket": { "enabled": false, "path": "" + }, + "mux": { + "enabled": false, + "concurrency": 8, + "idle_timeout": 60 } } \ No newline at end of file