From 70feacd276d6fa77f22f0a74d06591cacb23e35b Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 28 Mar 2022 19:08:54 +0800 Subject: [PATCH] Add hysteria support --- v2rayN/v2rayN/Forms/AddServer2Form.cs | 1 + v2rayN/v2rayN/Global.cs | 3 ++- v2rayN/v2rayN/Handler/ConfigHandler.cs | 9 +++++++++ v2rayN/v2rayN/Handler/LazyConfig.cs | 8 ++++++++ v2rayN/v2rayN/Mode/ECoreType.cs | 3 ++- 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/v2rayN/v2rayN/Forms/AddServer2Form.cs b/v2rayN/v2rayN/Forms/AddServer2Form.cs index adc881a4..2f8821b5 100644 --- a/v2rayN/v2rayN/Forms/AddServer2Form.cs +++ b/v2rayN/v2rayN/Forms/AddServer2Form.cs @@ -19,6 +19,7 @@ namespace v2rayN.Forms { cmbCoreType.Items.AddRange(Global.coreTypes.ToArray()); cmbCoreType.Items.Add("clash"); + cmbCoreType.Items.Add("hysteria"); cmbCoreType.Items.Add(string.Empty); txtAddress.ReadOnly = true; diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs index 774ee12f..710649d8 100644 --- a/v2rayN/v2rayN/Global.cs +++ b/v2rayN/v2rayN/Global.cs @@ -15,8 +15,9 @@ namespace v2rayN public const string xrayCoreUrl = "https://github.com/XTLS/Xray-core/releases"; public const string NUrl = @"https://github.com/2dust/v2rayN/releases"; public const string clashCoreUrl = "https://github.com/Dreamacro/clash/releases"; + public const string hysteriaCoreUrl = "https://github.com/HyNetwork/hysteria/releases"; + - /// diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs index 8556eb2c..bc99a314 100644 --- a/v2rayN/v2rayN/Handler/ConfigHandler.cs +++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs @@ -940,6 +940,15 @@ namespace v2rayN.Handler vmessItem.coreType = ECoreType.clash; vmessItem.address = fileName; vmessItem.remarks = "clash_custom"; + } + //Is Other configuration + else + { + var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.txt"); + File.WriteAllText(fileName, clipboardData); + + vmessItem.address = fileName; + vmessItem.remarks = "other_custom"; } if (!Utils.IsNullOrEmpty(subid)) diff --git a/v2rayN/v2rayN/Handler/LazyConfig.cs b/v2rayN/v2rayN/Handler/LazyConfig.cs index 9303a1af..ceccc7f3 100644 --- a/v2rayN/v2rayN/Handler/LazyConfig.cs +++ b/v2rayN/v2rayN/Handler/LazyConfig.cs @@ -90,6 +90,14 @@ namespace v2rayN.Handler arguments = "-f config.json", coreUrl = Global.clashCoreUrl }); + + coreInfos.Add(new CoreInfo + { + coreType = ECoreType.hysteria, + coreExes = new List { "hysteria-tun-windows-6.0-amd64", "hysteria-tun-windows-6.0-386", "hysteria" }, + arguments = "", + coreUrl = Global.hysteriaCoreUrl + }); } } diff --git a/v2rayN/v2rayN/Mode/ECoreType.cs b/v2rayN/v2rayN/Mode/ECoreType.cs index 2448c96d..be245303 100644 --- a/v2rayN/v2rayN/Mode/ECoreType.cs +++ b/v2rayN/v2rayN/Mode/ECoreType.cs @@ -5,7 +5,8 @@ namespace v2rayN.Mode { v2fly = 1, Xray = 2, - clash = 3, + clash = 11, + hysteria = 21, v2rayN = 99 } }