From 451b5a1fd4e06d36a51f5faf9ab3cc9119159ba1 Mon Sep 17 00:00:00 2001 From: Senis John Date: Tue, 27 Dec 2022 16:10:51 +0800 Subject: [PATCH] fix: typo --- api/newV2board/model.go | 12 +++++++----- api/newV2board/v2board.go | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/api/newV2board/model.go b/api/newV2board/model.go index 55c8dd8..e110c5b 100644 --- a/api/newV2board/model.go +++ b/api/newV2board/model.go @@ -1,5 +1,9 @@ package newV2board +import ( + "encoding/json" +) + type serverConfig struct { ServerPort int `json:"server_port"` BaseConfig struct { @@ -20,11 +24,9 @@ type serverConfig struct { // v2ray Network string `json:"network"` NetworkSettings struct { - Path string `json:"path"` - Headers struct { - Host string `json:"Host"` - } `json:"headers"` - ServiceName string `json:"serviceName"` + Path string `json:"path"` + Headers *json.RawMessage `json:"headers"` + ServiceName string `json:"serviceName"` } `json:"networkSettings"` Tls int `json:"tls"` diff --git a/api/newV2board/v2board.go b/api/newV2board/v2board.go index fd92ebb..c2cbff2 100644 --- a/api/newV2board/v2board.go +++ b/api/newV2board/v2board.go @@ -371,22 +371,23 @@ func (c *APIClient) parseV2rayNodeResponse(s *serverConfig) (*api.NodeInfo, erro TLSType = "xtls" } + if s.NetworkSettings.Headers != nil { + if httpHeader, err := s.NetworkSettings.Headers.MarshalJSON(); err != nil { + return nil, err + } else { + header = httpHeader + } + } + switch s.Network { case "ws": path = s.NetworkSettings.Path - host = s.NetworkSettings.Headers.Host + b, _ := simplejson.NewJson(header) + host = b.Get("Host").MustString() case "grpc": if s.NetworkSettings.ServiceName != "" { serviceName = s.NetworkSettings.ServiceName } - case "tcp": - if &s.NetworkSettings.Headers != nil { - if httpHeader, err := json.Marshal(s.NetworkSettings.Headers); err != nil { - return nil, err - } else { - header = httpHeader - } - } } if s.Tls == 1 {