Merge remote-tracking branch 'origin/Beta' into Meta

.github/workflows/build.yaml

@@ -5,12 +5,14 @@ jobs:
  build:
  runs-on: ubuntu-latest
  steps:
- - name: Set up Go
- uses: actions/setup-go@v1
+ - name: Check out code into the Go module directory
+ uses: actions/checkout@v3
+ - name: Setup Go
+ uses: actions/setup-go@v3
  with:
- go-version: 1.18
- - name: Check out code
- uses: actions/checkout@v1
+ go-version: '1.19'
+  check-latest: true
+  cache: true
  - name: Build
  run: make all
  - name: Release

.github/workflows/prerelease.yml

@@ -13,26 +13,15 @@ jobs:
  Build:
  runs-on: ubuntu-latest
  steps:
- - name: Get latest go version
- id: version
- run: |
- echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- - name: Setup Go
- uses: actions/setup-go@v3
- with:
- go-version: ${{ steps.version.outputs.go_version }}
-
  - name: Check out code into the Go module directory
  uses: actions/checkout@v3
 
- - name: Cache go module
- uses: actions/cache@v2
+ - name: Setup Go
+ uses: actions/setup-go@v3
  with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
-
+ go-version: '1.19'
+ check-latest: true
+ cache: true
 
  - name: Test
  if: ${{github.ref_name=='Beta'}}

.github/workflows/release.yaml

@@ -7,24 +7,16 @@ jobs:
  Build:
  runs-on: ubuntu-latest
  steps:
- - name: Get latest go version
- id: version
- run: |
- echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- - name: Setup Go
- uses: actions/setup-go@v2
- with:
- go-version: ${{ steps.version.outputs.go_version }}
-
  - name: Check out code into the Go module directory
  uses: actions/checkout@v3
- - name: Cache go module
- uses: actions/cache@v2
+
+ - name: Setup Go
+ uses: actions/setup-go@v3
  with:
- path: ~/go/pkg/mod
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- restore-keys: |
- ${{ runner.os }}-go-
+ go-version: '1.19'
+ check-latest: true
+ cache: true
+
  - name: Test
  run: |
  go test ./...

.golangci.yaml

@@ -8,9 +8,10 @@ linters:
 
 linters-settings:
  gci:
+ custom-order: true
  sections:
  - standard
  - prefix(github.com/Dreamacro/clash)
  - default
  staticcheck:
- go: '1.18'
+ go: '1.19'

README.md

