feat(nekobox): add hop port for hysteria2

fmt/Bean2CoreObj_box.cpp

@@ -197,14 +197,22 @@ namespace NekoGui_fmt {
  outbound["up_mbps"] = uploadMbps;
  outbound["down_mbps"] = downloadMbps;
 
- if (!hopPort.trimmed().isEmpty()) outbound["hop_ports"] = hopPort;
+ if (!hopPort.trimmed().isEmpty()) {
+ outbound["hop_ports"] = hopPort;
+ outbound["hop_interval"] = hopInterval;
+ }
  if (authPayloadType == hysteria_auth_base64) outbound["auth"] = authPayload;
  if (authPayloadType == hysteria_auth_string) outbound["auth_str"] = authPayload;
  } else if (proxy_type == proxy_Hysteria2) {
  outbound["type"] = "hysteria2";
  outbound["password"] = password;
  outbound["up_mbps"] = uploadMbps;
  outbound["down_mbps"] = downloadMbps;
+
+ if (!hopPort.trimmed().isEmpty()) {
+ outbound["hop_ports"] = hopPort;
+ outbound["hop_interval"] = hopInterval;
+ }
  if (!obfsPassword.isEmpty()) {
  outbound["obfs"] = QJsonObject{
  {"type", "salamander"},

fmt/Bean2External.cpp

@@ -52,7 +52,7 @@ namespace NekoGui_fmt {
 
  auto hysteria2Core = [=] {
  if (isFirstProfile) {
- if (NekoGui::dataStore->spmode_vpn || !hopPort.trimmed().isEmpty()) {
+ if (NekoGui::dataStore->spmode_vpn) {
  return 1;
  }
  return 2;

go/cmd/nekobox_core/go.mod

@@ -19,7 +19,7 @@ require (
  github.com/cloudflare/circl v1.3.3 // indirect
  github.com/cretz/bine v0.2.0 // indirect
  github.com/dustin/go-humanize v1.0.1 // indirect
- github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/fsnotify/fsnotify v1.7.0 // indirect
  github.com/go-chi/chi/v5 v5.0.10 // indirect
  github.com/go-chi/cors v1.2.1 // indirect
  github.com/go-chi/render v1.0.3 // indirect
@@ -48,21 +48,21 @@ require (
  github.com/pierrec/lz4/v4 v4.1.14 // indirect
  github.com/quic-go/qpack v0.4.0 // indirect
  github.com/quic-go/qtls-go1-20 v0.3.4 // indirect
- github.com/sagernet/bbolt v0.0.0-20231008142710-b2d6e2f20458 // indirect
+ github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a // indirect
  github.com/sagernet/cloudflare-tls v0.0.0-20230829051644-4a68352d0c4a // indirect
  github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 // indirect
  github.com/sagernet/gvisor v0.0.0-20230930141345-5fef6f2e17ab // indirect
  github.com/sagernet/netlink v0.0.0-20220905062125-8043b4a9aa97 // indirect
  github.com/sagernet/quic-go v0.0.0-20231008035953-32727fef9460 // indirect
  github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 // indirect
- github.com/sagernet/sing v0.2.14-0.20231011041941-e4d9384bcd84 // indirect
+ github.com/sagernet/sing v0.2.15-0.20231021090846-8002db54c028 // indirect
  github.com/sagernet/sing-dns v0.1.10 // indirect
  github.com/sagernet/sing-mux v0.1.3 // indirect
- github.com/sagernet/sing-quic v0.1.3-0.20231011042217-13b8d0b8f74b // indirect
+ github.com/sagernet/sing-quic v1.0.0 // indirect
  github.com/sagernet/sing-shadowsocks v0.2.5 // indirect
  github.com/sagernet/sing-shadowsocks2 v0.1.4 // indirect
  github.com/sagernet/sing-shadowtls v0.1.4 // indirect
- github.com/sagernet/sing-tun v0.1.16-0.20231006112722-19cc8b9e81aa // indirect
+ github.com/sagernet/sing-tun v0.1.16-0.20231022145846-fe9891a78413 // indirect
  github.com/sagernet/sing-vmess v0.1.8 // indirect
  github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 // indirect
  github.com/sagernet/tfo-go v0.0.0-20230816093905-5a5c285d44a6 // indirect
@@ -81,7 +81,7 @@ require (
  golang.org/x/crypto v0.14.0 // indirect
  golang.org/x/exp v0.0.0-20231005195138-3e424a577f31 // indirect
  golang.org/x/mod v0.12.0 // indirect
- golang.org/x/net v0.16.0 // indirect
+ golang.org/x/net v0.17.0 // indirect
  golang.org/x/sys v0.13.0 // indirect
  golang.org/x/text v0.13.0 // indirect
  golang.org/x/time v0.3.0 // indirect
@@ -101,6 +101,8 @@ replace github.com/matsuridayo/sing-box-extra => ../../../../sing-box-extra
 
 replace github.com/sagernet/sing-box => ../../../../sing-box
 
+replace github.com/sagernet/sing-quic => ../../../../sing-quic
+
 // replace github.com/sagernet/sing => ../../../../sing
 
 // replace github.com/sagernet/sing-dns => ../../../../sing-dns

go/cmd/nekobox_core/go.sum

@@ -33,8 +33,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
 github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
@@ -120,8 +120,8 @@ github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1
 github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg=
 github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/sagernet/bbolt v0.0.0-20231008142710-b2d6e2f20458 h1:7NXD6FUQucBklrw/TLCqeAARyFuoK9fD5iJ+Y/EHHBQ=
-github.com/sagernet/bbolt v0.0.0-20231008142710-b2d6e2f20458/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
+github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a h1:+NkI2670SQpQWvkkD2QgdTuzQG263YZ+2emfpeyGqW0=
+github.com/sagernet/bbolt v0.0.0-20231014093535-ea5cb2fe9f0a/go.mod h1:63s7jpZqcDAIpj8oI/1v4Izok+npJOHACFCU6+huCkM=
 github.com/sagernet/cloudflare-tls v0.0.0-20230829051644-4a68352d0c4a h1:wZHruBxZCsQLXHAozWpnJBL3wJ/XufDpz0qKtgpSnA4=
 github.com/sagernet/cloudflare-tls v0.0.0-20230829051644-4a68352d0c4a/go.mod h1:dNV1ZP9y3qx5ltULeKaQZTZWTLHflgW5DES+Ses7cMI=
 github.com/sagernet/go-tun2socks v1.16.12-0.20220818015926-16cb67876a61 h1:5+m7c6AkmAylhauulqN/c5dnh8/KssrE9c93TQrXldA=
@@ -136,22 +136,20 @@ github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byL
 github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU=
 github.com/sagernet/sing v0.0.0-20220817130738-ce854cda8522/go.mod h1:QVsS5L/ZA2Q5UhQwLrn0Trw+msNd/NPGEhBKR/ioWiY=
 github.com/sagernet/sing v0.1.8/go.mod h1:jt1w2u7lJQFFSGLiRrRIs5YWmx4kAPfWuOejuDW9qMk=
-github.com/sagernet/sing v0.2.14-0.20231011041941-e4d9384bcd84 h1:bPpV5QTOm6s9oJUCdfInImOgsWueoZWaJ7IpRkZuEsk=
-github.com/sagernet/sing v0.2.14-0.20231011041941-e4d9384bcd84/go.mod h1:AhNEHu0GXrpqkuzvTwvC8+j2cQUU/dh+zLEmq4C99pg=
+github.com/sagernet/sing v0.2.15-0.20231021090846-8002db54c028 h1:KRTzVdo7UPsygO235wsB705z6oWEM/L9HEJMOh4AsGI=
+github.com/sagernet/sing v0.2.15-0.20231021090846-8002db54c028/go.mod h1:AhNEHu0GXrpqkuzvTwvC8+j2cQUU/dh+zLEmq4C99pg=
 github.com/sagernet/sing-dns v0.1.10 h1:iIU7nRBlUYj+fF2TaktGIvRiTFFrHwSMedLQsvlTZCI=
 github.com/sagernet/sing-dns v0.1.10/go.mod h1:vtUimtf7Nq9EdvD5WTpfCr69KL1M7bcgOVKiYBiAY/c=
 github.com/sagernet/sing-mux v0.1.3 h1:fAf7PZa2A55mCeh0KKM02f1k2Y4vEmxuZZ/51ahkkLA=
 github.com/sagernet/sing-mux v0.1.3/go.mod h1:wGeIeiiFLx4HUM5LAg65wrNZ/X1muOimqK0PEhNbPi0=
-github.com/sagernet/sing-quic v0.1.3-0.20231011042217-13b8d0b8f74b h1:u95u1icfN2Ya7FTkuWfyNrC4llMn8AYwD+ZsGkVWkac=
-github.com/sagernet/sing-quic v0.1.3-0.20231011042217-13b8d0b8f74b/go.mod h1:1M7xP4802K9Kz6BQ7LlA7UeCapWvWlH1Htmk2bAqkWc=
 github.com/sagernet/sing-shadowsocks v0.2.5 h1:qxIttos4xu6ii7MTVJYA8EFQR7Q3KG6xMqmLJIFtBaY=
 github.com/sagernet/sing-shadowsocks v0.2.5/go.mod h1:MGWGkcU2xW2G2mfArT9/QqpVLOGU+dBaahZCtPHdt7A=
 github.com/sagernet/sing-shadowsocks2 v0.1.4 h1:vht2M8t3m5DTgXR2j24KbYOygG5aOp+MUhpQnAux728=
 github.com/sagernet/sing-shadowsocks2 v0.1.4/go.mod h1:Mgdee99NxxNd5Zld3ixIs18yVs4x2dI2VTDDE1N14Wc=
 github.com/sagernet/sing-shadowtls v0.1.4 h1:aTgBSJEgnumzFenPvc+kbD9/W0PywzWevnVpEx6Tw3k=
 github.com/sagernet/sing-shadowtls v0.1.4/go.mod h1:F8NBgsY5YN2beQavdgdm1DPlhaKQlaL6lpDdcBglGK4=
-github.com/sagernet/sing-tun v0.1.16-0.20231006112722-19cc8b9e81aa h1:lQVFeYJ916CXunKB3JrsOQqCtT16OAitMXw8Z0lRNvY=
-github.com/sagernet/sing-tun v0.1.16-0.20231006112722-19cc8b9e81aa/go.mod h1:d5kKDDW3I8Tr1OSWNaHXzrnsg1LbOx9sYVx83cHPhm8=
+github.com/sagernet/sing-tun v0.1.16-0.20231022145846-fe9891a78413 h1:0jLVkf1w93i0qns6UA5tzu2NblDLZ2L4uaG2nnDQfwI=
+github.com/sagernet/sing-tun v0.1.16-0.20231022145846-fe9891a78413/go.mod h1:aDReDW4yL0AzGDyH1fMvv8gKbJC/e4u4qi01oO+Zf2w=
 github.com/sagernet/sing-vmess v0.1.8 h1:XVWad1RpTy9b5tPxdm5MCU8cGfrTGdR8qCq6HV2aCNc=
 github.com/sagernet/sing-vmess v0.1.8/go.mod h1:vhx32UNzTDUkNwOyIjcZQohre1CaytquC5mPplId8uA=
 github.com/sagernet/smux v0.0.0-20230312102458-337ec2a5af37 h1:HuE6xSwco/Xed8ajZ+coeYLmioq0Qp1/Z2zczFaV8as=
@@ -228,8 +226,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
-golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -250,7 +248,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=

libs/get_source_env.sh

@@ -1,5 +1,5 @@
 if [ ! -z $ENV_NEKORAY ]; then
- export COMMIT_SING_BOX_EXTRA="f95483a6bfe3894efdf917f4ccceac8c0aec1693"
+ export COMMIT_SING_BOX_EXTRA="551b4c76cf9d69d24361cf9148b3b2a3f75401ca"
  export COMMIT_MATSURI_XRAY="01208225ee7e508044cca8eb6776a117bcecd997"
 fi
 

ui/edit/edit_quic.cpp

@@ -79,10 +79,6 @@ void EditQUIC::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
  ui->TLS->removeItem(ui->alpn_sp);
  if (IS_NEKO_BOX) {
  ui->disableMtuDiscovery->hide();
- ui->hopInterval->hide();
- ui->hopInterval_l->hide();
- ui->hopPort->hide();
- ui->hopPort_l->hide();
  ui->connectionReceiveWindow->hide();
  ui->connectionReceiveWindow_l->hide();
  ui->streamReceiveWindow->hide();