diff --git a/v2rayN/v2rayN/App.xaml.cs b/v2rayN/v2rayN/App.xaml.cs
index c4e40094371..b61aad77154 100644
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -27,7 +27,7 @@ public App()
///
protected override void OnStartup(StartupEventArgs e)
{
- var exePathKey = Utile.GetMD5(Utile.GetExePath());
+ var exePathKey = Utils.GetMD5(Utils.GetExePath());
var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
@@ -41,7 +41,7 @@ protected override void OnStartup(StartupEventArgs e)
Logging.Setup();
Init();
Logging.LoggingEnabled(_config.guiItem.enableLog);
- Logging.SaveLog($"v2rayN start up | {Utile.GetVersion()} | {Utile.GetExePath()}");
+ Logging.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
Logging.ClearLogs();
Thread.CurrentThread.CurrentUICulture = new(_config.uiItem.currentLanguage);
diff --git a/v2rayN/v2rayN/Common/DownloaderHelper.cs b/v2rayN/v2rayN/Common/DownloaderHelper.cs
index 9f4fe963864..ddfe3811606 100644
--- a/v2rayN/v2rayN/Common/DownloaderHelper.cs
+++ b/v2rayN/v2rayN/Common/DownloaderHelper.cs
@@ -11,7 +11,7 @@ internal class DownloaderHelper
public async Task DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
{
- if (Utile.IsNullOrEmpty(url))
+ if (Utils.IsNullOrEmpty(url))
{
return null;
}
@@ -19,9 +19,9 @@ internal class DownloaderHelper
Uri uri = new(url);
//Authorization Header
var headers = new WebHeaderCollection();
- if (!Utile.IsNullOrEmpty(uri.UserInfo))
+ if (!Utils.IsNullOrEmpty(uri.UserInfo))
{
- headers.Add(HttpRequestHeader.Authorization, "Basic " + Utile.Base64Encode(uri.UserInfo));
+ headers.Add(HttpRequestHeader.Authorization, "Basic " + Utils.Base64Encode(uri.UserInfo));
}
var downloadOpt = new DownloadConfiguration()
@@ -57,7 +57,7 @@ internal class DownloaderHelper
public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress progress, int timeout)
{
- if (Utile.IsNullOrEmpty(url))
+ if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}
@@ -120,11 +120,11 @@ public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgr
public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress progress, int timeout)
{
- if (Utile.IsNullOrEmpty(url))
+ if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}
- if (Utile.IsNullOrEmpty(fileName))
+ if (Utils.IsNullOrEmpty(fileName))
{
throw new ArgumentNullException(nameof(fileName));
}
diff --git a/v2rayN/v2rayN/Common/FileManager.cs b/v2rayN/v2rayN/Common/FileManager.cs
index 6fc6a21cb14..b721f5dbb39 100644
--- a/v2rayN/v2rayN/Common/FileManager.cs
+++ b/v2rayN/v2rayN/Common/FileManager.cs
@@ -67,7 +67,7 @@ public static bool ZipExtractToFile(string fileName, string toPath, string ignor
}
try
{
- if (!Utile.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+ if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
{
continue;
}
diff --git a/v2rayN/v2rayN/Common/HttpClientHelper.cs b/v2rayN/v2rayN/Common/HttpClientHelper.cs
index 51707be5eae..1c338b61be0 100644
--- a/v2rayN/v2rayN/Common/HttpClientHelper.cs
+++ b/v2rayN/v2rayN/Common/HttpClientHelper.cs
@@ -23,19 +23,19 @@ public class HttpClientHelper
public async Task GetAsync(string url)
{
- if (Utile.IsNullOrEmpty(url)) return null;
+ if (Utils.IsNullOrEmpty(url)) return null;
return await httpClient.GetStringAsync(url);
}
public async Task GetAsync(HttpClient client, string url, CancellationToken token = default)
{
- if (Utile.IsNullOrEmpty(url)) return null;
+ if (Utils.IsNullOrEmpty(url)) return null;
return await client.GetStringAsync(url, token);
}
public async Task PutAsync(string url, Dictionary headers)
{
- var jsonContent = JsonUtile.Serialize(headers);
+ var jsonContent = JsonUtils.Serialize(headers);
var content = new StringContent(jsonContent, Encoding.UTF8, MediaTypeNames.Application.Json);
var result = await httpClient.PutAsync(url, content);
@@ -88,7 +88,7 @@ public static async Task DownloadFileAsync(HttpClient client, string url, string
public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress progress, CancellationToken token = default)
{
- if (Utile.IsNullOrEmpty(url))
+ if (Utils.IsNullOrEmpty(url))
{
throw new ArgumentNullException(nameof(url));
}
diff --git a/v2rayN/v2rayN/Common/JsonUtile.cs b/v2rayN/v2rayN/Common/JsonUtils.cs
similarity index 99%
rename from v2rayN/v2rayN/Common/JsonUtile.cs
rename to v2rayN/v2rayN/Common/JsonUtils.cs
index 1c76fc4e25d..2198ba3541c 100644
--- a/v2rayN/v2rayN/Common/JsonUtile.cs
+++ b/v2rayN/v2rayN/Common/JsonUtils.cs
@@ -5,7 +5,7 @@
namespace v2rayN
{
- internal class JsonUtile
+ internal class JsonUtils
{
///
/// DeepCopy
diff --git a/v2rayN/v2rayN/Common/Logging.cs b/v2rayN/v2rayN/Common/Logging.cs
index d989aabf6d5..ba5b97e7e25 100644
--- a/v2rayN/v2rayN/Common/Logging.cs
+++ b/v2rayN/v2rayN/Common/Logging.cs
@@ -13,7 +13,7 @@ public static void Setup()
FileTarget fileTarget = new();
config.AddTarget("file", fileTarget);
fileTarget.Layout = "${longdate}-${level:uppercase=true} ${message}";
- fileTarget.FileName = Utile.GetLogPath("${shortdate}.txt");
+ fileTarget.FileName = Utils.GetLogPath("${shortdate}.txt");
config.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, fileTarget));
LogManager.Configuration = config;
}
@@ -33,7 +33,7 @@ public static void ClearLogs()
try
{
var now = DateTime.Now.AddMonths(-1);
- var dir = Utile.GetLogPath();
+ var dir = Utils.GetLogPath();
var files = Directory.GetFiles(dir, "*.txt");
foreach (var filePath in files)
{
diff --git a/v2rayN/v2rayN/Common/SqliteHelper.cs b/v2rayN/v2rayN/Common/SqliteHelper.cs
index 68d70feff4b..70beb81074c 100644
--- a/v2rayN/v2rayN/Common/SqliteHelper.cs
+++ b/v2rayN/v2rayN/Common/SqliteHelper.cs
@@ -15,7 +15,7 @@ public sealed class SQLiteHelper
public SQLiteHelper()
{
- _connstr = Utile.GetConfigPath(_configDB);
+ _connstr = Utils.GetConfigPath(_configDB);
_db = new SQLiteConnection(_connstr, false);
_dbAsync = new SQLiteAsyncConnection(_connstr, false);
}
diff --git a/v2rayN/v2rayN/Common/Utile.cs b/v2rayN/v2rayN/Common/Utils.cs
similarity index 98%
rename from v2rayN/v2rayN/Common/Utile.cs
rename to v2rayN/v2rayN/Common/Utils.cs
index 672b576333c..d98d9a7afd3 100644
--- a/v2rayN/v2rayN/Common/Utile.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -25,7 +25,7 @@
namespace v2rayN
{
- internal class Utile
+ internal class Utils
{
#region 资源Json操作
@@ -361,7 +361,7 @@ public static ImageSource IconToImageSource(Icon icon)
///
public static string GetPunycode(string url)
{
- if (Utile.IsNullOrEmpty(url))
+ if (Utils.IsNullOrEmpty(url))
{
return url;
}
@@ -391,7 +391,7 @@ public static bool IsBase64String(string plainText)
public static string Convert2Comma(string text)
{
- if (Utile.IsNullOrEmpty(text))
+ if (Utils.IsNullOrEmpty(text))
{
return text;
}
@@ -583,7 +583,7 @@ public static int GetFreePort(int defaultPort = 9090)
{
try
{
- if (!Utile.PortInUse(defaultPort))
+ if (!Utils.PortInUse(defaultPort))
{
return defaultPort;
}
@@ -840,7 +840,7 @@ public static string GetTempPath(string filename = "")
{
Directory.CreateDirectory(_tempPath);
}
- if (Utile.IsNullOrEmpty(filename))
+ if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -876,7 +876,7 @@ public static string GetConfigPath(string filename = "")
{
Directory.CreateDirectory(_tempPath);
}
- if (Utile.IsNullOrEmpty(filename))
+ if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -901,7 +901,7 @@ public static string GetBinPath(string filename, string? coreType = null)
Directory.CreateDirectory(_tempPath);
}
}
- if (Utile.IsNullOrEmpty(filename))
+ if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -918,7 +918,7 @@ public static string GetLogPath(string filename = "")
{
Directory.CreateDirectory(_tempPath);
}
- if (Utile.IsNullOrEmpty(filename))
+ if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -935,7 +935,7 @@ public static string GetFontsPath(string filename = "")
{
Directory.CreateDirectory(_tempPath);
}
- if (Utile.IsNullOrEmpty(filename))
+ if (Utils.IsNullOrEmpty(filename))
{
return _tempPath;
}
@@ -1107,7 +1107,7 @@ public static void RegWriteValue(string path, string name, object value)
///
public static void AutoStart(string taskName, string fileName, string description)
{
- if (Utile.IsNullOrEmpty(taskName))
+ if (Utils.IsNullOrEmpty(taskName))
{
return;
}
@@ -1122,7 +1122,7 @@ public static void AutoStart(string taskName, string fileName, string descriptio
{
taskService.RootFolder.DeleteTask(t.Name);
}
- if (Utile.IsNullOrEmpty(fileName))
+ if (Utils.IsNullOrEmpty(fileName))
{
return;
}
diff --git a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
index 938db7cc85d..5ce03286685 100644
--- a/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
+++ b/v2rayN/v2rayN/Converters/MaterialDesignFonts.cs
@@ -12,9 +12,9 @@ static MaterialDesignFonts()
try
{
var fontFamily = LazyConfig.Instance.GetConfig().uiItem.currentFontFamily;
- if (!Utile.IsNullOrEmpty(fontFamily))
+ if (!Utils.IsNullOrEmpty(fontFamily))
{
- var fontPath = Utile.GetFontsPath();
+ var fontPath = Utils.GetFontsPath();
MyFont = new FontFamily(new Uri(@$"file:///{fontPath}\"), $"./#{fontFamily}");
}
}
diff --git a/v2rayN/v2rayN/Handler/ConfigHandler.cs b/v2rayN/v2rayN/Handler/ConfigHandler.cs
index 4b430705e81..fa2377c6fc8 100644
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -23,15 +23,15 @@ internal class ConfigHandler
public static int LoadConfig(ref Config? config)
{
//载入配置文件
- var result = Utile.LoadResource(Utile.GetConfigPath(configRes));
- if (!Utile.IsNullOrEmpty(result))
+ var result = Utils.LoadResource(Utils.GetConfigPath(configRes));
+ if (!Utils.IsNullOrEmpty(result))
{
//转成Json
- config = JsonUtile.Deserialize(result);
+ config = JsonUtils.Deserialize(result);
}
else
{
- if (File.Exists(Utile.GetConfigPath(configRes)))
+ if (File.Exists(Utils.GetConfigPath(configRes)))
{
Logging.SaveLog("LoadConfig Exception");
return -1;
@@ -85,7 +85,7 @@ public static int LoadConfig(ref Config? config)
};
}
//路由规则
- if (Utile.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
+ if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
{
config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
}
@@ -144,7 +144,7 @@ public static int LoadConfig(ref Config? config)
{
config.uiItem.mainColumnItem = new();
}
- if (Utile.IsNullOrEmpty(config.uiItem.currentLanguage))
+ if (Utils.IsNullOrEmpty(config.uiItem.currentLanguage))
{
config.uiItem.currentLanguage = Global.Languages[0];
}
@@ -153,7 +153,7 @@ public static int LoadConfig(ref Config? config)
{
config.constItem = new ConstItem();
}
- if (Utile.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
+ if (Utils.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
{
config.constItem.defIEProxyExceptions = Global.IEProxyExceptions;
}
@@ -166,11 +166,11 @@ public static int LoadConfig(ref Config? config)
{
config.speedTestItem.speedTestTimeout = 10;
}
- if (Utile.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
+ if (Utils.IsNullOrEmpty(config.speedTestItem.speedTestUrl))
{
config.speedTestItem.speedTestUrl = Global.SpeedTestUrls[0];
}
- if (Utile.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
+ if (Utils.IsNullOrEmpty(config.speedTestItem.speedPingTestUrl))
{
config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
}
@@ -220,9 +220,9 @@ private static void ToJsonFile(Config config)
try
{
//save temp file
- var resPath = Utile.GetConfigPath(configRes);
+ var resPath = Utils.GetConfigPath(configRes);
var tempPath = $"{resPath}_temp";
- if (JsonUtile.ToFile(config, tempPath) != 0)
+ if (JsonUtils.ToFile(config, tempPath) != 0)
{
return;
}
@@ -243,34 +243,34 @@ private static void ToJsonFile(Config config)
public static int ImportOldGuiConfig(Config config, string fileName)
{
- var result = Utile.LoadResource(fileName);
- if (Utile.IsNullOrEmpty(result))
+ var result = Utils.LoadResource(fileName);
+ if (Utils.IsNullOrEmpty(result))
{
return -1;
}
- var configOld = JsonUtile.Deserialize(result);
+ var configOld = JsonUtils.Deserialize(result);
if (configOld == null)
{
return -1;
}
- var subItem = JsonUtile.Deserialize>(JsonUtile.Serialize(configOld.subItem));
+ var subItem = JsonUtils.Deserialize>(JsonUtils.Serialize(configOld.subItem));
foreach (var it in subItem)
{
- if (Utile.IsNullOrEmpty(it.id))
+ if (Utils.IsNullOrEmpty(it.id))
{
- it.id = Utile.GetGUID(false);
+ it.id = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(it);
}
- var profileItems = JsonUtile.Deserialize>(JsonUtile.Serialize(configOld.vmess));
+ var profileItems = JsonUtils.Deserialize>(JsonUtils.Serialize(configOld.vmess));
foreach (var it in profileItems)
{
- if (Utile.IsNullOrEmpty(it.indexId))
+ if (Utils.IsNullOrEmpty(it.indexId))
{
- it.indexId = Utile.GetGUID(false);
+ it.indexId = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(it);
}
@@ -281,22 +281,22 @@ public static int ImportOldGuiConfig(Config config, string fileName)
{
continue;
}
- var routing = JsonUtile.Deserialize(JsonUtile.Serialize(it));
+ var routing = JsonUtils.Deserialize(JsonUtils.Serialize(it));
foreach (var it2 in it.rules)
{
- it2.id = Utile.GetGUID(false);
+ it2.id = Utils.GetGUID(false);
}
routing.ruleNum = it.rules.Count;
- routing.ruleSet = JsonUtile.Serialize(it.rules, false);
+ routing.ruleSet = JsonUtils.Serialize(it.rules, false);
- if (Utile.IsNullOrEmpty(routing.id))
+ if (Utils.IsNullOrEmpty(routing.id))
{
- routing.id = Utile.GetGUID(false);
+ routing.id = Utils.GetGUID(false);
}
SQLiteHelper.Instance.Replace(routing);
}
- config = JsonUtile.Deserialize(JsonUtile.Serialize(configOld));
+ config = JsonUtils.Deserialize(JsonUtils.Serialize(configOld));
if (config.coreBasicItem == null)
{
@@ -412,13 +412,13 @@ public static int CopyServer(Config config, List indexes)
continue;
}
- ProfileItem profileItem = JsonUtile.DeepCopy(item);
+ ProfileItem profileItem = JsonUtils.DeepCopy(item);
profileItem.indexId = string.Empty;
profileItem.remarks = $"{item.remarks}-clone";
if (profileItem.configType == EConfigType.Custom)
{
- profileItem.address = Utile.GetConfigPath(profileItem.address);
+ profileItem.address = Utils.GetConfigPath(profileItem.address);
if (AddCustomServer(config, profileItem, false) == 0)
{
}
@@ -440,7 +440,7 @@ public static int CopyServer(Config config, List indexes)
///
public static int SetDefaultServerIndex(Config config, string? indexId)
{
- if (Utile.IsNullOrEmpty(indexId))
+ if (Utils.IsNullOrEmpty(indexId))
{
return -1;
}
@@ -570,12 +570,12 @@ public static int AddCustomServer(Config config, ProfileItem profileItem, bool b
return -1;
}
var ext = Path.GetExtension(fileName);
- string newFileName = $"{Utile.GetGUID()}{ext}";
+ string newFileName = $"{Utils.GetGUID()}{ext}";
//newFileName = Path.Combine(Utile.GetTempPath(), newFileName);
try
{
- File.Copy(fileName, Utile.GetConfigPath(newFileName));
+ File.Copy(fileName, Utils.GetConfigPath(newFileName));
if (blDelete)
{
File.Delete(fileName);
@@ -589,7 +589,7 @@ public static int AddCustomServer(Config config, ProfileItem profileItem, bool b
profileItem.address = newFileName;
profileItem.configType = EConfigType.Custom;
- if (Utile.IsNullOrEmpty(profileItem.remarks))
+ if (Utils.IsNullOrEmpty(profileItem.remarks))
{
profileItem.remarks = $"import custom@{DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")}";
}
@@ -676,7 +676,7 @@ public static int AddTrojanServer(Config config, ProfileItem profileItem, bool t
profileItem.address = profileItem.address.TrimEx();
profileItem.id = profileItem.id.TrimEx();
- if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+ if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
@@ -706,7 +706,7 @@ public static int AddHysteria2Server(Config config, ProfileItem profileItem, boo
profileItem.path = profileItem.path.TrimEx();
profileItem.network = string.Empty;
- if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+ if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
@@ -741,11 +741,11 @@ public static int AddTuicServer(Config config, ProfileItem profileItem, bool toF
profileItem.headerType = Global.TuicCongestionControls.FirstOrDefault()!;
}
- if (Utile.IsNullOrEmpty(profileItem.streamSecurity))
+ if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
profileItem.streamSecurity = Global.StreamSecurity;
}
- if (Utile.IsNullOrEmpty(profileItem.alpn))
+ if (Utils.IsNullOrEmpty(profileItem.alpn))
{
profileItem.alpn = "h3";
}
@@ -913,7 +913,7 @@ public static int AddVlessServer(Config config, ProfileItem profileItem, bool to
{
return -1;
}
- if (!Utile.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
+ if (!Utils.IsNullOrEmpty(profileItem.security) && profileItem.security != Global.None)
{
profileItem.security = Global.None;
}
@@ -951,7 +951,7 @@ public static int AddServerCommon(Config config, ProfileItem profileItem, bool t
{
profileItem.configVersion = 2;
- if (!Utile.IsNullOrEmpty(profileItem.streamSecurity))
+ if (!Utils.IsNullOrEmpty(profileItem.streamSecurity))
{
if (profileItem.streamSecurity != Global.StreamSecurity
&& profileItem.streamSecurity != Global.StreamSecurityReality)
@@ -960,26 +960,26 @@ public static int AddServerCommon(Config config, ProfileItem profileItem, bool t
}
else
{
- if (Utile.IsNullOrEmpty(profileItem.allowInsecure))
+ if (Utils.IsNullOrEmpty(profileItem.allowInsecure))
{
profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
}
- if (Utile.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
+ if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
{
profileItem.fingerprint = config.coreBasicItem.defFingerprint;
}
}
}
- if (!Utile.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
+ if (!Utils.IsNullOrEmpty(profileItem.network) && !Global.Networks.Contains(profileItem.network))
{
profileItem.network = Global.DefaultNetwork;
}
var maxSort = -1;
- if (Utile.IsNullOrEmpty(profileItem.indexId))
+ if (Utils.IsNullOrEmpty(profileItem.indexId))
{
- profileItem.indexId = Utile.GetGUID(false);
+ profileItem.indexId = Utils.GetGUID(false);
maxSort = ProfileExHandler.Instance.GetMaxSort();
}
if (!toFile && maxSort < 0)
@@ -1032,7 +1032,7 @@ private static int RemoveProfileItem(Config config, string indexId)
}
if (item.configType == EConfigType.Custom)
{
- File.Delete(Utile.GetConfigPath(item.address));
+ File.Delete(Utils.GetConfigPath(item.address));
}
SQLiteHelper.Instance.Delete(item);
@@ -1058,14 +1058,14 @@ private static int RemoveProfileItem(Config config, string indexId)
/// 成功导入的数量
private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
{
- if (Utile.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
string subFilter = string.Empty;
//remove sub items
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
subFilter = LazyConfig.Instance.GetSubItem(subid)?.filter ?? "";
@@ -1098,7 +1098,7 @@ private static int AddBatchServers(Config config, string clipboardData, string s
}
//exist sub items
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
var existItem = lstOriSub?.FirstOrDefault(t => t.isSub == isSub
&& config.uiItem.enableUpdateSubOnlyRemarksExist ? t.remarks == profileItem.remarks : CompareProfileItem(t, profileItem, true));
@@ -1120,7 +1120,7 @@ private static int AddBatchServers(Config config, string clipboardData, string s
}
}
//filter
- if (!Utile.IsNullOrEmpty(subFilter))
+ if (!Utils.IsNullOrEmpty(subFilter))
{
if (!Regex.IsMatch(profileItem.remarks, subFilter))
{
@@ -1162,7 +1162,7 @@ private static int AddBatchServers(Config config, string clipboardData, string s
private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
{
- if (Utile.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
@@ -1178,10 +1178,10 @@ static bool Contains(string str, params string[] s)
}
//Is v2ray array configuration
- var configObjects = JsonUtile.Deserialize(clipboardData);
+ var configObjects = JsonUtils.Deserialize(clipboardData);
if (configObjects != null && configObjects.Length > 0)
{
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
@@ -1189,11 +1189,11 @@ static bool Contains(string str, params string[] s)
int count = 0;
foreach (var configObject in configObjects)
{
- var objectString = JsonUtile.Serialize(configObject);
- var v2rayCon = JsonUtile.Deserialize(objectString);
+ var objectString = JsonUtils.Serialize(configObject);
+ var v2rayCon = JsonUtils.Deserialize(objectString);
if (v2rayCon?.inbounds?.Count > 0 && v2rayCon.outbounds?.Count > 0)
{
- var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+ var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, objectString);
var profileIt = new ProfileItem
@@ -1219,11 +1219,11 @@ static bool Contains(string str, params string[] s)
ProfileItem profileItem = new();
//Is v2ray configuration
- var v2rayConfig = JsonUtile.Deserialize(clipboardData);
+ var v2rayConfig = JsonUtils.Deserialize(clipboardData);
if (v2rayConfig?.inbounds?.Count > 0
&& v2rayConfig.outbounds?.Count > 0)
{
- var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+ var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.Xray;
@@ -1233,7 +1233,7 @@ static bool Contains(string str, params string[] s)
//Is Clash configuration
else if (Contains(clipboardData, "port", "socks-port", "proxies"))
{
- var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.yaml");
+ var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.yaml");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.mihomo;
@@ -1243,7 +1243,7 @@ static bool Contains(string str, params string[] s)
//Is hysteria configuration
else if (Contains(clipboardData, "server", "up", "down", "listen", "", ""))
{
- var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+ var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.hysteria;
@@ -1253,7 +1253,7 @@ static bool Contains(string str, params string[] s)
//Is naiveproxy configuration
else if (Contains(clipboardData, "listen", "proxy", "", ""))
{
- var fileName = Utile.GetTempPath($"{Utile.GetGUID(false)}.json");
+ var fileName = Utils.GetTempPath($"{Utils.GetGUID(false)}.json");
File.WriteAllText(fileName, clipboardData);
profileItem.coreType = ECoreType.naiveproxy;
@@ -1271,7 +1271,7 @@ static bool Contains(string str, params string[] s)
//profileItem.remarks = "other_custom";
}
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
@@ -1282,7 +1282,7 @@ static bool Contains(string str, params string[] s)
profileItem.subid = subid;
profileItem.isSub = isSub;
- if (Utile.IsNullOrEmpty(profileItem.address))
+ if (Utils.IsNullOrEmpty(profileItem.address))
{
return -1;
}
@@ -1299,21 +1299,21 @@ static bool Contains(string str, params string[] s)
private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List lstOriSub)
{
- if (Utile.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
RemoveServerViaSubid(config, subid, isSub);
}
//SsSIP008
- var lstSsServer = JsonUtile.Deserialize>(clipboardData);
+ var lstSsServer = JsonUtils.Deserialize>(clipboardData);
if (lstSsServer?.Count <= 0)
{
- var ssSIP008 = JsonUtile.Deserialize(clipboardData);
+ var ssSIP008 = JsonUtils.Deserialize(clipboardData);
if (ssSIP008?.servers?.Count > 0)
{
lstSsServer = ssSIP008.servers;
@@ -1332,7 +1332,7 @@ private static int AddBatchServers4SsSIP008(Config config, string clipboardData,
security = it.method,
id = it.password,
address = it.server,
- port = Utile.ToInt(it.server_port)
+ port = Utils.ToInt(it.server_port)
};
ssItem.subid = subid;
ssItem.isSub = isSub;
@@ -1351,15 +1351,15 @@ private static int AddBatchServers4SsSIP008(Config config, string clipboardData,
public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
{
List? lstOriSub = null;
- if (isSub && !Utile.IsNullOrEmpty(subid))
+ if (isSub && !Utils.IsNullOrEmpty(subid))
{
lstOriSub = LazyConfig.Instance.ProfileItems(subid);
}
var counter = 0;
- if (Utile.IsBase64String(clipboardData))
+ if (Utils.IsBase64String(clipboardData))
{
- counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+ counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
}
if (counter < 1)
{
@@ -1367,7 +1367,7 @@ public static int AddBatchServers(Config config, string clipboardData, string su
}
if (counter < 1)
{
- counter = AddBatchServers(config, Utile.Base64Decode(clipboardData), subid, isSub, lstOriSub);
+ counter = AddBatchServers(config, Utils.Base64Decode(clipboardData), subid, isSub, lstOriSub);
}
if (counter < 1)
@@ -1414,9 +1414,9 @@ public static int AddSubItem(Config config, string url)
public static int AddSubItem(Config config, SubItem subItem)
{
- if (Utile.IsNullOrEmpty(subItem.id))
+ if (Utils.IsNullOrEmpty(subItem.id))
{
- subItem.id = Utile.GetGUID(false);
+ subItem.id = Utils.GetGUID(false);
if (subItem.sort <= 0)
{
@@ -1446,7 +1446,7 @@ public static int AddSubItem(Config config, SubItem subItem)
///
public static int RemoveServerViaSubid(Config config, string subid, bool isSub)
{
- if (Utile.IsNullOrEmpty(subid))
+ if (Utils.IsNullOrEmpty(subid))
{
return -1;
}
@@ -1461,7 +1461,7 @@ public static int RemoveServerViaSubid(Config config, string subid, bool isSub)
}
foreach (var item in customProfile)
{
- File.Delete(Utile.GetConfigPath(item.address));
+ File.Delete(Utils.GetConfigPath(item.address));
}
return 0;
@@ -1497,9 +1497,9 @@ public static int MoveToGroup(Config config, List lstProfile, strin
public static int SaveRoutingItem(Config config, RoutingItem item)
{
- if (Utile.IsNullOrEmpty(item.id))
+ if (Utils.IsNullOrEmpty(item.id))
{
- item.id = Utile.GetGUID(false);
+ item.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(item) > 0)
@@ -1520,12 +1520,12 @@ public static int SaveRoutingItem(Config config, RoutingItem item)
///
public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
{
- if (Utile.IsNullOrEmpty(clipboardData))
+ if (Utils.IsNullOrEmpty(clipboardData))
{
return -1;
}
- var lstRules = JsonUtile.Deserialize>(clipboardData);
+ var lstRules = JsonUtils.Deserialize>(clipboardData);
if (lstRules == null)
{
return -1;
@@ -1533,14 +1533,14 @@ public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipb
foreach (var item in lstRules)
{
- item.id = Utile.GetGUID(false);
+ item.id = Utils.GetGUID(false);
}
routingItem.ruleNum = lstRules.Count;
- routingItem.ruleSet = JsonUtile.Serialize(lstRules, false);
+ routingItem.ruleSet = JsonUtils.Serialize(lstRules, false);
- if (Utile.IsNullOrEmpty(routingItem.id))
+ if (Utils.IsNullOrEmpty(routingItem.id))
{
- routingItem.id = Utile.GetGUID(false);
+ routingItem.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(routingItem) > 0)
@@ -1575,7 +1575,7 @@ public static int MoveRoutingRule(List rules, int index, EMove eMove,
{
return 0;
}
- var item = JsonUtile.DeepCopy(rules[index]);
+ var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(0, item);
@@ -1587,7 +1587,7 @@ public static int MoveRoutingRule(List rules, int index, EMove eMove,
{
return 0;
}
- var item = JsonUtile.DeepCopy(rules[index]);
+ var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(index - 1, item);
@@ -1600,7 +1600,7 @@ public static int MoveRoutingRule(List rules, int index, EMove eMove,
{
return 0;
}
- var item = JsonUtile.DeepCopy(rules[index]);
+ var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Insert(index + 1, item);
@@ -1612,7 +1612,7 @@ public static int MoveRoutingRule(List rules, int index, EMove eMove,
{
return 0;
}
- var item = JsonUtile.DeepCopy(rules[index]);
+ var item = JsonUtils.DeepCopy(rules[index]);
rules.RemoveAt(index);
rules.Add(item);
@@ -1621,7 +1621,7 @@ public static int MoveRoutingRule(List rules, int index, EMove eMove,
case EMove.Position:
{
var removeItem = rules[index];
- var item = JsonUtile.DeepCopy(rules[index]);
+ var item = JsonUtils.DeepCopy(rules[index]);
rules.Insert(pos, item);
rules.Remove(removeItem);
break;
@@ -1668,7 +1668,7 @@ public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules =
url = string.Empty,
sort = maxSort + 1,
};
- AddBatchRoutingRules(ref item2, Utile.GetEmbedText(Global.CustomRoutingFileName + "white"));
+ AddBatchRoutingRules(ref item2, Utils.GetEmbedText(Global.CustomRoutingFileName + "white"));
//Blacklist
var item3 = new RoutingItem()
@@ -1677,7 +1677,7 @@ public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules =
url = string.Empty,
sort = maxSort + 2,
};
- AddBatchRoutingRules(ref item3, Utile.GetEmbedText(Global.CustomRoutingFileName + "black"));
+ AddBatchRoutingRules(ref item3, Utils.GetEmbedText(Global.CustomRoutingFileName + "black"));
//Global
var item1 = new RoutingItem()
@@ -1686,7 +1686,7 @@ public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules =
url = string.Empty,
sort = maxSort + 3,
};
- AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "global"));
+ AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "global"));
if (!blImportAdvancedRules)
{
@@ -1702,7 +1702,7 @@ public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules =
url = string.Empty,
locked = true,
};
- AddBatchRoutingRules(ref item1, Utile.GetEmbedText(Global.CustomRoutingFileName + "locked"));
+ AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
}
return 0;
}
@@ -1746,9 +1746,9 @@ public static int InitBuiltinDNS(Config config)
public static int SaveDNSItems(Config config, DNSItem item)
{
- if (Utile.IsNullOrEmpty(item.id))
+ if (Utils.IsNullOrEmpty(item.id))
{
- item.id = Utile.GetGUID(false);
+ item.id = Utils.GetGUID(false);
}
if (SQLiteHelper.Instance.Replace(item) > 0)
diff --git a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
index 2137473815e..bfe35382216 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigHandler.cs
@@ -33,13 +33,13 @@ public static int GenerateClientConfig(ProfileItem node, string? fileName, out s
{
return -1;
}
- if (Utile.IsNullOrEmpty(fileName))
+ if (Utils.IsNullOrEmpty(fileName))
{
- content = JsonUtile.Serialize(singboxConfig);
+ content = JsonUtils.Serialize(singboxConfig);
}
else
{
- JsonUtile.ToFile(singboxConfig, fileName, false);
+ JsonUtils.ToFile(singboxConfig, fileName, false);
}
}
else
@@ -49,13 +49,13 @@ public static int GenerateClientConfig(ProfileItem node, string? fileName, out s
{
return -1;
}
- if (Utile.IsNullOrEmpty(fileName))
+ if (Utils.IsNullOrEmpty(fileName))
{
- content = JsonUtile.Serialize(v2rayConfig);
+ content = JsonUtils.Serialize(v2rayConfig);
}
else
{
- JsonUtile.ToFile(v2rayConfig, fileName, false);
+ JsonUtils.ToFile(v2rayConfig, fileName, false);
}
}
}
@@ -87,7 +87,7 @@ private static int GenerateClientCustomConfig(ProfileItem node, string? fileName
string addressFileName = node.address;
if (!File.Exists(addressFileName))
{
- addressFileName = Utile.GetConfigPath(addressFileName);
+ addressFileName = Utils.GetConfigPath(addressFileName);
}
if (!File.Exists(addressFileName))
{
@@ -158,7 +158,7 @@ public static int GenerateClientSpeedtestConfig(Config config, string fileName,
{
return -1;
}
- JsonUtile.ToFile(singboxConfig, fileName, false);
+ JsonUtils.ToFile(singboxConfig, fileName, false);
}
else
{
@@ -166,7 +166,7 @@ public static int GenerateClientSpeedtestConfig(Config config, string fileName,
{
return -1;
}
- JsonUtile.ToFile(v2rayConfig, fileName, false);
+ JsonUtils.ToFile(v2rayConfig, fileName, false);
}
return 0;
}
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index ab6177ee99e..dda659de772 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -28,14 +28,14 @@ public int GenerateClientConfigContent(ProfileItem node, out SingboxConfig? sing
msg = ResUI.InitialConfiguration;
- string result = Utile.GetEmbedText(Global.SingboxSampleClient);
- if (Utile.IsNullOrEmpty(result))
+ string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+ if (Utils.IsNullOrEmpty(result))
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
- singboxConfig = JsonUtile.Deserialize(result);
+ singboxConfig = JsonUtils.Deserialize(result);
if (singboxConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -95,7 +95,7 @@ private int GenLog(SingboxConfig singboxConfig)
if (_config.coreBasicItem.logEnabled)
{
var dtNow = DateTime.Now;
- singboxConfig.log.output = Utile.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
+ singboxConfig.log.output = Utils.GetLogPath($"sbox_{dtNow:yyyy-MM-dd}.txt");
}
}
catch (Exception ex)
@@ -124,12 +124,12 @@ private int GenInbounds(SingboxConfig singboxConfig)
inbound.listen_port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks);
inbound.sniff = _config.inbound[0].sniffingEnabled;
inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
- inbound.domain_strategy = Utile.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
+ inbound.domain_strategy = Utils.IsNullOrEmpty(_config.routingBasicItem.domainStrategy4Singbox) ? null : _config.routingBasicItem.domainStrategy4Singbox;
if (_config.routingBasicItem.enableRoutingAdvanced)
{
var routing = ConfigHandler.GetDefaultRouting(_config);
- if (!Utile.IsNullOrEmpty(routing.domainStrategy4Singbox))
+ if (!Utils.IsNullOrEmpty(routing.domainStrategy4Singbox))
{
inbound.domain_strategy = routing.domainStrategy4Singbox;
}
@@ -152,7 +152,7 @@ private int GenInbounds(SingboxConfig singboxConfig)
singboxConfig.inbounds.Add(inbound4);
//auth
- if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
+ if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
{
inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
@@ -170,14 +170,14 @@ private int GenInbounds(SingboxConfig singboxConfig)
{
if (_config.tunModeItem.mtu <= 0)
{
- _config.tunModeItem.mtu = Utile.ToInt(Global.TunMtus[0]);
+ _config.tunModeItem.mtu = Utils.ToInt(Global.TunMtus[0]);
}
- if (Utile.IsNullOrEmpty(_config.tunModeItem.stack))
+ if (Utils.IsNullOrEmpty(_config.tunModeItem.stack))
{
_config.tunModeItem.stack = Global.TunStacks[0];
}
- var tunInbound = JsonUtile.Deserialize(Utile.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
+ var tunInbound = JsonUtils.Deserialize(Utils.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
tunInbound.mtu = _config.tunModeItem.mtu;
tunInbound.strict_route = _config.tunModeItem.strictRoute;
tunInbound.stack = _config.tunModeItem.stack;
@@ -200,7 +200,7 @@ private int GenInbounds(SingboxConfig singboxConfig)
private Inbound4Sbox GetInbound(Inbound4Sbox inItem, EInboundProtocol protocol, bool bSocks)
{
- var inbound = JsonUtile.DeepCopy(inItem);
+ var inbound = JsonUtils.DeepCopy(inItem);
inbound.tag = protocol.ToString();
inbound.listen_port = inItem.listen_port + (int)protocol;
inbound.type = bSocks ? EInboundProtocol.socks.ToString() : EInboundProtocol.http.ToString();
@@ -245,8 +245,8 @@ private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
outbound.type = Global.ProtocolTypes[EConfigType.Socks];
outbound.version = "5";
- if (!Utile.IsNullOrEmpty(node.security)
- && !Utile.IsNullOrEmpty(node.id))
+ if (!Utils.IsNullOrEmpty(node.security)
+ && !Utils.IsNullOrEmpty(node.id))
{
outbound.username = node.security;
outbound.password = node.id;
@@ -260,7 +260,7 @@ private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
outbound.packet_encoding = "xudp";
- if (Utile.IsNullOrEmpty(node.flow))
+ if (Utils.IsNullOrEmpty(node.flow))
{
GenOutboundMux(node, outbound);
}
@@ -283,7 +283,7 @@ private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
outbound.password = node.id;
- if (!Utile.IsNullOrEmpty(node.path))
+ if (!Utils.IsNullOrEmpty(node.path))
{
outbound.obfs = new()
{
@@ -309,9 +309,9 @@ private int GenOutbound(ProfileItem node, Outbound4Sbox outbound)
outbound.private_key = node.id;
outbound.peer_public_key = node.publicKey;
- outbound.reserved = Utile.String2List(node.path).Select(int.Parse).ToArray();
- outbound.local_address = [.. Utile.String2List(node.requestHost)];
- outbound.mtu = Utile.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
+ outbound.reserved = Utils.String2List(node.path).Select(int.Parse).ToArray();
+ outbound.local_address = [.. Utils.String2List(node.requestHost)];
+ outbound.mtu = Utils.ToInt(node.shortId.IsNullOrEmpty() ? Global.TunMtus.FirstOrDefault() : node.shortId);
}
GenOutboundTls(node, outbound);
@@ -354,22 +354,22 @@ private int GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
if (node.streamSecurity == Global.StreamSecurityReality || node.streamSecurity == Global.StreamSecurity)
{
var server_name = string.Empty;
- if (!Utile.IsNullOrEmpty(node.sni))
+ if (!Utils.IsNullOrEmpty(node.sni))
{
server_name = node.sni;
}
- else if (!Utile.IsNullOrEmpty(node.requestHost))
+ else if (!Utils.IsNullOrEmpty(node.requestHost))
{
- server_name = Utile.String2List(node.requestHost)[0];
+ server_name = Utils.String2List(node.requestHost)[0];
}
var tls = new Tls4Sbox()
{
enabled = true,
server_name = server_name,
- insecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+ insecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
alpn = node.GetAlpn(),
};
- if (!Utile.IsNullOrEmpty(node.fingerprint))
+ if (!Utils.IsNullOrEmpty(node.fingerprint))
{
tls.utls = new Utls4Sbox()
{
@@ -407,8 +407,8 @@ private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
{
case nameof(ETransport.h2):
transport.type = nameof(ETransport.http);
- transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
- transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
+ transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+ transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
break;
case nameof(ETransport.tcp): //http
@@ -422,16 +422,16 @@ private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
else
{
transport.type = nameof(ETransport.http);
- transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : Utile.String2List(node.requestHost);
- transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
+ transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : Utils.String2List(node.requestHost);
+ transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
}
}
break;
case nameof(ETransport.ws):
transport.type = nameof(ETransport.ws);
- transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
- if (!Utile.IsNullOrEmpty(node.requestHost))
+ transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+ if (!Utils.IsNullOrEmpty(node.requestHost))
{
transport.headers = new()
{
@@ -442,8 +442,8 @@ private int GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
case nameof(ETransport.httpupgrade):
transport.type = nameof(ETransport.httpupgrade);
- transport.path = Utile.IsNullOrEmpty(node.path) ? null : node.path;
- transport.host = Utile.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
+ transport.path = Utils.IsNullOrEmpty(node.path) ? null : node.path;
+ transport.host = Utils.IsNullOrEmpty(node.requestHost) ? null : node.requestHost;
break;
@@ -490,14 +490,14 @@ private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
//current proxy
var outbound = singboxConfig.outbounds[0];
- var txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
+ var txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
//Previous proxy
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
if (prevNode is not null
&& prevNode.configType != EConfigType.Custom)
{
- var prevOutbound = JsonUtile.Deserialize(txtOutbound);
+ var prevOutbound = JsonUtils.Deserialize(txtOutbound);
GenOutbound(prevNode, prevOutbound);
prevOutbound.tag = $"{Global.ProxyTag}2";
singboxConfig.outbounds.Add(prevOutbound);
@@ -510,7 +510,7 @@ private int GenMoreOutbounds(ProfileItem node, SingboxConfig singboxConfig)
if (nextNode is not null
&& nextNode.configType != EConfigType.Custom)
{
- var nextOutbound = JsonUtile.Deserialize(txtOutbound);
+ var nextOutbound = JsonUtils.Deserialize(txtOutbound);
GenOutbound(nextNode, nextOutbound);
nextOutbound.tag = Global.ProxyTag;
singboxConfig.outbounds.Insert(0, nextOutbound);
@@ -535,7 +535,7 @@ private int GenRouting(SingboxConfig singboxConfig)
{
singboxConfig.route.auto_detect_interface = true;
- var tunRules = JsonUtile.Deserialize>(Utile.GetEmbedText(Global.TunSingboxRulesFileName));
+ var tunRules = JsonUtils.Deserialize>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
singboxConfig.route.rules.AddRange(tunRules);
GenRoutingDirectExe(out List lstDnsExe, out List lstDirectExe);
@@ -558,7 +558,7 @@ private int GenRouting(SingboxConfig singboxConfig)
var routing = ConfigHandler.GetDefaultRouting(_config);
if (routing != null)
{
- var rules = JsonUtile.Deserialize>(routing.ruleSet);
+ var rules = JsonUtils.Deserialize>(routing.ruleSet);
foreach (var item in rules!)
{
if (item.enabled)
@@ -573,7 +573,7 @@ private int GenRouting(SingboxConfig singboxConfig)
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
if (lockedItem != null)
{
- var rules = JsonUtile.Deserialize>(lockedItem.ruleSet);
+ var rules = JsonUtils.Deserialize>(lockedItem.ruleSet);
foreach (var item in rules!)
{
GenRoutingUserRule(item, singboxConfig.route.rules);
@@ -628,7 +628,7 @@ private int GenRoutingUserRule(RulesItem item, List rules)
outbound = item.outboundTag,
};
- if (!Utile.IsNullOrEmpty(item.port))
+ if (!Utils.IsNullOrEmpty(item.port))
{
if (item.port.Contains("-"))
{
@@ -636,7 +636,7 @@ private int GenRoutingUserRule(RulesItem item, List rules)
}
else
{
- rule.port = new List { Utile.ToInt(item.port) };
+ rule.port = new List { Utils.ToInt(item.port) };
}
}
if (item.protocol?.Count > 0)
@@ -647,8 +647,8 @@ private int GenRoutingUserRule(RulesItem item, List rules)
{
rule.inbound = item.inboundTag;
}
- var rule2 = JsonUtile.DeepCopy(rule);
- var rule3 = JsonUtile.DeepCopy(rule);
+ var rule2 = JsonUtils.DeepCopy(rule);
+ var rule3 = JsonUtils.DeepCopy(rule);
var hasDomainIp = false;
if (item.domain?.Count > 0)
@@ -761,22 +761,22 @@ private int GenDns(ProfileItem node, SingboxConfig singboxConfig)
{
var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
var tunDNS = item?.tunDNS;
- if (Utile.IsNullOrEmpty(tunDNS))
+ if (Utils.IsNullOrEmpty(tunDNS))
{
- tunDNS = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
+ tunDNS = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
}
- dns4Sbox = JsonUtile.Deserialize(tunDNS);
+ dns4Sbox = JsonUtils.Deserialize(tunDNS);
}
else
{
var item = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
var normalDNS = item?.normalDNS;
- if (Utile.IsNullOrEmpty(normalDNS))
+ if (Utils.IsNullOrEmpty(normalDNS))
{
normalDNS = "{\"servers\":[{\"address\":\"tcp://8.8.8.8\"}]}";
}
- dns4Sbox = JsonUtile.Deserialize(normalDNS);
+ dns4Sbox = JsonUtils.Deserialize(normalDNS);
}
if (dns4Sbox is null)
{
@@ -852,15 +852,15 @@ public int GenerateClientSpeedtestConfig(List selecteds, out Sin
msg = ResUI.InitialConfiguration;
- string result = Utile.GetEmbedText(Global.SingboxSampleClient);
- string txtOutbound = Utile.GetEmbedText(Global.SingboxSampleOutbound);
- if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
+ string result = Utils.GetEmbedText(Global.SingboxSampleClient);
+ string txtOutbound = Utils.GetEmbedText(Global.SingboxSampleOutbound);
+ if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
- singboxConfig = JsonUtile.Deserialize(result);
+ singboxConfig = JsonUtils.Deserialize(result);
if (singboxConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -899,7 +899,7 @@ public int GenerateClientSpeedtestConfig(List selecteds, out Sin
if (it.configType is EConfigType.VMess or EConfigType.VLESS)
{
var item2 = LazyConfig.Instance.GetProfileItem(it.indexId);
- if (item2 is null || Utile.IsNullOrEmpty(item2.id) || !Utile.IsGuidByParse(item2.id))
+ if (item2 is null || Utils.IsNullOrEmpty(item2.id) || !Utils.IsGuidByParse(item2.id))
{
continue;
}
@@ -958,7 +958,7 @@ public int GenerateClientSpeedtestConfig(List selecteds, out Sin
continue;
}
- var outbound = JsonUtile.Deserialize(txtOutbound);
+ var outbound = JsonUtils.Deserialize(txtOutbound);
GenOutbound(item, outbound);
outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
singboxConfig.outbounds.Add(outbound);
diff --git a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
index e882078cb54..f258bb2604b 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigV2ray.cs
@@ -28,14 +28,14 @@ public int GenerateClientConfigContent(ProfileItem node, out V2rayConfig? v2rayC
msg = ResUI.InitialConfiguration;
- string result = Utile.GetEmbedText(Global.V2raySampleClient);
- if (Utile.IsNullOrEmpty(result))
+ string result = Utils.GetEmbedText(Global.V2raySampleClient);
+ if (Utils.IsNullOrEmpty(result))
{
msg = ResUI.FailedGetDefaultConfiguration;
return -1;
}
- v2rayConfig = JsonUtile.Deserialize(result);
+ v2rayConfig = JsonUtils.Deserialize(result);
if (v2rayConfig == null)
{
msg = ResUI.FailedGenDefaultConfiguration;
@@ -77,8 +77,8 @@ private int GenLog(V2rayConfig v2rayConfig)
{
var dtNow = DateTime.Now;
v2rayConfig.log.loglevel = _config.coreBasicItem.loglevel;
- v2rayConfig.log.access = Utile.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
- v2rayConfig.log.error = Utile.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
+ v2rayConfig.log.access = Utils.GetLogPath($"Vaccess_{dtNow:yyyy-MM-dd}.txt");
+ v2rayConfig.log.error = Utils.GetLogPath($"Verror_{dtNow:yyyy-MM-dd}.txt");
}
else
{
@@ -120,7 +120,7 @@ private int GenInbounds(V2rayConfig v2rayConfig)
v2rayConfig.inbounds.Add(inbound4);
//auth
- if (!Utile.IsNullOrEmpty(_config.inbound[0].user) && !Utile.IsNullOrEmpty(_config.inbound[0].pass))
+ if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
{
inbound3.settings.auth = "password";
inbound3.settings.accounts = new List { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
@@ -145,13 +145,13 @@ private int GenInbounds(V2rayConfig v2rayConfig)
private Inbounds4Ray? GetInbound(InItem inItem, EInboundProtocol protocol, bool bSocks)
{
- string result = Utile.GetEmbedText(Global.V2raySampleInbound);
- if (Utile.IsNullOrEmpty(result))
+ string result = Utils.GetEmbedText(Global.V2raySampleInbound);
+ if (Utils.IsNullOrEmpty(result))
{
return null;
}
- var inbound = JsonUtile.Deserialize(result);
+ var inbound = JsonUtils.Deserialize(result);
if (inbound == null)
{
return null;
@@ -173,23 +173,23 @@ private int GenRouting(V2rayConfig v2rayConfig)
if (v2rayConfig.routing?.rules != null)
{
v2rayConfig.routing.domainStrategy = _config.routingBasicItem.domainStrategy;
- v2rayConfig.routing.domainMatcher = Utile.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
+ v2rayConfig.routing.domainMatcher = Utils.IsNullOrEmpty(_config.routingBasicItem.domainMatcher) ? null : _config.routingBasicItem.domainMatcher;
if (_config.routingBasicItem.enableRoutingAdvanced)
{
var routing = ConfigHandler.GetDefaultRouting(_config);
if (routing != null)
{
- if (!Utile.IsNullOrEmpty(routing.domainStrategy))
+ if (!Utils.IsNullOrEmpty(routing.domainStrategy))
{
v2rayConfig.routing.domainStrategy = routing.domainStrategy;
}
- var rules = JsonUtile.Deserialize>(routing.ruleSet);
+ var rules = JsonUtils.Deserialize>(routing.ruleSet);
foreach (var item in rules)
{
if (item.enabled)
{
- var item2 = JsonUtile.Deserialize(JsonUtile.Serialize(item));
+ var item2 = JsonUtils.Deserialize(JsonUtils.Serialize(item));
GenRoutingUserRule(item2, v2rayConfig);
}
}
@@ -200,10 +200,10 @@ private int GenRouting(V2rayConfig v2rayConfig)
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
if (lockedItem != null)
{
- var rules = JsonUtile.Deserialize>(lockedItem.ruleSet);
+ var rules = JsonUtils.Deserialize>(lockedItem.ruleSet);
foreach (var item in rules)
{
- var item2 = JsonUtile.Deserialize(JsonUtile.Serialize(item));
+ var item2 = JsonUtils.Deserialize(JsonUtils.Serialize(item));
GenRoutingUserRule(item2, v2rayConfig);
}
}
@@ -225,7 +225,7 @@ private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
{
return 0;
}
- if (Utile.IsNullOrEmpty(rules.port))
+ if (Utils.IsNullOrEmpty(rules.port))
{
rules.port = null;
}
@@ -249,7 +249,7 @@ private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
var hasDomainIp = false;
if (rules.domain?.Count > 0)
{
- var it = JsonUtile.DeepCopy(rules);
+ var it = JsonUtils.DeepCopy(rules);
it.ip = null;
it.type = "field";
for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -265,7 +265,7 @@ private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
}
if (rules.ip?.Count > 0)
{
- var it = JsonUtile.DeepCopy(rules);
+ var it = JsonUtils.DeepCopy(rules);
it.domain = null;
it.type = "field";
v2rayConfig.routing.rules.Add(it);
@@ -273,12 +273,12 @@ private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
}
if (!hasDomainIp)
{
- if (!Utile.IsNullOrEmpty(rules.port)
+ if (!Utils.IsNullOrEmpty(rules.port)
|| (rules.protocol?.Count > 0)
|| (rules.inboundTag?.Count > 0)
)
{
- var it = JsonUtile.DeepCopy(rules);
+ var it = JsonUtils.DeepCopy(rules);
it.type = "field";
v2rayConfig.routing.rules.Add(it);
}
@@ -380,8 +380,8 @@ private int GenOutbound(ProfileItem node, Outbounds4Ray outbound)
serversItem.method = null;
serversItem.password = null;
- if (!Utile.IsNullOrEmpty(node.security)
- && !Utile.IsNullOrEmpty(node.id))
+ if (!Utils.IsNullOrEmpty(node.security)
+ && !Utils.IsNullOrEmpty(node.id))
{
SocksUsersItem4Ray socksUsersItem = new()
{
@@ -432,14 +432,14 @@ private int GenOutbound(ProfileItem node, Outbounds4Ray outbound)
if (node.streamSecurity == Global.StreamSecurityReality
|| node.streamSecurity == Global.StreamSecurity)
{
- if (!Utile.IsNullOrEmpty(node.flow))
+ if (!Utils.IsNullOrEmpty(node.flow))
{
usersItem.flow = node.flow;
GenOutboundMux(node, outbound, false);
}
}
- if (node.streamSecurity == Global.StreamSecurityReality && Utile.IsNullOrEmpty(node.flow))
+ if (node.streamSecurity == Global.StreamSecurityReality && Utils.IsNullOrEmpty(node.flow))
{
GenOutboundMux(node, outbound, _config.coreBasicItem.muxEnabled);
}
@@ -529,17 +529,17 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
TlsSettings4Ray tlsSettings = new()
{
- allowInsecure = Utile.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
+ allowInsecure = Utils.ToBool(node.allowInsecure.IsNullOrEmpty() ? _config.coreBasicItem.defAllowInsecure.ToString().ToLower() : node.allowInsecure),
alpn = node.GetAlpn(),
fingerprint = node.fingerprint.IsNullOrEmpty() ? _config.coreBasicItem.defFingerprint : node.fingerprint
};
- if (!Utile.IsNullOrEmpty(sni))
+ if (!Utils.IsNullOrEmpty(sni))
{
tlsSettings.serverName = sni;
}
- else if (!Utile.IsNullOrEmpty(host))
+ else if (!Utils.IsNullOrEmpty(host))
{
- tlsSettings.serverName = Utile.String2List(host)[0];
+ tlsSettings.serverName = Utils.String2List(host)[0];
}
streamSettings.tlsSettings = tlsSettings;
}
@@ -581,7 +581,7 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
{
type = node.headerType
};
- if (!Utile.IsNullOrEmpty(node.path))
+ if (!Utils.IsNullOrEmpty(node.path))
{
kcpSettings.seed = node.path;
}
@@ -592,15 +592,15 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
WsSettings4Ray wsSettings = new();
wsSettings.headers = new Headers4Ray();
string path = node.path;
- if (!Utile.IsNullOrEmpty(host))
+ if (!Utils.IsNullOrEmpty(host))
{
wsSettings.headers.Host = host;
}
- if (!Utile.IsNullOrEmpty(path))
+ if (!Utils.IsNullOrEmpty(path))
{
wsSettings.path = path;
}
- if (!Utile.IsNullOrEmpty(useragent))
+ if (!Utils.IsNullOrEmpty(useragent))
{
wsSettings.headers.UserAgent = useragent;
}
@@ -611,11 +611,11 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
case nameof(ETransport.httpupgrade):
HttpupgradeSettings4Ray httpupgradeSettings = new();
- if (!Utile.IsNullOrEmpty(node.path))
+ if (!Utils.IsNullOrEmpty(node.path))
{
httpupgradeSettings.path = node.path;
}
- if (!Utile.IsNullOrEmpty(host))
+ if (!Utils.IsNullOrEmpty(host))
{
httpupgradeSettings.host = host;
}
@@ -626,9 +626,9 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
case nameof(ETransport.h2):
HttpSettings4Ray httpSettings = new();
- if (!Utile.IsNullOrEmpty(host))
+ if (!Utils.IsNullOrEmpty(host))
{
- httpSettings.host = Utile.String2List(host);
+ httpSettings.host = Utils.String2List(host);
}
httpSettings.path = node.path;
@@ -649,7 +649,7 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
streamSettings.quicSettings = quicsettings;
if (node.streamSecurity == Global.StreamSecurity)
{
- if (!Utile.IsNullOrEmpty(sni))
+ if (!Utils.IsNullOrEmpty(sni))
{
streamSettings.tlsSettings.serverName = sni;
}
@@ -663,7 +663,7 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
case nameof(ETransport.grpc):
GrpcSettings4Ray grpcSettings = new()
{
- authority = Utile.IsNullOrEmpty(host) ? null : host,
+ authority = Utils.IsNullOrEmpty(host) ? null : host,
serviceName = node.path,
multiMode = (node.headerType == Global.GrpcMultiMode),
idle_timeout = _config.grpcItem.idle_timeout,
@@ -687,7 +687,7 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
};
//request Host
- string request = Utile.GetEmbedText(Global.V2raySampleHttpRequestFileName);
+ string request = Utils.GetEmbedText(Global.V2raySampleHttpRequestFileName);
string[] arrHost = host.Split(',');
string host2 = string.Join("\",\"", arrHost);
request = request.Replace("$requestHost$", $"\"{host2}\"");
@@ -695,13 +695,13 @@ private int GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSe
request = request.Replace("$requestUserAgent$", $"\"{useragent}\"");
//Path
string pathHttp = @"/";
- if (!Utile.IsNullOrEmpty(node.path))
+ if (!Utils.IsNullOrEmpty(node.path))
{
string[] arrPath = node.path.Split(',');
pathHttp = string.Join("\",\"", arrPath);
}
request = request.Replace("$requestPath$", $"\"{pathHttp}\"");
- tcpSettings.header.request = JsonUtile.Deserialize