mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-08-02 08:10:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: add meek (#258)

Browse Source 
Co-authored-by: mzz <2017@duck.com>
Co-authored-by: dae-bot[bot] <136105375+dae-bot[bot]@users.noreply.github.com>
This commit is contained in:
秋のかえで
2023-08-06 22:35:23 +08:00
committed by GitHub
parent 7ef8205d41
commit 62ca625aaf
6 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
component/outbound/dialer/v2ray/v2ray.go
View File

@ -17,6 +17,7 @@ import (
"github.com/daeuniverse/softwind/protocol/direct"
"github.com/daeuniverse/softwind/protocol/http"
"github.com/daeuniverse/softwind/transport/grpc"
"github.com/daeuniverse/softwind/transport/meek"
jsoniter "github.com/json-iterator/go"
)
@ -166,6 +167,26 @@ func (s *V2Ray) Dialer(option *dialer.GlobalOption, nextDialer netproxy.Dialer)
if err != nil {
return nil, nil, err
}
case "meek":
if strings.HasPrefix(s.Path, "https://") && s.TLS != "tls" && s.TLS != "utls" {
return nil, nil, fmt.Errorf("%w: meek: tls should be enabled", dialer.InvalidParameterErr)
}
u := url.URL{
Scheme: "meek",
Host: net.JoinHostPort(s.Add, s.Port),
RawQuery: url.Values{
"url": []string{s.Path},
"alpn": []string{s.Alpn},
"serverName": []string{s.SNI},
"skipCertVerify": []string{common.BoolToString(s.AllowInsecure || option.AllowInsecure)},
}.Encode(),
}
d, err = meek.NewDialer(u.String(), d)
if err != nil {
return nil, nil, err
}
default:
return nil, nil, fmt.Errorf("%w: network: %v", dialer.UnexpectedFieldErr, s.Net)
}
@ -213,6 +234,11 @@ func ParseVlessURL(vless string) (data *V2Ray, err error) {
if data.Net == "grpc" {
data.Path = u.Query().Get("serviceName")
}
if data.Net == "meek" {
data.Path = u.Query().Get("url")
}
if data.Type == "" {
data.Type = "none"
}
@ -327,7 +353,10 @@ func (s *V2Ray) ExportToURL() string {
common.SetValue(&query, "path", s.Path)
case "grpc":
common.SetValue(&query, "serviceName", s.Path)
case "meek":
common.SetValue(&query, "url", s.Host)
}
//TODO: QUIC
if s.TLS != "none" {
common.SetValue(&query, "sni", s.Host) // FIXME: it may be different from ws's host