mirror/ProxySU
1
0
Fork 0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-11-25 22:56:09 +03:00
Code Issues Projects Releases Wiki Activity

适配v2rayN的mKCP Seed

Browse Source
This commit is contained in:
ProxySU 2020-09-01 11:09:46 +08:00
parent 7e2a0249aa
commit 81a598caec
10 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProxySU/MainWindow.xaml
View File

@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySU"
mc:Ignorable="d"
Title="ProxySU - v1.8.6" Height="625" Width="530">
Title="ProxySU - v2.0.1" Height="625" Width="530">
<!--以下样式参考自：https://yq.aliyun.com/articles/331878
https://docs.microsoft.com/en-us/dotnet/desktop-wpf/fundamentals/styles-templates-overview-->
<Window.Resources>

4
ProxySU/ResultClientInformation.xaml
View File

@ -13,7 +13,7 @@
<RowDefinition Height="0.12*"></RowDefinition>
</Grid.RowDefinitions>
<!-- 客户端配置参数 -->
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Collapsed" Grid.Row="0">
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Visible" Grid.Row="0">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.6*"></ColumnDefinition>
@ -133,7 +133,7 @@
</Grid>
</GroupBox>
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxNaiveProxyClient" Visibility="Visible" Grid.Row="0">
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxNaiveProxyClient" Visibility="Collapsed" Grid.Row="0">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0.5*"></ColumnDefinition>

35
ProxySU/ResultClientInformation.xaml.cs
View File

