Refactor: plain http proxy (#1443)

listener/mixed/conn.go

@@ -1,41 +0,0 @@
-package mixed
-
-import (
-	"bufio"
-	"net"
-)
-
-type BufferedConn struct {
-	r *bufio.Reader
-	net.Conn
-}
-
-func NewBufferedConn(c net.Conn) *BufferedConn {
-	return &BufferedConn{bufio.NewReader(c), c}
-}
-
-// Reader returns the internal bufio.Reader.
-func (c *BufferedConn) Reader() *bufio.Reader {
-	return c.r
-}
-
-// Peek returns the next n bytes without advancing the reader.
-func (c *BufferedConn) Peek(n int) ([]byte, error) {
-	return c.r.Peek(n)
-}
-
-func (c *BufferedConn) Read(p []byte) (int, error) {
-	return c.r.Read(p)
-}
-
-func (c *BufferedConn) ReadByte() (byte, error) {
-	return c.r.ReadByte()
-}
-
-func (c *BufferedConn) UnreadByte() error {
-	return c.r.UnreadByte()
-}
-
-func (c *BufferedConn) Buffered() int {
-	return c.r.Buffered()
-}

listener/mixed/mixed.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/Dreamacro/clash/common/cache"
+	N "github.com/Dreamacro/clash/common/net"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/listener/http"
 	"github.com/Dreamacro/clash/listener/socks"
@@ -51,7 +52,7 @@ func (l *Listener) Address() string {
 }
 
 func handleConn(conn net.Conn, in chan<- C.ConnContext, cache *cache.Cache) {
-	bufConn := NewBufferedConn(conn)
+	bufConn := N.NewBufferedConn(conn)
 	head, err := bufConn.Peek(1)
 	if err != nil {
 		return