@@ -232,6 +232,43 @@ proxies:
  grpc-service-name: grpcname
 ```
 
+
+Support outbound transport protocol `Wireguard`
+```yaml
+proxies:
+ - name: "wg"
+ type: wireguard
+ server: 162.159.192.1
+ port: 2480
+ ip: 172.16.0.2
+ ipv6: fd01:5ca1:ab1e:80fa:ab85:6eea:213f:f4a5
+ private-key: eCtXsJZ27+4PbhDkHnB923tkUn2Gj59wZw5wFA75MnU=
+ public-key: Cr8hWlKvtDt7nrvf+f0brNQQzabAqrjfBvas9pmowjo=
+ udp: true
+```
+
+Support outbound transport protocol `Tuic`
+```yaml
+proxies:
+ - name: "tuic"
+ server: www.example.com
+ port: 10443
+ type: tuic
+ token: TOKEN
+ # ip: 127.0.0.1 # for overwriting the DNS lookup result of the server address set in option 'server'
+ # heartbeat-interval: 10000
+ # alpn: [h3]
+ # disable-sni: true
+ reduce-rtt: true
+ # request-timeout: 8000
+ udp-relay-mode: native # Available: "native", "quic". Default: "native"
+ # congestion-controller: bbr # Available: "cubic", "new_reno", "bbr". Default: "cubic"
+ # max-udp-relay-packet-size: 1500
+ # fast-open: true
+ # skip-cert-verify: true
+
+```
+
 ### IPTABLES configuration
 Work on Linux OS who's supported `iptables`
 
@@ -306,6 +343,7 @@ the [GitHub Wiki](https://github.com/Dreamacro/clash/wiki/use-clash-as-a-library
 ## Credits
 
 * [Dreamacro/clash](https://github.com/Dreamacro/clash)
+* [SagerNet/sing-box](https://github.com/SagerNet/sing-box)
 * [riobard/go-shadowsocks2](https://github.com/riobard/go-shadowsocks2)
 * [v2ray/v2ray-core](https://github.com/v2ray/v2ray-core)
 * [WireGuard/wireguard-go](https://github.com/WireGuard/wireguard-go)

adapter/adapter.go

@@ -92,6 +92,7 @@ func (p *Proxy) MarshalJSON() ([]byte, error) {
  mapping["history"] = p.DelayHistory()
  mapping["name"] = p.Name()
  mapping["udp"] = p.SupportUDP()
+ mapping["tfo"] = p.SupportTFO()
  return json.Marshal(mapping)
 }
 
@@ -198,10 +199,9 @@ func urlToMetadata(rawURL string) (addr C.Metadata, err error) {
  }
 
  addr = C.Metadata{
- AddrType: C.AtypDomainName,
- Host: u.Hostname(),
- DstIP: netip.Addr{},
- DstPort: port,
+ Host: u.Hostname(),
+ DstIP: netip.Addr{},
+ DstPort: port,
  }
  return
 }

adapter/inbound/addition.go

@@ -0,0 +1,29 @@
+package inbound
+
+import (
+ C "github.com/Dreamacro/clash/constant"
+)
+
+type Addition func(metadata *C.Metadata)
+
+func (a Addition) Apply(metadata *C.Metadata) {
+ a(metadata)
+}
+
+func WithInName(name string) Addition {
+ return func(metadata *C.Metadata) {
+ metadata.InName = name
+ }
+}
+
+func WithSpecialRules(specialRules string) Addition {
+ return func(metadata *C.Metadata) {
+ metadata.SpecialRules = specialRules
+ }
+}
+
+func WithSpecialProxy(specialProxy string) Addition {
+ return func(metadata *C.Metadata) {
+ metadata.SpecialProxy = specialProxy
+ }
+}

adapter/inbound/http.go

@@ -9,13 +9,20 @@ import (
 )
 
 // NewHTTP receive normal http request and return HTTPContext
-func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn) *context.ConnContext {
+func NewHTTP(target socks5.Addr, source net.Addr, conn net.Conn, additions ...Addition) *context.ConnContext {
  metadata := parseSocksAddr(target)
  metadata.NetWork = C.TCP
  metadata.Type = C.HTTP
+ for _, addition := range additions {
+ addition.Apply(metadata)
+ }
  if ip, port, err := parseAddr(source.String()); err == nil {
  metadata.SrcIP = ip
  metadata.SrcPort = port
  }
+ if ip, port, err := parseAddr(conn.LocalAddr().String()); err == nil {
+ metadata.InIP = ip
+ metadata.InPort = port
+ }
  return context.NewConnContext(conn, metadata)
 }

adapter/inbound/https.go

@@ -9,12 +9,19 @@ import (
 )
 
 // NewHTTPS receive CONNECT request and return ConnContext
-func NewHTTPS(request *http.Request, conn net.Conn) *context.ConnContext {
+func NewHTTPS(request *http.Request, conn net.Conn, additions ...Addition) *context.ConnContext {
  metadata := parseHTTPAddr(request)
  metadata.Type = C.HTTPS
+ for _, addition := range additions {
+ addition.Apply(metadata)
+ }
  if ip, port, err := parseAddr(conn.RemoteAddr().String()); err == nil {
  metadata.SrcIP = ip
  metadata.SrcPort = port
  }
+ if ip, port, err := parseAddr(conn.LocalAddr().String()); err == nil {
+ metadata.InIP = ip
+ metadata.InPort = port
+ }
  return context.NewConnContext(conn, metadata)
 }

adapter/inbound/listen.go

@@ -0,0 +1,26 @@
+package inbound
+
+import (
+ "context"
+ "net"
+
+ "github.com/database64128/tfo-go/v2"
+)
+
+var (
+ lc = tfo.ListenConfig{
+ DisableTFO: true,
+ }
+)
+
+func SetTfo(open bool) {
+ lc.DisableTFO = !open
+}
+
+func ListenContext(ctx context.Context, network, address string) (net.Listener, error) {
+ return lc.Listen(ctx, network, address)
+}
+
+func Listen(network, address string) (net.Listener, error) {
+ return ListenContext(context.Background(), network, address)
+}

adapter/inbound/packet.go

@@ -17,17 +17,26 @@ func (s *PacketAdapter) Metadata() *C.Metadata {
 }
 
 // NewPacket is PacketAdapter generator
-func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type) *PacketAdapter {
+func NewPacket(target socks5.Addr, packet C.UDPPacket, source C.Type, additions ...Addition) C.PacketAdapter {
  metadata := parseSocksAddr(target)
  metadata.NetWork = C.UDP
  metadata.Type = source
+ for _, addition := range additions {
+ addition.Apply(metadata)
+ }
  if ip, port, err := parseAddr(packet.LocalAddr().String()); err == nil {
  metadata.SrcIP = ip
  metadata.SrcPort = port
  }
+ if p, ok := packet.(C.UDPPacketInAddr); ok {
+ if ip, port, err := parseAddr(p.InAddr().String()); err == nil {
+ metadata.InIP = ip
+ metadata.InPort = port
+ }
+ }
 
  return &PacketAdapter{
- UDPPacket: packet,
- metadata: metadata,
+ packet,
+ metadata,
  }
 }

adapter/inbound/socket.go

@@ -10,18 +10,31 @@ import (
 )
 
 // NewSocket receive TCP inbound and return ConnContext
-func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext {
+func NewSocket(target socks5.Addr, conn net.Conn, source C.Type, additions ...Addition) *context.ConnContext {
  metadata := parseSocksAddr(target)
  metadata.NetWork = C.TCP
  metadata.Type = source
+ for _, addition := range additions {
+ addition.Apply(metadata)
+ }
+
  remoteAddr := conn.RemoteAddr()
+
  // Filter when net.Addr interface is nil
  if remoteAddr != nil {
  if ip, port, err := parseAddr(remoteAddr.String()); err == nil {
  metadata.SrcIP = ip
  metadata.SrcPort = port
  }
  }
+ localAddr := conn.LocalAddr()
+ // Filter when net.Addr interface is nil
+ if localAddr != nil {
+ if ip, port, err := parseAddr(localAddr.String()); err == nil {
+ metadata.InIP = ip
+ metadata.InPort = port
+ }
+ }
 
  return context.NewConnContext(conn, metadata)
 }
@@ -32,17 +45,12 @@ func NewInner(conn net.Conn, dst string, host string) *context.ConnContext {
  metadata.Type = C.INNER
  metadata.DNSMode = C.DNSMapping
  metadata.Host = host
- metadata.AddrType = C.AtypDomainName
  metadata.Process = C.ClashName
  if h, port, err := net.SplitHostPort(dst); err == nil {
  metadata.DstPort = port
  if host == "" {
  if ip, err := netip.ParseAddr(h); err == nil {
  metadata.DstIP = ip
- metadata.AddrType = C.AtypIPv4
- if ip.Is6() {
- metadata.AddrType = C.AtypIPv6
- }
  }
  }
  }

adapter/inbound/util.go

@@ -13,9 +13,7 @@ import (
 )
 
 func parseSocksAddr(target socks5.Addr) *C.Metadata {
- metadata := &C.Metadata{
- AddrType: int(target[0]),
- }
+ metadata := &C.Metadata{}
 
  switch target[0] {
  case socks5.AtypDomainName:
@@ -45,21 +43,14 @@ func parseHTTPAddr(request *http.Request) *C.Metadata {
  host = strings.TrimRight(host, ".")
 
  metadata := &C.Metadata{
- NetWork: C.TCP,
- AddrType: C.AtypDomainName,
- Host: host,
- DstIP: netip.Addr{},
- DstPort: port,
+ NetWork: C.TCP,
+ Host: host,
+ DstIP: netip.Addr{},
+ DstPort: port,
  }
 
  ip, err := netip.ParseAddr(host)
  if err == nil {
- switch {
- case ip.Is6():
- metadata.AddrType = C.AtypIPv6
- default:
- metadata.AddrType = C.AtypIPv4
- }
  metadata.DstIP = ip
  }