From 87ffad398e3ed3f1ad4627e18b623cd411651ade Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Tue, 26 Jul 2022 20:02:07 +0800 Subject: [PATCH] add tuic support --- v2rayN/v2rayN/Forms/AddServer2Form.cs | 15 ++++++++++----- v2rayN/v2rayN/Global.cs | 1 + v2rayN/v2rayN/Handler/LazyConfig.cs | 8 ++++++++ v2rayN/v2rayN/Mode/ECoreType.cs | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.cs b/v2rayN/v2rayN/Forms/AddServer2Form.cs index 81d87cfa..f54c1257 100644 --- a/v2rayN/v2rayN/Forms/AddServer2Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Windows.Forms; @@ -18,11 +19,15 @@ namespace v2rayN.Forms private void AddServer2Form_Load(object sender, EventArgs e) { - cmbCoreType.Items.AddRange(Global.coreTypes.ToArray()); - cmbCoreType.Items.Add("clash"); - cmbCoreType.Items.Add("clash_meta"); - cmbCoreType.Items.Add("hysteria"); - cmbCoreType.Items.Add("naiveproxy"); + List coreTypes = new List (); + foreach (ECoreType it in Enum.GetValues(typeof(ECoreType))) + { + if (it == ECoreType.v2rayN) + continue; + coreTypes.Add(it.ToString()); + } + + cmbCoreType.Items.AddRange(coreTypes.ToArray()); cmbCoreType.Items.Add(string.Empty); txtAddress.ReadOnly = true; diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index 8de35296..9b3a1dec 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -18,6 +18,7 @@ namespace v2rayN public const string clashMetaCoreUrl = "https://github.com/MetaCubeX/Clash.Meta/releases"; public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases"; public const string naiveproxyCoreUrl = "https://github.com/klzgrad/naiveproxy/releases"; + public const string tuicCoreUrl = "https://github.com/EAimTY/tuic/releases"; public const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat"; diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index fb8bd77b..5e18ebc9 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -138,6 +138,14 @@ namespace v2rayN.Handler arguments = "config.json", coreUrl = Global.naiveproxyCoreUrl }); + + coreInfos.Add(new CoreInfo + { + coreType = ECoreType.tuic, + coreExes = new List { "tuic-client", "tuic" }, + arguments = "-c config.json", + coreUrl = Global.tuicCoreUrl + }); } } diff --git a/v2rayN/v2rayN/Mode/ECoreType.cs b/v2rayN/v2rayN/Mode/ECoreType.cs index 511663f3..8f754fed 100644 --- a/v2rayN/v2rayN/Mode/ECoreType.cs +++ b/v2rayN/v2rayN/Mode/ECoreType.cs @@ -9,6 +9,7 @@ namespace v2rayN.Mode clash_meta = 12, hysteria = 21, naiveproxy = 22, + tuic = 23, v2rayN = 99 } }