pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-10-05 13:02:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

External routing rules templates + regional presets support (#5840)

Browse Source 
* External routing rules templates + auto download geo file if repo changed

* Regional presets support
This commit is contained in:
runetfreedom
2024-10-16 09:11:20 +03:00
committed by GitHub
parent a5122b656d
commit 2edbbc523a
18 changed files with 272 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/Handler/ConfigHandler.cs
+102 -12
View File
@@ -1,4 +1,6 @@
using System.Data;
using ServiceLib.Common;
using System.Data;
using System.Text.Json.Nodes;
using System.Text.RegularExpressions;
namespace ServiceLib.Handler
@@ -1616,6 +1618,79 @@ namespace ServiceLib.Handler
return item;
}
public static int InitRouting(Config config, bool blImportAdvancedRules = false)
{
if (!String.IsNullOrEmpty(config.constItem.routeRulesTemplateSourceUrl))
{
InitExternalRouting(config, blImportAdvancedRules);
}
else
{
InitBuiltinRouting(config, blImportAdvancedRules);
}
if (GetLockedRoutingItem(config) == null)
{
var item1 = new RoutingItem()
{
remarks = "locked",
url = string.Empty,
locked = true,
};
AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
}
return 0;
}
public static int InitExternalRouting(Config config, bool blImportAdvancedRules = false)
{
DownloadService downloadHandle = new DownloadService();
var templateContent = Task.Run(() => downloadHandle.TryDownloadString(config.constItem.routeRulesTemplateSourceUrl, false, "")).Result;
if (String.IsNullOrEmpty(templateContent))
return InitBuiltinRouting(config, blImportAdvancedRules); // fallback
var template = JsonUtils.Deserialize<RoutingTemplate>(templateContent);
if (template == null)
return InitBuiltinRouting(config, blImportAdvancedRules); // fallback
var items = AppHandler.Instance.RoutingItems();
var maxSort = items.Count;
if (blImportAdvancedRules || items.Where(t => t.remarks.StartsWith(template.version)).ToList().Count <= 0)
{
for (var i = 0; i < template.routingItems.Length; i++)
{
var item = template.routingItems[i];
if (String.IsNullOrEmpty(item.url) && String.IsNullOrEmpty(item.ruleSet))
continue;
var ruleSetsString = !String.IsNullOrEmpty(item.ruleSet)
? item.ruleSet
: Task.Run(() => downloadHandle.TryDownloadString(item.url, false, "")).Result;
if (String.IsNullOrEmpty(ruleSetsString))
continue;
item.remarks = $"{template.version}-{item.remarks}";
item.enabled = true;
item.sort = ++maxSort;
item.url = string.Empty;
AddBatchRoutingRules(ref item, ruleSetsString);
//first rule as default at first startup
if (!blImportAdvancedRules && i == 0)
{
SetDefaultRouting(config, item);
}
}
}
return 0;
}
public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules = false)
{
var ver = "V3-";
@@ -1655,17 +1730,6 @@ namespace ServiceLib.Handler
SetDefaultRouting(config, item2);
}
}
if (GetLockedRoutingItem(config) == null)
{
var item1 = new RoutingItem()
{
remarks = "locked",
url = string.Empty,
locked = true,
};
AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
}
return 0;
}
@@ -1724,5 +1788,31 @@ namespace ServiceLib.Handler
}
#endregion DNS
#region Presets
public static bool ApplyPreset(Config config, EPresetType type)
{
switch (type)
{
case EPresetType.Default:
config.constItem.geoSourceUrl = "";
config.constItem.srsSourceUrl = "";
config.constItem.routeRulesTemplateSourceUrl = "";
return true;
case EPresetType.Russia:
config.constItem.geoSourceUrl = Global.GeoFilesSources[1];
config.constItem.srsSourceUrl = Global.SingboxRulesetSources[1];
config.constItem.routeRulesTemplateSourceUrl = Global.RoutingRulesSources[1];
return true;
}
return false;
}
#endregion
}
}