diff --git a/fmt/Link2Bean.cpp b/fmt/Link2Bean.cpp index a5f4725..792ad18 100644 --- a/fmt/Link2Bean.cpp +++ b/fmt/Link2Bean.cpp @@ -239,7 +239,7 @@ namespace NekoGui_fmt { // https://hysteria.network/docs/uri-scheme/ if (!query.hasQueryItem("upmbps") || !query.hasQueryItem("downmbps")) return false; - name = url.fragment(); + name = url.fragment(QUrl::FullyDecoded); serverAddress = url.host(); serverPort = url.port(); hopPort = query.queryItemValue("mport"); @@ -269,7 +269,7 @@ namespace NekoGui_fmt { // by daeuniverse // https://github.com/daeuniverse/dae/discussions/182 - name = url.fragment(); + name = url.fragment(QUrl::FullyDecoded); serverAddress = url.host(); if (serverPort == -1) serverPort = 443; serverPort = url.port(); @@ -284,7 +284,7 @@ namespace NekoGui_fmt { allowInsecure = query.queryItemValue("allow_insecure") == "1"; disableSni = query.queryItemValue("disable_sni") == "1"; } else if (QStringList{"hy2", "hysteria2"}.contains(url.scheme())) { - name = url.fragment(); + name = url.fragment(QUrl::FullyDecoded); serverAddress = url.host(); serverPort = url.port(); // hopPort = query.queryItemValue("mport"); diff --git a/go/cmd/nekobox_core/go.mod b/go/cmd/nekobox_core/go.mod index 36798a5..4cbae2d 100644 --- a/go/cmd/nekobox_core/go.mod +++ b/go/cmd/nekobox_core/go.mod @@ -61,7 +61,7 @@ require ( 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.15-0.20230930170051-6cfee41a5684 // indirect + github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b // 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 diff --git a/go/cmd/nekobox_core/go.sum b/go/cmd/nekobox_core/go.sum index 0d094fb..5582c79 100644 --- a/go/cmd/nekobox_core/go.sum +++ b/go/cmd/nekobox_core/go.sum @@ -148,8 +148,8 @@ github.com/sagernet/sing-shadowsocks2 v0.1.4 h1:vht2M8t3m5DTgXR2j24KbYOygG5aOp+M 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.15-0.20230930170051-6cfee41a5684 h1:F4cEIq+UpXxFoprR1xpC0mAMvPI8Jky6MfVPktFZ9yE= -github.com/sagernet/sing-tun v0.1.15-0.20230930170051-6cfee41a5684/go.mod h1:D+13Yc2j9CJ/EP25hs0vHn4kgH9JVfe0PIpdZwIbYZs= +github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b h1:lg4ddG9BaVVsLAx4972MefhLI7xYlTuE6q7SHK9nLfU= +github.com/sagernet/sing-tun v0.1.15-0.20231003035000-3ae726d9f02b/go.mod h1:D+13Yc2j9CJ/EP25hs0vHn4kgH9JVfe0PIpdZwIbYZs= 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= diff --git a/libs/get_source_env.sh b/libs/get_source_env.sh index e7ed879..885e762 100644 --- a/libs/get_source_env.sh +++ b/libs/get_source_env.sh @@ -1,5 +1,5 @@ if [ ! -z $ENV_NEKORAY ]; then - export COMMIT_SING_BOX_EXTRA="6cc2ef25bff24703c46da1a000d201413d697db6" + export COMMIT_SING_BOX_EXTRA="363f419392f51d8f70d8ecf6af2622a771cdcae3" export COMMIT_MATSURI_XRAY="01208225ee7e508044cca8eb6776a117bcecd997" fi