Northern_Lights/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-23 18:00:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Feat: Add support for httpupgrade transport

Browse Source
This commit is contained in:
Misaka-blog 2023-11-02 15:42:48 +08:00
parent 32ef100cf3
commit 7538075112
7 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fmt/Bean2CoreObj_box.cpp
View File

@ -28,6 +28,9 @@ namespace NekoGui_fmt {
if (!host.isEmpty()) transport["host"] = QList2QJsonArray(host.split(",")); if (!host.isEmpty()) transport["host"] = QList2QJsonArray(host.split(","));
} else if (network == "grpc") { } else if (network == "grpc") {
if (!path.isEmpty()) transport["service_name"] = path; if (!path.isEmpty()) transport["service_name"] = path;
} else if (network == "httpupgrade") {
if (!path.isEmpty()) transport["path"] = path;
if (!host.isEmpty()) transport["host"] = host;
} }
outbound->insert("transport", transport); outbound->insert("transport", transport);
} else if (header_type == "http") { } else if (header_type == "http") {

4
fmt/Bean2Link.cpp
View File

@ -51,7 +51,7 @@ namespace NekoGui_fmt {
// type // type
query.addQueryItem("type", stream->network); query.addQueryItem("type", stream->network);
if (stream->network == "ws" || stream->network == "http") { if (stream->network == "ws" || stream->network == "http" || stream->network == "httpupgrade") {
if (!stream->path.isEmpty()) query.addQueryItem("path", stream->path); if (!stream->path.isEmpty()) query.addQueryItem("path", stream->path);
if (!stream->host.isEmpty()) query.addQueryItem("host", stream->host); if (!stream->host.isEmpty()) query.addQueryItem("host", stream->host);
} else if (stream->network == "grpc") { } else if (stream->network == "grpc") {
@ -152,7 +152,7 @@ namespace NekoGui_fmt {
// type // type
query.addQueryItem("type", stream->network); query.addQueryItem("type", stream->network);
if (stream->network == "ws" || stream->network == "http") { if (stream->network == "ws" || stream->network == "http" || stream->network == "httpupgrade") {
if (!stream->path.isEmpty()) query.addQueryItem("path", stream->path); if (!stream->path.isEmpty()) query.addQueryItem("path", stream->path);
if (!stream->host.isEmpty()) query.addQueryItem("host", stream->host); if (!stream->host.isEmpty()) query.addQueryItem("host", stream->host);
} else if (stream->network == "grpc") { } else if (stream->network == "grpc") {

6
fmt/Link2Bean.cpp
View File

@ -81,6 +81,9 @@ namespace NekoGui_fmt {
} else if (stream->network == "http") { } else if (stream->network == "http") {
stream->path = GetQueryValue(query, "path", ""); stream->path = GetQueryValue(query, "path", "");
stream->host = GetQueryValue(query, "host", "").replace("|", ","); stream->host = GetQueryValue(query, "host", "").replace("|", ",");
} else if (stream->network == "httpupgrade") {
stream->path = GetQueryValue(query, "path", "");
stream->host = GetQueryValue(query, "host", "");
} else if (stream->network == "grpc") { } else if (stream->network == "grpc") {
stream->path = GetQueryValue(query, "serviceName", ""); stream->path = GetQueryValue(query, "serviceName", "");
} else if (stream->network == "tcp") { } else if (stream->network == "tcp") {
@ -199,6 +202,9 @@ namespace NekoGui_fmt {
} else if (stream->network == "http") { } else if (stream->network == "http") {
stream->path = GetQueryValue(query, "path", ""); stream->path = GetQueryValue(query, "path", "");
stream->host = GetQueryValue(query, "host", "").replace("|", ","); stream->host = GetQueryValue(query, "host", "").replace("|", ",");
} else if (stream->network == "httpupgrade") {
stream->path = GetQueryValue(query, "path", "");
stream->host = GetQueryValue(query, "host", "");
} else if (stream->network == "grpc") { } else if (stream->network == "grpc") {
stream->path = GetQueryValue(query, "serviceName", ""); stream->path = GetQueryValue(query, "serviceName", "");
} else if (stream->network == "tcp") { } else if (stream->network == "tcp") {

2
fmt/V2RayStreamSettings.hpp
View File

@ -8,7 +8,7 @@ namespace NekoGui_fmt {
QString network = "tcp"; QString network = "tcp";
QString security = ""; QString security = "";
QString packet_encoding = ""; QString packet_encoding = "";
// ws/http/grpc/tcp-http // ws/http/grpc/tcp-http/httpupgrade
QString path = ""; QString path = "";
QString host = ""; QString host = "";
// kcp/quic/tcp-http // kcp/quic/tcp-http

2
libs/get_source_env.sh
View File

@ -1,5 +1,5 @@
if [ ! -z $ENV_NEKORAY ]; then if [ ! -z $ENV_NEKORAY ]; then
export COMMIT_SING_BOX_EXTRA="2f8e1bdb842ec2138c1699101a84950617c3cbb8" export COMMIT_SING_BOX_EXTRA="b13bae46e9fcd330c26e66caedf5640ba31f4505"
export COMMIT_MATSURI_XRAY="01208225ee7e508044cca8eb6776a117bcecd997" export COMMIT_MATSURI_XRAY="01208225ee7e508044cca8eb6776a117bcecd997"
fi fi

2
ui/edit/dialog_edit_profile.cpp
View File

@ -46,7 +46,7 @@ DialogEditProfile::DialogEditProfile(const QString &_type, int profileOrGroupId,
ui->path_l->setVisible(true); ui->path_l->setVisible(true);
ui->host->setVisible(false); ui->host->setVisible(false);
ui->host_l->setVisible(false); ui->host_l->setVisible(false);
} else if (txt == "ws" || txt == "http") { } else if (txt == "ws" || txt == "http" || txt == "httpupgrade") {
ui->header_type->setVisible(false); ui->header_type->setVisible(false);
ui->header_type_l->setVisible(false); ui->header_type_l->setVisible(false);
ui->path->setVisible(true); ui->path->setVisible(true);

5
ui/edit/dialog_edit_profile.ui
View File

@ -260,6 +260,11 @@
<string notr="true">quic</string> <string notr="true">quic</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string notr="true">httpupgrade</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">