Skip to content

Commit 81a598c

Browse files
proxysuproxysu
committed
适配v2rayN的mKCP Seed
1 parent 7e2a024 commit 81a598c

10 files changed

+40
-47
lines changed

‎ProxySU/MainWindow.xaml

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

‎ProxySU/ResultClientInformation.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RowDefinition Height="0.12*"></RowDefinition>
1414
</Grid.RowDefinitions>
1515
<!-- 客户端配置参数 -->
16-
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Collapsed" Grid.Row="0">
16+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxV2rayClient" Visibility="Visible" Grid.Row="0">
1717
<Grid >
1818
<Grid.ColumnDefinitions>
1919
<ColumnDefinition Width="0.6*"></ColumnDefinition>
@@ -133,7 +133,7 @@
133133

134134
</Grid>
135135
</GroupBox>
136-
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxNaiveProxyClient" Visibility="Visible" Grid.Row="0">
136+
<GroupBox Header="{DynamicResource GroupBoxHeaderClientParameter}" x:Name="GroupBoxNaiveProxyClient" Visibility="Collapsed" Grid.Row="0">
137137
<Grid >
138138
<Grid.ColumnDefinitions>
139139
<ColumnDefinition Width="0.5*"></ColumnDefinition>

‎ProxySU/ResultClientInformation.xaml.cs

+20-15
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public ResultClientInformation()
3333

3434
if (String.Equals(MainWindow.proxyType, "V2Ray"))
3535
{
36+
//显示V2Ray参数，隐藏其他
3637
GroupBoxV2rayClient.Visibility = Visibility.Visible;
3738
GroupBoxTrojanGoClient.Visibility = Visibility.Collapsed;
3839
GroupBoxTrojanClient.Visibility = Visibility.Collapsed;
@@ -57,7 +58,7 @@ public ResultClientInformation()
5758
TextBoxHost.Text = "";
5859
//路径Path
5960
TextBoxPath.Text = MainWindow.ReceiveConfigurationParameters[3];
60-
//QUIC密钥
61+
//QUIC密钥/mKCP Seed
6162
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
6263

6364
if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "WebSocketTLS2Web"))
@@ -168,7 +169,7 @@ public ResultClientInformation()
168169
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
169170
TextBoxTLS.Text = "none";
170171
HidePath();
171-
ShowQuicKey();
172+
ShowQuicKey();//显示mKCP Seed
172173
}
173174
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2SRTP"))
174175
{
@@ -177,7 +178,7 @@ public ResultClientInformation()
177178
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
178179
TextBoxTLS.Text = "none";
179180
HidePath();
180-
ShowQuicKey();
181+
ShowQuicKey();//显示mKCP Seed
181182
}
182183
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCPuTP"))
183184
{
@@ -186,7 +187,7 @@ public ResultClientInformation()
186187
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
187188
TextBoxTLS.Text = "none";
188189
HidePath();
189-
ShowQuicKey();
190+
ShowQuicKey();//显示mKCP Seed
190191
}
191192
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WechatVideo"))
192193
{
@@ -195,7 +196,7 @@ public ResultClientInformation()
195196
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
196197
TextBoxTLS.Text = "none";
197198
HidePath();
198-
ShowQuicKey();
199+
ShowQuicKey();//显示mKCP Seed
199200
}
200201
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2DTLS"))
201202
{
@@ -204,7 +205,7 @@ public ResultClientInformation()
204205
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
205206
TextBoxTLS.Text = "none";
206207
HidePath();
207-
ShowQuicKey();
208+
ShowQuicKey();//显示mKCP Seed
208209
}
209210
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "mKCP2WireGuard"))
210211
{
@@ -213,7 +214,7 @@ public ResultClientInformation()
213214
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
214215
TextBoxTLS.Text = "none";
215216
HidePath();
216-
ShowQuicKey();
217+
ShowQuicKey();//显示mKCP Seed
217218
}
218219
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicNone"))
219220
{
@@ -222,7 +223,7 @@ public ResultClientInformation()
222223
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
223224
TextBoxTLS.Text = "none";
224225
HidePath();
225-
ShowQuicKey();
226+
ShowQuicKey();//显示QUIC密钥
226227
}
227228
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicSRTP"))
228229
{
@@ -231,7 +232,7 @@ public ResultClientInformation()
231232
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
232233
TextBoxTLS.Text = "none";
233234
HidePath();
234-
ShowQuicKey();
235+
ShowQuicKey();//显示QUIC密钥
235236
}
236237
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "Quic2uTP"))
237238
{
@@ -240,7 +241,7 @@ public ResultClientInformation()
240241
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
241242
TextBoxTLS.Text = "none";
242243
HidePath();
243-
ShowQuicKey();
244+
ShowQuicKey();//显示QUIC密钥
244245
}
245246
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWechatVideo"))
246247
{
@@ -249,7 +250,7 @@ public ResultClientInformation()
249250
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
250251
TextBoxTLS.Text = "none";
251252
HidePath();
252-
ShowQuicKey();
253+
ShowQuicKey();//显示QUIC密钥
253254
}
254255
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicDTLS"))
255256
{
@@ -258,7 +259,7 @@ public ResultClientInformation()
258259
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
259260
TextBoxTLS.Text = "none";
260261
HidePath();
261-
ShowQuicKey();
262+
ShowQuicKey();//显示QUIC密钥
262263
}
263264
else if (String.Equals(MainWindow.ReceiveConfigurationParameters[0], "QuicWireGuard"))
264265
{
@@ -267,7 +268,7 @@ public ResultClientInformation()
267268
TextBoxQuicKey.Text = MainWindow.ReceiveConfigurationParameters[6];
268269
TextBoxTLS.Text = "none";
269270
HidePath();
270-
ShowQuicKey();
271+
ShowQuicKey();//显示QUIC密钥
271272
}
272273

