mirror of
https://github.com/2dust/v2rayN.git
synced 2026-10-02 11:48:03 +03:00
2dust
4562d4cf00
Introduces EchConfigList and EchForceQuery fields to ProfileItem and V2rayConfig models, updates related handlers and services to process these fields, and extends the AddServerWindow UI to allow user input for ECH configuration. Also adds localization entries for the new fields and updates extension methods for string handling.
357 lines
16 KiB
C#
357 lines
16 KiB
C#
using v2rayN.Desktop.Base;
|
|
|
|
namespace v2rayN.Desktop.Views;
|
|
|
|
public partial class AddServerWindow : WindowBase<AddServerViewModel>
|
|
{
|
|
public AddServerWindow()
|
|
{
|
|
InitializeComponent();
|
|
}
|
|
|
|
public AddServerWindow(ProfileItem profileItem)
|
|
{
|
|
InitializeComponent();
|
|
|
|
Loaded += Window_Loaded;
|
|
btnCancel.Click += (s, e) => Close();
|
|
cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged;
|
|
cmbStreamSecurity.SelectionChanged += CmbStreamSecurity_SelectionChanged;
|
|
btnGUID.Click += btnGUID_Click;
|
|
btnGUID5.Click += btnGUID_Click;
|
|
|
|
ViewModel = new AddServerViewModel(profileItem, UpdateViewHandler);
|
|
|
|
cmbCoreType.ItemsSource = Global.CoreTypes.AppendEmpty();
|
|
cmbNetwork.ItemsSource = Global.Networks;
|
|
cmbFingerprint.ItemsSource = Global.Fingerprints;
|
|
cmbFingerprint2.ItemsSource = Global.Fingerprints;
|
|
cmbAllowInsecure.ItemsSource = Global.AllowInsecure;
|
|
cmbAlpn.ItemsSource = Global.Alpns;
|
|
cmbEchForceQuery.ItemsSource = Global.EchForceQuerys;
|
|
|
|
var lstStreamSecurity = new List<string>();
|
|
lstStreamSecurity.Add(string.Empty);
|
|
lstStreamSecurity.Add(Global.StreamSecurity);
|
|
|
|
switch (profileItem.ConfigType)
|
|
{
|
|
case EConfigType.VMess:
|
|
gridVMess.IsVisible = true;
|
|
cmbSecurity.ItemsSource = Global.VmessSecurities;
|
|
if (profileItem.Security.IsNullOrEmpty())
|
|
{
|
|
profileItem.Security = Global.DefaultSecurity;
|
|
}
|
|
break;
|
|
|
|
case EConfigType.Shadowsocks:
|
|
gridSs.IsVisible = true;
|
|
cmbSecurity3.ItemsSource = AppManager.Instance.GetShadowsocksSecurities(profileItem);
|
|
break;
|
|
|
|
case EConfigType.SOCKS:
|
|
case EConfigType.HTTP:
|
|
gridSocks.IsVisible = true;
|
|
break;
|
|
|
|
case EConfigType.VLESS:
|
|
gridVLESS.IsVisible = true;
|
|
lstStreamSecurity.Add(Global.StreamSecurityReality);
|
|
cmbFlow5.ItemsSource = Global.Flows;
|
|
if (profileItem.Security.IsNullOrEmpty())
|
|
{
|
|
profileItem.Security = Global.None;
|
|
}
|
|
break;
|
|
|
|
case EConfigType.Trojan:
|
|
gridTrojan.IsVisible = true;
|
|
lstStreamSecurity.Add(Global.StreamSecurityReality);
|
|
cmbFlow6.ItemsSource = Global.Flows;
|
|
break;
|
|
|
|
case EConfigType.Hysteria2:
|
|
gridHysteria2.IsVisible = true;
|
|
sepa2.IsVisible = false;
|
|
gridTransport.IsVisible = false;
|
|
cmbCoreType.IsEnabled = false;
|
|
cmbFingerprint.IsEnabled = false;
|
|
cmbFingerprint.SelectedValue = string.Empty;
|
|
break;
|
|
|
|
case EConfigType.TUIC:
|
|
gridTuic.IsVisible = true;
|
|
sepa2.IsVisible = false;
|
|
gridTransport.IsVisible = false;
|
|
cmbCoreType.IsEnabled = false;
|
|
cmbFingerprint.IsEnabled = false;
|
|
cmbFingerprint.SelectedValue = string.Empty;
|
|
|
|
cmbHeaderType8.ItemsSource = Global.TuicCongestionControls;
|
|
break;
|
|
|
|
case EConfigType.WireGuard:
|
|
gridWireguard.IsVisible = true;
|
|
|
|
sepa2.IsVisible = false;
|
|
gridTransport.IsVisible = false;
|
|
gridTls.IsVisible = false;
|
|
|
|
break;
|
|
|
|
case EConfigType.Anytls:
|
|
gridAnytls.IsVisible = true;
|
|
lstStreamSecurity.Add(Global.StreamSecurityReality);
|
|
cmbCoreType.IsEnabled = false;
|
|
break;
|
|
}
|
|
cmbStreamSecurity.ItemsSource = lstStreamSecurity;
|
|
|
|
gridTlsMore.IsVisible = false;
|
|
|
|
this.WhenActivated(disposables =>
|
|
{
|
|
this.Bind(ViewModel, vm => vm.CoreType, v => v.cmbCoreType.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Remarks, v => v.txtRemarks.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Address, v => v.txtAddress.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Port, v => v.txtPort.Text).DisposeWith(disposables);
|
|
|
|
switch (profileItem.ConfigType)
|
|
{
|
|
case EConfigType.VMess:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.AlterId, v => v.txtAlterId.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.cmbSecurity.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled.IsChecked).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.Shadowsocks:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId3.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.cmbSecurity3.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled3.IsChecked).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.SOCKS:
|
|
case EConfigType.HTTP:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId4.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.txtSecurity4.Text).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.VLESS:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId5.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Flow, v => v.cmbFlow5.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.txtSecurity5.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled5.IsChecked).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.Trojan:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId6.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Flow, v => v.cmbFlow6.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.MuxEnabled, v => v.togmuxEnabled6.IsChecked).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.Hysteria2:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId7.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath7.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Ports, v => v.txtPorts7.Text).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.TUIC:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId8.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Security, v => v.txtSecurity8.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType8.SelectedValue).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.WireGuard:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId9.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey9.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath9.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost9.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId9.Text).DisposeWith(disposables);
|
|
break;
|
|
|
|
case EConfigType.Anytls:
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Id, v => v.txtId10.Text).DisposeWith(disposables);
|
|
break;
|
|
}
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Extra, v => v.txtExtra.Text).DisposeWith(disposables);
|
|
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.AllowInsecure, v => v.cmbAllowInsecure.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Fingerprint, v => v.cmbFingerprint.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Alpn, v => v.cmbAlpn.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.CertTip, v => v.labCertPinning.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.Cert, v => v.txtCert.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.EchConfigList, v => v.txtEchConfigList.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.EchForceQuery, v => v.cmbEchForceQuery.SelectedValue).DisposeWith(disposables);
|
|
|
|
//reality
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI2.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Fingerprint, v => v.cmbFingerprint2.SelectedValue).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.PublicKey, v => v.txtPublicKey.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.ShortId, v => v.txtShortId.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.SpiderX, v => v.txtSpiderX.Text).DisposeWith(disposables);
|
|
this.Bind(ViewModel, vm => vm.SelectedSource.Mldsa65Verify, v => v.txtMldsa65Verify.Text).DisposeWith(disposables);
|
|
|
|
this.BindCommand(ViewModel, vm => vm.FetchCertCmd, v => v.btnFetchCert).DisposeWith(disposables);
|
|
this.BindCommand(ViewModel, vm => vm.FetchCertChainCmd, v => v.btnFetchCertChain).DisposeWith(disposables);
|
|
this.BindCommand(ViewModel, vm => vm.SaveCmd, v => v.btnSave).DisposeWith(disposables);
|
|
});
|
|
|
|
Title = $"{profileItem.ConfigType}";
|
|
}
|
|
|
|
private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
|
|
{
|
|
switch (action)
|
|
{
|
|
case EViewAction.CloseWindow:
|
|
Close(true);
|
|
break;
|
|
}
|
|
return await Task.FromResult(true);
|
|
}
|
|
|
|
private void Window_Loaded(object? sender, RoutedEventArgs e)
|
|
{
|
|
txtRemarks.Focus();
|
|
}
|
|
|
|
private void CmbNetwork_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
|
{
|
|
SetHeaderType();
|
|
SetTips();
|
|
}
|
|
|
|
private void CmbStreamSecurity_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
|
{
|
|
var security = cmbStreamSecurity.SelectedItem.ToString();
|
|
if (security == Global.StreamSecurityReality)
|
|
{
|
|
gridRealityMore.IsVisible = true;
|
|
gridTlsMore.IsVisible = false;
|
|
}
|
|
else if (security == Global.StreamSecurity)
|
|
{
|
|
gridRealityMore.IsVisible = false;
|
|
gridTlsMore.IsVisible = true;
|
|
}
|
|
else
|
|
{
|
|
gridRealityMore.IsVisible = false;
|
|
gridTlsMore.IsVisible = false;
|
|
}
|
|
}
|
|
|
|
private void btnGUID_Click(object? sender, RoutedEventArgs e)
|
|
{
|
|
txtId.Text =
|
|
txtId5.Text = Utils.GetGuid();
|
|
}
|
|
|
|
private void SetHeaderType()
|
|
{
|
|
var lstHeaderType = new List<string>();
|
|
|
|
var network = cmbNetwork.SelectedItem.ToString();
|
|
if (network.IsNullOrEmpty())
|
|
{
|
|
lstHeaderType.Add(Global.None);
|
|
cmbHeaderType.ItemsSource = lstHeaderType;
|
|
cmbHeaderType.SelectedIndex = 0;
|
|
return;
|
|
}
|
|
|
|
if (network == nameof(ETransport.tcp))
|
|
{
|
|
lstHeaderType.Add(Global.None);
|
|
lstHeaderType.Add(Global.TcpHeaderHttp);
|
|
}
|
|
else if (network is nameof(ETransport.kcp) or nameof(ETransport.quic))
|
|
{
|
|
lstHeaderType.Add(Global.None);
|
|
lstHeaderType.AddRange(Global.KcpHeaderTypes);
|
|
}
|
|
else if (network is nameof(ETransport.xhttp))
|
|
{
|
|
lstHeaderType.AddRange(Global.XhttpMode);
|
|
}
|
|
else if (network == nameof(ETransport.grpc))
|
|
{
|
|
lstHeaderType.Add(Global.GrpcGunMode);
|
|
lstHeaderType.Add(Global.GrpcMultiMode);
|
|
}
|
|
else
|
|
{
|
|
lstHeaderType.Add(Global.None);
|
|
}
|
|
cmbHeaderType.ItemsSource = lstHeaderType;
|
|
cmbHeaderType.SelectedIndex = 0;
|
|
}
|
|
|
|
private void SetTips()
|
|
{
|
|
var network = cmbNetwork.SelectedItem.ToString();
|
|
if (network.IsNullOrEmpty())
|
|
{
|
|
network = Global.DefaultNetwork;
|
|
}
|
|
labHeaderType.IsVisible = true;
|
|
btnExtra.IsVisible = false;
|
|
tipRequestHost.Text =
|
|
tipPath.Text =
|
|
tipHeaderType.Text = string.Empty;
|
|
|
|
switch (network)
|
|
{
|
|
case nameof(ETransport.tcp):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip1;
|
|
tipHeaderType.Text = ResUI.TransportHeaderTypeTip1;
|
|
break;
|
|
|
|
case nameof(ETransport.kcp):
|
|
tipHeaderType.Text = ResUI.TransportHeaderTypeTip2;
|
|
tipPath.Text = ResUI.TransportPathTip5;
|
|
break;
|
|
|
|
case nameof(ETransport.ws):
|
|
case nameof(ETransport.httpupgrade):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip2;
|
|
tipPath.Text = ResUI.TransportPathTip1;
|
|
break;
|
|
|
|
case nameof(ETransport.xhttp):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip2;
|
|
tipPath.Text = ResUI.TransportPathTip1;
|
|
tipHeaderType.Text = ResUI.TransportHeaderTypeTip5;
|
|
labHeaderType.IsVisible = false;
|
|
btnExtra.IsVisible = true;
|
|
break;
|
|
|
|
case nameof(ETransport.h2):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip3;
|
|
tipPath.Text = ResUI.TransportPathTip2;
|
|
break;
|
|
|
|
case nameof(ETransport.quic):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip4;
|
|
tipPath.Text = ResUI.TransportPathTip3;
|
|
tipHeaderType.Text = ResUI.TransportHeaderTypeTip3;
|
|
break;
|
|
|
|
case nameof(ETransport.grpc):
|
|
tipRequestHost.Text = ResUI.TransportRequestHostTip5;
|
|
tipPath.Text = ResUI.TransportPathTip4;
|
|
tipHeaderType.Text = ResUI.TransportHeaderTypeTip4;
|
|
labHeaderType.IsVisible = false;
|
|
break;
|
|
}
|
|
}
|
|
}
|