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

ws earlydata compatible with xray

Browse Source
This commit is contained in:
arm64v8a
2023-05-06 17:43:03 +09:00
parent 51616b5a9a
commit f53d0aba47
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fmt/Bean2CoreObj_box.cpp
View File

@@ -8,12 +8,25 @@ namespace NekoRay::fmt {
if (network != "tcp") { if (network != "tcp") {
QJsonObject transport{{"type", network}}; QJsonObject transport{{"type", network}};
if (network == "ws") { if (network == "ws") {
if (!path.isEmpty()) transport["path"] = path;
if (!host.isEmpty()) transport["headers"] = QJsonObject{{"Host", host}}; if (!host.isEmpty()) transport["headers"] = QJsonObject{{"Host", host}};
// ws path & ed
auto pathWithoutEd = SubStrBefore(path, "?ed=");
if (!pathWithoutEd.isEmpty()) transport["path"] = pathWithoutEd;
if (pathWithoutEd != path) {
auto ed = SubStrAfter(path, "?ed=").toInt();
if (ed > 0) {
transport["max_early_data"] = ed;
transport["early_data_header_name"] = "Sec-WebSocket-Protocol";
}
}
if (ws_early_data_length > 0) { if (ws_early_data_length > 0) {
transport["max_early_data"] = ws_early_data_length; transport["max_early_data"] = ws_early_data_length;
if (ws_early_data_name.isEmpty()) {
transport["early_data_header_name"] = "Sec-WebSocket-Protocol";
} else {
transport["early_data_header_name"] = ws_early_data_name; transport["early_data_header_name"] = ws_early_data_name;
} }
}
} else if (network == "http") { } else if (network == "http") {
if (!path.isEmpty()) transport["path"] = path; if (!path.isEmpty()) transport["path"] = path;
if (!host.isEmpty()) transport["host"] = QList2QJsonArray(host.split(",")); if (!host.isEmpty()) transport["host"] = QList2QJsonArray(host.split(","));

15
fmt/Bean2CoreObj_ray.cpp
View File

@@ -13,12 +13,25 @@ namespace NekoRay::fmt {
if (network == "ws") { if (network == "ws") {
QJsonObject ws; QJsonObject ws;
if (!path.isEmpty()) ws["path"] = path;
if (!host.isEmpty()) ws["headers"] = QJsonObject{{"Host", host}}; if (!host.isEmpty()) ws["headers"] = QJsonObject{{"Host", host}};
// ws path & ed
auto pathWithoutEd = SubStrBefore(path, "?ed=");
if (!pathWithoutEd.isEmpty()) ws["path"] = pathWithoutEd;
if (pathWithoutEd != path) {
auto ed = SubStrAfter(path, "?ed=").toInt();
if (ed > 0) {
ws["maxEarlyData"] = ed;
ws["earlyDataHeaderName"] = "Sec-WebSocket-Protocol";
}
}
if (ws_early_data_length > 0) { if (ws_early_data_length > 0) {
ws["maxEarlyData"] = ws_early_data_length; ws["maxEarlyData"] = ws_early_data_length;
if (ws_early_data_name.isEmpty()) {
ws["earlyDataHeaderName"] = "Sec-WebSocket-Protocol";
} else {
ws["earlyDataHeaderName"] = ws_early_data_name; ws["earlyDataHeaderName"] = ws_early_data_name;
} }
}
streamSettings["wsSettings"] = ws; streamSettings["wsSettings"] = ws;
} else if (network == "http") { } else if (network == "http") {
QJsonObject http; QJsonObject http;