Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 12:34:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: improve custom config

Browse Source
This commit is contained in:
arm64v8a
2022-10-21 19:44:02 +09:00
parent 48938f1db3
commit d49c2d4e90
11 changed files with 105 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
db/ConfigBuilder.cpp
View File

@@ -420,9 +420,13 @@ namespace NekoRay {
if (ent->bean->NeedExternal()) {
auto ext_socks_port = MkPort();
extR = ent->bean->BuildExternal(mapping_port, ext_socks_port);
if (extR.program.isEmpty()) {
status->result->error = QObject::tr("Core not found: %1").arg(ent->bean->DisplayType());
return {};
}
if (!extR.error.isEmpty()) { // rejected
status->result->error = extR.error;
return "";
return {};
}
// SOCKS OUTBOUND
@@ -528,7 +532,9 @@ namespace NekoRay {
status->result = result;
// Log
result->coreConfig["log"] = QJsonObject{{"level", dataStore->log_level}};
auto level = dataStore->log_level;
level = level.replace("warning", "warn");
result->coreConfig["log"] = QJsonObject{{"level", level}};
// Inbounds
@@ -723,7 +729,7 @@ namespace NekoRay {
});
// api
if (dataStore->traffic_loop_interval > 0) {
if (!forTest && dataStore->traffic_loop_interval > 0) {
result->coreConfig.insert("experimental", QJsonObject{
{"v2ray_api", QJsonObject{
{"listen", "127.0.0.1:" + Int2String(dataStore->inbound_socks_port + 10)},