mirror of
https://github.com/2dust/v2rayN.git
synced 2025-07-01 12:32:10 +00:00
Rename Utile to Utils
This commit is contained in:
2dust
parent
3871681de3
commit
bac13e8b71
42 changed files with 610 additions and 610 deletions
|
|
@ -27,7 +27,7 @@ namespace v2rayN
|
|||
/// <param name="e"></param>
|
||||
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 @@ namespace v2rayN
|
|||
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);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ namespace v2rayN
|
|||
|
||||
public async Task<string?> DownloadStringAsync(IWebProxy? webProxy, string url, string? userAgent, int timeout)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -19,9 +19,9 @@ namespace v2rayN
|
|||
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 @@ namespace v2rayN
|
|||
|
||||
public async Task DownloadDataAsync4Speed(IWebProxy webProxy, string url, IProgress<string> progress, int timeout)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(url));
|
||||
}
|
||||
|
|
@ -120,11 +120,11 @@ namespace v2rayN
|
|||
|
||||
public async Task DownloadFileAsync(IWebProxy? webProxy, string url, string fileName, IProgress<double> 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));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ namespace v2rayN
|
|||
}
|
||||
try
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
|
||||
if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,19 +23,19 @@ namespace v2rayN
|
|||
|
||||
public async Task<string?> GetAsync(string url)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(url)) return null;
|
||||
if (Utils.IsNullOrEmpty(url)) return null;
|
||||
return await httpClient.GetStringAsync(url);
|
||||
}
|
||||
|
||||
public async Task<string?> 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<string, string> 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 @@ namespace v2rayN
|
|||
|
||||
public async Task DownloadDataAsync4Speed(HttpClient client, string url, IProgress<string> progress, CancellationToken token = default)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
throw new ArgumentNullException(nameof(url));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using System.Text.Json.Serialization;
|
|||
|
||||
namespace v2rayN
|
||||
{
|
||||
internal class JsonUtile
|
||||
internal class JsonUtils
|
||||
{
|
||||
/// <summary>
|
||||
/// DeepCopy
|
||||
|
|
@ -13,7 +13,7 @@ namespace v2rayN
|
|||
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 @@ namespace v2rayN
|
|||
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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace v2rayN
|
|||
|
||||
public SQLiteHelper()
|
||||
{
|
||||
_connstr = Utile.GetConfigPath(_configDB);
|
||||
_connstr = Utils.GetConfigPath(_configDB);
|
||||
_db = new SQLiteConnection(_connstr, false);
|
||||
_dbAsync = new SQLiteAsyncConnection(_connstr, false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ using ZXing.Windows.Compatibility;
|
|||
|
||||
namespace v2rayN
|
||||
{
|
||||
internal class Utile
|
||||
internal class Utils
|
||||
{
|
||||
#region 资源Json操作
|
||||
|
||||
|
|
@ -361,7 +361,7 @@ namespace v2rayN
|
|||
/// <returns></returns>
|
||||
public static string GetPunycode(string url)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
return url;
|
||||
}
|
||||
|
|
@ -391,7 +391,7 @@ namespace v2rayN
|
|||
|
||||
public static string Convert2Comma(string text)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(text))
|
||||
if (Utils.IsNullOrEmpty(text))
|
||||
{
|
||||
return text;
|
||||
}
|
||||
|
|
@ -583,7 +583,7 @@ namespace v2rayN
|
|||
{
|
||||
try
|
||||
{
|
||||
if (!Utile.PortInUse(defaultPort))
|
||||
if (!Utils.PortInUse(defaultPort))
|
||||
{
|
||||
return defaultPort;
|
||||
}
|
||||
|
|
@ -840,7 +840,7 @@ namespace v2rayN
|
|||
{
|
||||
Directory.CreateDirectory(_tempPath);
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(filename))
|
||||
if (Utils.IsNullOrEmpty(filename))
|
||||
{
|
||||
return _tempPath;
|
||||
}
|
||||
|
|
@ -876,7 +876,7 @@ namespace v2rayN
|
|||
{
|
||||
Directory.CreateDirectory(_tempPath);
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(filename))
|
||||
if (Utils.IsNullOrEmpty(filename))
|
||||
{
|
||||
return _tempPath;
|
||||
}
|
||||
|
|
@ -901,7 +901,7 @@ namespace v2rayN
|
|||
Directory.CreateDirectory(_tempPath);
|
||||
}
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(filename))
|
||||
if (Utils.IsNullOrEmpty(filename))
|
||||
{
|
||||
return _tempPath;
|
||||
}
|
||||
|
|
@ -918,7 +918,7 @@ namespace v2rayN
|
|||
{
|
||||
Directory.CreateDirectory(_tempPath);
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(filename))
|
||||
if (Utils.IsNullOrEmpty(filename))
|
||||
{
|
||||
return _tempPath;
|
||||
}
|
||||
|
|
@ -935,7 +935,7 @@ namespace v2rayN
|
|||
{
|
||||
Directory.CreateDirectory(_tempPath);
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(filename))
|
||||
if (Utils.IsNullOrEmpty(filename))
|
||||
{
|
||||
return _tempPath;
|
||||
}
|
||||
|
|
@ -1107,7 +1107,7 @@ namespace v2rayN
|
|||
/// <exception cref="ArgumentNullException"></exception>
|
||||
public static void AutoStart(string taskName, string fileName, string description)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(taskName))
|
||||
if (Utils.IsNullOrEmpty(taskName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1122,7 +1122,7 @@ namespace v2rayN
|
|||
{
|
||||
taskService.RootFolder.DeleteTask(t.Name);
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -12,9 +12,9 @@ namespace v2rayN.Converters
|
|||
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}");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,15 +23,15 @@ namespace v2rayN.Handler
|
|||
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<Config>(result);
|
||||
config = JsonUtils.Deserialize<Config>(result);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (File.Exists(Utile.GetConfigPath(configRes)))
|
||||
if (File.Exists(Utils.GetConfigPath(configRes)))
|
||||
{
|
||||
Logging.SaveLog("LoadConfig Exception");
|
||||
return -1;
|
||||
|
|
@ -85,7 +85,7 @@ namespace v2rayN.Handler
|
|||
};
|
||||
}
|
||||
//路由规则
|
||||
if (Utile.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
|
||||
if (Utils.IsNullOrEmpty(config.routingBasicItem.domainStrategy))
|
||||
{
|
||||
config.routingBasicItem.domainStrategy = Global.DomainStrategies[0];//"IPIfNonMatch";
|
||||
}
|
||||
|
|
@ -144,7 +144,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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<ConfigOld>(result);
|
||||
var configOld = JsonUtils.Deserialize<ConfigOld>(result);
|
||||
if (configOld == null)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
var subItem = JsonUtile.Deserialize<List<SubItem>>(JsonUtile.Serialize(configOld.subItem));
|
||||
var subItem = JsonUtils.Deserialize<List<SubItem>>(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<List<ProfileItem>>(JsonUtile.Serialize(configOld.vmess));
|
||||
var profileItems = JsonUtils.Deserialize<List<ProfileItem>>(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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
continue;
|
||||
}
|
||||
var routing = JsonUtile.Deserialize<RoutingItem>(JsonUtile.Serialize(it));
|
||||
var routing = JsonUtils.Deserialize<RoutingItem>(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<Config>(JsonUtile.Serialize(configOld));
|
||||
config = JsonUtils.Deserialize<Config>(JsonUtils.Serialize(configOld));
|
||||
|
||||
if (config.coreBasicItem == null)
|
||||
{
|
||||
|
|
@ -412,13 +412,13 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
/// <returns></returns>
|
||||
public static int SetDefaultServerIndex(Config config, string? indexId)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(indexId))
|
||||
if (Utils.IsNullOrEmpty(indexId))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -570,12 +570,12 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
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 @@ namespace v2rayN.Handler
|
|||
/// <returns>成功导入的数量</returns>
|
||||
private static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> 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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
|
||||
//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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
}
|
||||
//filter
|
||||
if (!Utile.IsNullOrEmpty(subFilter))
|
||||
if (!Utils.IsNullOrEmpty(subFilter))
|
||||
{
|
||||
if (!Regex.IsMatch(profileItem.remarks, subFilter))
|
||||
{
|
||||
|
|
@ -1162,7 +1162,7 @@ namespace v2rayN.Handler
|
|||
|
||||
private static int AddBatchServers4Custom(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> lstOriSub)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(clipboardData))
|
||||
if (Utils.IsNullOrEmpty(clipboardData))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1178,10 +1178,10 @@ namespace v2rayN.Handler
|
|||
}
|
||||
|
||||
//Is v2ray array configuration
|
||||
var configObjects = JsonUtile.Deserialize<Object[]>(clipboardData);
|
||||
var configObjects = JsonUtils.Deserialize<Object[]>(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 @@ namespace v2rayN.Handler
|
|||
int count = 0;
|
||||
foreach (var configObject in configObjects)
|
||||
{
|
||||
var objectString = JsonUtile.Serialize(configObject);
|
||||
var v2rayCon = JsonUtile.Deserialize<V2rayConfig>(objectString);
|
||||
var objectString = JsonUtils.Serialize(configObject);
|
||||
var v2rayCon = JsonUtils.Deserialize<V2rayConfig>(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 @@ namespace v2rayN.Handler
|
|||
|
||||
ProfileItem profileItem = new();
|
||||
//Is v2ray configuration
|
||||
var v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(clipboardData);
|
||||
var v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(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 @@ namespace v2rayN.Handler
|
|||
//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 @@ namespace v2rayN.Handler
|
|||
//Is hysteria configuration
|
||||
else if (Contains(clipboardData, "server", "up", "down", "listen", "<html>", "<body>"))
|
||||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
//Is naiveproxy configuration
|
||||
else if (Contains(clipboardData, "listen", "proxy", "<html>", "<body>"))
|
||||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
//profileItem.remarks = "other_custom";
|
||||
}
|
||||
|
||||
if (isSub && !Utile.IsNullOrEmpty(subid))
|
||||
if (isSub && !Utils.IsNullOrEmpty(subid))
|
||||
{
|
||||
RemoveServerViaSubid(config, subid, isSub);
|
||||
}
|
||||
|
|
@ -1282,7 +1282,7 @@ namespace v2rayN.Handler
|
|||
profileItem.subid = subid;
|
||||
profileItem.isSub = isSub;
|
||||
|
||||
if (Utile.IsNullOrEmpty(profileItem.address))
|
||||
if (Utils.IsNullOrEmpty(profileItem.address))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1299,21 +1299,21 @@ namespace v2rayN.Handler
|
|||
|
||||
private static int AddBatchServers4SsSIP008(Config config, string clipboardData, string subid, bool isSub, List<ProfileItem> 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<List<SsServer>>(clipboardData);
|
||||
var lstSsServer = JsonUtils.Deserialize<List<SsServer>>(clipboardData);
|
||||
if (lstSsServer?.Count <= 0)
|
||||
{
|
||||
var ssSIP008 = JsonUtile.Deserialize<SsSIP008>(clipboardData);
|
||||
var ssSIP008 = JsonUtils.Deserialize<SsSIP008>(clipboardData);
|
||||
if (ssSIP008?.servers?.Count > 0)
|
||||
{
|
||||
lstSsServer = ssSIP008.servers;
|
||||
|
|
@ -1332,7 +1332,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
public static int AddBatchServers(Config config, string clipboardData, string subid, bool isSub)
|
||||
{
|
||||
List<ProfileItem>? 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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
/// <returns></returns>
|
||||
public static int RemoveServerViaSubid(Config config, string subid, bool isSub)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(subid))
|
||||
if (Utils.IsNullOrEmpty(subid))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1461,7 +1461,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
foreach (var item in customProfile)
|
||||
{
|
||||
File.Delete(Utile.GetConfigPath(item.address));
|
||||
File.Delete(Utils.GetConfigPath(item.address));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -1497,9 +1497,9 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
/// <returns></returns>
|
||||
public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(clipboardData))
|
||||
if (Utils.IsNullOrEmpty(clipboardData))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
|
||||
var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
|
||||
if (lstRules == null)
|
||||
{
|
||||
return -1;
|
||||
|
|
@ -1533,14 +1533,14 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
var item = JsonUtile.DeepCopy(rules[index]);
|
||||
var item = JsonUtils.DeepCopy(rules[index]);
|
||||
rules.RemoveAt(index);
|
||||
rules.Add(item);
|
||||
|
||||
|
|
@ -1621,7 +1621,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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)
|
||||
|
|
|
|||
|
|
@ -33,13 +33,13 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
string addressFileName = node.address;
|
||||
if (!File.Exists(addressFileName))
|
||||
{
|
||||
addressFileName = Utile.GetConfigPath(addressFileName);
|
||||
addressFileName = Utils.GetConfigPath(addressFileName);
|
||||
}
|
||||
if (!File.Exists(addressFileName))
|
||||
{
|
||||
|
|
@ -158,7 +158,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
return -1;
|
||||
}
|
||||
JsonUtile.ToFile(singboxConfig, fileName, false);
|
||||
JsonUtils.ToFile(singboxConfig, fileName, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -166,7 +166,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
return -1;
|
||||
}
|
||||
JsonUtile.ToFile(v2rayConfig, fileName, false);
|
||||
JsonUtils.ToFile(v2rayConfig, fileName, false);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@ namespace v2rayN.Handler
|
|||
|
||||
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<SingboxConfig>(result);
|
||||
singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
|
||||
if (singboxConfig == null)
|
||||
{
|
||||
msg = ResUI.FailedGenDefaultConfiguration;
|
||||
|
|
@ -95,7 +95,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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<Inbound4Sbox>(Utile.GetEmbedText(Global.TunSingboxInboundFileName)) ?? new Inbound4Sbox { };
|
||||
var tunInbound = JsonUtils.Deserialize<Inbound4Sbox>(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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
outbound.packet_encoding = "xudp";
|
||||
|
||||
if (Utile.IsNullOrEmpty(node.flow))
|
||||
if (Utils.IsNullOrEmpty(node.flow))
|
||||
{
|
||||
GenOutboundMux(node, outbound);
|
||||
}
|
||||
|
|
@ -283,7 +283,7 @@ namespace v2rayN.Handler
|
|||
|
||||
outbound.password = node.id;
|
||||
|
||||
if (!Utile.IsNullOrEmpty(node.path))
|
||||
if (!Utils.IsNullOrEmpty(node.path))
|
||||
{
|
||||
outbound.obfs = new()
|
||||
{
|
||||
|
|
@ -309,9 +309,9 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
//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<Outbound4Sbox>(txtOutbound);
|
||||
var prevOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
|
||||
GenOutbound(prevNode, prevOutbound);
|
||||
prevOutbound.tag = $"{Global.ProxyTag}2";
|
||||
singboxConfig.outbounds.Add(prevOutbound);
|
||||
|
|
@ -510,7 +510,7 @@ namespace v2rayN.Handler
|
|||
if (nextNode is not null
|
||||
&& nextNode.configType != EConfigType.Custom)
|
||||
{
|
||||
var nextOutbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
|
||||
var nextOutbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
|
||||
GenOutbound(nextNode, nextOutbound);
|
||||
nextOutbound.tag = Global.ProxyTag;
|
||||
singboxConfig.outbounds.Insert(0, nextOutbound);
|
||||
|
|
@ -535,7 +535,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
singboxConfig.route.auto_detect_interface = true;
|
||||
|
||||
var tunRules = JsonUtile.Deserialize<List<Rule4Sbox>>(Utile.GetEmbedText(Global.TunSingboxRulesFileName));
|
||||
var tunRules = JsonUtils.Deserialize<List<Rule4Sbox>>(Utils.GetEmbedText(Global.TunSingboxRulesFileName));
|
||||
singboxConfig.route.rules.AddRange(tunRules);
|
||||
|
||||
GenRoutingDirectExe(out List<string> lstDnsExe, out List<string> lstDirectExe);
|
||||
|
|
@ -558,7 +558,7 @@ namespace v2rayN.Handler
|
|||
var routing = ConfigHandler.GetDefaultRouting(_config);
|
||||
if (routing != null)
|
||||
{
|
||||
var rules = JsonUtile.Deserialize<List<RulesItem>>(routing.ruleSet);
|
||||
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
|
||||
foreach (var item in rules!)
|
||||
{
|
||||
if (item.enabled)
|
||||
|
|
@ -573,7 +573,7 @@ namespace v2rayN.Handler
|
|||
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
|
||||
if (lockedItem != null)
|
||||
{
|
||||
var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
|
||||
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
|
||||
foreach (var item in rules!)
|
||||
{
|
||||
GenRoutingUserRule(item, singboxConfig.route.rules);
|
||||
|
|
@ -628,7 +628,7 @@ namespace v2rayN.Handler
|
|||
outbound = item.outboundTag,
|
||||
};
|
||||
|
||||
if (!Utile.IsNullOrEmpty(item.port))
|
||||
if (!Utils.IsNullOrEmpty(item.port))
|
||||
{
|
||||
if (item.port.Contains("-"))
|
||||
{
|
||||
|
|
@ -636,7 +636,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
else
|
||||
{
|
||||
rule.port = new List<int> { Utile.ToInt(item.port) };
|
||||
rule.port = new List<int> { Utils.ToInt(item.port) };
|
||||
}
|
||||
}
|
||||
if (item.protocol?.Count > 0)
|
||||
|
|
@ -647,8 +647,8 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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<Dns4Sbox>(tunDNS);
|
||||
dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(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<Dns4Sbox>(normalDNS);
|
||||
dns4Sbox = JsonUtils.Deserialize<Dns4Sbox>(normalDNS);
|
||||
}
|
||||
if (dns4Sbox is null)
|
||||
{
|
||||
|
|
@ -852,15 +852,15 @@ namespace v2rayN.Handler
|
|||
|
||||
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<SingboxConfig>(result);
|
||||
singboxConfig = JsonUtils.Deserialize<SingboxConfig>(result);
|
||||
if (singboxConfig == null)
|
||||
{
|
||||
msg = ResUI.FailedGenDefaultConfiguration;
|
||||
|
|
@ -899,7 +899,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
continue;
|
||||
}
|
||||
|
||||
var outbound = JsonUtile.Deserialize<Outbound4Sbox>(txtOutbound);
|
||||
var outbound = JsonUtils.Deserialize<Outbound4Sbox>(txtOutbound);
|
||||
GenOutbound(item, outbound);
|
||||
outbound.tag = Global.ProxyTag + inbound.listen_port.ToString();
|
||||
singboxConfig.outbounds.Add(outbound);
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@ namespace v2rayN.Handler
|
|||
|
||||
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<V2rayConfig>(result);
|
||||
v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
|
||||
if (v2rayConfig == null)
|
||||
{
|
||||
msg = ResUI.FailedGenDefaultConfiguration;
|
||||
|
|
@ -77,8 +77,8 @@ namespace v2rayN.Handler
|
|||
{
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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<AccountsItem4Ray> { new AccountsItem4Ray() { user = _config.inbound[0].user, pass = _config.inbound[0].pass } };
|
||||
|
|
@ -145,13 +145,13 @@ namespace v2rayN.Handler
|
|||
|
||||
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<Inbounds4Ray>(result);
|
||||
var inbound = JsonUtils.Deserialize<Inbounds4Ray>(result);
|
||||
if (inbound == null)
|
||||
{
|
||||
return null;
|
||||
|
|
@ -173,23 +173,23 @@ namespace v2rayN.Handler
|
|||
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<List<RulesItem>>(routing.ruleSet);
|
||||
var rules = JsonUtils.Deserialize<List<RulesItem>>(routing.ruleSet);
|
||||
foreach (var item in rules)
|
||||
{
|
||||
if (item.enabled)
|
||||
{
|
||||
var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
|
||||
var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
|
||||
GenRoutingUserRule(item2, v2rayConfig);
|
||||
}
|
||||
}
|
||||
|
|
@ -200,10 +200,10 @@ namespace v2rayN.Handler
|
|||
var lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
|
||||
if (lockedItem != null)
|
||||
{
|
||||
var rules = JsonUtile.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
|
||||
var rules = JsonUtils.Deserialize<List<RulesItem>>(lockedItem.ruleSet);
|
||||
foreach (var item in rules)
|
||||
{
|
||||
var item2 = JsonUtile.Deserialize<RulesItem4Ray>(JsonUtile.Serialize(item));
|
||||
var item2 = JsonUtils.Deserialize<RulesItem4Ray>(JsonUtils.Serialize(item));
|
||||
GenRoutingUserRule(item2, v2rayConfig);
|
||||
}
|
||||
}
|
||||
|
|
@ -225,7 +225,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
return 0;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(rules.port))
|
||||
if (Utils.IsNullOrEmpty(rules.port))
|
||||
{
|
||||
rules.port = null;
|
||||
}
|
||||
|
|
@ -249,7 +249,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
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 @@ namespace v2rayN.Handler
|
|||
}
|
||||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
|
||||
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 @@ namespace v2rayN.Handler
|
|||
{
|
||||
type = node.headerType
|
||||
};
|
||||
if (!Utile.IsNullOrEmpty(node.path))
|
||||
if (!Utils.IsNullOrEmpty(node.path))
|
||||
{
|
||||
kcpSettings.seed = node.path;
|
||||
}
|
||||
|
|
@ -592,15 +592,15 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
streamSettings.quicSettings = quicsettings;
|
||||
if (node.streamSecurity == Global.StreamSecurity)
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(sni))
|
||||
if (!Utils.IsNullOrEmpty(sni))
|
||||
{
|
||||
streamSettings.tlsSettings.serverName = sni;
|
||||
}
|
||||
|
|
@ -663,7 +663,7 @@ namespace v2rayN.Handler
|
|||
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 @@ namespace v2rayN.Handler
|
|||
};
|
||||
|
||||
//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 @@ namespace v2rayN.Handler
|
|||
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<object>(request);
|
||||
tcpSettings.header.request = JsonUtils.Deserialize<object>(request);
|
||||
|
||||
streamSettings.tcpSettings = tcpSettings;
|
||||
}
|
||||
|
|
@ -722,20 +722,20 @@ namespace v2rayN.Handler
|
|||
var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
|
||||
var normalDNS = item?.normalDNS;
|
||||
var domainStrategy4Freedom = item?.domainStrategy4Freedom;
|
||||
if (Utile.IsNullOrEmpty(normalDNS))
|
||||
if (Utils.IsNullOrEmpty(normalDNS))
|
||||
{
|
||||
normalDNS = "1.1.1.1,8.8.8.8";
|
||||
}
|
||||
|
||||
//Outbound Freedom domainStrategy
|
||||
if (!Utile.IsNullOrEmpty(domainStrategy4Freedom))
|
||||
if (!Utils.IsNullOrEmpty(domainStrategy4Freedom))
|
||||
{
|
||||
var outbound = v2rayConfig.outbounds[1];
|
||||
outbound.settings.domainStrategy = domainStrategy4Freedom;
|
||||
outbound.settings.userLevel = 0;
|
||||
}
|
||||
|
||||
var obj = JsonUtile.ParseJson(normalDNS);
|
||||
var obj = JsonUtils.ParseJson(normalDNS);
|
||||
if (obj is null)
|
||||
{
|
||||
List<string> servers = [];
|
||||
|
|
@ -744,14 +744,14 @@ namespace v2rayN.Handler
|
|||
{
|
||||
servers.Add(str);
|
||||
}
|
||||
obj = JsonUtile.ParseJson("{}");
|
||||
obj["servers"] = JsonUtile.SerializeToNode(servers);
|
||||
obj = JsonUtils.ParseJson("{}");
|
||||
obj["servers"] = JsonUtils.SerializeToNode(servers);
|
||||
}
|
||||
|
||||
// 追加至 dns 设置
|
||||
if (item.useSystemHosts)
|
||||
{
|
||||
var systemHosts = Utile.GetSystemHosts();
|
||||
var systemHosts = Utils.GetSystemHosts();
|
||||
if (systemHosts.Count > 0)
|
||||
{
|
||||
var normalHost = obj["hosts"];
|
||||
|
|
@ -842,7 +842,7 @@ namespace v2rayN.Handler
|
|||
|
||||
//current proxy
|
||||
var outbound = v2rayConfig.outbounds[0];
|
||||
var txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
|
||||
var txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
|
||||
|
||||
//Previous proxy
|
||||
var prevNode = LazyConfig.Instance.GetProfileItemViaRemarks(subItem.prevProfile!);
|
||||
|
|
@ -852,7 +852,7 @@ namespace v2rayN.Handler
|
|||
&& prevNode.configType != EConfigType.Tuic
|
||||
&& prevNode.configType != EConfigType.Wireguard)
|
||||
{
|
||||
var prevOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
var prevOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
GenOutbound(prevNode, prevOutbound);
|
||||
prevOutbound.tag = $"{Global.ProxyTag}2";
|
||||
v2rayConfig.outbounds.Add(prevOutbound);
|
||||
|
|
@ -871,7 +871,7 @@ namespace v2rayN.Handler
|
|||
&& nextNode.configType != EConfigType.Tuic
|
||||
&& nextNode.configType != EConfigType.Wireguard)
|
||||
{
|
||||
var nextOutbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
var nextOutbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
GenOutbound(nextNode, nextOutbound);
|
||||
nextOutbound.tag = Global.ProxyTag;
|
||||
v2rayConfig.outbounds.Insert(0, nextOutbound);
|
||||
|
|
@ -908,15 +908,15 @@ namespace v2rayN.Handler
|
|||
|
||||
msg = ResUI.InitialConfiguration;
|
||||
|
||||
string result = Utile.GetEmbedText(Global.V2raySampleClient);
|
||||
string txtOutbound = Utile.GetEmbedText(Global.V2raySampleOutbound);
|
||||
if (Utile.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
|
||||
string result = Utils.GetEmbedText(Global.V2raySampleClient);
|
||||
string txtOutbound = Utils.GetEmbedText(Global.V2raySampleOutbound);
|
||||
if (Utils.IsNullOrEmpty(result) || txtOutbound.IsNullOrEmpty())
|
||||
{
|
||||
msg = ResUI.FailedGetDefaultConfiguration;
|
||||
return -1;
|
||||
}
|
||||
|
||||
v2rayConfig = JsonUtile.Deserialize<V2rayConfig>(result);
|
||||
v2rayConfig = JsonUtils.Deserialize<V2rayConfig>(result);
|
||||
if (v2rayConfig == null)
|
||||
{
|
||||
msg = ResUI.FailedGenDefaultConfiguration;
|
||||
|
|
@ -954,7 +954,7 @@ namespace v2rayN.Handler
|
|||
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;
|
||||
}
|
||||
|
|
@ -1013,7 +1013,7 @@ namespace v2rayN.Handler
|
|||
continue;
|
||||
}
|
||||
|
||||
var outbound = JsonUtile.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
|
||||
GenOutbound(item, outbound);
|
||||
outbound.tag = Global.ProxyTag + inbound.port.ToString();
|
||||
v2rayConfig.outbounds.Add(outbound);
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ namespace v2rayN.Handler
|
|||
_config = config;
|
||||
_updateFunc = update;
|
||||
|
||||
Environment.SetEnvironmentVariable("v2ray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
|
||||
Environment.SetEnvironmentVariable("xray.location.asset", Utile.GetBinPath(""), EnvironmentVariableTarget.Process);
|
||||
Environment.SetEnvironmentVariable("v2ray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
|
||||
Environment.SetEnvironmentVariable("xray.location.asset", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
|
||||
}
|
||||
|
||||
public void LoadCore()
|
||||
|
|
@ -35,7 +35,7 @@ namespace v2rayN.Handler
|
|||
return;
|
||||
}
|
||||
|
||||
string fileName = Utile.GetConfigPath(Global.CoreConfigFileName);
|
||||
string fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
|
||||
if (CoreConfigHandler.GenerateClientConfig(node, fileName, out string msg, out string content) != 0)
|
||||
{
|
||||
ShowMsg(false, msg);
|
||||
|
|
@ -48,7 +48,7 @@ namespace v2rayN.Handler
|
|||
if (_config.tunModeItem.enableTun)
|
||||
{
|
||||
Thread.Sleep(1000);
|
||||
Utile.RemoveTunDevice();
|
||||
Utils.RemoveTunDevice();
|
||||
}
|
||||
|
||||
CoreStart(node);
|
||||
|
|
@ -77,7 +77,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
int pid = -1;
|
||||
var coreType = selecteds.Exists(t => t.configType == EConfigType.Hysteria2 || t.configType == EConfigType.Tuic || t.configType == EConfigType.Wireguard) ? ECoreType.sing_box : ECoreType.Xray;
|
||||
string configPath = Utile.GetConfigPath(Global.CoreSpeedtestConfigFileName);
|
||||
string configPath = Utils.GetConfigPath(Global.CoreSpeedtestConfigFileName);
|
||||
if (CoreConfigHandler.GenerateClientSpeedtestConfig(_config, configPath, selecteds, coreType, out string msg) != 0)
|
||||
{
|
||||
ShowMsg(false, msg);
|
||||
|
|
@ -126,7 +126,7 @@ namespace v2rayN.Handler
|
|||
foreach (Process p in existing)
|
||||
{
|
||||
string? path = p.MainModule?.FileName;
|
||||
if (path == $"{Utile.GetBinPath(vName, it.coreType.ToString())}.exe")
|
||||
if (path == $"{Utils.GetBinPath(vName, it.coreType.ToString())}.exe")
|
||||
{
|
||||
KillProcess(p);
|
||||
}
|
||||
|
|
@ -162,16 +162,16 @@ namespace v2rayN.Handler
|
|||
foreach (string name in coreInfo.coreExes)
|
||||
{
|
||||
string vName = $"{name}.exe";
|
||||
vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
|
||||
vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
|
||||
if (File.Exists(vName))
|
||||
{
|
||||
fileName = vName;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
string msg = string.Format(ResUI.NotFoundCore, Utile.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
|
||||
string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.coreType.ToString()), string.Join(", ", coreInfo.coreExes.ToArray()), coreInfo.coreUrl);
|
||||
Logging.SaveLog(msg);
|
||||
ShowMsg(false, msg);
|
||||
}
|
||||
|
|
@ -214,7 +214,7 @@ namespace v2rayN.Handler
|
|||
address = Global.Loopback,
|
||||
port = node.preSocksPort
|
||||
};
|
||||
string fileName2 = Utile.GetConfigPath(Global.CorePreConfigFileName);
|
||||
string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
|
||||
if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
|
||||
{
|
||||
var coreInfo2 = LazyConfig.Instance.GetCoreInfo(ECoreType.sing_box);
|
||||
|
|
@ -267,7 +267,7 @@ namespace v2rayN.Handler
|
|||
try
|
||||
{
|
||||
string fileName = CoreFindExe(coreInfo);
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -277,7 +277,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
FileName = fileName,
|
||||
Arguments = string.Format(coreInfo.arguments, configPath),
|
||||
WorkingDirectory = Utile.GetConfigPath(),
|
||||
WorkingDirectory = Utils.GetConfigPath(),
|
||||
UseShellExecute = false,
|
||||
RedirectStandardOutput = displayLog,
|
||||
RedirectStandardError = displayLog,
|
||||
|
|
@ -292,7 +292,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
proc.OutputDataReceived += (sender, e) =>
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(e.Data))
|
||||
if (!Utils.IsNullOrEmpty(e.Data))
|
||||
{
|
||||
string msg = e.Data + Environment.NewLine;
|
||||
ShowMsg(false, msg);
|
||||
|
|
@ -300,7 +300,7 @@ namespace v2rayN.Handler
|
|||
};
|
||||
proc.ErrorDataReceived += (sender, e) =>
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(e.Data))
|
||||
if (!Utils.IsNullOrEmpty(e.Data))
|
||||
{
|
||||
string msg = e.Data + Environment.NewLine;
|
||||
ShowMsg(false, msg);
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
|
||||
var progress = new Progress<string>();
|
||||
progress.ProgressChanged += (sender, value) =>
|
||||
|
|
@ -66,7 +66,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
UpdateCompleted?.Invoke(this, new ResultEventArgs(false, $"{ResUI.Downloading} {url}"));
|
||||
|
||||
var progress = new Progress<double>();
|
||||
|
|
@ -78,7 +78,7 @@ namespace v2rayN.Handler
|
|||
var webProxy = GetWebProxy(blProxy);
|
||||
await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
|
||||
url,
|
||||
Utile.GetTempPath(Utile.GetDownloadFileName(url)),
|
||||
Utils.GetTempPath(Utils.GetDownloadFileName(url)),
|
||||
progress,
|
||||
downloadTimeout);
|
||||
}
|
||||
|
|
@ -96,7 +96,7 @@ namespace v2rayN.Handler
|
|||
|
||||
public async Task<string?> UrlRedirectAsync(string url, bool blProxy)
|
||||
{
|
||||
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
var webRequestHandler = new SocketsHttpHandler
|
||||
{
|
||||
AllowAutoRedirect = false,
|
||||
|
|
@ -121,7 +121,7 @@ namespace v2rayN.Handler
|
|||
try
|
||||
{
|
||||
var result1 = await DownloadStringAsync(url, blProxy, userAgent);
|
||||
if (!Utile.IsNullOrEmpty(result1))
|
||||
if (!Utils.IsNullOrEmpty(result1))
|
||||
{
|
||||
return result1;
|
||||
}
|
||||
|
|
@ -139,7 +139,7 @@ namespace v2rayN.Handler
|
|||
try
|
||||
{
|
||||
var result2 = await DownloadStringViaDownloader(url, blProxy, userAgent);
|
||||
if (!Utile.IsNullOrEmpty(result2))
|
||||
if (!Utils.IsNullOrEmpty(result2))
|
||||
{
|
||||
return result2;
|
||||
}
|
||||
|
|
@ -159,7 +159,7 @@ namespace v2rayN.Handler
|
|||
using var wc = new WebClient();
|
||||
wc.Proxy = GetWebProxy(blProxy);
|
||||
var result3 = await wc.DownloadStringTaskAsync(url);
|
||||
if (!Utile.IsNullOrEmpty(result3))
|
||||
if (!Utils.IsNullOrEmpty(result3))
|
||||
{
|
||||
return result3;
|
||||
}
|
||||
|
|
@ -185,7 +185,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
var webProxy = GetWebProxy(blProxy);
|
||||
var client = new HttpClient(new SocketsHttpHandler()
|
||||
{
|
||||
|
|
@ -193,17 +193,17 @@ namespace v2rayN.Handler
|
|||
UseProxy = webProxy != null
|
||||
});
|
||||
|
||||
if (Utile.IsNullOrEmpty(userAgent))
|
||||
if (Utils.IsNullOrEmpty(userAgent))
|
||||
{
|
||||
userAgent = Utile.GetVersion(false);
|
||||
userAgent = Utils.GetVersion(false);
|
||||
}
|
||||
client.DefaultRequestHeaders.UserAgent.TryParseAdd(userAgent);
|
||||
|
||||
Uri uri = new(url);
|
||||
//Authorization Header
|
||||
if (!Utile.IsNullOrEmpty(uri.UserInfo))
|
||||
if (!Utils.IsNullOrEmpty(uri.UserInfo))
|
||||
{
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utile.Base64Encode(uri.UserInfo));
|
||||
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Utils.Base64Encode(uri.UserInfo));
|
||||
}
|
||||
|
||||
using var cts = new CancellationTokenSource();
|
||||
|
|
@ -230,13 +230,13 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
Utile.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
Utils.SetSecurityProtocol(LazyConfig.Instance.GetConfig().guiItem.enableSecurityProtocolTls13);
|
||||
|
||||
var webProxy = GetWebProxy(blProxy);
|
||||
|
||||
if (Utile.IsNullOrEmpty(userAgent))
|
||||
if (Utils.IsNullOrEmpty(userAgent))
|
||||
{
|
||||
userAgent = Utile.GetVersion(false);
|
||||
userAgent = Utils.GetVersion(false);
|
||||
}
|
||||
var result = await DownloaderHelper.Instance.DownloadStringAsync(webProxy, url, userAgent, 30);
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
if (_statePort is null)
|
||||
{
|
||||
_statePort = Utile.GetFreePort(GetLocalPort(EInboundProtocol.api));
|
||||
_statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
|
||||
}
|
||||
|
||||
return _statePort.Value;
|
||||
|
|
@ -77,7 +77,7 @@ namespace v2rayN.Handler
|
|||
|
||||
public List<ProfileItem> ProfileItems(string subid)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(subid))
|
||||
if (Utils.IsNullOrEmpty(subid))
|
||||
{
|
||||
return SQLiteHelper.Instance.Table<ProfileItem>().ToList();
|
||||
}
|
||||
|
|
@ -89,7 +89,7 @@ namespace v2rayN.Handler
|
|||
|
||||
public List<string> ProfileItemIndexes(string subid)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(subid))
|
||||
if (Utils.IsNullOrEmpty(subid))
|
||||
{
|
||||
return SQLiteHelper.Instance.Table<ProfileItem>().Select(t => t.indexId).ToList();
|
||||
}
|
||||
|
|
@ -106,11 +106,11 @@ namespace v2rayN.Handler
|
|||
from ProfileItem a
|
||||
left join SubItem b on a.subid = b.id
|
||||
where 1=1 ";
|
||||
if (!Utile.IsNullOrEmpty(subid))
|
||||
if (!Utils.IsNullOrEmpty(subid))
|
||||
{
|
||||
sql += $" and a.subid = '{subid}'";
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(filter))
|
||||
if (!Utils.IsNullOrEmpty(filter))
|
||||
{
|
||||
if (filter.Contains('\''))
|
||||
{
|
||||
|
|
@ -124,7 +124,7 @@ namespace v2rayN.Handler
|
|||
|
||||
public ProfileItem? GetProfileItem(string indexId)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(indexId))
|
||||
if (Utils.IsNullOrEmpty(indexId))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -133,7 +133,7 @@ namespace v2rayN.Handler
|
|||
|
||||
public ProfileItem? GetProfileItemViaRemarks(string remarks)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(remarks))
|
||||
if (Utils.IsNullOrEmpty(remarks))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
|
||||
//Load from local file
|
||||
var fileName = Utile.GetPath($"NotifyIcon{index + 1}.ico");
|
||||
var fileName = Utils.GetPath($"NotifyIcon{index + 1}.ico");
|
||||
if (File.Exists(fileName))
|
||||
{
|
||||
return new Icon(fileName);
|
||||
|
|
@ -79,7 +79,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
|
||||
var item = ConfigHandler.GetDefaultRouting(config);
|
||||
if (item == null || Utile.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
|
||||
if (item == null || Utils.IsNullOrEmpty(item.customIcon) || !File.Exists(item.customIcon))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@ namespace v2rayN.Handler
|
|||
return;
|
||||
}
|
||||
string fileName = fileDialog.FileName;
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ namespace v2rayN.Handler
|
|||
|
||||
private void IndexIdEnqueue(string indexId)
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
|
||||
if (!Utils.IsNullOrEmpty(indexId) && !_queIndexIds.Contains(indexId))
|
||||
{
|
||||
_queIndexIds.Enqueue(indexId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
else if (type is 2 or 4) // named proxy or autoproxy script URL
|
||||
{
|
||||
optionCount = Utile.IsNullOrEmpty(exceptions) ? 2 : 3;
|
||||
optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
|
||||
}
|
||||
|
||||
int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@ namespace v2rayN.Handler
|
|||
fp = item.fingerprint
|
||||
};
|
||||
|
||||
url = JsonUtile.Serialize(vmessQRCode);
|
||||
url = Utile.Base64Encode(url);
|
||||
url = JsonUtils.Serialize(vmessQRCode);
|
||||
url = Utils.Base64Encode(url);
|
||||
url = $"{Global.ProtocolShares[EConfigType.VMess]}{url}";
|
||||
|
||||
return url;
|
||||
|
|
@ -77,9 +77,9 @@ namespace v2rayN.Handler
|
|||
string url = string.Empty;
|
||||
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
//url = string.Format("{0}:{1}@{2}:{3}",
|
||||
// item.security,
|
||||
|
|
@ -88,7 +88,7 @@ namespace v2rayN.Handler
|
|||
// item.port);
|
||||
//url = Utile.Base64Encode(url);
|
||||
//new Sip002
|
||||
var pw = Utile.Base64Encode($"{item.security}:{item.id}");
|
||||
var pw = Utils.Base64Encode($"{item.security}:{item.id}");
|
||||
url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
|
||||
url = $"{Global.ProtocolShares[EConfigType.Shadowsocks]}{url}{remark}";
|
||||
return url;
|
||||
|
|
@ -98,9 +98,9 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
//url = string.Format("{0}:{1}@{2}:{3}",
|
||||
// item.security,
|
||||
|
|
@ -109,7 +109,7 @@ namespace v2rayN.Handler
|
|||
// item.port);
|
||||
//url = Utile.Base64Encode(url);
|
||||
//new
|
||||
var pw = Utile.Base64Encode($"{item.security}:{item.id}");
|
||||
var pw = Utils.Base64Encode($"{item.security}:{item.id}");
|
||||
url = $"{pw}@{GetIpv6(item.address)}:{item.port}";
|
||||
url = $"{Global.ProtocolShares[EConfigType.Socks]}{url}{remark}";
|
||||
return url;
|
||||
|
|
@ -119,9 +119,9 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
GetStdTransport(item, null, ref dicQuery);
|
||||
|
|
@ -139,12 +139,12 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
if (!Utile.IsNullOrEmpty(item.security))
|
||||
if (!Utils.IsNullOrEmpty(item.security))
|
||||
{
|
||||
dicQuery.Add("encryption", item.security);
|
||||
}
|
||||
|
|
@ -167,23 +167,23 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
if (!Utile.IsNullOrEmpty(item.sni))
|
||||
if (!Utils.IsNullOrEmpty(item.sni))
|
||||
{
|
||||
dicQuery.Add("sni", item.sni);
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.alpn))
|
||||
if (!Utils.IsNullOrEmpty(item.alpn))
|
||||
{
|
||||
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
|
||||
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("obfs", "salamander");
|
||||
dicQuery.Add("obfs-password", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("obfs-password", Utils.UrlEncode(item.path));
|
||||
}
|
||||
dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
|
||||
|
||||
|
|
@ -201,18 +201,18 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
if (!Utile.IsNullOrEmpty(item.sni))
|
||||
if (!Utils.IsNullOrEmpty(item.sni))
|
||||
{
|
||||
dicQuery.Add("sni", item.sni);
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.alpn))
|
||||
if (!Utils.IsNullOrEmpty(item.alpn))
|
||||
{
|
||||
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
|
||||
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
|
||||
}
|
||||
dicQuery.Add("congestion_control", item.headerType);
|
||||
|
||||
|
|
@ -230,32 +230,32 @@ namespace v2rayN.Handler
|
|||
{
|
||||
string url = string.Empty;
|
||||
string remark = string.Empty;
|
||||
if (!Utile.IsNullOrEmpty(item.remarks))
|
||||
if (!Utils.IsNullOrEmpty(item.remarks))
|
||||
{
|
||||
remark = "#" + Utile.UrlEncode(item.remarks);
|
||||
remark = "#" + Utils.UrlEncode(item.remarks);
|
||||
}
|
||||
|
||||
var dicQuery = new Dictionary<string, string>();
|
||||
if (!Utile.IsNullOrEmpty(item.publicKey))
|
||||
if (!Utils.IsNullOrEmpty(item.publicKey))
|
||||
{
|
||||
dicQuery.Add("publickey", Utile.UrlEncode(item.publicKey));
|
||||
dicQuery.Add("publickey", Utils.UrlEncode(item.publicKey));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("reserved", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("reserved", Utils.UrlEncode(item.path));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.requestHost))
|
||||
if (!Utils.IsNullOrEmpty(item.requestHost))
|
||||
{
|
||||
dicQuery.Add("address", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("address", Utils.UrlEncode(item.requestHost));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.shortId))
|
||||
if (!Utils.IsNullOrEmpty(item.shortId))
|
||||
{
|
||||
dicQuery.Add("mtu", Utile.UrlEncode(item.shortId));
|
||||
dicQuery.Add("mtu", Utils.UrlEncode(item.shortId));
|
||||
}
|
||||
string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
|
||||
|
||||
url = string.Format("{0}@{1}:{2}",
|
||||
Utile.UrlEncode(item.id),
|
||||
Utils.UrlEncode(item.id),
|
||||
GetIpv6(item.address),
|
||||
item.port);
|
||||
url = $"{Global.ProtocolShares[EConfigType.Wireguard]}{url}/{query}{remark}";
|
||||
|
|
@ -264,17 +264,17 @@ namespace v2rayN.Handler
|
|||
|
||||
private static string GetIpv6(string address)
|
||||
{
|
||||
return Utile.IsIpv6(address) ? $"[{address}]" : address;
|
||||
return Utils.IsIpv6(address) ? $"[{address}]" : address;
|
||||
}
|
||||
|
||||
private static int GetStdTransport(ProfileItem item, string? securityDef, ref Dictionary<string, string> dicQuery)
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(item.flow))
|
||||
if (!Utils.IsNullOrEmpty(item.flow))
|
||||
{
|
||||
dicQuery.Add("flow", item.flow);
|
||||
}
|
||||
|
||||
if (!Utile.IsNullOrEmpty(item.streamSecurity))
|
||||
if (!Utils.IsNullOrEmpty(item.streamSecurity))
|
||||
{
|
||||
dicQuery.Add("security", item.streamSecurity);
|
||||
}
|
||||
|
|
@ -285,90 +285,90 @@ namespace v2rayN.Handler
|
|||
dicQuery.Add("security", securityDef);
|
||||
}
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.sni))
|
||||
if (!Utils.IsNullOrEmpty(item.sni))
|
||||
{
|
||||
dicQuery.Add("sni", item.sni);
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.alpn))
|
||||
if (!Utils.IsNullOrEmpty(item.alpn))
|
||||
{
|
||||
dicQuery.Add("alpn", Utile.UrlEncode(item.alpn));
|
||||
dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.fingerprint))
|
||||
if (!Utils.IsNullOrEmpty(item.fingerprint))
|
||||
{
|
||||
dicQuery.Add("fp", Utile.UrlEncode(item.fingerprint));
|
||||
dicQuery.Add("fp", Utils.UrlEncode(item.fingerprint));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.publicKey))
|
||||
if (!Utils.IsNullOrEmpty(item.publicKey))
|
||||
{
|
||||
dicQuery.Add("pbk", Utile.UrlEncode(item.publicKey));
|
||||
dicQuery.Add("pbk", Utils.UrlEncode(item.publicKey));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.shortId))
|
||||
if (!Utils.IsNullOrEmpty(item.shortId))
|
||||
{
|
||||
dicQuery.Add("sid", Utile.UrlEncode(item.shortId));
|
||||
dicQuery.Add("sid", Utils.UrlEncode(item.shortId));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.spiderX))
|
||||
if (!Utils.IsNullOrEmpty(item.spiderX))
|
||||
{
|
||||
dicQuery.Add("spx", Utile.UrlEncode(item.spiderX));
|
||||
dicQuery.Add("spx", Utils.UrlEncode(item.spiderX));
|
||||
}
|
||||
|
||||
dicQuery.Add("type", !Utile.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
|
||||
dicQuery.Add("type", !Utils.IsNullOrEmpty(item.network) ? item.network : nameof(ETransport.tcp));
|
||||
|
||||
switch (item.network)
|
||||
{
|
||||
case nameof(ETransport.tcp):
|
||||
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
if (!Utile.IsNullOrEmpty(item.requestHost))
|
||||
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
if (!Utils.IsNullOrEmpty(item.requestHost))
|
||||
{
|
||||
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.kcp):
|
||||
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("seed", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("seed", Utils.UrlEncode(item.path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.ws):
|
||||
case nameof(ETransport.httpupgrade):
|
||||
if (!Utile.IsNullOrEmpty(item.requestHost))
|
||||
if (!Utils.IsNullOrEmpty(item.requestHost))
|
||||
{
|
||||
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("path", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("path", Utils.UrlEncode(item.path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.http):
|
||||
case nameof(ETransport.h2):
|
||||
dicQuery["type"] = nameof(ETransport.http);
|
||||
if (!Utile.IsNullOrEmpty(item.requestHost))
|
||||
if (!Utils.IsNullOrEmpty(item.requestHost))
|
||||
{
|
||||
dicQuery.Add("host", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("path", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("path", Utils.UrlEncode(item.path));
|
||||
}
|
||||
break;
|
||||
|
||||
case nameof(ETransport.quic):
|
||||
dicQuery.Add("headerType", !Utile.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
dicQuery.Add("quicSecurity", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("key", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("headerType", !Utils.IsNullOrEmpty(item.headerType) ? item.headerType : Global.None);
|
||||
dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("key", Utils.UrlEncode(item.path));
|
||||
break;
|
||||
|
||||
case nameof(ETransport.grpc):
|
||||
if (!Utile.IsNullOrEmpty(item.path))
|
||||
if (!Utils.IsNullOrEmpty(item.path))
|
||||
{
|
||||
dicQuery.Add("authority", Utile.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("serviceName", Utile.UrlEncode(item.path));
|
||||
dicQuery.Add("authority", Utils.UrlEncode(item.requestHost));
|
||||
dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
|
||||
if (item.headerType is Global.GrpcGunMode or Global.GrpcMultiMode)
|
||||
{
|
||||
dicQuery.Add("mode", Utile.UrlEncode(item.headerType));
|
||||
dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -393,7 +393,7 @@ namespace v2rayN.Handler
|
|||
try
|
||||
{
|
||||
string result = clipboardData.TrimEx();
|
||||
if (Utile.IsNullOrEmpty(result))
|
||||
if (Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
msg = ResUI.FailedReadConfiguration;
|
||||
return null;
|
||||
|
|
@ -484,10 +484,10 @@ namespace v2rayN.Handler
|
|||
};
|
||||
|
||||
result = result[Global.ProtocolShares[EConfigType.VMess].Length..];
|
||||
result = Utile.Base64Decode(result);
|
||||
result = Utils.Base64Decode(result);
|
||||
|
||||
//转成Json
|
||||
VmessQRCode? vmessQRCode = JsonUtile.Deserialize<VmessQRCode>(result);
|
||||
VmessQRCode? vmessQRCode = JsonUtils.Deserialize<VmessQRCode>(result);
|
||||
if (vmessQRCode == null)
|
||||
{
|
||||
msg = ResUI.FailedConversionConfiguration;
|
||||
|
|
@ -497,30 +497,30 @@ namespace v2rayN.Handler
|
|||
profileItem.network = Global.DefaultNetwork;
|
||||
profileItem.headerType = Global.None;
|
||||
|
||||
profileItem.configVersion = Utile.ToInt(vmessQRCode.v);
|
||||
profileItem.remarks = Utile.ToString(vmessQRCode.ps);
|
||||
profileItem.address = Utile.ToString(vmessQRCode.add);
|
||||
profileItem.port = Utile.ToInt(vmessQRCode.port);
|
||||
profileItem.id = Utile.ToString(vmessQRCode.id);
|
||||
profileItem.alterId = Utile.ToInt(vmessQRCode.aid);
|
||||
profileItem.security = Utile.ToString(vmessQRCode.scy);
|
||||
profileItem.configVersion = Utils.ToInt(vmessQRCode.v);
|
||||
profileItem.remarks = Utils.ToString(vmessQRCode.ps);
|
||||
profileItem.address = Utils.ToString(vmessQRCode.add);
|
||||
profileItem.port = Utils.ToInt(vmessQRCode.port);
|
||||
profileItem.id = Utils.ToString(vmessQRCode.id);
|
||||
profileItem.alterId = Utils.ToInt(vmessQRCode.aid);
|
||||
profileItem.security = Utils.ToString(vmessQRCode.scy);
|
||||
|
||||
profileItem.security = !Utile.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
|
||||
if (!Utile.IsNullOrEmpty(vmessQRCode.net))
|
||||
profileItem.security = !Utils.IsNullOrEmpty(vmessQRCode.scy) ? vmessQRCode.scy : Global.DefaultSecurity;
|
||||
if (!Utils.IsNullOrEmpty(vmessQRCode.net))
|
||||
{
|
||||
profileItem.network = vmessQRCode.net;
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(vmessQRCode.type))
|
||||
if (!Utils.IsNullOrEmpty(vmessQRCode.type))
|
||||
{
|
||||
profileItem.headerType = vmessQRCode.type;
|
||||
}
|
||||
|
||||
profileItem.requestHost = Utile.ToString(vmessQRCode.host);
|
||||
profileItem.path = Utile.ToString(vmessQRCode.path);
|
||||
profileItem.streamSecurity = Utile.ToString(vmessQRCode.tls);
|
||||
profileItem.sni = Utile.ToString(vmessQRCode.sni);
|
||||
profileItem.alpn = Utile.ToString(vmessQRCode.alpn);
|
||||
profileItem.fingerprint = Utile.ToString(vmessQRCode.fp);
|
||||
profileItem.requestHost = Utils.ToString(vmessQRCode.host);
|
||||
profileItem.path = Utils.ToString(vmessQRCode.path);
|
||||
profileItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
|
||||
profileItem.sni = Utils.ToString(vmessQRCode.sni);
|
||||
profileItem.alpn = Utils.ToString(vmessQRCode.alpn);
|
||||
profileItem.fingerprint = Utils.ToString(vmessQRCode.fp);
|
||||
|
||||
return profileItem;
|
||||
}
|
||||
|
|
@ -537,7 +537,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
result = result[..indexSplit];
|
||||
}
|
||||
result = Utile.Base64Decode(result);
|
||||
result = Utils.Base64Decode(result);
|
||||
|
||||
string[] arr1 = result.Split('@');
|
||||
if (arr1.Length != 2)
|
||||
|
|
@ -552,7 +552,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
|
||||
profileItem.address = arr22[0];
|
||||
profileItem.port = Utile.ToInt(arr22[1]);
|
||||
profileItem.port = Utils.ToInt(arr22[1]);
|
||||
profileItem.security = arr21[0];
|
||||
profileItem.id = arr21[1];
|
||||
|
||||
|
|
@ -576,7 +576,7 @@ namespace v2rayN.Handler
|
|||
i.address = u.IdnHost;
|
||||
i.port = u.Port;
|
||||
i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
var query = Utile.ParseQueryString(u.Query);
|
||||
var query = Utils.ParseQueryString(u.Query);
|
||||
|
||||
var m = StdVmessUserInfo.Match(u.UserInfo);
|
||||
if (!m.Success) return null;
|
||||
|
|
@ -593,7 +593,7 @@ namespace v2rayN.Handler
|
|||
break;
|
||||
|
||||
default:
|
||||
if (!Utile.IsNullOrEmpty(i.streamSecurity))
|
||||
if (!Utils.IsNullOrEmpty(i.streamSecurity))
|
||||
return null;
|
||||
break;
|
||||
}
|
||||
|
|
@ -614,7 +614,7 @@ namespace v2rayN.Handler
|
|||
case nameof(ETransport.httpupgrade):
|
||||
string p1 = query["path"] ?? "/";
|
||||
string h1 = query["host"] ?? "";
|
||||
i.requestHost = Utile.UrlDecode(h1);
|
||||
i.requestHost = Utils.UrlDecode(h1);
|
||||
i.path = p1;
|
||||
break;
|
||||
|
||||
|
|
@ -623,7 +623,7 @@ namespace v2rayN.Handler
|
|||
i.network = nameof(ETransport.h2);
|
||||
string p2 = query["path"] ?? "/";
|
||||
string h2 = query["host"] ?? "";
|
||||
i.requestHost = Utile.UrlDecode(h2);
|
||||
i.requestHost = Utils.UrlDecode(h2);
|
||||
i.path = p2;
|
||||
break;
|
||||
|
||||
|
|
@ -632,7 +632,7 @@ namespace v2rayN.Handler
|
|||
string k = query["key"] ?? "";
|
||||
string t3 = query["type"] ?? Global.None;
|
||||
i.headerType = t3;
|
||||
i.requestHost = Utile.UrlDecode(s);
|
||||
i.requestHost = Utils.UrlDecode(s);
|
||||
i.path = k;
|
||||
break;
|
||||
|
||||
|
|
@ -670,12 +670,12 @@ namespace v2rayN.Handler
|
|||
return null;
|
||||
}
|
||||
server.security = userInfoParts[0];
|
||||
server.id = Utile.UrlDecode(userInfoParts[1]);
|
||||
server.id = Utils.UrlDecode(userInfoParts[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
// parse base64 UserInfo
|
||||
string userInfo = Utile.Base64Decode(rawUserInfo);
|
||||
string userInfo = Utils.Base64Decode(rawUserInfo);
|
||||
string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
|
||||
if (userInfoParts.Length != 2)
|
||||
{
|
||||
|
|
@ -685,12 +685,12 @@ namespace v2rayN.Handler
|
|||
server.id = userInfoParts[1];
|
||||
}
|
||||
|
||||
var queryParameters = Utile.ParseQueryString(parsedUrl.Query);
|
||||
var queryParameters = Utils.ParseQueryString(parsedUrl.Query);
|
||||
if (queryParameters["plugin"] != null)
|
||||
{
|
||||
//obfs-host exists
|
||||
var obfsHost = queryParameters["plugin"]?.Split(';').FirstOrDefault(t => t.Contains("obfs-host"));
|
||||
if (queryParameters["plugin"].Contains("obfs=http") && !Utile.IsNullOrEmpty(obfsHost))
|
||||
if (queryParameters["plugin"].Contains("obfs=http") && !Utils.IsNullOrEmpty(obfsHost))
|
||||
{
|
||||
obfsHost = obfsHost?.Replace("obfs-host=", "");
|
||||
server.network = Global.DefaultNetwork;
|
||||
|
|
@ -718,14 +718,14 @@ namespace v2rayN.Handler
|
|||
ProfileItem server = new();
|
||||
var base64 = match.Groups["base64"].Value.TrimEnd('/');
|
||||
var tag = match.Groups["tag"].Value;
|
||||
if (!Utile.IsNullOrEmpty(tag))
|
||||
if (!Utils.IsNullOrEmpty(tag))
|
||||
{
|
||||
server.remarks = Utile.UrlDecode(tag);
|
||||
server.remarks = Utils.UrlDecode(tag);
|
||||
}
|
||||
Match details;
|
||||
try
|
||||
{
|
||||
details = DetailsParser.Match(Utile.Base64Decode(base64));
|
||||
details = DetailsParser.Match(Utils.Base64Decode(base64));
|
||||
}
|
||||
catch (FormatException)
|
||||
{
|
||||
|
|
@ -736,7 +736,7 @@ namespace v2rayN.Handler
|
|||
server.security = details.Groups["method"].Value;
|
||||
server.id = details.Groups["password"].Value;
|
||||
server.address = details.Groups["hostname"].Value;
|
||||
server.port = Utile.ToInt(details.Groups["port"].Value);
|
||||
server.port = Utils.ToInt(details.Groups["port"].Value);
|
||||
return server;
|
||||
}
|
||||
|
||||
|
|
@ -756,7 +756,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
profileItem.remarks = Utile.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
|
||||
profileItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
|
||||
}
|
||||
catch { }
|
||||
result = result[..indexRemark];
|
||||
|
|
@ -768,7 +768,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
else
|
||||
{
|
||||
result = Utile.Base64Decode(result);
|
||||
result = Utils.Base64Decode(result);
|
||||
}
|
||||
|
||||
string[] arr1 = result.Split('@');
|
||||
|
|
@ -784,7 +784,7 @@ namespace v2rayN.Handler
|
|||
return null;
|
||||
}
|
||||
profileItem.address = arr1[1][..indexPort];
|
||||
profileItem.port = Utile.ToInt(arr1[1][(indexPort + 1)..]);
|
||||
profileItem.port = Utils.ToInt(arr1[1][(indexPort + 1)..]);
|
||||
profileItem.security = arr21[0];
|
||||
profileItem.id = arr21[1];
|
||||
|
||||
|
|
@ -811,7 +811,7 @@ namespace v2rayN.Handler
|
|||
|
||||
// parse base64 UserInfo
|
||||
string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
|
||||
string userInfo = Utile.Base64Decode(rawUserInfo);
|
||||
string userInfo = Utils.Base64Decode(rawUserInfo);
|
||||
string[] userInfoParts = userInfo.Split(new[] { ':' }, 2);
|
||||
if (userInfoParts.Length == 2)
|
||||
{
|
||||
|
|
@ -834,9 +834,9 @@ namespace v2rayN.Handler
|
|||
item.address = url.IdnHost;
|
||||
item.port = url.Port;
|
||||
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
item.id = Utile.UrlDecode(url.UserInfo);
|
||||
item.id = Utils.UrlDecode(url.UserInfo);
|
||||
|
||||
var query = Utile.ParseQueryString(url.Query);
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
ResolveStdTransport(query, ref item);
|
||||
|
||||
return item;
|
||||
|
|
@ -855,9 +855,9 @@ namespace v2rayN.Handler
|
|||
item.address = url.IdnHost;
|
||||
item.port = url.Port;
|
||||
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
item.id = Utile.UrlDecode(url.UserInfo);
|
||||
item.id = Utils.UrlDecode(url.UserInfo);
|
||||
|
||||
var query = Utile.ParseQueryString(url.Query);
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
item.security = query["encryption"] ?? Global.None;
|
||||
item.streamSecurity = query["security"] ?? "";
|
||||
ResolveStdTransport(query, ref item);
|
||||
|
|
@ -877,11 +877,11 @@ namespace v2rayN.Handler
|
|||
item.address = url.IdnHost;
|
||||
item.port = url.Port;
|
||||
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
item.id = Utile.UrlDecode(url.UserInfo);
|
||||
item.id = Utils.UrlDecode(url.UserInfo);
|
||||
|
||||
var query = Utile.ParseQueryString(url.Query);
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
ResolveStdTransport(query, ref item);
|
||||
item.path = Utile.UrlDecode(query["obfs-password"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["obfs-password"] ?? "");
|
||||
item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
|
||||
|
||||
return item;
|
||||
|
|
@ -906,7 +906,7 @@ namespace v2rayN.Handler
|
|||
item.security = userInfoParts[1];
|
||||
}
|
||||
|
||||
var query = Utile.ParseQueryString(url.Query);
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
ResolveStdTransport(query, ref item);
|
||||
item.headerType = query["congestion_control"] ?? "";
|
||||
|
||||
|
|
@ -925,14 +925,14 @@ namespace v2rayN.Handler
|
|||
item.address = url.IdnHost;
|
||||
item.port = url.Port;
|
||||
item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
|
||||
item.id = Utile.UrlDecode(url.UserInfo);
|
||||
item.id = Utils.UrlDecode(url.UserInfo);
|
||||
|
||||
var query = Utile.ParseQueryString(url.Query);
|
||||
var query = Utils.ParseQueryString(url.Query);
|
||||
|
||||
item.publicKey = Utile.UrlDecode(query["publickey"] ?? "");
|
||||
item.path = Utile.UrlDecode(query["reserved"] ?? "");
|
||||
item.requestHost = Utile.UrlDecode(query["address"] ?? "");
|
||||
item.shortId = Utile.UrlDecode(query["mtu"] ?? "");
|
||||
item.publicKey = Utils.UrlDecode(query["publickey"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["reserved"] ?? "");
|
||||
item.requestHost = Utils.UrlDecode(query["address"] ?? "");
|
||||
item.shortId = Utils.UrlDecode(query["mtu"] ?? "");
|
||||
|
||||
return item;
|
||||
}
|
||||
|
|
@ -942,49 +942,49 @@ namespace v2rayN.Handler
|
|||
item.flow = query["flow"] ?? "";
|
||||
item.streamSecurity = query["security"] ?? "";
|
||||
item.sni = query["sni"] ?? "";
|
||||
item.alpn = Utile.UrlDecode(query["alpn"] ?? "");
|
||||
item.fingerprint = Utile.UrlDecode(query["fp"] ?? "");
|
||||
item.publicKey = Utile.UrlDecode(query["pbk"] ?? "");
|
||||
item.shortId = Utile.UrlDecode(query["sid"] ?? "");
|
||||
item.spiderX = Utile.UrlDecode(query["spx"] ?? "");
|
||||
item.alpn = Utils.UrlDecode(query["alpn"] ?? "");
|
||||
item.fingerprint = Utils.UrlDecode(query["fp"] ?? "");
|
||||
item.publicKey = Utils.UrlDecode(query["pbk"] ?? "");
|
||||
item.shortId = Utils.UrlDecode(query["sid"] ?? "");
|
||||
item.spiderX = Utils.UrlDecode(query["spx"] ?? "");
|
||||
|
||||
item.network = query["type"] ?? nameof(ETransport.tcp);
|
||||
switch (item.network)
|
||||
{
|
||||
case nameof(ETransport.tcp):
|
||||
item.headerType = query["headerType"] ?? Global.None;
|
||||
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
|
||||
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
|
||||
|
||||
break;
|
||||
|
||||
case nameof(ETransport.kcp):
|
||||
item.headerType = query["headerType"] ?? Global.None;
|
||||
item.path = Utile.UrlDecode(query["seed"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["seed"] ?? "");
|
||||
break;
|
||||
|
||||
case nameof(ETransport.ws):
|
||||
case nameof(ETransport.httpupgrade):
|
||||
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
|
||||
item.path = Utile.UrlDecode(query["path"] ?? "/");
|
||||
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["path"] ?? "/");
|
||||
break;
|
||||
|
||||
case nameof(ETransport.http):
|
||||
case nameof(ETransport.h2):
|
||||
item.network = nameof(ETransport.h2);
|
||||
item.requestHost = Utile.UrlDecode(query["host"] ?? "");
|
||||
item.path = Utile.UrlDecode(query["path"] ?? "/");
|
||||
item.requestHost = Utils.UrlDecode(query["host"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["path"] ?? "/");
|
||||
break;
|
||||
|
||||
case nameof(ETransport.quic):
|
||||
item.headerType = query["headerType"] ?? Global.None;
|
||||
item.requestHost = query["quicSecurity"] ?? Global.None;
|
||||
item.path = Utile.UrlDecode(query["key"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["key"] ?? "");
|
||||
break;
|
||||
|
||||
case nameof(ETransport.grpc):
|
||||
item.requestHost = Utile.UrlDecode(query["authority"] ?? "");
|
||||
item.path = Utile.UrlDecode(query["serviceName"] ?? "");
|
||||
item.headerType = Utile.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
|
||||
item.requestHost = Utils.UrlDecode(query["authority"] ?? "");
|
||||
item.path = Utils.UrlDecode(query["serviceName"] ?? "");
|
||||
item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcGunMode);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ namespace v2rayN.Handler
|
|||
while (!res.CloseStatus.HasValue)
|
||||
{
|
||||
var result = Encoding.UTF8.GetString(buffer, 0, res.Count);
|
||||
if (!Utile.IsNullOrEmpty(result))
|
||||
if (!Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
ParseOutput(result, out ulong up, out ulong down);
|
||||
|
||||
|
|
@ -113,7 +113,7 @@ namespace v2rayN.Handler
|
|||
up = 0; down = 0;
|
||||
try
|
||||
{
|
||||
var trafficItem = JsonUtile.Deserialize<TrafficItem>(source);
|
||||
var trafficItem = JsonUtils.Deserialize<TrafficItem>(source);
|
||||
if (trafficItem != null)
|
||||
{
|
||||
up = trafficItem.up;
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ namespace v2rayN.Handler
|
|||
var strExceptions = $"<local>;{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
|
||||
|
||||
var strProxy = string.Empty;
|
||||
if (Utile.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
|
||||
if (Utils.IsNullOrEmpty(config.systemProxyAdvancedProtocol))
|
||||
{
|
||||
strProxy = $"{Global.Loopback}:{port}";
|
||||
}
|
||||
|
|
@ -75,7 +75,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
else if (type == ESysProxyType.Pac)
|
||||
{
|
||||
PacHandler.Start(Utile.GetConfigPath(), port, portPac);
|
||||
PacHandler.Start(Utils.GetConfigPath(), port, portPac);
|
||||
var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
|
||||
ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
|
||||
}
|
||||
|
|
@ -97,7 +97,7 @@ namespace v2rayN.Handler
|
|||
try
|
||||
{
|
||||
//TODO To be verified
|
||||
Utile.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
|
||||
Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,15 +47,15 @@ namespace v2rayN.Handler
|
|||
|
||||
try
|
||||
{
|
||||
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
|
||||
fileName = Utile.UrlEncode(fileName);
|
||||
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
|
||||
fileName = Utils.UrlEncode(fileName);
|
||||
Process process = new()
|
||||
{
|
||||
StartInfo = new ProcessStartInfo
|
||||
{
|
||||
FileName = "v2rayUpgrade.exe",
|
||||
Arguments = fileName.AppendQuotes(),
|
||||
WorkingDirectory = Utile.StartupPath()
|
||||
WorkingDirectory = Utils.StartupPath()
|
||||
}
|
||||
};
|
||||
process.Start();
|
||||
|
|
@ -179,7 +179,7 @@ namespace v2rayN.Handler
|
|||
string url = item.url.TrimEx();
|
||||
string userAgent = item.userAgent.TrimEx();
|
||||
string hashCode = $"{item.remarks}->";
|
||||
if (Utile.IsNullOrEmpty(id) || Utile.IsNullOrEmpty(url) || (!Utile.IsNullOrEmpty(subId) && item.id != subId))
|
||||
if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (!Utils.IsNullOrEmpty(subId) && item.id != subId))
|
||||
{
|
||||
//_updateFunc(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
|
||||
continue;
|
||||
|
|
@ -203,12 +203,12 @@ namespace v2rayN.Handler
|
|||
_updateFunc(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
|
||||
|
||||
//one url
|
||||
url = Utile.GetPunycode(url);
|
||||
url = Utils.GetPunycode(url);
|
||||
//convert
|
||||
if (!Utile.IsNullOrEmpty(item.convertTarget))
|
||||
if (!Utils.IsNullOrEmpty(item.convertTarget))
|
||||
{
|
||||
var subConvertUrl = Utile.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
|
||||
url = string.Format(subConvertUrl!, Utile.UrlEncode(url));
|
||||
var subConvertUrl = Utils.IsNullOrEmpty(config.constItem.subConvertUrl) ? Global.SubConvertUrls.FirstOrDefault() : config.constItem.subConvertUrl;
|
||||
url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
|
||||
if (!url.Contains("target="))
|
||||
{
|
||||
url += string.Format("&target={0}", item.convertTarget);
|
||||
|
|
@ -219,17 +219,17 @@ namespace v2rayN.Handler
|
|||
}
|
||||
}
|
||||
var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
|
||||
if (blProxy && Utile.IsNullOrEmpty(result))
|
||||
if (blProxy && Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
result = await downloadHandle.TryDownloadString(url, false, userAgent);
|
||||
}
|
||||
|
||||
//more url
|
||||
if (Utile.IsNullOrEmpty(item.convertTarget) && !Utile.IsNullOrEmpty(item.moreUrl.TrimEx()))
|
||||
if (Utils.IsNullOrEmpty(item.convertTarget) && !Utils.IsNullOrEmpty(item.moreUrl.TrimEx()))
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(result) && Utile.IsBase64String(result!))
|
||||
if (!Utils.IsNullOrEmpty(result) && Utils.IsBase64String(result!))
|
||||
{
|
||||
result = Utile.Base64Decode(result);
|
||||
result = Utils.Base64Decode(result);
|
||||
}
|
||||
|
||||
var lstUrl = new List<string>
|
||||
|
|
@ -238,22 +238,22 @@ namespace v2rayN.Handler
|
|||
};
|
||||
foreach (var it in lstUrl)
|
||||
{
|
||||
var url2 = Utile.GetPunycode(it);
|
||||
if (Utile.IsNullOrEmpty(url2))
|
||||
var url2 = Utils.GetPunycode(it);
|
||||
if (Utils.IsNullOrEmpty(url2))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
|
||||
if (blProxy && Utile.IsNullOrEmpty(result2))
|
||||
if (blProxy && Utils.IsNullOrEmpty(result2))
|
||||
{
|
||||
result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(result2))
|
||||
if (!Utils.IsNullOrEmpty(result2))
|
||||
{
|
||||
if (Utile.IsBase64String(result2!))
|
||||
if (Utils.IsBase64String(result2!))
|
||||
{
|
||||
result += Utile.Base64Decode(result2);
|
||||
result += Utils.Base64Decode(result2);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -263,7 +263,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
}
|
||||
|
||||
if (Utile.IsNullOrEmpty(result))
|
||||
if (Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
_updateFunc(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
|
||||
}
|
||||
|
|
@ -325,7 +325,7 @@ namespace v2rayN.Handler
|
|||
string url = coreInfo.coreReleaseApiUrl;
|
||||
|
||||
var result = await (new DownloadHandle()).DownloadStringAsync(url, true, "");
|
||||
if (!Utile.IsNullOrEmpty(result))
|
||||
if (!Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
responseHandler(type, result, preRelease);
|
||||
}
|
||||
|
|
@ -354,7 +354,7 @@ namespace v2rayN.Handler
|
|||
foreach (string name in coreInfo.coreExes)
|
||||
{
|
||||
string vName = $"{name}.exe";
|
||||
vName = Utile.GetBinPath(vName, coreInfo.coreType.ToString());
|
||||
vName = Utils.GetBinPath(vName, coreInfo.coreType.ToString());
|
||||
if (File.Exists(vName))
|
||||
{
|
||||
filePath = vName;
|
||||
|
|
@ -372,7 +372,7 @@ namespace v2rayN.Handler
|
|||
using Process p = new();
|
||||
p.StartInfo.FileName = filePath.AppendQuotes();
|
||||
p.StartInfo.Arguments = coreInfo.versionArg;
|
||||
p.StartInfo.WorkingDirectory = Utile.StartupPath();
|
||||
p.StartInfo.WorkingDirectory = Utils.StartupPath();
|
||||
p.StartInfo.UseShellExecute = false;
|
||||
p.StartInfo.RedirectStandardOutput = true;
|
||||
p.StartInfo.CreateNoWindow = true;
|
||||
|
|
@ -414,7 +414,7 @@ namespace v2rayN.Handler
|
|||
{
|
||||
try
|
||||
{
|
||||
var gitHubReleases = JsonUtile.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
|
||||
var gitHubReleases = JsonUtils.Deserialize<List<GitHubRelease>>(gitHubReleaseApi);
|
||||
var gitHubRelease = preRelease ? gitHubReleases?.First() : gitHubReleases?.First(r => r.Prerelease == false);
|
||||
var version = new SemanticVersion(gitHubRelease?.TagName!);
|
||||
var body = gitHubRelease?.Body;
|
||||
|
|
@ -498,7 +498,7 @@ namespace v2rayN.Handler
|
|||
}
|
||||
case ECoreType.v2rayN:
|
||||
{
|
||||
curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utile.GetExePath()).FileVersion.ToString());
|
||||
curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
|
||||
message = string.Format(ResUI.IsLatestN, type, curVersion);
|
||||
switch (RuntimeInformation.ProcessArchitecture)
|
||||
{
|
||||
|
|
@ -570,7 +570,7 @@ namespace v2rayN.Handler
|
|||
|
||||
try
|
||||
{
|
||||
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(url));
|
||||
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
|
||||
if (File.Exists(fileName))
|
||||
{
|
||||
//Global.coreTypes.ForEach(it =>
|
||||
|
|
@ -578,7 +578,7 @@ namespace v2rayN.Handler
|
|||
// string targetPath = Utile.GetBinPath($"{geoName}.dat", (ECoreType)Enum.Parse(typeof(ECoreType), it));
|
||||
// File.Copy(fileName, targetPath, true);
|
||||
//});
|
||||
string targetPath = Utile.GetBinPath($"{geoName}.dat");
|
||||
string targetPath = Utils.GetBinPath($"{geoName}.dat");
|
||||
File.Copy(fileName, targetPath, true);
|
||||
|
||||
File.Delete(fileName);
|
||||
|
|
|
|||
|
|
@ -60,19 +60,19 @@ namespace v2rayN.Model
|
|||
|
||||
public List<string> GetAlpn()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(alpn))
|
||||
if (Utils.IsNullOrEmpty(alpn))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
return Utile.String2List(alpn);
|
||||
return Utils.String2List(alpn);
|
||||
}
|
||||
}
|
||||
|
||||
public string GetNetwork()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
|
||||
if (Utils.IsNullOrEmpty(network) || !Global.Networks.Contains(network))
|
||||
{
|
||||
return Global.DefaultNetwork;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
else
|
||||
{
|
||||
SelectedSource = JsonUtile.DeepCopy(profileItem);
|
||||
SelectedSource = JsonUtils.DeepCopy(profileItem);
|
||||
}
|
||||
|
||||
_view = view;
|
||||
|
|
@ -56,19 +56,19 @@ namespace v2rayN.ViewModels
|
|||
SaveServer();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void SaveServer()
|
||||
{
|
||||
string remarks = SelectedSource.remarks;
|
||||
if (Utile.IsNullOrEmpty(remarks))
|
||||
if (Utils.IsNullOrEmpty(remarks))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.address))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.address))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
|
||||
return;
|
||||
|
|
@ -108,7 +108,7 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
return;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -119,9 +119,9 @@ namespace v2rayN.ViewModels
|
|||
if (ConfigHandler.AddCustomServer(_config, item, false) == 0)
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.SuccessfullyImportedCustomServer);
|
||||
if (!Utile.IsNullOrEmpty(item.indexId))
|
||||
if (!Utils.IsNullOrEmpty(item.indexId))
|
||||
{
|
||||
SelectedSource = JsonUtile.DeepCopy(item);
|
||||
SelectedSource = JsonUtils.DeepCopy(item);
|
||||
}
|
||||
IsModified = true;
|
||||
}
|
||||
|
|
@ -134,16 +134,16 @@ namespace v2rayN.ViewModels
|
|||
private void EditServer()
|
||||
{
|
||||
var address = SelectedSource.address;
|
||||
if (Utile.IsNullOrEmpty(address))
|
||||
if (Utils.IsNullOrEmpty(address))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillServerAddressCustom);
|
||||
return;
|
||||
}
|
||||
|
||||
address = Utile.GetConfigPath(address);
|
||||
address = Utils.GetConfigPath(address);
|
||||
if (File.Exists(address))
|
||||
{
|
||||
Utile.ProcessStart(address);
|
||||
Utils.ProcessStart(address);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
else
|
||||
{
|
||||
SelectedSource = JsonUtile.DeepCopy(profileItem);
|
||||
SelectedSource = JsonUtils.DeepCopy(profileItem);
|
||||
}
|
||||
|
||||
SaveCmd = ReactiveCommand.Create(() =>
|
||||
|
|
@ -44,24 +44,24 @@ namespace v2rayN.ViewModels
|
|||
SaveServer();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void SaveServer()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.remarks))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.remarks))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
|
||||
return;
|
||||
}
|
||||
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.address))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.address))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillServerAddress);
|
||||
return;
|
||||
}
|
||||
var port = SelectedSource.port.ToString();
|
||||
if (Utile.IsNullOrEmpty(port) || !Utile.IsNumeric(port)
|
||||
if (Utils.IsNullOrEmpty(port) || !Utils.IsNumeric(port)
|
||||
|| SelectedSource.port <= 0 || SelectedSource.port >= Global.MaxPort)
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillCorrectServerPort);
|
||||
|
|
@ -69,12 +69,12 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
if (SelectedSource.configType == EConfigType.Shadowsocks)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.id))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.id))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillPassword);
|
||||
return;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.security))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.security))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.PleaseSelectEncryption);
|
||||
return;
|
||||
|
|
@ -82,7 +82,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
if (SelectedSource.configType != EConfigType.Socks)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedSource.id))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource.id))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillUUID);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -47,23 +47,23 @@ namespace v2rayN.ViewModels
|
|||
|
||||
ImportDefConfig4V2rayCmd = ReactiveCommand.Create(() =>
|
||||
{
|
||||
normalDNS = Utile.GetEmbedText(Global.DNSV2rayNormalFileName);
|
||||
normalDNS = Utils.GetEmbedText(Global.DNSV2rayNormalFileName);
|
||||
});
|
||||
|
||||
ImportDefConfig4SingboxCmd = ReactiveCommand.Create(() =>
|
||||
{
|
||||
normalDNS2 = Utile.GetEmbedText(Global.DNSSingboxNormalFileName);
|
||||
tunDNS2 = Utile.GetEmbedText(Global.TunSingboxDNSFileName);
|
||||
normalDNS2 = Utils.GetEmbedText(Global.DNSSingboxNormalFileName);
|
||||
tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void SaveSetting()
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(normalDNS))
|
||||
if (!Utils.IsNullOrEmpty(normalDNS))
|
||||
{
|
||||
var obj = JsonUtile.ParseJson(normalDNS);
|
||||
var obj = JsonUtils.ParseJson(normalDNS);
|
||||
if (obj != null && obj["servers"] != null)
|
||||
{
|
||||
}
|
||||
|
|
@ -76,18 +76,18 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
}
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(normalDNS2))
|
||||
if (!Utils.IsNullOrEmpty(normalDNS2))
|
||||
{
|
||||
var obj2 = JsonUtile.Deserialize<Dns4Sbox>(normalDNS2);
|
||||
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(normalDNS2);
|
||||
if (obj2 == null)
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(tunDNS2))
|
||||
if (!Utils.IsNullOrEmpty(tunDNS2))
|
||||
{
|
||||
var obj2 = JsonUtile.Deserialize<Dns4Sbox>(tunDNS2);
|
||||
var obj2 = JsonUtils.Deserialize<Dns4Sbox>(tunDNS2);
|
||||
if (obj2 == null)
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillCorrectDNSText);
|
||||
|
|
@ -102,8 +102,8 @@ namespace v2rayN.ViewModels
|
|||
ConfigHandler.SaveDNSItems(_config, item);
|
||||
|
||||
var item2 = LazyConfig.Instance.GetDNSItem(ECoreType.sing_box);
|
||||
item2.normalDNS = JsonUtile.Serialize(JsonUtile.ParseJson(normalDNS2));
|
||||
item2.tunDNS = JsonUtile.Serialize(JsonUtile.ParseJson(tunDNS2));
|
||||
item2.normalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
|
||||
item2.tunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
|
||||
ConfigHandler.SaveDNSItems(_config, item2);
|
||||
|
||||
_noticeHandler?.Enqueue(ResUI.OperationSuccess);
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ namespace v2rayN.ViewModels
|
|||
SelectedMoveToGroup = new();
|
||||
SelectedRouting = new();
|
||||
SelectedServer = new();
|
||||
if (_config.tunModeItem.enableTun && Utile.IsAdministrator())
|
||||
if (_config.tunModeItem.enableTun && Utils.IsAdministrator())
|
||||
{
|
||||
EnableTun = true;
|
||||
}
|
||||
|
|
@ -645,8 +645,8 @@ namespace v2rayN.ViewModels
|
|||
return;
|
||||
}
|
||||
|
||||
SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utile.HumanFy(update.proxyUp), Utile.HumanFy(update.proxyDown));
|
||||
SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utile.HumanFy(update.directUp), Utile.HumanFy(update.directDown));
|
||||
SpeedProxyDisplay = string.Format(ResUI.SpeedDisplayText, Global.ProxyTag, Utils.HumanFy(update.proxyUp), Utils.HumanFy(update.proxyDown));
|
||||
SpeedDirectDisplay = string.Format(ResUI.SpeedDisplayText, Global.DirectTag, Utils.HumanFy(update.directUp), Utils.HumanFy(update.directDown));
|
||||
|
||||
if (update.proxyUp + update.proxyDown > 0)
|
||||
{
|
||||
|
|
@ -656,20 +656,20 @@ namespace v2rayN.ViewModels
|
|||
var item = _profileItems.Where(it => it.indexId == update.indexId).FirstOrDefault();
|
||||
if (item != null)
|
||||
{
|
||||
item.todayDown = Utile.HumanFy(update.todayDown);
|
||||
item.todayUp = Utile.HumanFy(update.todayUp);
|
||||
item.totalDown = Utile.HumanFy(update.totalDown);
|
||||
item.totalUp = Utile.HumanFy(update.totalUp);
|
||||
item.todayDown = Utils.HumanFy(update.todayDown);
|
||||
item.todayUp = Utils.HumanFy(update.todayUp);
|
||||
item.totalDown = Utils.HumanFy(update.totalDown);
|
||||
item.totalUp = Utils.HumanFy(update.totalUp);
|
||||
|
||||
if (SelectedProfile?.indexId == item.indexId)
|
||||
{
|
||||
var temp = JsonUtile.DeepCopy(item);
|
||||
var temp = JsonUtils.DeepCopy(item);
|
||||
_profileItems.Replace(item, temp);
|
||||
SelectedProfile = temp;
|
||||
}
|
||||
else
|
||||
{
|
||||
_profileItems.Replace(item, JsonUtile.DeepCopy(item));
|
||||
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -692,7 +692,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
private void SetTestResult(string indexId, string delay, string speed)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(indexId))
|
||||
if (Utils.IsNullOrEmpty(indexId))
|
||||
{
|
||||
_noticeHandler?.SendMessage(delay, true);
|
||||
_noticeHandler?.Enqueue(delay);
|
||||
|
|
@ -701,17 +701,17 @@ namespace v2rayN.ViewModels
|
|||
var item = _profileItems.Where(it => it.indexId == indexId).FirstOrDefault();
|
||||
if (item != null)
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(delay))
|
||||
if (!Utils.IsNullOrEmpty(delay))
|
||||
{
|
||||
int.TryParse(delay, out int temp);
|
||||
item.delay = temp;
|
||||
item.delayVal = $"{delay} {Global.DelayUnit}";
|
||||
}
|
||||
if (!Utile.IsNullOrEmpty(speed))
|
||||
if (!Utils.IsNullOrEmpty(speed))
|
||||
{
|
||||
item.speedVal = $"{speed} {Global.SpeedUnit}";
|
||||
}
|
||||
_profileItems.Replace(item, JsonUtile.DeepCopy(item));
|
||||
_profileItems.Replace(item, JsonUtils.DeepCopy(item));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -801,7 +801,7 @@ namespace v2rayN.ViewModels
|
|||
return;
|
||||
}
|
||||
_serverFilter = ServerFilter;
|
||||
if (Utile.IsNullOrEmpty(_serverFilter))
|
||||
if (Utils.IsNullOrEmpty(_serverFilter))
|
||||
{
|
||||
RefreshServers();
|
||||
}
|
||||
|
|
@ -841,12 +841,12 @@ namespace v2rayN.ViewModels
|
|||
delay = t33 == null ? 0 : t33.delay,
|
||||
delayVal = t33?.delay != 0 ? $"{t33?.delay} {Global.DelayUnit}" : string.Empty,
|
||||
speedVal = t33?.speed != 0 ? $"{t33?.speed} {Global.SpeedUnit}" : string.Empty,
|
||||
todayDown = t22 == null ? "" : Utile.HumanFy(t22.todayDown),
|
||||
todayUp = t22 == null ? "" : Utile.HumanFy(t22.todayUp),
|
||||
totalDown = t22 == null ? "" : Utile.HumanFy(t22.totalDown),
|
||||
totalUp = t22 == null ? "" : Utile.HumanFy(t22.totalUp)
|
||||
todayDown = t22 == null ? "" : Utils.HumanFy(t22.todayDown),
|
||||
todayUp = t22 == null ? "" : Utils.HumanFy(t22.todayUp),
|
||||
totalDown = t22 == null ? "" : Utils.HumanFy(t22.totalDown),
|
||||
totalUp = t22 == null ? "" : Utils.HumanFy(t22.totalUp)
|
||||
}).OrderBy(t => t.sort).ToList();
|
||||
_lstProfile = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(lstModel));
|
||||
_lstProfile = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(lstModel));
|
||||
|
||||
Application.Current.Dispatcher.Invoke((Action)(() =>
|
||||
{
|
||||
|
|
@ -951,7 +951,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
else
|
||||
{
|
||||
lstSelecteds = JsonUtile.Deserialize<List<ProfileItem>>(JsonUtile.Serialize(orderProfiles));
|
||||
lstSelecteds = JsonUtils.Deserialize<List<ProfileItem>>(JsonUtils.Serialize(orderProfiles));
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -971,7 +971,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
else
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
|
||||
if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1004,7 +1004,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
public void AddServerViaClipboard()
|
||||
{
|
||||
var clipboardData = Utile.GetClipboardData();
|
||||
var clipboardData = Utils.GetClipboardData();
|
||||
int ret = ConfigHandler.AddBatchServers(_config, clipboardData!, _subId, false);
|
||||
if (ret > 0)
|
||||
{
|
||||
|
|
@ -1018,15 +1018,15 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
ShowHideWindow(false);
|
||||
|
||||
var dpiXY = Utile.GetDpiXY(Application.Current.MainWindow);
|
||||
var dpiXY = Utils.GetDpiXY(Application.Current.MainWindow);
|
||||
string result = await Task.Run(() =>
|
||||
{
|
||||
return Utile.ScanScreen(dpiXY.Item1, dpiXY.Item2);
|
||||
return Utils.ScanScreen(dpiXY.Item1, dpiXY.Item2);
|
||||
});
|
||||
|
||||
ShowHideWindow(true);
|
||||
|
||||
if (Utile.IsNullOrEmpty(result))
|
||||
if (Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.NoValidQRcodeFound);
|
||||
}
|
||||
|
|
@ -1088,7 +1088,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
public void SetDefaultServer()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedProfile?.indexId))
|
||||
if (Utils.IsNullOrEmpty(SelectedProfile?.indexId))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1097,7 +1097,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
private void SetDefaultServer(string indexId)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(indexId))
|
||||
if (Utils.IsNullOrEmpty(indexId))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1129,7 +1129,7 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
return;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(SelectedServer.ID))
|
||||
if (Utils.IsNullOrEmpty(SelectedServer.ID))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1145,7 +1145,7 @@ namespace v2rayN.ViewModels
|
|||
return;
|
||||
}
|
||||
var url = ShareHandler.GetShareUrl(item);
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1161,7 +1161,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
public void SortServer(string colName)
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(colName))
|
||||
if (Utils.IsNullOrEmpty(colName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1286,7 +1286,7 @@ namespace v2rayN.ViewModels
|
|||
foreach (var it in lstSelecteds)
|
||||
{
|
||||
string url = ShareHandler.GetShareUrl(it);
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1295,7 +1295,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
Utile.SetClipboardData(sb.ToString());
|
||||
Utils.SetClipboardData(sb.ToString());
|
||||
_noticeHandler?.SendMessage(ResUI.BatchExportURLSuccessfully);
|
||||
}
|
||||
}
|
||||
|
|
@ -1311,7 +1311,7 @@ namespace v2rayN.ViewModels
|
|||
foreach (var it in lstSelecteds)
|
||||
{
|
||||
string? url = ShareHandler.GetShareUrl(it);
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1320,7 +1320,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
if (sb.Length > 0)
|
||||
{
|
||||
Utile.SetClipboardData(Utile.Base64Encode(sb.ToString()));
|
||||
Utils.SetClipboardData(Utils.Base64Encode(sb.ToString()));
|
||||
_noticeHandler?.SendMessage(ResUI.BatchExportSubscriptionSuccessfully);
|
||||
}
|
||||
}
|
||||
|
|
@ -1407,8 +1407,8 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
UseShellExecute = true,
|
||||
Arguments = Global.RebootAs,
|
||||
WorkingDirectory = Utile.StartupPath(),
|
||||
FileName = Utile.GetExePath().AppendQuotes(),
|
||||
WorkingDirectory = Utils.StartupPath(),
|
||||
FileName = Utils.GetExePath().AppendQuotes(),
|
||||
Verb = "runas",
|
||||
};
|
||||
try
|
||||
|
|
@ -1426,7 +1426,7 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
return;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1472,8 +1472,8 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
CloseCore();
|
||||
|
||||
string fileName = Utile.GetTempPath(Utile.GetDownloadFileName(msg));
|
||||
string toPath = Utile.GetBinPath("", type.ToString());
|
||||
string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(msg));
|
||||
string toPath = Utils.GetBinPath("", type.ToString());
|
||||
|
||||
FileManager.ZipExtractToFile(fileName, toPath, _config.guiItem.ignoreGeoUpdateCore ? "geo" : "");
|
||||
|
||||
|
|
@ -1647,7 +1647,7 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
_config.tunModeItem.enableTun = EnableTun;
|
||||
// When running as a non-administrator, reboot to administrator mode
|
||||
if (EnableTun && !Utile.IsAdministrator())
|
||||
if (EnableTun && !Utils.IsAdministrator())
|
||||
{
|
||||
_config.tunModeItem.enableTun = false;
|
||||
RebootAsAdmin();
|
||||
|
|
@ -1689,7 +1689,7 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
if (FollowSystemTheme)
|
||||
{
|
||||
ModifyTheme(!Utile.IsLightTheme());
|
||||
ModifyTheme(!Utils.IsLightTheme());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1747,7 +1747,7 @@ namespace v2rayN.ViewModels
|
|||
ConfigHandler.SaveConfig(_config);
|
||||
if (FollowSystemTheme)
|
||||
{
|
||||
ModifyTheme(!Utile.IsLightTheme());
|
||||
ModifyTheme(!Utils.IsLightTheme());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1799,7 +1799,7 @@ namespace v2rayN.ViewModels
|
|||
y => y != null && !y.IsNullOrEmpty())
|
||||
.Subscribe(c =>
|
||||
{
|
||||
if (!Utile.IsNullOrEmpty(CurrentLanguage))
|
||||
if (!Utils.IsNullOrEmpty(CurrentLanguage))
|
||||
{
|
||||
_config.uiItem.currentLanguage = CurrentLanguage;
|
||||
Thread.CurrentThread.CurrentUICulture = new(CurrentLanguage);
|
||||
|
|
@ -1851,7 +1851,7 @@ namespace v2rayN.ViewModels
|
|||
theme.SetBaseTheme(isDarkTheme ? Theme.Dark : Theme.Light);
|
||||
_paletteHelper.SetTheme(theme);
|
||||
|
||||
Utile.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
|
||||
Utils.SetDarkBorder(Application.Current.MainWindow, isDarkTheme);
|
||||
}
|
||||
|
||||
public void ChangePrimaryColor(System.Windows.Media.Color color)
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ namespace v2rayN.ViewModels
|
|||
SaveSetting();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void InitCoreType()
|
||||
|
|
@ -249,7 +249,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
private void SaveSetting()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(localPort.ToString()) || !Utile.IsNumeric(localPort.ToString())
|
||||
if (Utils.IsNullOrEmpty(localPort.ToString()) || !Utils.IsNumeric(localPort.ToString())
|
||||
|| localPort <= 0 || localPort >= Global.MaxPort)
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.FillLocalListeningPort);
|
||||
|
|
@ -300,7 +300,7 @@ namespace v2rayN.ViewModels
|
|||
//_config.kcpItem.congestion = Kcpcongestion;
|
||||
|
||||
//UI
|
||||
Utile.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
|
||||
Utils.SetAutoRun(Global.AutoRunRegPath, Global.AutoRunName, AutoRun);
|
||||
_config.guiItem.autoRun = AutoRun;
|
||||
_config.guiItem.enableStatistics = EnableStatistics;
|
||||
_config.guiItem.keepOlderDedupl = KeepOlderDedupl;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
if (rulesItem.id.IsNullOrEmpty())
|
||||
{
|
||||
rulesItem.id = Utile.GetGUID(false);
|
||||
rulesItem.id = Utils.GetGUID(false);
|
||||
rulesItem.outboundTag = Global.ProxyTag;
|
||||
rulesItem.enabled = true;
|
||||
SelectedSource = rulesItem;
|
||||
|
|
@ -53,35 +53,35 @@ namespace v2rayN.ViewModels
|
|||
SelectedSource = rulesItem;
|
||||
}
|
||||
|
||||
Domain = Utile.List2String(SelectedSource.domain, true);
|
||||
IP = Utile.List2String(SelectedSource.ip, true);
|
||||
Process = Utile.List2String(SelectedSource.process, true);
|
||||
Domain = Utils.List2String(SelectedSource.domain, true);
|
||||
IP = Utils.List2String(SelectedSource.ip, true);
|
||||
Process = Utils.List2String(SelectedSource.process, true);
|
||||
|
||||
SaveCmd = ReactiveCommand.Create(() =>
|
||||
{
|
||||
SaveRules();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void SaveRules()
|
||||
{
|
||||
Domain = Utile.Convert2Comma(Domain);
|
||||
IP = Utile.Convert2Comma(IP);
|
||||
Process = Utile.Convert2Comma(Process);
|
||||
Domain = Utils.Convert2Comma(Domain);
|
||||
IP = Utils.Convert2Comma(IP);
|
||||
Process = Utils.Convert2Comma(Process);
|
||||
|
||||
if (AutoSort)
|
||||
{
|
||||
SelectedSource.domain = Utile.String2ListSorted(Domain);
|
||||
SelectedSource.ip = Utile.String2ListSorted(IP);
|
||||
SelectedSource.process = Utile.String2ListSorted(Process);
|
||||
SelectedSource.domain = Utils.String2ListSorted(Domain);
|
||||
SelectedSource.ip = Utils.String2ListSorted(IP);
|
||||
SelectedSource.process = Utils.String2ListSorted(Process);
|
||||
}
|
||||
else
|
||||
{
|
||||
SelectedSource.domain = Utile.String2List(Domain);
|
||||
SelectedSource.ip = Utile.String2List(IP);
|
||||
SelectedSource.process = Utile.String2List(Process);
|
||||
SelectedSource.domain = Utils.String2List(Domain);
|
||||
SelectedSource.ip = Utils.String2List(IP);
|
||||
SelectedSource.process = Utils.String2List(Process);
|
||||
}
|
||||
SelectedSource.protocol = ProtocolItems?.ToList();
|
||||
SelectedSource.inboundTag = InboundTagItems?.ToList();
|
||||
|
|
@ -90,7 +90,7 @@ namespace v2rayN.ViewModels
|
|||
|| SelectedSource.ip?.Count > 0
|
||||
|| SelectedSource.protocol?.Count > 0
|
||||
|| SelectedSource.process?.Count > 0
|
||||
|| !Utile.IsNullOrEmpty(SelectedSource.port);
|
||||
|| !Utils.IsNullOrEmpty(SelectedSource.port);
|
||||
|
||||
if (!hasRule)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ namespace v2rayN.ViewModels
|
|||
else
|
||||
{
|
||||
SelectedRouting = routingItem;
|
||||
_rules = JsonUtile.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
|
||||
_rules = JsonUtils.Deserialize<List<RulesItem>>(SelectedRouting.ruleSet);
|
||||
}
|
||||
|
||||
RefreshRulesItems();
|
||||
|
|
@ -115,7 +115,7 @@ namespace v2rayN.ViewModels
|
|||
SaveRouting();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
public void RefreshRulesItems()
|
||||
|
|
@ -129,10 +129,10 @@ namespace v2rayN.ViewModels
|
|||
id = item.id,
|
||||
outboundTag = item.outboundTag,
|
||||
port = item.port,
|
||||
protocols = Utile.List2String(item.protocol),
|
||||
inboundTags = Utile.List2String(item.inboundTag),
|
||||
domains = Utile.List2String(item.domain),
|
||||
ips = Utile.List2String(item.ip),
|
||||
protocols = Utils.List2String(item.protocol),
|
||||
inboundTags = Utils.List2String(item.inboundTag),
|
||||
domains = Utils.List2String(item.domain),
|
||||
ips = Utils.List2String(item.ip),
|
||||
enabled = item.enabled,
|
||||
};
|
||||
_rulesItems.Add(it);
|
||||
|
|
@ -207,7 +207,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
if (lst.Count > 0)
|
||||
{
|
||||
Utile.SetClipboardData(JsonUtile.Serialize(lst));
|
||||
Utils.SetClipboardData(JsonUtils.Serialize(lst));
|
||||
//_noticeHandler?.Enqueue(ResUI.OperationSuccess"));
|
||||
}
|
||||
}
|
||||
|
|
@ -235,7 +235,7 @@ namespace v2rayN.ViewModels
|
|||
private void SaveRouting()
|
||||
{
|
||||
string remarks = SelectedRouting.remarks;
|
||||
if (Utile.IsNullOrEmpty(remarks))
|
||||
if (Utils.IsNullOrEmpty(remarks))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
|
||||
return;
|
||||
|
|
@ -243,10 +243,10 @@ namespace v2rayN.ViewModels
|
|||
var item = SelectedRouting;
|
||||
foreach (var it in _rules)
|
||||
{
|
||||
it.id = Utile.GetGUID(false);
|
||||
it.id = Utils.GetGUID(false);
|
||||
}
|
||||
item.ruleNum = _rules.Count;
|
||||
item.ruleSet = JsonUtile.Serialize(_rules, false);
|
||||
item.ruleSet = JsonUtils.Serialize(_rules, false);
|
||||
|
||||
if (ConfigHandler.SaveRoutingItem(_config, item) == 0)
|
||||
{
|
||||
|
|
@ -268,13 +268,13 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
return;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(fileName))
|
||||
if (Utils.IsNullOrEmpty(fileName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
string result = Utile.LoadResource(fileName);
|
||||
if (Utile.IsNullOrEmpty(result))
|
||||
string result = Utils.LoadResource(fileName);
|
||||
if (Utils.IsNullOrEmpty(result))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -288,7 +288,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
private void ImportRulesFromClipboard()
|
||||
{
|
||||
string clipboardData = Utile.GetClipboardData();
|
||||
string clipboardData = Utils.GetClipboardData();
|
||||
if (AddBatchRoutingRules(SelectedRouting, clipboardData) == 0)
|
||||
{
|
||||
RefreshRulesItems();
|
||||
|
|
@ -299,7 +299,7 @@ namespace v2rayN.ViewModels
|
|||
private async Task ImportRulesFromUrl()
|
||||
{
|
||||
var url = SelectedRouting.url;
|
||||
if (Utile.IsNullOrEmpty(url))
|
||||
if (Utils.IsNullOrEmpty(url))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.MsgNeedUrl);
|
||||
return;
|
||||
|
|
@ -324,18 +324,18 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
blReplace = true;
|
||||
}
|
||||
if (Utile.IsNullOrEmpty(clipboardData))
|
||||
if (Utils.IsNullOrEmpty(clipboardData))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
var lstRules = JsonUtile.Deserialize<List<RulesItem>>(clipboardData);
|
||||
var lstRules = JsonUtils.Deserialize<List<RulesItem>>(clipboardData);
|
||||
if (lstRules == null)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
foreach (var rule in lstRules)
|
||||
{
|
||||
rule.id = Utile.GetGUID(false);
|
||||
rule.id = Utils.GetGUID(false);
|
||||
}
|
||||
|
||||
if (blReplace)
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ namespace v2rayN.ViewModels
|
|||
SaveRouting();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
#region locked
|
||||
|
|
@ -136,15 +136,15 @@ namespace v2rayN.ViewModels
|
|||
_lockedItem = ConfigHandler.GetLockedRoutingItem(_config);
|
||||
if (_lockedItem != null)
|
||||
{
|
||||
_lockedRules = JsonUtile.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
|
||||
ProxyDomain = Utile.List2String(_lockedRules[0].domain, true);
|
||||
ProxyIP = Utile.List2String(_lockedRules[0].ip, true);
|
||||
_lockedRules = JsonUtils.Deserialize<List<RulesItem>>(_lockedItem.ruleSet);
|
||||
ProxyDomain = Utils.List2String(_lockedRules[0].domain, true);
|
||||
ProxyIP = Utils.List2String(_lockedRules[0].ip, true);
|
||||
|
||||
DirectDomain = Utile.List2String(_lockedRules[1].domain, true);
|
||||
DirectIP = Utile.List2String(_lockedRules[1].ip, true);
|
||||
DirectDomain = Utils.List2String(_lockedRules[1].domain, true);
|
||||
DirectIP = Utils.List2String(_lockedRules[1].ip, true);
|
||||
|
||||
BlockDomain = Utile.List2String(_lockedRules[2].domain, true);
|
||||
BlockIP = Utile.List2String(_lockedRules[2].ip, true);
|
||||
BlockDomain = Utils.List2String(_lockedRules[2].domain, true);
|
||||
BlockIP = Utils.List2String(_lockedRules[2].ip, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -152,16 +152,16 @@ namespace v2rayN.ViewModels
|
|||
{
|
||||
if (_lockedItem != null)
|
||||
{
|
||||
_lockedRules[0].domain = Utile.String2List(Utile.Convert2Comma(ProxyDomain.TrimEx()));
|
||||
_lockedRules[0].ip = Utile.String2List(Utile.Convert2Comma(ProxyIP.TrimEx()));
|
||||
_lockedRules[0].domain = Utils.String2List(Utils.Convert2Comma(ProxyDomain.TrimEx()));
|
||||
_lockedRules[0].ip = Utils.String2List(Utils.Convert2Comma(ProxyIP.TrimEx()));
|
||||
|
||||
_lockedRules[1].domain = Utile.String2List(Utile.Convert2Comma(DirectDomain.TrimEx()));
|
||||
_lockedRules[1].ip = Utile.String2List(Utile.Convert2Comma(DirectIP.TrimEx()));
|
||||
_lockedRules[1].domain = Utils.String2List(Utils.Convert2Comma(DirectDomain.TrimEx()));
|
||||
_lockedRules[1].ip = Utils.String2List(Utils.Convert2Comma(DirectIP.TrimEx()));
|
||||
|
||||
_lockedRules[2].domain = Utile.String2List(Utile.Convert2Comma(BlockDomain.TrimEx()));
|
||||
_lockedRules[2].ip = Utile.String2List(Utile.Convert2Comma(BlockIP.TrimEx()));
|
||||
_lockedRules[2].domain = Utils.String2List(Utils.Convert2Comma(BlockDomain.TrimEx()));
|
||||
_lockedRules[2].ip = Utils.String2List(Utils.Convert2Comma(BlockIP.TrimEx()));
|
||||
|
||||
_lockedItem.ruleSet = JsonUtile.Serialize(_lockedRules, false);
|
||||
_lockedItem.ruleSet = JsonUtils.Serialize(_lockedRules, false);
|
||||
|
||||
ConfigHandler.SaveRoutingItem(_config, _lockedItem);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace v2rayN.ViewModels
|
|||
}
|
||||
else
|
||||
{
|
||||
SelectedSource = JsonUtile.DeepCopy(subItem);
|
||||
SelectedSource = JsonUtils.DeepCopy(subItem);
|
||||
}
|
||||
|
||||
SaveCmd = ReactiveCommand.Create(() =>
|
||||
|
|
@ -40,13 +40,13 @@ namespace v2rayN.ViewModels
|
|||
SaveSub();
|
||||
});
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
private void SaveSub()
|
||||
{
|
||||
string remarks = SelectedSource.remarks;
|
||||
if (Utile.IsNullOrEmpty(remarks))
|
||||
if (Utils.IsNullOrEmpty(remarks))
|
||||
{
|
||||
_noticeHandler?.Enqueue(ResUI.PleaseFillRemarks);
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace v2rayN.ViewModels
|
|||
SubShare();
|
||||
}, canEditRemove);
|
||||
|
||||
Utile.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
|
||||
}
|
||||
|
||||
public void RefreshSubItems()
|
||||
|
|
@ -112,7 +112,7 @@ namespace v2rayN.ViewModels
|
|||
|
||||
private async void SubShare()
|
||||
{
|
||||
if (Utile.IsNullOrEmpty(SelectedSource?.url))
|
||||
if (Utils.IsNullOrEmpty(SelectedSource?.url))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ namespace v2rayN.Views
|
|||
private void btnGUID_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
txtId.Text =
|
||||
txtId5.Text = Utile.GetGUID();
|
||||
txtId5.Text = Utils.GetGUID();
|
||||
}
|
||||
|
||||
private void SetHeaderType()
|
||||
|
|
@ -273,7 +273,7 @@ namespace v2rayN.Views
|
|||
cmbHeaderType.Items.Clear();
|
||||
|
||||
var network = cmbNetwork.SelectedItem.ToString();
|
||||
if (Utile.IsNullOrEmpty(network))
|
||||
if (Utils.IsNullOrEmpty(network))
|
||||
{
|
||||
cmbHeaderType.Items.Add(Global.None);
|
||||
return;
|
||||
|
|
@ -307,7 +307,7 @@ namespace v2rayN.Views
|
|||
private void SetTips()
|
||||
{
|
||||
var network = cmbNetwork.SelectedItem.ToString();
|
||||
if (Utile.IsNullOrEmpty(network))
|
||||
if (Utils.IsNullOrEmpty(network))
|
||||
{
|
||||
network = Global.DefaultNetwork;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ namespace v2rayN.Views
|
|||
|
||||
private void linkDnsObjectDoc_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
|
||||
Utils.ProcessStart("https://www.v2fly.org/config/dns.html#dnsobject");
|
||||
}
|
||||
|
||||
private void linkDnsSingboxObjectDoc_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
|
||||
Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/dns/");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ namespace v2rayN.Views
|
|||
|
||||
HotkeyHandler.Instance.IsPause = true;
|
||||
this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
|
||||
Utile.SetDarkBorder(this, _config.uiItem.colorModeDark);
|
||||
Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
|
||||
InitData();
|
||||
}
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ namespace v2rayN.Views
|
|||
|
||||
private KeyEventItem GetKeyEventItemByEGlobalHotkey(List<KeyEventItem> KEList, EGlobalHotkey eg)
|
||||
{
|
||||
return JsonUtile.DeepCopy(KEList.Find((it) => it.eGlobalHotkey == eg) ?? new()
|
||||
return JsonUtils.DeepCopy(KEList.Find((it) => it.eGlobalHotkey == eg) ?? new()
|
||||
{
|
||||
eGlobalHotkey = eg,
|
||||
Control = false,
|
||||
|
|
|
|||
|
|
@ -210,8 +210,8 @@ namespace v2rayN.Views
|
|||
RestoreUI();
|
||||
AddHelpMenuItem();
|
||||
|
||||
var IsAdministrator = Utile.IsAdministrator();
|
||||
this.Title = $"{Utile.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
|
||||
var IsAdministrator = Utils.IsAdministrator();
|
||||
this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
|
||||
|
||||
//if (_config.uiItem.autoHideStartup)
|
||||
//{
|
||||
|
|
@ -234,7 +234,7 @@ namespace v2rayN.Views
|
|||
{
|
||||
if (wParam == IntPtr.Zero && Marshal.PtrToStringUni(lParam) == "ImmersiveColorSet")
|
||||
{
|
||||
ViewModel?.ModifyTheme(!Utile.IsLightTheme());
|
||||
ViewModel?.ModifyTheme(!Utils.IsLightTheme());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -421,7 +421,7 @@ namespace v2rayN.Views
|
|||
|
||||
private void menuPromotion_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart($"{Utile.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
|
||||
Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
|
||||
}
|
||||
|
||||
private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)
|
||||
|
|
@ -431,7 +431,7 @@ namespace v2rayN.Views
|
|||
|
||||
private void menuSettingsSetUWP_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart(Utile.GetBinPath("EnableLoopback.exe"));
|
||||
Utils.ProcessStart(Utils.GetBinPath("EnableLoopback.exe"));
|
||||
}
|
||||
|
||||
private void BtnAutofitColumnWidth_Click(object sender, RoutedEventArgs e)
|
||||
|
|
@ -516,8 +516,8 @@ namespace v2rayN.Views
|
|||
|
||||
private void StorageUI()
|
||||
{
|
||||
_config.uiItem.mainWidth = Utile.ToInt(this.Width);
|
||||
_config.uiItem.mainHeight = Utile.ToInt(this.Height);
|
||||
_config.uiItem.mainWidth = Utils.ToInt(this.Width);
|
||||
_config.uiItem.mainHeight = Utils.ToInt(this.Height);
|
||||
|
||||
List<ColumnItem> lvColumnItem = new();
|
||||
for (int k = 0; k < lstProfiles.Columns.Count; k++)
|
||||
|
|
@ -526,7 +526,7 @@ namespace v2rayN.Views
|
|||
lvColumnItem.Add(new()
|
||||
{
|
||||
Name = item2.ExName,
|
||||
Width = item2.Visibility == Visibility.Visible ? Utile.ToInt(item2.ActualWidth) : -1,
|
||||
Width = item2.Visibility == Visibility.Visible ? Utils.ToInt(item2.ActualWidth) : -1,
|
||||
Index = item2.DisplayIndex
|
||||
});
|
||||
}
|
||||
|
|
@ -559,7 +559,7 @@ namespace v2rayN.Views
|
|||
{
|
||||
if (sender is MenuItem item)
|
||||
{
|
||||
Utile.ProcessStart(item.Tag.ToString());
|
||||
Utils.ProcessStart(item.Tag.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ namespace v2rayN.Views
|
|||
|
||||
var MsgFilter = cmbMsgFilter.Text.TrimEx();
|
||||
if (MsgFilter != lastMsgFilter) lastMsgFilterNotAvailable = false;
|
||||
if (!Utile.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
|
||||
if (!Utils.IsNullOrEmpty(MsgFilter) && !lastMsgFilterNotAvailable)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -99,13 +99,13 @@ namespace v2rayN.Views
|
|||
private void menuMsgViewCopy_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
{
|
||||
var data = txtMsg.SelectedText.TrimEx();
|
||||
Utile.SetClipboardData(data);
|
||||
Utils.SetClipboardData(data);
|
||||
}
|
||||
|
||||
private void menuMsgViewCopyAll_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
{
|
||||
var data = txtMsg.Text;
|
||||
Utile.SetClipboardData(data);
|
||||
Utils.SetClipboardData(data);
|
||||
}
|
||||
|
||||
private void menuMsgViewClear_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
|
|
|
|||
|
|
@ -96,13 +96,13 @@ namespace v2rayN.Views
|
|||
var files = new List<string>();
|
||||
foreach (var pattern in searchPatterns)
|
||||
{
|
||||
files.AddRange(Directory.GetFiles(Utile.GetFontsPath(), pattern));
|
||||
files.AddRange(Directory.GetFiles(Utils.GetFontsPath(), pattern));
|
||||
}
|
||||
var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
|
||||
var culture2 = "en-us";
|
||||
foreach (var ttf in files)
|
||||
{
|
||||
var families = Fonts.GetFontFamilies(Utile.GetFontsPath(ttf));
|
||||
var families = Fonts.GetFontFamilies(Utils.GetFontsPath(ttf));
|
||||
foreach (FontFamily family in families)
|
||||
{
|
||||
var typefaces = family.GetTypefaces();
|
||||
|
|
@ -115,10 +115,10 @@ namespace v2rayN.Views
|
|||
// continue;
|
||||
//}
|
||||
var fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture)];
|
||||
if (Utile.IsNullOrEmpty(fontFamily))
|
||||
if (Utils.IsNullOrEmpty(fontFamily))
|
||||
{
|
||||
fontFamily = glyph.Win32FamilyNames[new CultureInfo(culture2)];
|
||||
if (Utile.IsNullOrEmpty(fontFamily))
|
||||
if (Utils.IsNullOrEmpty(fontFamily))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ namespace v2rayN.Views
|
|||
|
||||
private void linkRuleobjectDoc_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart("https://www.v2fly.org/config/routing.html#ruleobject");
|
||||
Utils.ProcessStart("https://www.v2fly.org/config/routing.html#ruleobject");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -127,12 +127,12 @@ namespace v2rayN.Views
|
|||
|
||||
private void linkdomainStrategy_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart("https://www.v2fly.org/config/routing.html");
|
||||
Utils.ProcessStart("https://www.v2fly.org/config/routing.html");
|
||||
}
|
||||
|
||||
private void linkdomainStrategy4Singbox_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Utile.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
|
||||
Utils.ProcessStart("https://sing-box.sagernet.org/zh/configuration/shared/listen/#domain_strategy");
|
||||
}
|
||||
|
||||
private void btnCancel_Click(object sender, System.Windows.RoutedEventArgs e)
|
||||
|
|
|
|||
Loading…
Reference in a new issue