mirror of
https://github.com/MatsuriDayo/nekoray.git
synced 2025-12-18 04:54:38 +03:00
fix
This commit is contained in:
@@ -27,7 +27,7 @@ namespace NekoRay {
|
||||
}
|
||||
|
||||
// hook.js
|
||||
if (result->error.isEmpty()) {
|
||||
if (result->error.isEmpty() && !forTest) {
|
||||
auto source = qjs::ReadHookJS();
|
||||
if (!source.isEmpty()) {
|
||||
qjs::QJS js(source);
|
||||
@@ -274,7 +274,7 @@ namespace NekoRay {
|
||||
});
|
||||
}
|
||||
dnsServers += QJsonObject{
|
||||
{"address", directDnsAddress},
|
||||
{"address", directDnsAddress.replace("https://", "https+local://")},
|
||||
{"fallbackStrategy", "disabled"},
|
||||
{"domains", QList2QJsonArray<QString>(status->domainListDNSDirect)},
|
||||
};
|
||||
@@ -595,9 +595,12 @@ namespace NekoRay {
|
||||
auto stream = GetStreamSettings(ent->bean.data());
|
||||
if (stream != nullptr && !stream->packet_encoding.isEmpty()) {
|
||||
muxObj["packetEncoding"] = stream->packet_encoding;
|
||||
} else if (stream != nullptr && stream->network == "grpc") {
|
||||
// ignore mux.cool for gRPC
|
||||
} else {
|
||||
outbound["mux"] = muxObj;
|
||||
muxApplied = true;
|
||||
}
|
||||
outbound["mux"] = muxObj;
|
||||
muxApplied = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,6 +109,7 @@ namespace NekoRay {
|
||||
_add(new configItem("id", &id, itemType::integer));
|
||||
_add(new configItem("gid", &gid, itemType::integer));
|
||||
_add(new configItem("yc", &latency, itemType::integer));
|
||||
_add(new configItem("report", &full_test_report, itemType::string));
|
||||
|
||||
// 可以不关联 bean,只加载 ProxyEntity 的信息
|
||||
if (bean != nullptr) {
|
||||
|
||||
@@ -31,7 +31,6 @@ namespace NekoRay {
|
||||
QSharedPointer<fmt::AbstractBean> bean;
|
||||
QSharedPointer<traffic::TrafficData> traffic_data = QSharedPointer<traffic::TrafficData>(new traffic::TrafficData(""));
|
||||
|
||||
// Cache
|
||||
QString full_test_report;
|
||||
|
||||
ProxyEntity(fmt::AbstractBean *bean, const QString &type_);
|
||||
|
||||
Reference in New Issue
Block a user