273274
else
@@ -421,8 +422,12 @@ private void GenerateV2rayShareQRcodeAndBase64Url()
421422
v2rayNjsonObject["aid"] = TextBoxUUIDextra.Text; //设置额外ID
422423
v2rayNjsonObject["net"] = TextBoxTransmission.Text; //设置传输模式
423424
v2rayNjsonObject["type"] = TextBoxCamouflageType.Text; //设置伪装类型
424-
425-
if (TextBoxTransmission.Text.Contains("quic")==true)
425+
426+
if (TextBoxTransmission.Text.Contains("kcp") == true)
427+
{
428+
v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置mKCP Seed
429+
}
430+
else if (TextBoxTransmission.Text.Contains("quic")==true)
426431
{
427432
v2rayNjsonObject["path"] = TextBoxQuicKey.Text;//设置quic密钥
428433
v2rayNjsonObject["host"] = "chacha20-poly1305";

‎ProxySU/Translations/ProxySU.en-US.xaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
<sys:String x:Key="ButtonV2RayServerPortChange">Random</sys:String>
7272
<sys:String x:Key="TextBlockV2RayServerPortExplain">If TLS encryption is used, please keep the default port 443</sys:String>
7373
<sys:String x:Key="TextBlockV2RayUUIDExplain">Use the existing UUID and paste it directly into the box</sys:String>
74-
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP/QUIC key</sys:String>
75-
<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>
74+
<sys:String x:Key="TextBlockV2RayQuicUUID">mKCP Seed/QUIC key</sys:String>
75+
<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>
7676
<sys:String x:Key="TextBlockV2RayPath">Path:</sys:String>
7777
<sys:String x:Key="TextBlockV2RayDomain">Domain name:</sys:String>
7878
<sys:String x:Key="TextBlockV2RayMaskSites">Mask a website:</sys:String>
@@ -130,7 +130,7 @@
130130
<sys:String x:Key="TextBlockCamouflageType">Camouflage type:</sys:String>
131131
<sys:String x:Key="TextBlockIsOrNotTLS">TLS:</sys:String>
132132
<sys:String x:Key="TextBlockClientPath">Path:</sys:String>
133-
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP/QUIC key:</sys:String>
133+
<sys:String x:Key="TextBlockClientMkcpQuicKey">mKCP Seed/QUIC key:</sys:String>
134134
<sys:String x:Key="TextBlockEncryptionIsAuto">default auto</sys:String>
135135
<sys:String x:Key="GrouBoxHeaderUrlOrQR">QR/URL</sys:String>
136136
<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>

‎ProxySU/Translations/ProxySU.zh-CN.xaml

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

‎ProxySU/Translations/ProxySU.zh-TW.xaml

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

‎ProxySU/V2RayTemplateWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
<GroupBox Header="{DynamicResource GroupBoxHeaderParameterV2Ray}" Grid.Row="3" Grid.RowSpan="2">
234234
<Grid>
235235
<Grid.ColumnDefinitions>
236-
<ColumnDefinition></ColumnDefinition>
236+
<ColumnDefinition Width="1.1*"></ColumnDefinition>
237237
<ColumnDefinition ></ColumnDefinition>
238238
<ColumnDefinition></ColumnDefinition>
239239
<ColumnDefinition></ColumnDefinition>

‎ProxySU/V2RayTemplateWindow.xaml.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
257257
//传递模板类型
258258
MainWindow.ReceiveConfigurationParameters[0] = "mKCPNone";
259259
MainWindow.ReceiveConfigurationParameters[5] = "none";
260+
//传递mKCP Seed
260261
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text)==false)
261262
{
262263
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -268,6 +269,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
268269
//传递模板类型
269270
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2SRTP";
270271
MainWindow.ReceiveConfigurationParameters[5] = "srtp";
272+
//传递mKCP Seed
271273
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
272274
{
273275
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -279,6 +281,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
279281
//传递模板类型
280282
MainWindow.ReceiveConfigurationParameters[0] = "mKCPuTP";
281283
MainWindow.ReceiveConfigurationParameters[5] = "utp";
284+
//传递mKCP Seed
282285
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
283286
{
284287
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -290,6 +293,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
290293
//传递模板类型
291294
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WechatVideo";
292295
MainWindow.ReceiveConfigurationParameters[5] = "wechat-video";
296+
//传递mKCP Seed
293297
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
294298
{
295299
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -301,6 +305,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
301305
//传递模板类型
302306
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2DTLS";
303307
MainWindow.ReceiveConfigurationParameters[5] = "dtls";
308+
//传递mKCP Seed
304309
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
305310
{
306311
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -312,6 +317,7 @@ private void ButtondDecide_Click(object sender, RoutedEventArgs e)
312317
//传递模板类型
313318
MainWindow.ReceiveConfigurationParameters[0] = "mKCP2WireGuard";
314319
MainWindow.ReceiveConfigurationParameters[5] = "wireguard";
320+
//传递mKCP Seed
315321
if (String.IsNullOrEmpty(TextBoxQuicUUID.Text) == false)
316322
{
317323
MainWindow.ReceiveConfigurationParameters[6] = TextBoxQuicUUID.Text;
@@ -643,7 +649,7 @@ private void ButtonNewUUID_Click(object sender, RoutedEventArgs e)
643649
Guid uuid = Guid.NewGuid();
644650
TextBoxNewUUID.Text = uuid.ToString();
645651
}
646-
//产生QUIC密钥所用的UUID
652+
//产生QUIC密钥/mKCP Seed所用的UUID
647653
private void ButtonQuicUUID_Click(object sender, RoutedEventArgs e)
648654
{
649655
Guid uuid = Guid.NewGuid();

‎ProxySU/bin/Beta/Beta.zip

-354 Bytes
Binary file not shown.

‎TemplateConfg/3in1_config.caddyfile

-18
This file was deleted.

0 commit comments

Comments
 (0)