Improve: config convergent and add log-level

adapters/local/http.go

@@ -0,0 +1,32 @@
+package adapters
+
+import (
+	"net/http"
+
+	C "github.com/Dreamacro/clash/constant"
+)
+
+type HttpAdapter struct {
+	addr *C.Addr
+	R    *http.Request
+	W    http.ResponseWriter
+	done chan struct{}
+}
+
+func (h *HttpAdapter) Close() {
+	h.done <- struct{}{}
+}
+
+func (h *HttpAdapter) Addr() *C.Addr {
+	return h.addr
+}
+
+func NewHttp(host string, w http.ResponseWriter, r *http.Request) (*HttpAdapter, chan struct{}) {
+	done := make(chan struct{})
+	return &HttpAdapter{
+		addr: parseHttpAddr(host),
+		R:    r,
+		W:    w,
+		done: done,
+	}, done
+}

adapters/local/https.go

@@ -0,0 +1,33 @@
+package adapters
+
+import (
+	"bufio"
+	"net"
+
+	C "github.com/Dreamacro/clash/constant"
+)
+
+type HttpsAdapter struct {
+	addr *C.Addr
+	conn net.Conn
+	rw   *bufio.ReadWriter
+}
+
+func (h *HttpsAdapter) Close() {
+	h.conn.Close()
+}
+
+func (h *HttpsAdapter) Addr() *C.Addr {
+	return h.addr
+}
+
+func (h *HttpsAdapter) Conn() net.Conn {
+	return h.conn
+}
+
+func NewHttps(host string, conn net.Conn) *HttpsAdapter {
+	return &HttpsAdapter{
+		addr: parseHttpAddr(host),
+		conn: conn,
+	}
+}

adapters/local/socks.go

@@ -0,0 +1,32 @@
+package adapters
+
+import (
+	"net"
+
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/riobard/go-shadowsocks2/socks"
+)
+
+type SocksAdapter struct {
+	conn net.Conn
+	addr *C.Addr
+}
+
+func (s *SocksAdapter) Close() {
+	s.conn.Close()
+}
+
+func (s *SocksAdapter) Addr() *C.Addr {
+	return s.addr
+}
+
+func (s *SocksAdapter) Conn() net.Conn {
+	return s.conn
+}
+
+func NewSocks(target socks.Addr, conn net.Conn) *SocksAdapter {
+	return &SocksAdapter{
+		conn: conn,
+		addr: parseSocksAddr(target),
+	}
+}

adapters/local/util.go

@@ -0,0 +1,66 @@
+package adapters
+
+import (
+	"net"
+	"strconv"
+
+	C "github.com/Dreamacro/clash/constant"
+	"github.com/riobard/go-shadowsocks2/socks"
+)
+
+func parseSocksAddr(target socks.Addr) *C.Addr {
+	var host, port string
+	var ip net.IP
+
+	switch target[0] {
+	case socks.AtypDomainName:
+		host = string(target[2 : 2+target[1]])
+		port = strconv.Itoa((int(target[2+target[1]]) << 8) | int(target[2+target[1]+1]))
+		ipAddr, err := net.ResolveIPAddr("ip", host)
+		if err == nil {
+			ip = ipAddr.IP
+		}
+	case socks.AtypIPv4:
+		ip = net.IP(target[1 : 1+net.IPv4len])
+		port = strconv.Itoa((int(target[1+net.IPv4len]) << 8) | int(target[1+net.IPv4len+1]))
+	case socks.AtypIPv6:
+		ip = net.IP(target[1 : 1+net.IPv6len])
+		port = strconv.Itoa((int(target[1+net.IPv6len]) << 8) | int(target[1+net.IPv6len+1]))
+	}
+
+	return &C.Addr{
+		NetWork:  C.TCP,
+		AddrType: int(target[0]),
+		Host:     host,
+		IP:       &ip,
+		Port:     port,
+	}
+}
+
+func parseHttpAddr(target string) *C.Addr {
+	host, port, _ := net.SplitHostPort(target)
+	ipAddr, err := net.ResolveIPAddr("ip", host)
+	var resolveIP *net.IP
+	if err == nil {
+		resolveIP = &ipAddr.IP
+	}
+
+	var addType int
+	ip := net.ParseIP(host)
+	switch {
+	case ip == nil:
+		addType = socks.AtypDomainName
+	case ip.To4() == nil:
+		addType = socks.AtypIPv6
+	default:
+		addType = socks.AtypIPv4
+	}
+
+	return &C.Addr{
+		NetWork:  C.TCP,
+		AddrType: addType,
+		Host:     host,
+		IP:       resolveIP,
+		Port:     port,
+	}
+}

adapters/remote/direct.go