@ -33,6 +33,7 @@ namespace ProxySU
if (String.Equals(MainWindow.proxyType, "V2Ray"))
{
//显示V2Ray参数，隐藏其他
GroupBoxV2rayClient.Visibility = Visibility.Visible;
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
@ -57,7 +58,7 @@ namespace ProxySU
TextBoxHost.Text = "";
//路径Path
TextBoxPath.Text = MainWindow.ReceiveConfigurationParameters[3];
//QUIC密钥
//QUIC密钥/mKCP Seed
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLS2Web"))
@ -168,7 +169,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2SRTP"))
{
@ -177,7 +178,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCPuTP"))
{
@ -186,7 +187,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WechatVideo"))
{
@ -195,7 +196,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2DTLS"))
{
@ -204,7 +205,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WireGuard"))
{
@ -213,7 +214,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示mKCP Seed
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicNone"))
{
@ -222,7 +223,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicSRTP"))
{
@ -231,7 +232,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "Quic2uTP"))
{
@ -240,7 +241,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWechatVideo"))
{
@ -249,7 +250,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicDTLS"))
{
@ -258,7 +259,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWireGuard"))
{
@ -267,7 +268,7 @@ namespace ProxySU
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
TextBoxTLS.Text = "none";
HidePath();
ShowQuicKey();
ShowQuicKey();//显示QUIC密钥
}
else
@ -421,8 +422,12 @@ namespace ProxySU
v2rayNjsonObject["aid"] = TextBoxUUIDextra.Text; //设置额外ID
v2rayNjsonObject["net"] = TextBoxTransmission.Text; //设置传输模式
v2rayNjsonObject["type"] = TextBoxCamouflageType.Text; //设置伪装类型
if (TextBoxTransmission.Text.Contains("quic")==true)
if (TextBoxTransmission.Text.Contains("kcp") == true)
{
v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置mKCP Seed
}
else if (TextBoxTransmission.Text.Contains("quic")==true)
{
v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置quic密钥
v2rayNjsonObject["host"] = "chacha20-poly1305";

6
ProxySU/Translations/ProxySU.en-US.xaml
View File

@ -71,8 +71,8 @@
<sys:String x:Key="ButtonV2RayServerPortChange">Random</sys:String>
<sys:String x:Key="TextBlockV2RayServerPortExplain">If TLS encryption is used, please keep the default port 443</sys:String>
<sys:String x:Key="TextBlockV2RayUUIDExplain">Use the existing UUID and paste it directly into the box</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC key</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">Enable the mKCP key to enhance anti-recognition, leave it blank to disable it. Version 4.24.2 or above is required. V2rayN does not currently support</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP Seed/QUIC key</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">Enable the mKCP Seed key to enhance anti-recognition, leave it blank to disable it. Version 4.24.2 or above is required. V2rayN does not currently support</sys:String>
<sys:String x:Key="TextBlockV2RayPath">Path:</sys:String>
<sys:String x:Key="TextBlockV2RayDomain">Domain name:</sys:String>
<sys:String x:Key="TextBlockV2RayMaskSites">Mask a website:</sys:String>
@ -130,7 +130,7 @@
<sys:String x:Key="TextBlockCamouflageType">Camouflage type:</sys:String>
<sys:String x:Key="TextBlockIsOrNotTLS">TLS:</sys:String>
<sys:String x:Key="TextBlockClientPath">Path:</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP/QUIC key:</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP Seed/QUIC key:</sys:String>
<sys:String x:Key="TextBlockEncryptionIsAuto">default auto</sys:String>
<sys:String x:Key="GrouBoxHeaderUrlOrQR">QR/URL</sys:String>
<sys:String x:Key="TextBlockUsedParameter">The above parameters can be entered into the client manually or by scanning. The configuration and related files used for the official client have been stored in the directory. Click the OK button to open</sys:String>

6
ProxySU/Translations/ProxySU.zh-CN.xaml
View File

@ -71,8 +71,8 @@
<sys:String x:Key="ButtonV2RayServerPortChange">随机选择</sys:String>
<sys:String x:Key="TextBlockV2RayServerPortExplain">若使用TLS加密，请保持默认的443端口</sys:String>
<sys:String x:Key="TextBlockV2RayUUIDExplain">使用已有UUID，直接粘贴到框中</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC密钥</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">启用mKCP密钥，可增强抗识别，留空则禁用,要求版本4.24.2以上,V2rayN暂不支持</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP Seed/QUIC密钥</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">启用mKCP Seed密钥，可增强抗识别，留空则禁用,要求版本4.24.2以上,V2rayN暂不支持</sys:String>
<sys:String x:Key="TextBlockV2RayPath">路径：</sys:String>
<sys:String x:Key="TextBlockV2RayDomain">域名：</sys:String>
<sys:String x:Key="TextBlockV2RayMaskSites">伪装网站：</sys:String>
@ -130,7 +130,7 @@
<sys:String x:Key="TextBlockCamouflageType">伪装类型:</sys:String>
<sys:String x:Key="TextBlockIsOrNotTLS">是否使用TLS:</sys:String>
<sys:String x:Key="TextBlockClientPath">路径(Path):</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP/QUIC密钥:</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP Seed/QUIC密钥:</sys:String>
<sys:String x:Key="TextBlockEncryptionIsAuto">默认auto</sys:String>
<sys:String x:Key="GrouBoxHeaderUrlOrQR">二维码/URL</sys:String>
<sys:String x:Key="TextBlockUsedParameter">以上参数可以手动或扫描输入客户端，用于官方客户端的配置和相关文件已经存放入目录下，点击 确定 按扭可打开</sys:String>

6
ProxySU/Translations/ProxySU.zh-TW.xaml
View File

@ -72,8 +72,8 @@
<sys:String x:Key="ButtonV2RayServerPortChange">隨機選擇</sys:String>
<sys:String x:Key="TextBlockV2RayServerPortExplain">若使用TLS加密，請保持默認的443端口</sys:String>
<sys:String x:Key="TextBlockV2RayUUIDExplain">使用已有UUID，直接粘貼到框中</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC密鑰</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">啟用mKCP密鑰，可增強抗識別，留空則禁用,要求版本4.24.2以上,V2rayN暫不支持</sys:String>
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP Seed/QUIC密鑰</sys:String>
<sys:String x:Key="TextBlockV2RayMkcpExplain">啟用mKCP Seed密鑰，可增強抗識別，留空則禁用,要求版本4.24.2以上,V2rayN暫不支持</sys:String>
<sys:String x:Key="TextBlockV2RayPath">路徑：</sys:String>
<sys:String x:Key="TextBlockV2RayDomain">域名：</sys:String>
<sys:String x:Key="TextBlockV2RayMaskSites">偽裝網站：</sys:String>
@ -131,7 +131,7 @@
<sys:String x:Key="TextBlockCamouflageType">偽裝類型:</sys:String>
<sys:String x:Key="TextBlockIsOrNotTLS">是否使用TLS:</sys:String>
<sys:String x:Key="TextBlockClientPath">路徑(Path):</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP/QUIC密鑰:</sys:String>
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP Seed/QUIC密鑰:</sys:String>
<sys:String x:Key="TextBlockEncryptionIsAuto">默認auto</sys:String>
<sys:String x:Key="GrouBoxHeaderUrlOrQR">二維碼/URL</sys:String>
<sys:String x:Key="TextBlockUsedParameter">以上參數可以手動或掃描輸入客戶端，用於官方客戶端的配置和相關文件已經存放入目錄下，點擊 確定 按扭可打開</sys:String>

2
ProxySU/V2RayTemplateWindow.xaml
View File

@ -233,7 +233,7 @@
<GroupBox Header="{DynamicResource GroupBoxHeaderParameterV2Ray}" Grid.Row="3" Grid.RowSpan="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="1.1*"></ColumnDefinition>
<ColumnDefinition ></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>

8
ProxySU/V2RayTemplateWindow.xaml.cs
View File

@ -257,6 +257,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCPNone";
MainWindow.ReceiveConfigurationParameters[5] = "none";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text)==false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -268,6 +269,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2SRTP";
MainWindow.ReceiveConfigurationParameters[5] = "srtp";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -279,6 +281,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCPuTP";
MainWindow.ReceiveConfigurationParameters[5] = "utp";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -290,6 +293,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WechatVideo";
MainWindow.ReceiveConfigurationParameters[5] = "wechat-video";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -301,6 +305,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2DTLS";
MainWindow.ReceiveConfigurationParameters[5] = "dtls";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -312,6 +317,7 @@ namespace ProxySU
//传递模板类型
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WireGuard";
MainWindow.ReceiveConfigurationParameters[5] = "wireguard";
//传递mKCP Seed
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
{
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@ -643,7 +649,7 @@ namespace ProxySU
Guid uuid = Guid.NewGuid();
TextBoxNewUUID.Text = uuid.ToString();
}
//产生QUIC密钥所用的UUID
//产生QUIC密钥/mKCP Seed所用的UUID
private void ButtonQuicUUID_Click(object sender, RoutedEventArgs e)
{
Guid uuid = Guid.NewGuid();

BIN
ProxySU/bin/Beta/Beta.zip
View File

Binary file not shown.

18
TemplateConfg/3in1_config.caddyfile
View File

@ -1,18 +0,0 @@
##domain## {
log stdout
errors stderr
root /var/www
tls off
forwardproxy {
##basicauth##
probe_resistance
hide_ip
hide_via
upstream http://127.0.0.1:8383
}
##sites##
proxy ##path## localhost:10000 {
websocket
header_upstream -Origin
}
}