diff --git a/api/panel/node.go b/api/panel/node.go index 6105da3..495f9d5 100644 --- a/api/panel/node.go +++ b/api/panel/node.go @@ -2,7 +2,6 @@ package panel import ( "crypto/sha256" - "encoding/base64" "encoding/hex" "fmt" "reflect" @@ -10,7 +9,6 @@ import ( "strings" "time" - "github.com/InazumaV/V2bX/common/crypt" "github.com/goccy/go-json" ) @@ -186,18 +184,6 @@ func (c *Client) GetNodeInfo() (node *NodeInfo, err error) { cm = &rsp.CommonNode node.VAllss = rsp node.Security = node.VAllss.Tls - if len(rsp.NetworkSettings) > 0 { - err = json.Unmarshal(rsp.NetworkSettings, &rsp.RealityConfig) - if err != nil { - return nil, fmt.Errorf("decode reality config error: %s", err) - } - } - if node.Security == Reality { - if rsp.TlsSettings.PrivateKey == "" { - key := crypt.GenX25519Private([]byte("vless" + c.Token)) - rsp.TlsSettings.PrivateKey = base64.RawURLEncoding.EncodeToString(key) - } - } case "shadowsocks": rsp := &ShadowsocksNode{} err = json.Unmarshal(r.Body(), rsp) diff --git a/core/hy2/node.go b/core/hy2/node.go index 601ca2e..014bc5e 100644 --- a/core/hy2/node.go +++ b/core/hy2/node.go @@ -1,6 +1,8 @@ package hy2 import ( + "strings" + "github.com/InazumaV/V2bX/api/panel" "github.com/InazumaV/V2bX/conf" "github.com/apernet/hysteria/core/v2/server" @@ -56,7 +58,9 @@ func (h *Hysteria2) AddNode(tag string, info *panel.NodeInfo, config *conf.Optio h.Hy2nodes[tag] = n go func() { if err := s.Serve(); err != nil { - h.Logger.Error("Server Error", zap.Error(err)) + if !strings.Contains(err.Error(), "quic: server closed") { + h.Logger.Error("Server Error", zap.Error(err)) + } } }() return nil diff --git a/core/xray/inbound.go b/core/xray/inbound.go index 8dc7338..18d8492 100644 --- a/core/xray/inbound.go +++ b/core/xray/inbound.go @@ -190,7 +190,7 @@ func buildV2ray(config *conf.Options, nodeInfo *panel.NodeInfo, inbound *coreCon return nil } - t := coreConf.TransportProtocol(nodeInfo.VAllss.Network) + t := coreConf.TransportProtocol(v.Network) inbound.StreamSetting = &coreConf.StreamConfig{Network: &t} switch v.Network { case "tcp": @@ -221,12 +221,12 @@ func buildV2ray(config *conf.Options, nodeInfo *panel.NodeInfo, inbound *coreCon case "httpupgrade": err := json.Unmarshal(v.NetworkSettings, &inbound.StreamSetting.HTTPUPGRADESettings) if err != nil { - return fmt.Errorf("unmarshal grpc settings error: %s", err) + return fmt.Errorf("unmarshal httpupgrade settings error: %s", err) } case "splithttp": err := json.Unmarshal(v.NetworkSettings, &inbound.StreamSetting.SplitHTTPSettings) if err != nil { - return fmt.Errorf("unmarshal grpc settings error: %s", err) + return fmt.Errorf("unmarshal splithttp settings error: %s", err) } default: return errors.New("the network type is not vail") diff --git a/go.mod b/go.mod index a6651b8..24ba848 100644 --- a/go.mod +++ b/go.mod @@ -14,12 +14,12 @@ require ( github.com/goccy/go-json v0.10.3 github.com/hashicorp/go-multierror v1.1.1 github.com/juju/ratelimit v1.0.2 - github.com/sagernet/sing v0.5.0-alpha.12 - github.com/sagernet/sing-box v1.10.0 + github.com/sagernet/sing v0.5.0-alpha.12.0.20240717075530-332e47007567 + github.com/sagernet/sing-box v1.10.0-alpha.22 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.15.0 - github.com/xtls/xray-core v1.8.19 + github.com/xtls/xray-core v1.8.21-0.20240720172606-57248d34013e go.uber.org/zap v1.27.0 golang.org/x/crypto v0.25.0 golang.org/x/sys v0.22.0 @@ -273,5 +273,4 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -//github.com/apernet/hysteria/core v1.3.5-0.20240201034858-bb99579bb92c => /root/hysteria/core -replace github.com/sagernet/sing-box v1.10.0 => github.com/wyx2685/sing-box_mod v0.0.9 +replace github.com/sagernet/sing-box v1.10.0-alpha.22 => github.com/wyx2685/sing-box_mod v1.10.0-alpha.22 diff --git a/go.sum b/go.sum index ac5a89b..14859c3 100644 --- a/go.sum +++ b/go.sum @@ -777,8 +777,8 @@ github.com/sagernet/quic-go v0.45.1-beta.2/go.mod h1:+N3FqM9DAzOWfe64uxXuBejVJwX github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691 h1:5Th31OC6yj8byLGkEnIYp6grlXfo1QYUfiYFGjewIdc= github.com/sagernet/reality v0.0.0-20230406110435-ee17307e7691/go.mod h1:B8lp4WkQ1PwNnrVMM6KyuFR20pU8jYBD+A4EhJovEXU= github.com/sagernet/sing v0.2.18/go.mod h1:OL6k2F0vHmEzXz2KW19qQzu172FDgSbUSODylighuVo= -github.com/sagernet/sing v0.5.0-alpha.12 h1:pjffG3SUpuF9PLDCqPO2fOAUozXItIBmnMVTKQ/QMhM= -github.com/sagernet/sing v0.5.0-alpha.12/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= +github.com/sagernet/sing v0.5.0-alpha.12.0.20240717075530-332e47007567 h1:Sus0pCYn5KPOQmArXdRTtrml6XccSzV87FkFTDqATtU= +github.com/sagernet/sing v0.5.0-alpha.12.0.20240717075530-332e47007567/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak= github.com/sagernet/sing-dns v0.3.0-beta.10 h1:Js61EjQXVpcu2VDegWEQTH1isCcVwJju8WEHYgG4tQ0= github.com/sagernet/sing-dns v0.3.0-beta.10/go.mod h1:nXE6EYMXahB5DV3AcXYbFfuorqF7tbQ86kxweSxRKM4= github.com/sagernet/sing-mux v0.2.0 h1:4C+vd8HztJCWNYfufvgL49xaOoOHXty2+EAjnzN3IYo= @@ -941,8 +941,8 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= -github.com/wyx2685/sing-box_mod v0.0.9 h1:xxxPk107vFiAFiD8jOCCAHbNLPJ5Jgq5IJIi1Lil4NI= -github.com/wyx2685/sing-box_mod v0.0.9/go.mod h1:0IErt79whUyLappgPDCSORcDQCP1kubkf9KW6FVqPOk= +github.com/wyx2685/sing-box_mod v1.10.0-alpha.22 h1:3i//NYaaut+RecZAr6rVTxqmtYiU8s61kheBIOmYquE= +github.com/wyx2685/sing-box_mod v1.10.0-alpha.22/go.mod h1:tK9s5GiwC01C4Ap7RuKFchVIIa3Qv6KJGrr5pcX2zGo= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -951,6 +951,8 @@ github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d h1:+B97uD9uHLgAAulhig github.com/xtls/reality v0.0.0-20240712055506-48f0b2d5ed6d/go.mod h1:dm4y/1QwzjGaK17ofi0Vs6NpKAHegZky8qk6J2JJZAE= github.com/xtls/xray-core v1.8.19 h1:mml7smcO2FM5HyyKdqnf5F2BUvi3br2ldrqmeemEFRE= github.com/xtls/xray-core v1.8.19/go.mod h1:0CwyMPNA5Cs+ukPXHbYQGgne/ug0PuXOSVqBu7zyXOc= +github.com/xtls/xray-core v1.8.21-0.20240720172606-57248d34013e h1:kqWViuGYCBLMkIchaA8gaoKcUoy/8Lb5m1b1eETqAmQ= +github.com/xtls/xray-core v1.8.21-0.20240720172606-57248d34013e/go.mod h1:0CwyMPNA5Cs+ukPXHbYQGgne/ug0PuXOSVqBu7zyXOc= github.com/yandex-cloud/go-genproto v0.0.0-20240318083951-4fe6125f286e h1:jLIqA7M9qY31g/Nw/5htVD0DFbxmLnlFZcHKJiG3osI= github.com/yandex-cloud/go-genproto v0.0.0-20240318083951-4fe6125f286e/go.mod h1:HEUYX/p8966tMUHHT+TsS0hF/Ca/NYwqprC5WXSDMfE= github.com/yandex-cloud/go-sdk v0.0.0-20240318084659-dfa50323a0b4 h1:wtzLQJmghkSUb1YkeFphIh7ST7NNVDaVOJZSAJcjMdw=