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

Support hysteria2

Browse Source
This commit is contained in:
arm64v8a
2023-09-06 18:45:20 +09:00
parent 9efde1a59e
commit 29c618581e
12 changed files with 109 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fmt/Bean2CoreObj_box.cpp
View File

@@ -202,7 +202,7 @@ namespace NekoGui_fmt {
if (authPayloadType == hysteria_auth_string) outbound["auth_str"] = authPayload;
} else if (proxy_type == proxy_Hysteria2) {
outbound["type"] = "hysteria2";
outbound["password"] = authPayload;
outbound["password"] = password;
outbound["up_mbps"] = uploadMbps;
outbound["down_mbps"] = downloadMbps;
if (!obfsPassword.isEmpty()) {

6
fmt/Bean2External.cpp
View File

@@ -198,11 +198,7 @@ namespace NekoGui_fmt {
{"listen", "127.0.0.1:" + Int2String(socks_port)},
{"disableUDP", false},
};
if (username.isEmpty()) {
config["auth"] = authPayload;
} else {
config["auth"] = username + ":" + authPayload;
}
config["auth"] = password;
QJsonObject bandwidth;
if (uploadMbps > 0) bandwidth["up"] = Int2String(uploadMbps) + " mbps";

20
fmt/Bean2Link.cpp
View File

@@ -214,6 +214,26 @@ namespace NekoGui_fmt {
if (disableSni) q.addQueryItem("disable_sni", "1");
if (!q.isEmpty()) url.setQuery(q);
if (!name.isEmpty()) url.setFragment(name);
} else if (proxy_type == proxy_Hysteria2) {
url.setScheme("hy2");
url.setHost(serverAddress);
url.setPort(serverPort);
if (password.contains(":")) {
url.setUserName(SubStrBefore(password, ":"));
url.setPassword(SubStrAfter(password, ":"));
} else {
url.setUserName(password);
}
QUrlQuery q;
if (!obfsPassword.isEmpty()) {
q.addQueryItem("obfs", "salamander");
q.addQueryItem("obfs-password", obfsPassword);
}
// if (!hopPort.trimmed().isEmpty()) q.addQueryItem("mport", hopPort);
if (allowInsecure) q.addQueryItem("insecure", "1");
if (!sni.isEmpty()) q.addQueryItem("sni", sni);
if (!q.isEmpty()) url.setQuery(q);
if (!name.isEmpty()) url.setFragment(name);
}
return url.toString(QUrl::FullyEncoded);
}

18
fmt/Link2Bean.cpp
View File

@@ -233,10 +233,9 @@ namespace NekoGui_fmt {
name = url.fragment();
serverAddress = url.host();
serverPort = url.port();
serverAddress = url.host(); // default sni
hopPort = query.queryItemValue("mport");
obfsPassword = query.queryItemValue("obfsParam");
allowInsecure = query.queryItemValue("insecure") == "1";
allowInsecure = QStringList{"1", "true"}.contains(query.queryItemValue("insecure"));
uploadMbps = query.queryItemValue("upmbps").toInt();
downloadMbps = query.queryItemValue("downmbps").toInt();
@@ -275,6 +274,21 @@ namespace NekoGui_fmt {
udpRelayMode = query.queryItemValue("udp_relay_mode");
allowInsecure = query.queryItemValue("allow_insecure") == "1";
disableSni = query.queryItemValue("disable_sni") == "1";
} else if (QStringList{"hy2", "hysteria2"}.contains(url.scheme())) {
name = url.fragment();
serverAddress = url.host();
serverPort = url.port();
// hopPort = query.queryItemValue("mport");
obfsPassword = query.queryItemValue("obfs-password");
allowInsecure = QStringList{"1", "true"}.contains(query.queryItemValue("insecure"));
if (url.password().isEmpty()) {
password = url.userName();
} else {
password = url.userName() + ":" + url.password();
}
sni = query.queryItemValue("sni");
}
return true;

27
fmt/QUICBean.hpp
View File

@@ -12,7 +12,7 @@ namespace NekoGui_fmt {
bool forceExternal = false;
// Hysteria
// Hysteria 1
static constexpr int hysteria_protocol_udp = 0;
static constexpr int hysteria_protocol_facktcp = 1;
@@ -23,8 +23,10 @@ namespace NekoGui_fmt {
static constexpr int hysteria_auth_string = 1;
static constexpr int hysteria_auth_base64 = 2;
int authPayloadType = 0;
QString authPayload = "";
// Hysteria 1&2
QString obfsPassword = "";
int uploadMbps = 100;
@@ -37,19 +39,19 @@ namespace NekoGui_fmt {
int hopInterval = 10;
QString hopPort = "";
// Hysteria 2 (Something same as hy1)
QString username = "";
// TUIC
QString uuid = "";
QString password = "";
QString congestionControl = "bbr";
QString udpRelayMode = "native";
bool zeroRttHandshake = false;
QString heartbeat = "10s";
bool uos = false;
// HY2&TUIC
QString password = "";
// TLS
bool allowInsecure = false;
@@ -76,9 +78,8 @@ namespace NekoGui_fmt {
} else { // hy2
uploadMbps = 0;
downloadMbps = 0;
_add(new configItem("username", &username, itemType::string));
_add(new configItem("password", &password, itemType::string));
}
} else if (proxy_type == proxy_TUIC) {
_add(new configItem("uuid", &uuid, itemType::string));
_add(new configItem("password", &password, itemType::string));
@@ -114,7 +115,15 @@ namespace NekoGui_fmt {
}
}
QString DisplayType() override { return proxy_type == proxy_TUIC ? "TUIC" : "Hysteria"; };
QString DisplayType() override {
if (proxy_type == proxy_TUIC) {
return "TUIC";
} else if (proxy_type == proxy_Hysteria) {
return "Hysteria1";
} else {
return "Hysteria2";
}
};
int NeedExternal(bool isFirstProfile) override;

10
sub/GroupUpdater.cpp
View File

@@ -124,7 +124,7 @@ namespace NekoGui_sub {
if (!ok) return;
}
// Hysteria
// Hysteria1
if (str.startsWith("hysteria://")) {
needFix = false;
ent = NekoGui::ProfileManager::NewProxyEntity("hysteria");
@@ -132,6 +132,14 @@ namespace NekoGui_sub {
if (!ok) return;
}
// Hysteria2
if (str.startsWith("hysteria2://") || str.startsWith("hy2://")) {
needFix = false;
ent = NekoGui::ProfileManager::NewProxyEntity("hysteria2");
auto ok = ent->QUICBean()->TryParseLink(str);
if (!ok) return;
}
// TUIC
if (str.startsWith("tuic://")) {
needFix = false;

4
translations/fa_IR.ts
View File

@@ -972,10 +972,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>UDP Relay Mode</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Username</source>
<translation type="unfinished">نام کاربری</translation>
</message>
<message>
<source>Force use external core</source>
<translation type="unfinished"></translation>

4
translations/ru_RU.ts
View File

@@ -979,10 +979,6 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
<source>UDP Relay Mode</source>
<translation>Режим UDP Relay</translation>
</message>
<message>
<source>Username</source>
<translation type="unfinished">Имя пользователя</translation>
</message>
<message>
<source>Force use external core</source>
<translation type="unfinished"></translation>

4
translations/zh_CN.ts
View File

@@ -980,10 +980,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Disable SNI</source>
<translation>不发送服务器名称指示</translation>
</message>
<message>
<source>Username</source>
<translation>用户名</translation>
</message>
<message>
<source>Force use external core</source>
<translation>强制使用外部核心</translation>

4
ui/edit/dialog_edit_profile.cpp
View File

@@ -120,8 +120,8 @@ DialogEditProfile::DialogEditProfile(const QString &_type, int profileOrGroupId,
LOAD_TYPE("vmess")
LOAD_TYPE("vless")
LOAD_TYPE("naive")
ui->type->addItem("Hysteria1", "hysteria");
ui->type->addItem("Hysteria2", "hysteria2");
LOAD_TYPE("hysteria")
LOAD_TYPE("hysteria2")
LOAD_TYPE("tuic")
ui->type->addItem(tr("Custom (%1 outbound)").arg(software_core_name), "internal");
ui->type->addItem(tr("Custom (%1 config)").arg(software_core_name), "internal-full");

51
ui/edit/edit_quic.cpp
View File

@@ -19,7 +19,6 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
this->ent = _ent;
auto bean = this->ent->QUICBean();
if (bean->proxy_type == NekoGui_fmt::QUICBean::proxy_Hysteria || bean->proxy_type == NekoGui_fmt::QUICBean::proxy_Hysteria2) {
P_LOAD_STRING(hopPort);
P_LOAD_INT(hopInterval);
P_LOAD_INT(uploadMbps);
@@ -29,13 +28,30 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
P_LOAD_STRING(authPayload);
P_LOAD_INT(streamReceiveWindow);
P_LOAD_INT(connectionReceiveWindow);
P_LOAD_BOOL(forceExternal);
P_LOAD_BOOL(forceExternal);
P_LOAD_COMBO_INT(hyProtocol);
P_LOAD_COMBO_INT(authPayloadType);
P_LOAD_STRING(uuid);
P_LOAD_STRING(password);
P_LOAD_COMBO_STRING(congestionControl);
P_LOAD_COMBO_STRING(udpRelayMode);
P_LOAD_BOOL(zeroRttHandshake);
P_LOAD_STRING(heartbeat);
P_LOAD_BOOL(uos);
// TLS
P_LOAD_STRING(sni);
P_LOAD_STRING(alpn);
P_C_LOAD_STRING(caText);
P_LOAD_BOOL(allowInsecure);
P_LOAD_BOOL(disableSni);
if (bean->proxy_type == NekoGui_fmt::QUICBean::proxy_Hysteria || bean->proxy_type == NekoGui_fmt::QUICBean::proxy_Hysteria2) {
ui->uuid->hide();
ui->uuid_l->hide();
ui->uuidgen->hide();
ui->password->hide();
ui->password_l->hide();
ui->congestionControl->hide();
ui->congestionControl_l->hide();
ui->udpRelayMode->hide();
@@ -47,14 +63,9 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
if (!IS_NEKO_BOX) ui->forceExternal->hide();
if (bean->proxy_type == NekoGui_fmt::QUICBean::proxy_Hysteria) { // hy1
P_LOAD_COMBO_INT(hyProtocol);
P_LOAD_COMBO_INT(authPayloadType);
ui->username_l->hide();
ui->username->hide();
ui->password->hide();
ui->password_l->hide();
} else { // hy2
P_LOAD_STRING(username);
ui->hyProtocol->hide();
ui->hyProtocol_l->hide();
ui->hyProtocol->hide();
@@ -79,14 +90,6 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
}
}
} else if (bean->proxy_type == NekoGui_fmt::QUICBean::proxy_TUIC) {
P_LOAD_STRING(uuid);
P_LOAD_STRING(password);
P_LOAD_COMBO_STRING(congestionControl);
P_LOAD_COMBO_STRING(udpRelayMode);
P_LOAD_BOOL(zeroRttHandshake);
P_LOAD_STRING(heartbeat);
P_LOAD_BOOL(uos);
ui->hopPort->hide();
ui->hopPort_l->hide();
ui->hopInterval->hide();
@@ -112,13 +115,6 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
ui->uos->hide();
}
}
// TLS
P_LOAD_STRING(sni);
P_LOAD_STRING(alpn);
P_C_LOAD_STRING(caText);
P_LOAD_BOOL(allowInsecure);
P_LOAD_BOOL(disableSni);
}
bool EditQUIC::onEnd() {
@@ -139,9 +135,6 @@ bool EditQUIC::onEnd() {
P_SAVE_INT(streamReceiveWindow);
P_SAVE_INT(connectionReceiveWindow);
// Hysteria2
P_SAVE_STRING(username);
// TUIC
P_SAVE_STRING(uuid);
P_SAVE_STRING(password);

39
ui/edit/edit_quic.ui
View File

@@ -176,16 +176,20 @@
</item>
<item>
<layout class="QGridLayout" name="obfuscation">
<item row="2" column="1">
<widget class="MyLineEdit" name="obfsPassword"/>
</item>
<item row="2" column="0">
<item row="1" column="0">
<widget class="QLabel" name="obfsPassword_l">
<property name="text">
<string>Obfs Password</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="hyProtocol_l">
<property name="text">
<string>Protocol</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
@@ -222,22 +226,8 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="hyProtocol_l">
<property name="text">
<string>Protocol</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="username_l">
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="MyLineEdit" name="username"/>
<widget class="MyLineEdit" name="obfsPassword"/>
</item>
</layout>
</item>
@@ -262,7 +252,7 @@
<item row="1" column="0">
<widget class="QLabel" name="authPayload_l">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -275,7 +265,7 @@
<item row="3" column="0">
<widget class="QLabel" name="password_l">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -287,12 +277,6 @@
</item>
<item row="2" column="0">
<widget class="QLabel" name="uuid_l">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string notr="true">UUID</string>
</property>
@@ -446,7 +430,6 @@
<tabstop>uos</tabstop>
<tabstop>hyProtocol</tabstop>
<tabstop>disableMtuDiscovery</tabstop>
<tabstop>username</tabstop>
<tabstop>obfsPassword</tabstop>
<tabstop>authPayloadType</tabstop>
<tabstop>authPayload</tabstop>