Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-27 03:41:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remote ruleset support

Browse Source
This commit is contained in:
parhelia512 2025-07-21 18:11:32 +08:00 committed by Mahdi
parent e8615de6b2
commit 706d4d8605
3 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/dataStore/RouteEntity.h
View File

@ -113,6 +113,7 @@ namespace Configs {
QList<std::shared_ptr<RouteRule>> Rules; QList<std::shared_ptr<RouteRule>> Rules;
QList<JsonStore*> castedRules; QList<JsonStore*> castedRules;
int defaultOutboundID = proxyID; int defaultOutboundID = proxyID;
std::map<QString, QString> tagMap;
RoutingChain(); RoutingChain();
@ -124,7 +125,7 @@ namespace Configs {
void FromJson(QJsonObject object); void FromJson(QJsonObject object);
QJsonArray get_route_rules(bool forView = false, std::map<int, QString> outboundMap = {}, const QStringList& tagList = {}); QJsonArray get_route_rules(bool forView = false, std::map<int, QString> outboundMap = {});
bool isViewOnly() const; bool isViewOnly() const;
@ -140,8 +141,6 @@ namespace Configs {
std::shared_ptr<QStringList> get_used_rule_sets(); std::shared_ptr<QStringList> get_used_rule_sets();
std::shared_ptr<QStringList> get_used_remote_rule_sets();
QStringList get_direct_sites(); QStringList get_direct_sites();
QStringList get_direct_ips(); QStringList get_direct_ips();

71
src/configs/ConfigBuilder.cpp
View File

@ -612,7 +612,6 @@ namespace Configs {
} }
auto neededOutbounds = routeChain->get_used_outbounds(); auto neededOutbounds = routeChain->get_used_outbounds();
auto neededRuleSets = routeChain->get_used_rule_sets(); auto neededRuleSets = routeChain->get_used_rule_sets();
auto neededRemoteRuleSets = routeChain->get_used_remote_rule_sets();
std::map<int, QString> outboundMap; std::map<int, QString> outboundMap;
outboundMap[-1] = "proxy"; outboundMap[-1] = "proxy";
outboundMap[-2] = "direct"; outboundMap[-2] = "direct";
@ -642,6 +641,8 @@ namespace Configs {
needDirectDnsRules = true; needDirectDnsRules = true;
} }
} }
auto routeRules = routeChain->get_route_rules(false, outboundMap);
routeObj["rules"] = routeRules;
// DNS hijack deps // DNS hijack deps
bool needHijackRules = false; bool needHijackRules = false;
@ -674,50 +675,38 @@ namespace Configs {
auto ruleSetArray = QJsonArray(); auto ruleSetArray = QJsonArray();
auto geoSitePath = GetCoreAssetDir("geosite.db"); auto geoSitePath = GetCoreAssetDir("geosite.db");
auto geoIpPath = GetCoreAssetDir("geoip.db"); auto geoIpPath = GetCoreAssetDir("geoip.db");
QStringList tagList;
for (const auto &item: *neededRuleSets) { for (const auto &item: *neededRuleSets) {
tagList.push_back(item); if(item.startsWith("https://") && item.endsWith(".srs")) {
ruleSetArray += QJsonObject{ ruleSetArray += QJsonObject{
{"type", "local"}, {"type", "remote"},
{"tag", item}, {"tag", routeChain->tagMap[item]},
{"format", "binary"}, {"format", "binary"},
{"path", RULE_SETS_DIR + QString("/%1.srs").arg(item)}, {"url", item},
}; };
if (QFile(QString(RULE_SETS_DIR + "/%1.srs").arg(item)).exists()) continue;
bool ok;
auto mode = API::GeoRuleSetType::site;
auto geoAssertPath = geoSitePath;
if (item.contains("_IP")) {
mode = API::GeoRuleSetType::ip;
geoAssertPath = geoIpPath;
} }
auto err = API::defaultClient->CompileGeoSet(&ok, mode, item.toStdString(), geoAssertPath); else {
if (!ok) { ruleSetArray += QJsonObject{
MW_show_log("Failed to generate rule set asset for " + item); {"type", "local"},
status->result->error = err; {"tag", item},
return; {"format", "binary"},
{"path", RULE_SETS_DIR + QString("/%1.srs").arg(item)},
};
if (QFile(QString(RULE_SETS_DIR + "/%1.srs").arg(item)).exists()) continue;
bool ok;
auto mode = API::GeoRuleSetType::site;
auto geoAssertPath = geoSitePath;
if (item.contains("_IP")) {
mode = API::GeoRuleSetType::ip;
geoAssertPath = geoIpPath;
}
auto err = API::defaultClient->CompileGeoSet(&ok, mode, item.toStdString(), geoAssertPath);
if (!ok) {
MW_show_log("Failed to generate rule set asset for " + item);
status->result->error = err;
return;
}
} }
} }
for (const auto &item: *neededRemoteRuleSets) {
QString tagRemote, tmp = item.section('/', -1);
tmp.chop(4);
tagRemote = tmp;
int index = 1;
while(tagList.contains(tagRemote))
{
tagRemote = tmp + QString::number(index);
index++;
}
tagList.push_back(tagRemote);
ruleSetArray += QJsonObject{
{"type", "remote"},
{"tag", tagRemote},
{"format", "binary"},
{"url", item},
};
}
auto routeRules = routeChain->get_route_rules(false, outboundMap, tagList);
routeObj["rules"] = routeRules;
routeObj["rule_set"] = ruleSetArray; routeObj["rule_set"] = ruleSetArray;
// DNS settings // DNS settings

38
src/dataStore/RouteEntity.cpp
View File

@ -564,8 +564,30 @@ namespace Configs {
return rules; return rules;
} }
QJsonArray RoutingChain::get_route_rules(bool forView, std::map<int, QString> outboundMap, const QStringList& tagList) { QJsonArray RoutingChain::get_route_rules(bool forView, std::map<int, QString> outboundMap) {
QJsonArray res; QJsonArray res;
QStringList tagList;
for (const auto& item: Rules) {
for (const auto& ruleItem: item->rule_set) {
if (!ruleItem.startsWith("https://")) {
tagList.push_back(ruleItem);
}
}
}
for (const auto& item: Rules) {
for (const auto& ruleItem: item->rule_set) {
if (ruleItem.startsWith("https://") && ruleItem.endsWith(".srs")) {
QString tagRemote, tmp = ruleItem.section('/', -1);
tmp.chop(4);
tagRemote = tmp;
int index = 1;
while(tagList.contains(tagRemote))
tagRemote = tmp + QString::number(index++);
tagMap.insert(std::map<QString, QString>::value_type(ruleItem, tagRemote));
tagList.push_back(tagRemote);
}
}
}
for (const auto &item: Rules) { for (const auto &item: Rules) {
auto outboundTag = QString(); auto outboundTag = QString();
if (outboundMap.count(item->outboundID)) outboundTag = outboundMap[item->outboundID]; if (outboundMap.count(item->outboundID)) outboundTag = outboundMap[item->outboundID];
@ -690,19 +712,7 @@ namespace Configs {
auto res = std::make_shared<QStringList>(); auto res = std::make_shared<QStringList>();
for (const auto& item: Rules) { for (const auto& item: Rules) {
for (const auto& ruleItem: item->rule_set) { for (const auto& ruleItem: item->rule_set) {
if (!ruleItem.startsWith("https://")) res->push_back(ruleItem);
res->push_back(ruleItem);
}
}
return res;
}
std::shared_ptr<QStringList> RoutingChain::get_used_remote_rule_sets() {
auto res = std::make_shared<QStringList>();
for (const auto& item: Rules) {
for (const auto& ruleItem: item->rule_set) {
if (ruleItem.startsWith("https://") && ruleItem.endsWith(".srs"))
res->push_back(ruleItem);
} }
} }
return res; return res;