@@ -1,7 +1,6 @@
 package adapters
 
 import (
-	"io"
 	"net"
 
 	C "github.com/Dreamacro/clash/constant"
@@ -12,11 +11,6 @@ type DirectAdapter struct {
 	conn net.Conn
 }
 
-// ReadWriter is used to handle network traffic
-func (d *DirectAdapter) ReadWriter() io.ReadWriter {
-	return d.conn
-}
-
 // Close is used to close connection
 func (d *DirectAdapter) Close() {
 	d.conn.Close()
@@ -27,9 +21,7 @@ func (d *DirectAdapter) Conn() net.Conn {
 	return d.conn
 }
 
-type Direct struct {
-	traffic *C.Traffic
-}
+type Direct struct{}
 
 func (d *Direct) Name() string {
 	return "Direct"
@@ -45,9 +37,9 @@ func (d *Direct) Generator(addr *C.Addr) (adapter C.ProxyAdapter, err error) {
 		return
 	}
 	c.(*net.TCPConn).SetKeepAlive(true)
-	return &DirectAdapter{conn: NewTrafficTrack(c, d.traffic)}, nil
+	return &DirectAdapter{conn: c}, nil
 }
 
-func NewDirect(traffic *C.Traffic) *Direct {
-	return &Direct{traffic: traffic}
+func NewDirect() *Direct {
+	return &Direct{}
 }

adapters/remote/reject.go

@@ -11,11 +11,6 @@ import (
 type RejectAdapter struct {
 }
 
-// ReadWriter is used to handle network traffic
-func (r *RejectAdapter) ReadWriter() io.ReadWriter {
-	return &NopRW{}
-}
-
 // Close is used to close connection
 func (r *RejectAdapter) Close() {}
 

adapters/remote/shadowsocks.go

@@ -3,7 +3,6 @@ package adapters
 import (
 	"bytes"
 	"fmt"
-	"io"
 	"net"
 	"net/url"
 	"strconv"
@@ -19,11 +18,6 @@ type ShadowsocksAdapter struct {
 	conn net.Conn
 }
 
-// ReadWriter is used to handle network traffic
-func (ss *ShadowsocksAdapter) ReadWriter() io.ReadWriter {
-	return ss.conn
-}
-
 // Close is used to close connection
 func (ss *ShadowsocksAdapter) Close() {
 	ss.conn.Close()
@@ -34,10 +28,9 @@ func (ss *ShadowsocksAdapter) Conn() net.Conn {
 }
 
 type ShadowSocks struct {
-	server  string
-	name    string
-	cipher  core.Cipher
-	traffic *C.Traffic
+	server string
+	name   string
+	cipher core.Cipher
 }
 
 func (ss *ShadowSocks) Name() string {
@@ -56,10 +49,10 @@ func (ss *ShadowSocks) Generator(addr *C.Addr) (adapter C.ProxyAdapter, err erro
 	c.(*net.TCPConn).SetKeepAlive(true)
 	c = ss.cipher.StreamConn(c)
 	_, err = c.Write(serializesSocksAddr(addr))
-	return &ShadowsocksAdapter{conn: NewTrafficTrack(c, ss.traffic)}, err
+	return &ShadowsocksAdapter{conn: c}, err
 }
 
-func NewShadowSocks(name string, ssURL string, traffic *C.Traffic) (*ShadowSocks, error) {
+func NewShadowSocks(name string, ssURL string) (*ShadowSocks, error) {
 	var key []byte
 	server, cipher, password, _ := parseURL(ssURL)
 	ciph, err := core.PickCipher(cipher, key, password)
@@ -67,10 +60,9 @@ func NewShadowSocks(name string, ssURL string, traffic *C.Traffic) (*ShadowSocks
 		return nil, fmt.Errorf("ss %s initialize error: %s", server, err.Error())
 	}
 	return &ShadowSocks{
-		server:  server,
-		name:    name,
-		cipher:  ciph,
-		traffic: traffic,
+		server: server,
+		name:   name,
+		cipher: ciph,
 	}, nil
 }
 

adapters/util.go

@@ -1,28 +0,0 @@
-package adapters
-
-import (
-	"net"
-
-	C "github.com/Dreamacro/clash/constant"
-)
-
-type TrafficTrack struct {
-	net.Conn
-	traffic *C.Traffic
-}
-
-func (tt *TrafficTrack) Read(b []byte) (int, error) {
-	n, err := tt.Conn.Read(b)
-	tt.traffic.Down() <- int64(n)
-	return n, err
-}
-
-func (tt *TrafficTrack) Write(b []byte) (int, error) {
-	n, err := tt.Conn.Write(b)
-	tt.traffic.Up() <- int64(n)
-	return n, err
-}
-
-func NewTrafficTrack(conn net.Conn, traffic *C.Traffic) *TrafficTrack {
-	return &TrafficTrack{traffic: traffic, Conn: conn}
-}